diff options
Diffstat (limited to 'internal/typeutils/internaltofrontend.go')
| -rw-r--r-- | internal/typeutils/internaltofrontend.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index b2a4652d3..961e99206 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -2883,7 +2883,7 @@ func (c *Converter) InteractionReqToAPIInteractionReq( interactedStatus, err := c.StatusToAPIStatus( ctx, - req.Status, + req.TargetStatus, requestingAcct, ) if err != nil { @@ -2921,16 +2921,21 @@ func (c *Converter) InteractionReqToAPIInteractionReq( rejectedAt = util.FormatISO8601(req.RejectedAt) } + createdAt, err := id.TimeFromULID(req.ID) + if err != nil { + err := gtserror.Newf("error converting id to time: %w", err) + return nil, err + } + return &apimodel.InteractionRequest{ ID: req.ID, Type: req.InteractionType.String(), - CreatedAt: util.FormatISO8601(req.CreatedAt), + CreatedAt: util.FormatISO8601(createdAt), Account: interactingAcct, Status: interactedStatus, Reply: reply, AcceptedAt: acceptedAt, RejectedAt: rejectedAt, - URI: req.URI, }, nil } |