diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2024-08-24 11:49:37 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-08-24 11:49:37 +0200 |
| commit | f23f04e0b1d117be714bf91d5266dab219ed741e (patch) | |
| tree | 0b3ddd60d51c8729949c3669993910a7f8f32a7b /internal/api/activitypub/users/acceptget.go | |
| parent | [performance] ffmpeg ffprobe wrapper improvements (#3225) (diff) | |
| download | gotosocial-f23f04e0b1d117be714bf91d5266dab219ed741e.tar.xz | |
[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
Diffstat (limited to 'internal/api/activitypub/users/acceptget.go')
| -rw-r--r-- | internal/api/activitypub/users/acceptget.go | 6 |
1 files changed, 3 insertions, 3 deletions
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 |