From 34fe804242ff1e7064f6597fb81024b009e68c3f Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 3 Dec 2024 13:27:08 +0000 Subject: [PATCH] fix up more tests, further complete the dereferencer status edit tests --- .../api/activitypub/users/outboxget_test.go | 12 +- internal/api/client/admin/reportsget_test.go | 4 +- internal/db/bundb/timeline_test.go | 10 +- .../federation/dereferencing/status_test.go | 427 ++++++++---------- internal/processing/account/rss_test.go | 16 +- 5 files changed, 213 insertions(+), 256 deletions(-) diff --git a/internal/api/activitypub/users/outboxget_test.go b/internal/api/activitypub/users/outboxget_test.go index ad2c3c5f4..10cacf096 100644 --- a/internal/api/activitypub/users/outboxget_test.go +++ b/internal/api/activitypub/users/outboxget_test.go @@ -142,6 +142,14 @@ func (suite *OutboxGetTestSuite) TestGetOutboxFirstPage() { "id": "http://localhost:8080/users/the_mighty_zork/outbox?limit=40", "next": "http://localhost:8080/users/the_mighty_zork/outbox?limit=40\u0026max_id=01F8MHAMCHF6Y650WCRSCP4WMY", "orderedItems": [ + { + "actor": "http://localhost:8080/users/the_mighty_zork", + "cc": "http://localhost:8080/users/the_mighty_zork/followers", + "id": "http://localhost:8080/users/the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR/activity#Create", + "object": "http://localhost:8080/users/the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR", + "to": "https://www.w3.org/ns/activitystreams#Public", + "type": "Create" + }, { "actor": "http://localhost:8080/users/the_mighty_zork", "cc": "http://localhost:8080/users/the_mighty_zork/followers", @@ -160,8 +168,8 @@ func (suite *OutboxGetTestSuite) TestGetOutboxFirstPage() { } ], "partOf": "http://localhost:8080/users/the_mighty_zork/outbox", - "prev": "http://localhost:8080/users/the_mighty_zork/outbox?limit=40\u0026min_id=01HH9KYNQPA416TNJ53NSATP40", - "totalItems": 8, + "prev": "http://localhost:8080/users/the_mighty_zork/outbox?limit=40\u0026min_id=01JDPZC707CKDN8N4QVWM4Z1NR", + "totalItems": 9, "type": "OrderedCollectionPage" }`, dst.String()) diff --git a/internal/api/client/admin/reportsget_test.go b/internal/api/client/admin/reportsget_test.go index 0090f3df7..cbf59de8b 100644 --- a/internal/api/client/admin/reportsget_test.go +++ b/internal/api/client/admin/reportsget_test.go @@ -521,8 +521,8 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() { "header_description": "Flat gray background (default header).", "followers_count": 0, "following_count": 0, - "statuses_count": 3, - "last_status_at": "2021-09-11", + "statuses_count": 4, + "last_status_at": "2024-11-01", "emojis": [], "fields": [] }, diff --git a/internal/db/bundb/timeline_test.go b/internal/db/bundb/timeline_test.go index 2302e1a73..75a335512 100644 --- a/internal/db/bundb/timeline_test.go +++ b/internal/db/bundb/timeline_test.go @@ -193,7 +193,7 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineIgnoreExclusive() { if err != nil { suite.FailNow(err.Error()) } - suite.checkStatuses(s, id.Highest, id.Lowest, 12) + suite.checkStatuses(s, id.Highest, id.Lowest, 13) } func (suite *TimelineTestSuite) TestGetHomeTimelineNoFollowing() { @@ -278,8 +278,8 @@ func (suite *TimelineTestSuite) TestGetHomeTimelineFromHighest() { } suite.checkStatuses(s, id.Highest, id.Lowest, 5) - suite.Equal("01J2M1HPFSS54S60Y0KYV23KJE", s[0].ID) - suite.Equal("01G36SF3V6Y6V5BF9P4R7PQG7G", s[len(s)-1].ID) + suite.Equal("01JDPZEZ77X1NX0TY9M10BK1HM", s[0].ID) + suite.Equal("01HEN2RZ8BG29Y5Z9VJC73HZW7", s[len(s)-1].ID) } func (suite *TimelineTestSuite) TestGetListTimelineNoParams() { @@ -308,8 +308,8 @@ func (suite *TimelineTestSuite) TestGetListTimelineMaxID() { } suite.checkStatuses(s, id.Highest, id.Lowest, 5) - suite.Equal("01HEN2PRXT0TF4YDRA64FZZRN7", s[0].ID) - suite.Equal("01FF25D5Q0DH7CHD57CTRS6WK0", s[len(s)-1].ID) + suite.Equal("01JDPZEZ77X1NX0TY9M10BK1HM", s[0].ID) + suite.Equal("01FN3VJGFH10KR7S2PB0GFJZYG", s[len(s)-1].ID) } func (suite *TimelineTestSuite) TestGetListTimelineMinID() { diff --git a/internal/federation/dereferencing/status_test.go b/internal/federation/dereferencing/status_test.go index 3114ba973..99a7e119f 100644 --- a/internal/federation/dereferencing/status_test.go +++ b/internal/federation/dereferencing/status_test.go @@ -24,6 +24,7 @@ import ( "time" "github.com/stretchr/testify/suite" + "github.com/superseriousbusiness/activity/streams" "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing" @@ -33,7 +34,7 @@ import ( ) // instantFreshness is the shortest possible freshness window. -var instantFreshness = util.Ptr(dereferencing.FreshnessWindow(1)) +var instantFreshness = util.Ptr(dereferencing.FreshnessWindow(0)) type StatusTestSuite struct { DereferencerStandardTestSuite @@ -235,111 +236,6 @@ func (suite *StatusTestSuite) TestDereferenceStatusWithNonMatchingURI() { suite.Nil(fetchedStatus) } -func (suite *StatusTestSuite) TestDereferencerGetStatusUpdated() { - // Create a new context for this test. - ctx, cncl := context.WithCancel(context.Background()) - defer cncl() - - // The local account we will be fetching statuses as. - fetchingAccount := suite.testAccounts["local_account_1"] - - // The test status in question that we will be dereferencing from "remote". - testURIStr := "https://unknown-instance.com/users/brand_new_person/statuses/01FE4NTHKWW7THT67EF10EB839" - testURI := testrig.URLMustParse(testURIStr) - testStatusable := suite.client.TestRemoteStatuses[testURIStr] - - // Fetch the remote status first to load it into instance. - testStatus, statusable, err := suite.dereferencer.GetStatusByURI(ctx, - fetchingAccount.Username, - testURI, - ) - suite.Equal(testStatusable, statusable) - suite.NoError(err) - - var ( - editedContent string - editedContentWarning string - editedLanguage string - editedSensitive bool - editedAttachmentIDs []string - editedPollOptions []string - editedPollVotes []int - editedAt time.Time - ) - - // Perform any edits to the remote status. - editedContent = "updated status content!" - editedContentWarning = "CW: edited status content" - editedLanguage = testStatus.Language // no change - editedSensitive = *testStatus.Sensitive // no change - editedAttachmentIDs = testStatus.AttachmentIDs // no change - editedPollOptions = getPollOptions(testStatus) // no change - editedPollVotes = getPollVotes(testStatus) // no change - editedAt = time.Now() - - // Edit the "remote" statusable obj. - suite.editStatusable(testStatusable, - editedContent, - editedContentWarning, - editedLanguage, - editedSensitive, - editedAttachmentIDs, - editedPollOptions, - editedPollVotes, - editedAt, - ) - - // Manually set fetched_at time to something - // in the past so we can refetch right now. - testStatus.FetchedAt = time.Time{} - err = suite.state.DB.UpdateStatus(ctx, testStatus, "fetched_at") - suite.NoError(err) - - // Refetch the remote status to trigger dereferencing edited copy. - latest, statusable, err := suite.dereferencer.GetStatusByURI(ctx, - fetchingAccount.Username, - testURI, - ) - suite.NotNil(statusable) - suite.Equal(testStatusable, statusable) - suite.NoError(err) - - // verify updated status details. - suite.verifyEditedStatusUpdate( - - // latest status - // being tested. - latest, - - // previous length of edits. - len(testStatus.EditIDs), - - // expected current state. - >smodel.StatusEdit{ - Content: editedContent, - ContentWarning: editedContentWarning, - Language: editedLanguage, - Sensitive: &editedSensitive, - AttachmentIDs: editedAttachmentIDs, - PollOptions: editedPollOptions, - PollVotes: editedPollVotes, - CreatedAt: editedAt, - }, - - // expected historic edit. - >smodel.StatusEdit{ - Content: testStatus.Content, - ContentWarning: testStatus.ContentWarning, - Language: testStatus.Language, - Sensitive: testStatus.Sensitive, - AttachmentIDs: testStatus.AttachmentIDs, - PollOptions: getPollOptions(testStatus), - PollVotes: getPollVotes(testStatus), - CreatedAt: testStatus.CreatedAt, - }, - ) -} - func (suite *StatusTestSuite) TestDereferencerRefreshStatusUpdated() { // Create a new context for this test. ctx, cncl := context.WithCancel(context.Background()) @@ -361,7 +257,8 @@ func (suite *StatusTestSuite) TestDereferencerRefreshStatusUpdated() { suite.Equal(testStatusable, statusable) suite.NoError(err) - var ( + // Run through multiple possible edits. + for _, testCase := range []struct { editedContent string editedContentWarning string editedLanguage string @@ -370,74 +267,79 @@ func (suite *StatusTestSuite) TestDereferencerRefreshStatusUpdated() { editedPollOptions []string editedPollVotes []int editedAt time.Time - ) - - // Perform any edits to the remote status. - editedContent = "updated status content!" - editedContentWarning = "CW: edited status content" - editedLanguage = testStatus.Language // no change - editedSensitive = *testStatus.Sensitive // no change - editedAttachmentIDs = testStatus.AttachmentIDs // no change - editedPollOptions = getPollOptions(testStatus) // no change - editedPollVotes = getPollVotes(testStatus) // no change - editedAt = time.Now() - - // Edit the "remote" statusable obj. - suite.editStatusable(testStatusable, - editedContent, - editedContentWarning, - editedLanguage, - editedSensitive, - editedAttachmentIDs, - editedPollOptions, - editedPollVotes, - editedAt, - ) - - // Refresh the remote status to trigger dereferencing edited copy. - latest, statusable, err := suite.dereferencer.RefreshStatus(ctx, - fetchingAccount.Username, - testStatus, - nil, - instantFreshness, - ) - suite.NotNil(statusable) - suite.NoError(err) - - // verify updated status details. - suite.verifyEditedStatusUpdate( - - // latest status - // being tested. - latest, - - // previous length of edits. - len(testStatus.EditIDs), - - // expected current state. - >smodel.StatusEdit{ - Content: editedContent, - ContentWarning: editedContentWarning, - Language: editedLanguage, - Sensitive: &editedSensitive, - AttachmentIDs: editedAttachmentIDs, - PollOptions: editedPollOptions, - PollVotes: editedPollVotes, - CreatedAt: editedAt, + }{ + { + editedContent: "updated status content!", + editedContentWarning: "CW: edited status content", + editedLanguage: testStatus.Language, // no change + editedSensitive: *testStatus.Sensitive, // no change + editedAttachmentIDs: testStatus.AttachmentIDs, // no change + editedPollOptions: getPollOptions(testStatus), // no change + editedPollVotes: getPollVotes(testStatus), // no change + editedAt: time.Now(), }, + } { + // Take a snapshot of current + // state of the test status. + testStatus = copyStatus(testStatus) - // expected historic edit. - >smodel.StatusEdit{ - Content: testStatus.Content, - ContentWarning: testStatus.ContentWarning, - Language: testStatus.Language, - Sensitive: testStatus.Sensitive, - AttachmentIDs: testStatus.AttachmentIDs, - PollOptions: getPollOptions(testStatus), - PollVotes: getPollVotes(testStatus), - CreatedAt: testStatus.CreatedAt, - }, - ) + // Edit the "remote" statusable obj. + suite.editStatusable(testStatusable, + testCase.editedContent, + testCase.editedContentWarning, + testCase.editedLanguage, + testCase.editedSensitive, + testCase.editedAttachmentIDs, + testCase.editedPollOptions, + testCase.editedPollVotes, + testCase.editedAt, + ) + + // Refresh with a given statusable to updated to edited copy. + latest, statusable, err := suite.dereferencer.RefreshStatus(ctx, + fetchingAccount.Username, + testStatus, + nil, + instantFreshness, + ) + suite.Equal(testStatusable, statusable) + suite.NoError(err) + + // verify updated status details. + suite.verifyEditedStatusUpdate( + + // latest status + // being tested. + latest, + + // previous length of edits. + len(testStatus.EditIDs), + + // expected current state. + >smodel.StatusEdit{ + Content: testCase.editedContent, + ContentWarning: testCase.editedContentWarning, + Language: testCase.editedLanguage, + Sensitive: &testCase.editedSensitive, + AttachmentIDs: testCase.editedAttachmentIDs, + PollOptions: testCase.editedPollOptions, + PollVotes: testCase.editedPollVotes, + CreatedAt: testCase.editedAt, + }, + + // expected historic edit. + >smodel.StatusEdit{ + Content: testStatus.Content, + ContentWarning: testStatus.ContentWarning, + Language: testStatus.Language, + Sensitive: testStatus.Sensitive, + AttachmentIDs: testStatus.AttachmentIDs, + PollOptions: getPollOptions(testStatus), + PollVotes: getPollVotes(testStatus), + CreatedAt: testStatus.CreatedAt, + }, + ) + } } func (suite *StatusTestSuite) TestDereferencerRefreshStatusReceivedUpdate() { @@ -461,7 +363,8 @@ func (suite *StatusTestSuite) TestDereferencerRefreshStatusReceivedUpdate() { suite.Equal(testStatusable, statusable) suite.NoError(err) - var ( + // Run through multiple possible edits. + for _, testCase := range []struct { editedContent string editedContentWarning string editedLanguage string @@ -470,74 +373,79 @@ func (suite *StatusTestSuite) TestDereferencerRefreshStatusReceivedUpdate() { editedPollOptions []string editedPollVotes []int editedAt time.Time - ) - - // Perform any edits to the remote status. - editedContent = "updated status content!" - editedContentWarning = "CW: edited status content" - editedLanguage = testStatus.Language // no change - editedSensitive = *testStatus.Sensitive // no change - editedAttachmentIDs = testStatus.AttachmentIDs // no change - editedPollOptions = getPollOptions(testStatus) // no change - editedPollVotes = getPollVotes(testStatus) // no change - editedAt = time.Now() - - // Edit the "remote" statusable obj. - suite.editStatusable(testStatusable, - editedContent, - editedContentWarning, - editedLanguage, - editedSensitive, - editedAttachmentIDs, - editedPollOptions, - editedPollVotes, - editedAt, - ) - - // Refresh with a given statusable to updated to edited copy. - latest, statusable, err := suite.dereferencer.RefreshStatus(ctx, - fetchingAccount.Username, - testStatus, - testStatusable, - instantFreshness, - ) - suite.Equal(testStatusable, statusable) - suite.NoError(err) - - // verify updated status details. - suite.verifyEditedStatusUpdate( - - // latest status - // being tested. - latest, - - // previous length of edits. - len(testStatus.EditIDs), - - // expected current state. - >smodel.StatusEdit{ - Content: editedContent, - ContentWarning: editedContentWarning, - Language: editedLanguage, - Sensitive: &editedSensitive, - AttachmentIDs: editedAttachmentIDs, - PollOptions: editedPollOptions, - PollVotes: editedPollVotes, - CreatedAt: editedAt, + }{ + { + editedContent: "updated status content!", + editedContentWarning: "CW: edited status content", + editedLanguage: testStatus.Language, // no change + editedSensitive: *testStatus.Sensitive, // no change + editedAttachmentIDs: testStatus.AttachmentIDs, // no change + editedPollOptions: getPollOptions(testStatus), // no change + editedPollVotes: getPollVotes(testStatus), // no change + editedAt: time.Now(), }, + } { + // Take a snapshot of current + // state of the test status. + testStatus = copyStatus(testStatus) - // expected historic edit. - >smodel.StatusEdit{ - Content: testStatus.Content, - ContentWarning: testStatus.ContentWarning, - Language: testStatus.Language, - Sensitive: testStatus.Sensitive, - AttachmentIDs: testStatus.AttachmentIDs, - PollOptions: getPollOptions(testStatus), - PollVotes: getPollVotes(testStatus), - CreatedAt: testStatus.CreatedAt, - }, - ) + // Edit the "remote" statusable obj. + suite.editStatusable(testStatusable, + testCase.editedContent, + testCase.editedContentWarning, + testCase.editedLanguage, + testCase.editedSensitive, + testCase.editedAttachmentIDs, + testCase.editedPollOptions, + testCase.editedPollVotes, + testCase.editedAt, + ) + + // Refresh with a given statusable to updated to edited copy. + latest, statusable, err := suite.dereferencer.RefreshStatus(ctx, + fetchingAccount.Username, + testStatus, + testStatusable, + instantFreshness, + ) + suite.Equal(testStatusable, statusable) + suite.NoError(err) + + // verify updated status details. + suite.verifyEditedStatusUpdate( + + // latest status + // being tested. + latest, + + // previous length of edits. + len(testStatus.EditIDs), + + // expected current state. + >smodel.StatusEdit{ + Content: testCase.editedContent, + ContentWarning: testCase.editedContentWarning, + Language: testCase.editedLanguage, + Sensitive: &testCase.editedSensitive, + AttachmentIDs: testCase.editedAttachmentIDs, + PollOptions: testCase.editedPollOptions, + PollVotes: testCase.editedPollVotes, + CreatedAt: testCase.editedAt, + }, + + // expected historic edit. + >smodel.StatusEdit{ + Content: testStatus.Content, + ContentWarning: testStatus.ContentWarning, + Language: testStatus.Language, + Sensitive: testStatus.Sensitive, + AttachmentIDs: testStatus.AttachmentIDs, + PollOptions: getPollOptions(testStatus), + PollVotes: getPollVotes(testStatus), + CreatedAt: testStatus.CreatedAt, + }, + ) + } } // editStatusable updates the given statusable attributes. @@ -548,12 +456,36 @@ func (suite *StatusTestSuite) editStatusable( contentWarning string, language string, sensitive bool, - attachmentIDs []string, - pollOptions []string, - pollVotes []int, + attachmentIDs []string, // TODO: this will require some thinking as to how ... + pollOptions []string, // TODO: this will require changing statusable type to question + pollVotes []int, // TODO: this will require changing statusable type to question editedAt time.Time, ) { - suite.Fail("TODO") + // simply reset all mentions / emojis / tags + statusable.SetActivityStreamsTag(nil) + + // Update the statusable content property + language (if set). + contentProp := streams.NewActivityStreamsContentProperty() + statusable.SetActivityStreamsContent(contentProp) + contentProp.AppendXMLSchemaString(content) + if language != "" { + contentProp.AppendRDFLangString(map[string]string{ + language: content, + }) + } + + // Update the statusable content-warning property. + summaryProp := streams.NewActivityStreamsSummaryProperty() + statusable.SetActivityStreamsSummary(summaryProp) + summaryProp.AppendXMLSchemaString(contentWarning) + + // Update the statusable sensitive property. + sensitiveProp := streams.NewActivityStreamsSensitiveProperty() + statusable.SetActivityStreamsSensitive(sensitiveProp) + sensitiveProp.AppendXMLSchemaBoolean(sensitive) + + // Update the statusable updated property. + ap.SetUpdated(statusable, editedAt) } // verifyEditedStatusUpdate verifies that a given status has @@ -603,6 +535,13 @@ func TestStatusTestSuite(t *testing.T) { suite.Run(t, new(StatusTestSuite)) } +// copyStatus returns a copy of the given status model (not including sub-structs). +func copyStatus(status *gtsmodel.Status) *gtsmodel.Status { + copy := new(gtsmodel.Status) + *copy = *status + return copy +} + // getPollOptions extracts poll option strings from status (if poll is set). func getPollOptions(status *gtsmodel.Status) []string { if status.Poll != nil { diff --git a/internal/processing/account/rss_test.go b/internal/processing/account/rss_test.go index e4706d3b7..5606151c2 100644 --- a/internal/processing/account/rss_test.go +++ b/internal/processing/account/rss_test.go @@ -70,7 +70,7 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSAdmin() { func (suite *GetRSSTestSuite) TestGetAccountRSSZork() { getFeed, lastModified, err := suite.accountProcessor.GetRSSFeedForUsername(context.Background(), "the_mighty_zork") suite.NoError(err) - suite.EqualValues(1704878640, lastModified.Unix()) + suite.EqualValues(1730451600, lastModified.Unix()) feed, err := getFeed() suite.NoError(err) @@ -79,13 +79,23 @@ func (suite *GetRSSTestSuite) TestGetAccountRSSZork() { Posts from @the_mighty_zork@localhost:8080 http://localhost:8080/@the_mighty_zork Posts from @the_mighty_zork@localhost:8080 - Wed, 10 Jan 2024 09:24:00 +0000 - Wed, 10 Jan 2024 09:24:00 +0000 + Fri, 01 Nov 2024 09:00:00 +0000 + Fri, 01 Nov 2024 09:00:00 +0000 http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/small/01F8MH58A357CV5K7R7TJMSH6S.webp Avatar for @the_mighty_zork@localhost:8080 http://localhost:8080/@the_mighty_zork + + edited status + http://localhost:8080/@the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR + @the_mighty_zork@localhost:8080 made a new post: "this is the latest revision of the status, with a content-warning" + this is the latest revision of the status, with a content-warning

]]> + @the_mighty_zork@localhost:8080 + http://localhost:8080/@the_mighty_zork/statuses/01JDPZC707CKDN8N4QVWM4Z1NR + Fri, 01 Nov 2024 09:00:00 +0000 + http://localhost:8080/@the_mighty_zork/feed.rss + HTML in post http://localhost:8080/@the_mighty_zork/statuses/01HH9KYNQPA416TNJ53NSATP40