Tidying and linting

internal/apimodule/account/accountcreate_test.go

@@ -57,8 +57,6 @@ type AccountCreateTestSuite struct {
 	config               *config.Config
 	log                  *logrus.Logger
 	testAccountLocal     *model.Account
-	testAccountRemote    *model.Account
-	testUser             *model.User
 	testApplication      *model.Application
 	testToken            oauth2.TokenInfo
 	mockOauthServer      *oauth.MockServer

internal/apimodule/account/accountget.go

@@ -33,19 +33,18 @@ import (
 func (m *accountModule) accountGETHandler(c *gin.Context) {
 	targetAcctID := c.Param(idKey)
 	if targetAcctID == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error":"no account id specified"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "no account id specified"})
 		return
 	}
 
 	targetAccount := &model.Account{}
 	if err := m.db.GetByID(targetAcctID, targetAccount); err != nil {
 		if _, ok := err.(db.ErrNoEntries); ok {
-			c.JSON(http.StatusNotFound, gin.H{"error":"Record not found"})
-			return
-		} else {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			c.JSON(http.StatusNotFound, gin.H{"error": "Record not found"})
 			return
 		}
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
 	}
 
 	acctInfo, err := m.db.AccountToMastoPublic(targetAccount)

internal/apimodule/account/accountupdate.go

@@ -137,13 +137,12 @@ func (m *accountModule) accountUpdateCredentialsPATCHHandler(c *gin.Context) {
 			if err := util.ValidateLanguage(*form.Source.Language); err != nil {
 				c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 				return
-			} else {
+			}
 			if err := m.db.UpdateOneByID(authed.Account.ID, "language", *form.Source.Language, &model.Account{}); err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				return
 			}
 		}
-		}
 
 		if form.Source.Sensitive != nil {
 			if err := m.db.UpdateOneByID(authed.Account.ID, "locked", *form.Locked, &model.Account{}); err != nil {
@@ -156,18 +155,17 @@ func (m *accountModule) accountUpdateCredentialsPATCHHandler(c *gin.Context) {
 			if err := util.ValidatePrivacy(*form.Source.Privacy); err != nil {
 				c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 				return
-			} else {
+			}
 			if err := m.db.UpdateOneByID(authed.Account.ID, "privacy", *form.Source.Privacy, &model.Account{}); err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				return
 			}
 		}
 	}
-	}
 
-	if form.FieldsAttributes != nil {
-		// TODO: parse fields attributes nicely and update
-	}
+	// if form.FieldsAttributes != nil {
+	// 	// TODO: parse fields attributes nicely and update
+	// }
 
 	// fetch the account with all updated values set
 	updatedAccount := &model.Account{}

internal/apimodule/account/accountupdate_test.go

@@ -53,8 +53,6 @@ type AccountUpdateTestSuite struct {
 	config               *config.Config
 	log                  *logrus.Logger
 	testAccountLocal     *model.Account
-	testAccountRemote    *model.Account
-	testUser             *model.User
 	testApplication      *model.Application
 	testToken            oauth2.TokenInfo
 	mockOauthServer      *oauth.MockServer

internal/apimodule/fileserver/fileserver.go

@@ -25,7 +25,7 @@ type fileServer struct {
 // New returns a new fileServer module
 func New(config *config.Config, db db.DB, storage storage.Storage, log *logrus.Logger) apimodule.ClientAPIModule {
 
-	storageBase := fmt.Sprintf("%s", config.StorageConfig.BasePath) // TODO: do this properly
+	storageBase := config.StorageConfig.BasePath // TODO: do this properly
 
 	return &fileServer{
 		config:      config,

internal/media/media.go

@@ -120,7 +120,7 @@ func (mh *mediaHandler) processHeaderOrAvi(imageBytes []byte, contentType string
 		return nil, errors.New("header or avatar not selected")
 	}
 
-	clean := []byte{}
+	var clean []byte
 	var err error
 
 	switch contentType {
@@ -152,7 +152,7 @@ func (mh *mediaHandler) processHeaderOrAvi(imageBytes []byte, contentType string
 	extension := strings.Split(contentType, "/")[1]
 	newMediaID := uuid.NewString()
 
-	base := fmt.Sprintf("%s://%s%s", mh.config.StorageConfig.ServeProtocol, mh.config.StorageConfig.ServeHost, mh.config.StorageConfig.ServeBasePath, )
+	base := fmt.Sprintf("%s://%s%s", mh.config.StorageConfig.ServeProtocol, mh.config.StorageConfig.ServeHost, mh.config.StorageConfig.ServeBasePath)
 
 	// we store the original...
 	originalPath := fmt.Sprintf("%s/%s/%s/original/%s.%s", base, accountID, headerOrAvi, newMediaID, extension)

internal/media/util.go

@@ -73,7 +73,7 @@ func supportedImageType(mimeType string) bool {
 // purgeExif is a little wrapper for the action of removing exif data from an image.
 // Only pass pngs or jpegs to this function.
 func purgeExif(b []byte) ([]byte, error) {
-	if b == nil || len(b) == 0 {
+	if len(b) == 0 {
 		return nil, errors.New("passed image was not valid")
 	}
 
@@ -81,7 +81,7 @@ func purgeExif(b []byte) ([]byte, error) {
 	if err != nil {
 		return nil, fmt.Errorf("could not purge exif from image: %s", err)
 	}
-	if clean == nil || len(clean) == 0 {
+	if len(clean) == 0 {
 		return nil, errors.New("purged image was not valid")
 	}
 	return clean, nil

internal/util/validation_test.go

@@ -90,7 +90,7 @@ func (suite *ValidationTestSuite) TestValidateUsername() {
 	weirdChars := "thisusername&&&&&&&istooweird!!"
 	leadingSpace := " see_that_leading_space"
 	trailingSpace := "thisusername_ends_with_a_space "
-	newlines := fmt.Sprintf("this_is\n_almost_ok")
+	newlines := "this_is\n_almost_ok"
 	goodUsername := "this_is_a_good_username"
 	var err error