whole buncha stuff

3 files changed, 72 insertions, 7 deletions

diff --git a/internal/gtsmodel/account.go b/internal/gtsmodel/account.go
index 7cd942ee8..84ba027b2 100644
--- a/internal/gtsmodel/account.go
+++ b/internal/gtsmodel/account.go
@@ -26,10 +26,10 @@ import (
 	"time"
 )
 
-// GTSAccount represents a GoToSocial user account
-type GTSAccount struct {
-	GTSAvatar
-	GTSHeader
+// Account represents a GoToSocial user account
+type Account struct {
+	Avatar
+	Header
 	URI                   string
 	URL                   string
 	ID                    string `pg:"type:uuid,default:gen_random_uuid(),pk,notnull"`
@@ -66,7 +66,7 @@ type GTSAccount struct {
 	SuspensionOrigin      int
 }
 
-type GTSAvatar struct {
+type Avatar struct {
 	AvatarFileName             string
 	AvatarContentType          string
 	AvatarFileSize             int
@@ -75,7 +75,7 @@ type GTSAvatar struct {
 	AvatarStorageSchemaVersion int
 }
 
-type GTSHeader struct {
+type Header struct {
 	HeaderFileName             string
 	HeaderContentType          string
 	HeaderFileSize             int
diff --git a/internal/gtsmodel/status.go b/internal/gtsmodel/status.go
index cba8a6ba8..39c450934 100644
--- a/internal/gtsmodel/status.go
+++ b/internal/gtsmodel/status.go
@@ -20,7 +20,7 @@ package gtsmodel
 
 import "time"
 
-type GTSStatus struct {
+type Status struct {
 	ID             string `pg:"type:uuid,default:gen_random_uuid(),pk,notnull"`
 	URI            string
 	URL            string
diff --git a/internal/gtsmodel/user.go b/internal/gtsmodel/user.go
new file mode 100644
index 000000000..577590ddf
--- /dev/null
+++ b/internal/gtsmodel/user.go
@@ -0,0 +1,65 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package gtsmodel
+
+import (
+	"net"
+	"time"
+)
+
+type User struct {
+	ID                     string    `pg:"type:uuid,default:gen_random_uuid(),pk,notnull"`
+	Email                  string    `pg:",notnull"`
+	CreatedAt              time.Time `pg:"type:timestamp,notnull"`
+	UpdatedAt              time.Time `pg:"type:timestamp,notnull"`
+	EncryptedPassword      string    `pg:",notnull"`
+	ResetPasswordToken     string
+	ResetPasswordSentAt    time.Time `pg:"type:timestamp"`
+	SignInCount            int
+	CurrentSignInAt        time.Time `pg:"type:timestamp"`
+	LastSignInAt           time.Time `pg:"type:timestamp"`
+	CurrentSignInIP        net.IP
+	LastSignInIP           net.IP
+	Admin                  bool
+	ConfirmationToken      string
+	ConfirmedAt            time.Time `pg:"type:timestamp"`
+	ConfirmationSentAt     time.Time `pg:"type:timestamp"`
+	UnconfirmedEmail       string
+	Locale                 string
+	EncryptedOTPSecret     string
+	EncryptedOTPSecretIv   string
+	EncryptedOTPSecretSalt string
+	ConsumedTimestamp      int
+	OTPRequiredForLogin    bool
+	LastEmailedAt          time.Time `pg:"type:timestamp"`
+	OTPBackupCodes         []string
+	FilteredLanguages      []string
+	AccountID              string `pg:",notnull"`
+	Disabled               bool
+	Moderator              bool
+	InviteID               string
+	RememberToken          string
+	ChosenLanguages        []string
+	CreatedByApplicationID string
+	Approved               bool
+	SignInToken            string
+	SignInTokenSentAt      time.Time `pg:"type:timestamp"`
+	WebauthnID             string
+	SignUpIP               net.IP
+}