mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-31 17:52:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Ensure id set on outgoing Reject + Accept (#3312)

Browse source
This commit is contained in:
tobi 2024-09-16 22:41:04 +02:00 • committed by GitHub
commit 4bd5e68b2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

62
internal/processing/workers/federate.go
View file

@ -1149,41 +1149,18 @@ func (f *federate) AcceptInteraction(
return nil
}
// Parse relevant URI(s).
// Parse outbox URI.
outboxIRI, err := parseURI(req.TargetAccount.OutboxURI)
if err != nil {
return err
}
acceptingAcctIRI, err := parseURI(req.TargetAccount.URI)
// Convert req to Accept.
accept, err := f.converter.InteractionReqToASAccept(ctx, req)
if err != nil {
return err
return gtserror.Newf("error converting request to Accept: %w", err)
}
interactingAcctURI, err := parseURI(req.InteractingAccount.URI)
if err != nil {
return err
}
interactionURI, err := parseURI(req.InteractionURI)
if err != nil {
return err
}
// Create a new Accept.
accept := streams.NewActivityStreamsAccept()
// Set interacted-with account
// as Actor of the Accept.
ap.AppendActorIRIs(accept, acceptingAcctIRI)
// Set the interacted-with object
// as Object of the Accept.
ap.AppendObjectIRIs(accept, interactionURI)
// Address the Accept To the interacting acct.
ap.AppendTo(accept, interactingAcctURI)
// Send the Accept via the Actor's outbox.
if _, err := f.FederatingActor().Send(
ctx, outboxIRI, accept,
@ -1221,41 +1198,18 @@ func (f *federate) RejectInteraction(
return nil
}
// Parse relevant URI(s).
// Parse outbox URI.
outboxIRI, err := parseURI(req.TargetAccount.OutboxURI)
if err != nil {
return err
}
rejectingAcctIRI, err := parseURI(req.TargetAccount.URI)
// Convert req to Reject.
reject, err := f.converter.InteractionReqToASReject(ctx, req)
if err != nil {
return err
return gtserror.Newf("error converting request to Reject: %w", err)
}
interactingAcctURI, err := parseURI(req.InteractingAccount.URI)
if err != nil {
return err
}
interactionURI, err := parseURI(req.InteractionURI)
if err != nil {
return err
}
// Create a new Reject.
reject := streams.NewActivityStreamsReject()
// Set interacted-with account
// as Actor of the Reject.
ap.AppendActorIRIs(reject, rejectingAcctIRI)
// Set the interacted-with object
// as Object of the Reject.
ap.AppendObjectIRIs(reject, interactionURI)
// Address the Reject To the interacting acct.
ap.AppendTo(reject, interactingAcctURI)
// Send the Reject via the Actor's outbox.
if _, err := f.FederatingActor().Send(
ctx, outboxIRI, reject,