From 615e3b085e5aa26b6dfb3e51f2b28073bae5a96e Mon Sep 17 00:00:00 2001
From: Till Faelligen <tfaelligen@gmail.com>
Date: Thu, 24 Mar 2022 15:54:58 +0100
Subject: [PATCH] Fix linter issues

---
 clientapi/routing/profile.go  | 7 +++++--
 clientapi/threepid/invites.go | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go
index ade196097..dd1da1806 100644
--- a/clientapi/routing/profile.go
+++ b/clientapi/routing/profile.go
@@ -141,7 +141,7 @@ func SetAvatarURL(
 	}
 
 	setRes := &userapi.PerformSetAvatarURLResponse{}
-	if err := profileAPI.SetAvatarURL(req.Context(), &userapi.PerformSetAvatarURLRequest{
+	if err = profileAPI.SetAvatarURL(req.Context(), &userapi.PerformSetAvatarURLRequest{
 		Localpart: localpart,
 		AvatarURL: r.AvatarURL,
 	}, setRes); err != nil {
@@ -259,7 +259,10 @@ func SetDisplayName(
 	err = profileAPI.QueryProfile(req.Context(), &userapi.QueryProfileRequest{
 		UserID: userID,
 	}, pRes)
-
+	if err != nil {
+		util.GetLogger(req.Context()).WithError(err).Error("profileAPI.QueryProfile failed")
+		return jsonerror.InternalServerError()
+	}
 	oldProfile := &authtypes.Profile{
 		Localpart:   localpart,
 		DisplayName: pRes.DisplayName,
diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go
index c32942e6a..6b750199b 100644
--- a/clientapi/threepid/invites.go
+++ b/clientapi/threepid/invites.go
@@ -217,7 +217,7 @@ func queryIDServerStoreInvite(
 	var profile *authtypes.Profile
 	if serverName == cfg.Matrix.ServerName {
 		res := &userapi.QueryProfileResponse{}
-		err := db.QueryProfile(ctx, &userapi.QueryProfileRequest{UserID: device.UserID}, res)
+		err = db.QueryProfile(ctx, &userapi.QueryProfileRequest{UserID: device.UserID}, res)
 		if err != nil {
 			return nil, err
 		}