Fix nakedreturns after merge

Author: 42wim

modules/activitypub/client.go

@@ -92,7 +92,7 @@ func NewClient(user *user_model.User, pubID string) (c *Client, err error) {
 		priv:        privParsed,
 		pubID:       pubID,
 	}
-	return
+	return c, err
 }
 
 // NewRequest function
@@ -110,7 +110,7 @@ func (c *Client) NewRequest(b []byte, to string) (req *http.Request, err error)
 		return
 	}
 	err = signer.SignRequest(c.priv, c.pubID, req, b)
-	return
+	return req, err
 }
 
 // Post function
@@ -120,5 +120,5 @@ func (c *Client) Post(b []byte, to string) (resp *http.Response, err error) {
 		return
 	}
 	resp, err = c.client.Do(req)
-	return
+	return resp, err
 }

modules/activitypub/user_settings.go

@@ -35,11 +35,11 @@ func GetKeyPair(user *user_model.User) (pub, priv string, err error) {
 // GetPublicKey function returns a user's public key
 func GetPublicKey(user *user_model.User) (pub string, err error) {
 	pub, _, err = GetKeyPair(user)
-	return
+	return pub, err
 }
 
 // GetPrivateKey function returns a user's private key
 func GetPrivateKey(user *user_model.User) (priv string, err error) {
 	_, priv, err = GetKeyPair(user)
-	return
+	return priv, err
 }

routers/api/v1/activitypub/reqsignature.go

@@ -41,7 +41,7 @@ func getPublicKeyFromResponse(b []byte, keyID *url.URL) (p crypto.PublicKey, err
 		return
 	}
 	p, err = x509.ParsePKIXPublicKey(block.Bytes)
-	return
+	return p, err
 }
 
 func fetch(iri *url.URL) (b []byte, err error) {
@@ -59,7 +59,7 @@ func fetch(iri *url.URL) (b []byte, err error) {
 		return
 	}
 	b, err = io.ReadAll(io.LimitReader(resp.Body, setting.Federation.MaxSize))
-	return
+	return b, err
 }
 
 func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, err error) {
@@ -87,7 +87,7 @@ func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, er
 	// 3. Verify the other actor's key
 	algo := httpsig.Algorithm(setting.Federation.Algorithms[0])
 	authenticated = v.Verify(pubKey, algo) == nil
-	return
+	return authenticated, err
 }
 
 // ReqHTTPSignature function