SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[chore] Add "object" uri to outgoing Accept + Reject messages (#3717)

Browse Source
This commit is contained in:
tobi
2025-01-31 17:09:11 +01:00
committed by GitHub
parent fc895ade02
commit c47b9bd1d1
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/typeutils/internaltoas.go
View File

@ -2021,7 +2021,19 @@ func (c *Converter) InteractionReqToASAccept(
objectIRI, err := url.Parse(req.InteractionURI)
if err != nil {
return nil, gtserror.Newf("invalid target uri: %w", err)
return nil, gtserror.Newf("invalid object uri: %w", err)
}
if req.Status == nil {
req.Status, err = c.state.DB.GetStatusByID(ctx, req.StatusID)
if err != nil {
return nil, gtserror.Newf("db error getting interaction req target status: %w", err)
}
}
targetIRI, err := url.Parse(req.Status.URI)
if err != nil {
return nil, gtserror.Newf("invalid interaction req target status uri: %w", err)
}
toIRI, err := url.Parse(req.InteractingAccount.URI)
@ -2040,6 +2052,10 @@ func (c *Converter) InteractionReqToASAccept(
// Object is the interaction URI.
ap.AppendObjectIRIs(accept, objectIRI)
// Target is the URI of the
// status being interacted with.
ap.AppendTargetIRIs(accept, targetIRI)
// Address to the owner
// of interaction URI.
ap.AppendTo(accept, toIRI)
@ -2101,7 +2117,19 @@ func (c *Converter) InteractionReqToASReject(
objectIRI, err := url.Parse(req.InteractionURI)
if err != nil {
return nil, gtserror.Newf("invalid target uri: %w", err)
return nil, gtserror.Newf("invalid object uri: %w", err)
}
if req.Status == nil {
req.Status, err = c.state.DB.GetStatusByID(ctx, req.StatusID)
if err != nil {
return nil, gtserror.Newf("db error getting interaction req target status: %w", err)
}
}
targetIRI, err := url.Parse(req.Status.URI)
if err != nil {
return nil, gtserror.Newf("invalid interaction req target status uri: %w", err)
}
toIRI, err := url.Parse(req.InteractingAccount.URI)
@ -2120,6 +2148,10 @@ func (c *Converter) InteractionReqToASReject(
// Object is the interaction URI.
ap.AppendObjectIRIs(reject, objectIRI)
// Target is the URI of the
// status being interacted with.
ap.AppendTargetIRIs(reject, targetIRI)
// Address to the owner
// of interaction URI.
ap.AppendTo(reject, toIRI)