From f23f04e0b1d117be714bf91d5266dab219ed741e Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sat, 24 Aug 2024 11:49:37 +0200
Subject: [feature] Interaction requests client api + settings panel (#3215)

* [feature] Interaction requests client api + settings panel

* test accept / reject

* fmt

* don't pin rejected interaction

* use single db model for interaction accept, reject, and request

* swaggor

* env sharting

* append errors

* remove ErrNoEntries checks

* change intReqID to reqID

* rename "pend" to "request"

* markIntsPending -> mark interactionsPending

* use log instead of returning error when rejecting interaction

* empty migration

* jolly renaming

* make interactionURI unique again

* swag grr

* remove unnecessary locks

* invalidate as last step
---
 internal/api/activitypub/users/acceptget.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'internal/api/activitypub')

diff --git a/internal/api/activitypub/users/acceptget.go b/internal/api/activitypub/users/acceptget.go
index c2b438330..4d0630df7 100644
--- a/internal/api/activitypub/users/acceptget.go
+++ b/internal/api/activitypub/users/acceptget.go
@@ -25,7 +25,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 )
 
-// AcceptGETHandler serves an interactionApproval as an ActivityStreams Accept.
+// AcceptGETHandler serves an interaction request as an ActivityStreams Accept.
 func (m *Module) AcceptGETHandler(c *gin.Context) {
 	username, errWithCode := apiutil.ParseUsername(c.Param(apiutil.UsernameKey))
 	if errWithCode != nil {
@@ -33,7 +33,7 @@ func (m *Module) AcceptGETHandler(c *gin.Context) {
 		return
 	}
 
-	acceptID, errWithCode := apiutil.ParseID(c.Param(apiutil.IDKey))
+	reqID, errWithCode := apiutil.ParseID(c.Param(apiutil.IDKey))
 	if errWithCode != nil {
 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
 		return
@@ -45,7 +45,7 @@ func (m *Module) AcceptGETHandler(c *gin.Context) {
 		return
 	}
 
-	resp, errWithCode := m.processor.Fedi().AcceptGet(c.Request.Context(), username, acceptID)
+	resp, errWithCode := m.processor.Fedi().AcceptGet(c.Request.Context(), username, reqID)
 	if errWithCode != nil {
 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
 		return
-- 
cgit v1.2.3