From 4920229a3b6e1d7dde536bc9ff766542b05d935c Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 20 Aug 2021 12:26:56 +0200
Subject: Database updates (#144)

* start moving some database stuff around

* continue moving db stuff around

* more fiddling

* more updates

* and some more

* and yet more

* i broke SOMETHING but what, it's a mystery

* tidy up

* vendor ttlcache

* use ttlcache

* fix up some tests

* rename some stuff

* little reminder

* some more updates
---
 internal/cliactions/admin/account/account.go | 20 ++++++++++----------
 internal/cliactions/server/server.go         |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'internal/cliactions')

diff --git a/internal/cliactions/admin/account/account.go b/internal/cliactions/admin/account/account.go
index 732527aa4..0ae7f32de 100644
--- a/internal/cliactions/admin/account/account.go
+++ b/internal/cliactions/admin/account/account.go
@@ -88,8 +88,8 @@ var Confirm cliactions.GTSAction = func(ctx context.Context, c *config.Config, l
 		return err
 	}
 
-	a := &gtsmodel.Account{}
-	if err := dbConn.GetLocalAccountByUsername(username, a); err != nil {
+	a, err := dbConn.GetLocalAccountByUsername(username)
+	if err != nil {
 		return err
 	}
 
@@ -123,8 +123,8 @@ var Promote cliactions.GTSAction = func(ctx context.Context, c *config.Config, l
 		return err
 	}
 
-	a := &gtsmodel.Account{}
-	if err := dbConn.GetLocalAccountByUsername(username, a); err != nil {
+	a, err := dbConn.GetLocalAccountByUsername(username)
+	if err != nil {
 		return err
 	}
 
@@ -155,8 +155,8 @@ var Demote cliactions.GTSAction = func(ctx context.Context, c *config.Config, lo
 		return err
 	}
 
-	a := &gtsmodel.Account{}
-	if err := dbConn.GetLocalAccountByUsername(username, a); err != nil {
+	a, err := dbConn.GetLocalAccountByUsername(username)
+	if err != nil {
 		return err
 	}
 
@@ -187,8 +187,8 @@ var Disable cliactions.GTSAction = func(ctx context.Context, c *config.Config, l
 		return err
 	}
 
-	a := &gtsmodel.Account{}
-	if err := dbConn.GetLocalAccountByUsername(username, a); err != nil {
+	a, err := dbConn.GetLocalAccountByUsername(username)
+	if err != nil {
 		return err
 	}
 
@@ -233,8 +233,8 @@ var Password cliactions.GTSAction = func(ctx context.Context, c *config.Config,
 		return err
 	}
 
-	a := &gtsmodel.Account{}
-	if err := dbConn.GetLocalAccountByUsername(username, a); err != nil {
+	a, err := dbConn.GetLocalAccountByUsername(username)
+	if err != nil {
 		return err
 	}
 
diff --git a/internal/cliactions/server/server.go b/internal/cliactions/server/server.go
index 2314e2608..72c6cfadf 100644
--- a/internal/cliactions/server/server.go
+++ b/internal/cliactions/server/server.go
@@ -62,6 +62,8 @@ var models []interface{} = []interface{}{
 	&gtsmodel.MediaAttachment{},
 	&gtsmodel.Mention{},
 	&gtsmodel.Status{},
+	&gtsmodel.StatusToEmoji{},
+	&gtsmodel.StatusToTag{},
 	&gtsmodel.StatusFave{},
 	&gtsmodel.StatusBookmark{},
 	&gtsmodel.StatusMute{},
-- 
cgit v1.2.3