- Removed double imports (#1989)

- Lower cased error messages

Signed-off-by: Ryan Whittington <twentybitdev@gmail.com>

Co-authored-by: kegsay <kegan@matrix.org>

4 files changed, 7 insertions, 8 deletions

diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index 518edef4..4ff8f51d 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -177,10 +177,10 @@ func (a *UserInternalAPI) deviceListUpdate(userID string, deviceIDs []string) er
 		DeviceKeys: deviceKeys,
 	}, &uploadRes)
 	if uploadRes.Error != nil {
-		return fmt.Errorf("Failed to delete device keys: %v", uploadRes.Error)
+		return fmt.Errorf("failed to delete device keys: %v", uploadRes.Error)
 	}
 	if len(uploadRes.KeyErrors) > 0 {
-		return fmt.Errorf("Failed to delete device keys, key errors: %+v", uploadRes.KeyErrors)
+		return fmt.Errorf("failed to delete device keys, key errors: %+v", uploadRes.KeyErrors)
 	}
 	return nil
 }
@@ -242,10 +242,10 @@ func (a *UserInternalAPI) PerformDeviceUpdate(ctx context.Context, req *api.Perf
 			OnlyDisplayNameUpdates: true,
 		}, &uploadRes)
 		if uploadRes.Error != nil {
-			return fmt.Errorf("Failed to update device key display name: %v", uploadRes.Error)
+			return fmt.Errorf("failed to update device key display name: %v", uploadRes.Error)
 		}
 		if len(uploadRes.KeyErrors) > 0 {
-			return fmt.Errorf("Failed to update device key display name, key errors: %+v", uploadRes.KeyErrors)
+			return fmt.Errorf("failed to update device key display name, key errors: %+v", uploadRes.KeyErrors)
 		}
 	}
 	return nil
diff --git a/userapi/storage/accounts/interface.go b/userapi/storage/accounts/interface.go
index 887f7193..7af2f15f 100644
--- a/userapi/storage/accounts/interface.go
+++ b/userapi/storage/accounts/interface.go
@@ -67,4 +67,4 @@ type Database interface {
 
 // Err3PIDInUse is the error returned when trying to save an association involving
 // a third-party identifier which is already associated to a local user.
-var Err3PIDInUse = errors.New("This third-party identifier is already in use")
+var Err3PIDInUse = errors.New("this third-party identifier is already in use")
diff --git a/userapi/storage/accounts/postgres/storage.go b/userapi/storage/accounts/postgres/storage.go
index 6bddbfc3..2f829062 100644
--- a/userapi/storage/accounts/postgres/storage.go
+++ b/userapi/storage/accounts/postgres/storage.go
@@ -28,7 +28,6 @@ import (
 	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/dendrite/userapi/storage/accounts/postgres/deltas"
-	_ "github.com/matrix-org/dendrite/userapi/storage/accounts/postgres/deltas"
 	"github.com/matrix-org/gomatrixserverlib"
 	"golang.org/x/crypto/bcrypt"
 
@@ -271,7 +270,7 @@ func (d *Database) hashPassword(plaintext string) (hash string, err error) {
 
 // Err3PIDInUse is the error returned when trying to save an association involving
 // a third-party identifier which is already associated to a local user.
-var Err3PIDInUse = errors.New("This third-party identifier is already in use")
+var Err3PIDInUse = errors.New("this third-party identifier is already in use")
 
 // SaveThreePIDAssociation saves the association between a third party identifier
 // and a local Matrix user (identified by the user's ID's local part).
diff --git a/userapi/storage/accounts/sqlite3/storage.go b/userapi/storage/accounts/sqlite3/storage.go
index d752e3db..2b731b75 100644
--- a/userapi/storage/accounts/sqlite3/storage.go
+++ b/userapi/storage/accounts/sqlite3/storage.go
@@ -304,7 +304,7 @@ func (d *Database) hashPassword(plaintext string) (hash string, err error) {
 
 // Err3PIDInUse is the error returned when trying to save an association involving
 // a third-party identifier which is already associated to a local user.
-var Err3PIDInUse = errors.New("This third-party identifier is already in use")
+var Err3PIDInUse = errors.New("this third-party identifier is already in use")
 
 // SaveThreePIDAssociation saves the association between a third party identifier
 // and a local Matrix user (identified by the user's ID's local part).