summaryrefslogtreecommitdiff
path: root/internal/typeutils/astointernal.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2024-12-05 13:35:07 +0000
committerLibravatar GitHub <noreply@github.com>2024-12-05 13:35:07 +0000
commit23fc70f4e68730b7eec91d58dac54ec00099ed8d (patch)
tree9ab22b85d1d2c9c7ff2db9371ab2dc752c085f07 /internal/typeutils/astointernal.go
parent[feature] unending polls (#3592) (diff)
downloadgotosocial-23fc70f4e68730b7eec91d58dac54ec00099ed8d.tar.xz
[feature] add support for receiving federated status edits (#3597)
* add support for extracting Updated field from Statusable implementers * add support for status edits in the database, and update status dereferencer to handle them * remove unused AdditionalInfo{}.CreatedAt * remove unused AdditionalEmojiInfo{}.CreatedAt * update new mention creation to use status.UpdatedAt * remove mention.UpdatedAt, fixes related to NewULIDFromTime() change * add migration to remove Mention{}.UpdatedAt field * add migration to add the StatusEdit{} table * start adding tests, add delete function for status edits * add more of status edit migrations, fill in more of the necessary edit delete functionality * remove unused function * allow generating gotosocial compatible ulid via CLI with `go run ./cmd/gen-ulid` * add StatusEdit{} test models * fix new statusedits sql * use model instead of table name * actually remove the Mention.UpdatedAt field... * fix tests now new models are added, add more status edit DB tests * fix panic wording * add test for deleting status edits * don't automatically set `updated_at` field on updated statuses * flesh out more of the dereferencer status edit tests, ensure updated at field set on outgoing AS statuses * remove media_attachments.updated_at column * fix up more tests, further complete the dereferencer status edit tests * update more status serialization tests not expecting 'updated' AS property * gah!! json serialization tests!! * undo some gtscontext wrapping changes * more serialization test fixing :smiling_face_with_tear: * more test fixing, ensure the edit.status_id field is actually set :facepalm: * fix status edit test * grrr linter * add edited_at field to apimodel status * remove the choice of paging on the timeline public filtered test (otherwise it needs updating every time you add statuses ...) * ensure that status.updated_at always fits chronologically * fix more serialization tests ... * add more code comments * fix envparsing * update swagger file * properly handle media description changes during status edits * slight formatting tweak * code comment
Diffstat (limited to 'internal/typeutils/astointernal.go')
-rw-r--r--internal/typeutils/astointernal.go22
1 files changed, 18 insertions, 4 deletions
diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go
index cf0c0719a..1a7098673 100644
--- a/internal/typeutils/astointernal.go
+++ b/internal/typeutils/astointernal.go
@@ -111,6 +111,13 @@ func (c *Converter) ASRepresentationToAccount(
acct.UpdatedAt = pub
}
+ // Extract updated time if possible, i.e. last edited.
+ if upd := ap.GetUpdated(accountable); !upd.IsZero() {
+ acct.UpdatedAt = upd
+ } else {
+ acct.UpdatedAt = acct.CreatedAt
+ }
+
// Extract a preferred name (display name), fallback to username.
if displayName := ap.ExtractName(accountable); displayName != "" {
acct.DisplayName = displayName
@@ -348,18 +355,25 @@ func (c *Converter) ASStatusToStatus(ctx context.Context, statusable ap.Statusab
// zero-time will fall back to db defaults.
if pub := ap.GetPublished(statusable); !pub.IsZero() {
status.CreatedAt = pub
- status.UpdatedAt = pub
} else {
log.Warnf(ctx, "unusable published property on %s", uri)
}
+ // status.Updated
+ //
+ // Extract updated time for status, defaults to Published.
+ if upd := ap.GetUpdated(statusable); !upd.IsZero() {
+ status.UpdatedAt = upd
+ } else {
+ status.UpdatedAt = status.CreatedAt
+ }
+
// status.AccountURI
// status.AccountID
// status.Account
//
- // Account that created the status. Assume we have
- // this in the db by the time this function is called,
- // error if we don't.
+ // Account that created the status. Assume we have this
+ // in the db by the time this function is called, else error.
status.Account, err = c.getASAttributedToAccount(ctx,
status.URI,
statusable,