diff options
Diffstat (limited to 'internal/processing')
-rw-r--r-- | internal/processing/status/create.go | 1 | ||||
-rw-r--r-- | internal/processing/status/edit.go | 6 | ||||
-rw-r--r-- | internal/processing/status/edit_test.go | 36 | ||||
-rw-r--r-- | internal/processing/workers/fromfediapi_test.go | 1 |
4 files changed, 21 insertions, 23 deletions
diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index af9831b9c..b77d0af9c 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -97,7 +97,6 @@ func (p *Processor) Create( URI: accountURIs.StatusesURI + "/" + statusID, URL: accountURIs.StatusesURL + "/" + statusID, CreatedAt: now, - UpdatedAt: now, Local: util.Ptr(true), Account: requester, AccountID: requester.ID, diff --git a/internal/processing/status/edit.go b/internal/processing/status/edit.go index d16092a57..95665074e 100644 --- a/internal/processing/status/edit.go +++ b/internal/processing/status/edit.go @@ -147,7 +147,7 @@ func (p *Processor) Edit( // Track status columns we // need to update in database. cols := make([]string, 2, 13) - cols[0] = "updated_at" + cols[0] = "edited_at" cols[1] = "edits" if contentChanged { @@ -259,7 +259,7 @@ func (p *Processor) Edit( edit.Language = status.Language edit.Sensitive = status.Sensitive edit.StatusID = status.ID - edit.CreatedAt = status.UpdatedAt + edit.CreatedAt = status.UpdatedAt() // Copy existing media and descriptions. edit.AttachmentIDs = status.AttachmentIDs @@ -302,7 +302,7 @@ func (p *Processor) Edit( status.Sensitive = &form.Sensitive status.AttachmentIDs = form.MediaIDs status.Attachments = media - status.UpdatedAt = now + status.EditedAt = now if poll != nil { // Set relevent fields for latest with poll. diff --git a/internal/processing/status/edit_test.go b/internal/processing/status/edit_test.go index 393c3efc2..36ebf2765 100644 --- a/internal/processing/status/edit_test.go +++ b/internal/processing/status/edit_test.go @@ -68,7 +68,7 @@ func (suite *StatusEditTestSuite) TestSimpleEdit() { suite.Equal(form.SpoilerText, apiStatus.SpoilerText) suite.Equal(form.Sensitive, apiStatus.Sensitive) suite.Equal(form.Language, *apiStatus.Language) - suite.NotEqual(util.FormatISO8601(status.UpdatedAt), *apiStatus.EditedAt) + suite.NotEqual(util.FormatISO8601(status.EditedAt), *apiStatus.EditedAt) // Fetched the latest version of edited status from the database. latestStatus, err := suite.state.DB.GetStatusByID(ctx, status.ID) @@ -80,7 +80,7 @@ func (suite *StatusEditTestSuite) TestSimpleEdit() { suite.Equal(form.Sensitive, *latestStatus.Sensitive) suite.Equal(form.Language, latestStatus.Language) suite.Equal(len(status.EditIDs)+1, len(latestStatus.EditIDs)) - suite.NotEqual(status.UpdatedAt, latestStatus.UpdatedAt) + suite.NotEqual(status.UpdatedAt(), latestStatus.UpdatedAt()) // Populate all historical edits for this status. err = suite.state.DB.PopulateStatusEdits(ctx, latestStatus) @@ -93,7 +93,7 @@ func (suite *StatusEditTestSuite) TestSimpleEdit() { suite.Equal(status.ContentWarning, previousEdit.ContentWarning) suite.Equal(*status.Sensitive, *previousEdit.Sensitive) suite.Equal(status.Language, previousEdit.Language) - suite.Equal(status.UpdatedAt, previousEdit.CreatedAt) + suite.Equal(status.UpdatedAt(), previousEdit.CreatedAt) } func (suite *StatusEditTestSuite) TestEditAddPoll() { @@ -135,7 +135,7 @@ func (suite *StatusEditTestSuite) TestEditAddPoll() { suite.Equal(form.SpoilerText, apiStatus.SpoilerText) suite.Equal(form.Sensitive, apiStatus.Sensitive) suite.Equal(form.Language, *apiStatus.Language) - suite.NotEqual(util.FormatISO8601(status.UpdatedAt), *apiStatus.EditedAt) + suite.NotEqual(util.FormatISO8601(status.EditedAt), *apiStatus.EditedAt) suite.NotNil(apiStatus.Poll) suite.Equal(form.Poll.Options, xslices.Gather(nil, apiStatus.Poll.Options, func(opt apimodel.PollOption) string { return opt.Title @@ -151,7 +151,7 @@ func (suite *StatusEditTestSuite) TestEditAddPoll() { suite.Equal(form.Sensitive, *latestStatus.Sensitive) suite.Equal(form.Language, latestStatus.Language) suite.Equal(len(status.EditIDs)+1, len(latestStatus.EditIDs)) - suite.NotEqual(status.UpdatedAt, latestStatus.UpdatedAt) + suite.NotEqual(status.UpdatedAt(), latestStatus.UpdatedAt()) suite.NotNil(latestStatus.Poll) suite.Equal(form.Poll.Options, latestStatus.Poll.Options) @@ -170,7 +170,7 @@ func (suite *StatusEditTestSuite) TestEditAddPoll() { suite.Equal(status.ContentWarning, previousEdit.ContentWarning) suite.Equal(*status.Sensitive, *previousEdit.Sensitive) suite.Equal(status.Language, previousEdit.Language) - suite.Equal(status.UpdatedAt, previousEdit.CreatedAt) + suite.Equal(status.UpdatedAt(), previousEdit.CreatedAt) suite.Equal(status.Poll != nil, len(previousEdit.PollOptions) > 0) } @@ -213,7 +213,7 @@ func (suite *StatusEditTestSuite) TestEditAddPollNoExpiry() { suite.Equal(form.SpoilerText, apiStatus.SpoilerText) suite.Equal(form.Sensitive, apiStatus.Sensitive) suite.Equal(form.Language, *apiStatus.Language) - suite.NotEqual(util.FormatISO8601(status.UpdatedAt), *apiStatus.EditedAt) + suite.NotEqual(util.FormatISO8601(status.EditedAt), *apiStatus.EditedAt) suite.NotNil(apiStatus.Poll) suite.Equal(form.Poll.Options, xslices.Gather(nil, apiStatus.Poll.Options, func(opt apimodel.PollOption) string { return opt.Title @@ -229,7 +229,7 @@ func (suite *StatusEditTestSuite) TestEditAddPollNoExpiry() { suite.Equal(form.Sensitive, *latestStatus.Sensitive) suite.Equal(form.Language, latestStatus.Language) suite.Equal(len(status.EditIDs)+1, len(latestStatus.EditIDs)) - suite.NotEqual(status.UpdatedAt, latestStatus.UpdatedAt) + suite.NotEqual(status.UpdatedAt(), latestStatus.UpdatedAt()) suite.NotNil(latestStatus.Poll) suite.Equal(form.Poll.Options, latestStatus.Poll.Options) @@ -248,7 +248,7 @@ func (suite *StatusEditTestSuite) TestEditAddPollNoExpiry() { suite.Equal(status.ContentWarning, previousEdit.ContentWarning) suite.Equal(*status.Sensitive, *previousEdit.Sensitive) suite.Equal(status.Language, previousEdit.Language) - suite.Equal(status.UpdatedAt, previousEdit.CreatedAt) + suite.Equal(status.UpdatedAt(), previousEdit.CreatedAt) suite.Equal(status.Poll != nil, len(previousEdit.PollOptions) > 0) } @@ -287,7 +287,7 @@ func (suite *StatusEditTestSuite) TestEditMediaDescription() { suite.Equal(form.SpoilerText, apiStatus.SpoilerText) suite.Equal(form.Sensitive, apiStatus.Sensitive) suite.Equal(form.Language, *apiStatus.Language) - suite.NotEqual(util.FormatISO8601(status.UpdatedAt), *apiStatus.EditedAt) + suite.NotEqual(util.FormatISO8601(status.EditedAt), *apiStatus.EditedAt) suite.Equal(form.MediaIDs, xslices.Gather(nil, apiStatus.MediaAttachments, func(media *apimodel.Attachment) string { return media.ID })) @@ -310,7 +310,7 @@ func (suite *StatusEditTestSuite) TestEditMediaDescription() { suite.Equal(form.Sensitive, *latestStatus.Sensitive) suite.Equal(form.Language, latestStatus.Language) suite.Equal(len(status.EditIDs)+1, len(latestStatus.EditIDs)) - suite.NotEqual(status.UpdatedAt, latestStatus.UpdatedAt) + suite.NotEqual(status.UpdatedAt(), latestStatus.UpdatedAt()) suite.Equal(form.MediaIDs, latestStatus.AttachmentIDs) suite.Equal( xslices.Gather(nil, form.MediaAttributes, func(attr apimodel.AttachmentAttributesRequest) string { @@ -338,7 +338,7 @@ func (suite *StatusEditTestSuite) TestEditMediaDescription() { suite.Equal(status.ContentWarning, previousEdit.ContentWarning) suite.Equal(*status.Sensitive, *previousEdit.Sensitive) suite.Equal(status.Language, previousEdit.Language) - suite.Equal(status.UpdatedAt, previousEdit.CreatedAt) + suite.Equal(status.UpdatedAt(), previousEdit.CreatedAt) suite.Equal(status.AttachmentIDs, previousEdit.AttachmentIDs) suite.Equal( xslices.Gather(nil, status.Attachments, func(media *gtsmodel.MediaAttachment) string { @@ -390,7 +390,7 @@ func (suite *StatusEditTestSuite) TestEditAddMedia() { suite.Equal(form.SpoilerText, apiStatus.SpoilerText) suite.Equal(form.Sensitive, apiStatus.Sensitive) suite.Equal(form.Language, *apiStatus.Language) - suite.NotEqual(util.FormatISO8601(status.UpdatedAt), *apiStatus.EditedAt) + suite.NotEqual(util.FormatISO8601(status.EditedAt), *apiStatus.EditedAt) suite.Equal(form.MediaIDs, xslices.Gather(nil, apiStatus.MediaAttachments, func(media *apimodel.Attachment) string { return media.ID })) @@ -405,7 +405,7 @@ func (suite *StatusEditTestSuite) TestEditAddMedia() { suite.Equal(form.Sensitive, *latestStatus.Sensitive) suite.Equal(form.Language, latestStatus.Language) suite.Equal(len(status.EditIDs)+1, len(latestStatus.EditIDs)) - suite.NotEqual(status.UpdatedAt, latestStatus.UpdatedAt) + suite.NotEqual(status.UpdatedAt(), latestStatus.UpdatedAt()) suite.Equal(form.MediaIDs, latestStatus.AttachmentIDs) // Populate all historical edits for this status. @@ -419,7 +419,7 @@ func (suite *StatusEditTestSuite) TestEditAddMedia() { suite.Equal(status.ContentWarning, previousEdit.ContentWarning) suite.Equal(*status.Sensitive, *previousEdit.Sensitive) suite.Equal(status.Language, previousEdit.Language) - suite.Equal(status.UpdatedAt, previousEdit.CreatedAt) + suite.Equal(status.UpdatedAt(), previousEdit.CreatedAt) suite.Equal(status.AttachmentIDs, previousEdit.AttachmentIDs) } @@ -456,7 +456,7 @@ func (suite *StatusEditTestSuite) TestEditRemoveMedia() { suite.Equal(form.SpoilerText, apiStatus.SpoilerText) suite.Equal(form.Sensitive, apiStatus.Sensitive) suite.Equal(form.Language, *apiStatus.Language) - suite.NotEqual(util.FormatISO8601(status.UpdatedAt), *apiStatus.EditedAt) + suite.NotEqual(util.FormatISO8601(status.EditedAt), *apiStatus.EditedAt) suite.Equal(form.MediaIDs, xslices.Gather(nil, apiStatus.MediaAttachments, func(media *apimodel.Attachment) string { return media.ID })) @@ -471,7 +471,7 @@ func (suite *StatusEditTestSuite) TestEditRemoveMedia() { suite.Equal(form.Sensitive, *latestStatus.Sensitive) suite.Equal(form.Language, latestStatus.Language) suite.Equal(len(status.EditIDs)+1, len(latestStatus.EditIDs)) - suite.NotEqual(status.UpdatedAt, latestStatus.UpdatedAt) + suite.NotEqual(status.UpdatedAt(), latestStatus.UpdatedAt()) suite.Equal(form.MediaIDs, latestStatus.AttachmentIDs) // Populate all historical edits for this status. @@ -485,7 +485,7 @@ func (suite *StatusEditTestSuite) TestEditRemoveMedia() { suite.Equal(status.ContentWarning, previousEdit.ContentWarning) suite.Equal(*status.Sensitive, *previousEdit.Sensitive) suite.Equal(status.Language, previousEdit.Language) - suite.Equal(status.UpdatedAt, previousEdit.CreatedAt) + suite.Equal(status.UpdatedAt(), previousEdit.CreatedAt) suite.Equal(status.AttachmentIDs, previousEdit.AttachmentIDs) } diff --git a/internal/processing/workers/fromfediapi_test.go b/internal/processing/workers/fromfediapi_test.go index d7d7454e7..88d0e6071 100644 --- a/internal/processing/workers/fromfediapi_test.go +++ b/internal/processing/workers/fromfediapi_test.go @@ -55,7 +55,6 @@ func (suite *FromFediAPITestSuite) TestProcessFederationAnnounce() { announceStatus.URI = "https://example.org/some-announce-uri" announceStatus.BoostOfURI = boostedStatus.URI announceStatus.CreatedAt = time.Now() - announceStatus.UpdatedAt = time.Now() announceStatus.AccountID = boostingAccount.ID announceStatus.AccountURI = boostingAccount.URI announceStatus.Account = boostingAccount |