From 8640fc2b008c6fd84f4443768218bd1d0705c866 Mon Sep 17 00:00:00 2001
From: tsmethurst <tobi.smethurst@klarrio.com>
Date: Sun, 23 May 2021 18:06:42 +0200
Subject: [PATCH] lint + fmt

---
 cmd/gotosocial/main.go               | 32 ++++++++++++++--------------
 internal/federation/federating_db.go |  6 +++---
 internal/message/frprocess.go        |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/cmd/gotosocial/main.go b/cmd/gotosocial/main.go
index a113ef2dc..1b7187809 100644
--- a/cmd/gotosocial/main.go
+++ b/cmd/gotosocial/main.go
@@ -277,16 +277,16 @@ func main() {
 								Usage: "create a new account",
 								Flags: []cli.Flag{
 									&cli.StringFlag{
-										Name:    config.UsernameFlag,
-										Usage:   config.UsernameUsage,
+										Name:  config.UsernameFlag,
+										Usage: config.UsernameUsage,
 									},
 									&cli.StringFlag{
-										Name:    config.EmailFlag,
-										Usage:   config.EmailUsage,
+										Name:  config.EmailFlag,
+										Usage: config.EmailUsage,
 									},
 									&cli.StringFlag{
-										Name:    config.PasswordFlag,
-										Usage:   config.PasswordUsage,
+										Name:  config.PasswordFlag,
+										Usage: config.PasswordUsage,
 									},
 								},
 								Action: func(c *cli.Context) error {
@@ -298,8 +298,8 @@ func main() {
 								Usage: "confirm an existing account manually, thereby skipping email confirmation",
 								Flags: []cli.Flag{
 									&cli.StringFlag{
-										Name:    config.UsernameFlag,
-										Usage:   config.UsernameUsage,
+										Name:  config.UsernameFlag,
+										Usage: config.UsernameUsage,
 									},
 								},
 								Action: func(c *cli.Context) error {
@@ -311,8 +311,8 @@ func main() {
 								Usage: "promote an account to admin",
 								Flags: []cli.Flag{
 									&cli.StringFlag{
-										Name:    config.UsernameFlag,
-										Usage:   config.UsernameUsage,
+										Name:  config.UsernameFlag,
+										Usage: config.UsernameUsage,
 									},
 								},
 								Action: func(c *cli.Context) error {
@@ -324,8 +324,8 @@ func main() {
 								Usage: "demote an account from admin to normal user",
 								Flags: []cli.Flag{
 									&cli.StringFlag{
-										Name:    config.UsernameFlag,
-										Usage:   config.UsernameUsage,
+										Name:  config.UsernameFlag,
+										Usage: config.UsernameUsage,
 									},
 								},
 								Action: func(c *cli.Context) error {
@@ -337,8 +337,8 @@ func main() {
 								Usage: "prevent an account from signing in or posting etc, but don't delete anything",
 								Flags: []cli.Flag{
 									&cli.StringFlag{
-										Name:    config.UsernameFlag,
-										Usage:   config.UsernameUsage,
+										Name:  config.UsernameFlag,
+										Usage: config.UsernameUsage,
 									},
 								},
 								Action: func(c *cli.Context) error {
@@ -350,8 +350,8 @@ func main() {
 								Usage: "completely remove an account and all of its posts, media, etc",
 								Flags: []cli.Flag{
 									&cli.StringFlag{
-										Name:    config.UsernameFlag,
-										Usage:   config.UsernameUsage,
+										Name:  config.UsernameFlag,
+										Usage: config.UsernameUsage,
 									},
 								},
 								Action: func(c *cli.Context) error {
diff --git a/internal/federation/federating_db.go b/internal/federation/federating_db.go
index b40819bfa..af685904a 100644
--- a/internal/federation/federating_db.go
+++ b/internal/federation/federating_db.go
@@ -560,7 +560,7 @@ func (f *federatingDB) Update(ctx context.Context, asType vocab.Type) error {
 		typeName == gtsmodel.ActivityStreamsOrganization ||
 		typeName == gtsmodel.ActivityStreamsPerson ||
 		typeName == gtsmodel.ActivityStreamsService {
-			// it's an UPDATE to some kind of account
+		// it's an UPDATE to some kind of account
 		var accountable typeutils.Accountable
 
 		switch asType.GetTypeName() {
@@ -671,7 +671,7 @@ func (f *federatingDB) Delete(ctx context.Context, id *url.URL) error {
 	s := &gtsmodel.Status{}
 	if err := f.db.GetWhere(where, s); err == nil {
 		// it's a status
-		l.Debug("uri is for status with id: %s", s.ID)
+		l.Debugf("uri is for status with id: %s", s.ID)
 		if err := f.db.DeleteByID(s.ID, &gtsmodel.Status{}); err != nil {
 			return fmt.Errorf("Delete: err deleting status: %s", err)
 		}
@@ -686,7 +686,7 @@ func (f *federatingDB) Delete(ctx context.Context, id *url.URL) error {
 	a := &gtsmodel.Account{}
 	if err := f.db.GetWhere(where, a); err == nil {
 		// it's an account
-		l.Debug("uri is for an account with id: %s", s.ID)
+		l.Debugf("uri is for an account with id: %s", s.ID)
 		if err := f.db.DeleteByID(a.ID, &gtsmodel.Account{}); err != nil {
 			return fmt.Errorf("Delete: err deleting account: %s", err)
 		}
diff --git a/internal/message/frprocess.go b/internal/message/frprocess.go
index 5d02836e6..41ab285c2 100644
--- a/internal/message/frprocess.go
+++ b/internal/message/frprocess.go
@@ -68,8 +68,8 @@ func (p *processor) FollowRequestAccept(auth *oauth.Auth, accountID string) (*ap
 		APObjectType:   gtsmodel.ActivityStreamsFollow,
 		APActivityType: gtsmodel.ActivityStreamsAccept,
 		GTSModel:       follow,
-		OriginAccount: originAccount,
-		TargetAccount: targetAccount,
+		OriginAccount:  originAccount,
+		TargetAccount:  targetAccount,
 	}
 
 	gtsR, err := p.db.GetRelationship(auth.Account.ID, accountID)