diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2024-12-24 21:16:49 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-12-24 21:16:49 +0000 |
| commit | 0784aa3218934dea46c2fa501696e7f32696168b (patch) | |
| tree | f69af51af9ec809b04d7c09e7b95ee98b0920ee0 /internal/typeutils/astointernal.go | |
| parent | [feature] add support for clients editing statuses and fetching status revisi... (diff) | |
| download | gotosocial-0784aa3218934dea46c2fa501696e7f32696168b.tar.xz | |
[bugfix] small editing tweaks (#3631)
* ensure edited_at isn't set on boost wrapper statuses
* improve handling of remote status updated_at to fix previous cases
* formatting
* add remote status published / updated field validation checks, handle appropriately in handleStatusEdit()
* specifically allowed updated to be equal to published
* only check creation date change when an existing status
Diffstat (limited to 'internal/typeutils/astointernal.go')
| -rw-r--r-- | internal/typeutils/astointernal.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go index 1a7098673..a473317ff 100644 --- a/internal/typeutils/astointernal.go +++ b/internal/typeutils/astointernal.go @@ -22,6 +22,7 @@ import ( "context" "errors" "net/url" + "time" "github.com/miekg/dns" "github.com/superseriousbusiness/gotosocial/internal/ap" @@ -357,15 +358,21 @@ func (c *Converter) ASStatusToStatus(ctx context.Context, statusable ap.Statusab status.CreatedAt = pub } else { log.Warnf(ctx, "unusable published property on %s", uri) + status.CreatedAt = time.Now() } // status.Updated // - // Extract updated time for status, defaults to Published. - if upd := ap.GetUpdated(statusable); !upd.IsZero() { + // Extract and validate update time for status. Defaults to published. + if upd := ap.GetUpdated(statusable); !upd.Before(status.CreatedAt) { status.UpdatedAt = upd - } else { + } else if upd.IsZero() { status.UpdatedAt = status.CreatedAt + } else { + + // This is a malformed status that will likely break our systems. + err := gtserror.Newf("status %s 'updated' predates 'published'", uri) + return nil, gtserror.SetMalformed(err) } // status.AccountURI |