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/federation/federatingdb/accept.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/federation/federatingdb/accept.go')
| -rw-r--r-- | internal/federation/federatingdb/accept.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/federation/federatingdb/accept.go b/internal/federation/federatingdb/accept.go index 60b9cfe58..8082e555f 100644 --- a/internal/federation/federatingdb/accept.go +++ b/internal/federation/federatingdb/accept.go @@ -38,11 +38,11 @@ func (f *federatingDB) GetAccept( ctx context.Context, acceptIRI *url.URL, ) (vocab.ActivityStreamsAccept, error) { - approval, err := f.state.DB.GetInteractionApprovalByURI(ctx, acceptIRI.String()) + approval, err := f.state.DB.GetInteractionRequestByURI(ctx, acceptIRI.String()) if err != nil { return nil, err } - return f.converter.InteractionApprovalToASAccept(ctx, approval) + return f.converter.InteractionReqToASAccept(ctx, approval) } func (f *federatingDB) Accept(ctx context.Context, accept vocab.ActivityStreamsAccept) error { |