Mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-10-31 22:40:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[bugfix] Ensure local statuses always get a threadID so they can be muted (#2665)

Browse source 
* [chore/bugfix] Ensure threadID always set on local statuses

* test
This commit is contained in:
tobi 2024-02-19 11:50:49 +01:00 committed by GitHub
parent e2ebcbb516
commit 0554550acb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
internal/processing/status/create.go
View file

@ -190,18 +190,28 @@ func (p *Processor) processReplyToID(ctx context.Context, form *apimodel.Advance
}
func (p *Processor) processThreadID(ctx context.Context, status *gtsmodel.Status) gtserror.WithCode {
// Status takes the thread ID
// of whatever it replies to.
if status.InReplyTo != nil {
// Status takes the thread ID of
// whatever it replies to, if set.
//
// Might not be set if status is local
// and replies to a remote status that
// doesn't have a thread ID yet.
//
// If so, we can just thread from this
// status onwards instead, since this
// is where the relevant part of the
// thread starts, from the perspective
// of our instance at least.
if status.InReplyTo != nil &&
status.InReplyTo.ThreadID != "" {
// Just inherit threadID from parent.
status.ThreadID = status.InReplyTo.ThreadID
return nil
}
// Status doesn't reply to anything,
// so it's a new local top-level status
// and therefore needs a thread ID.
// Mark new thread (or threaded
// subsection) starting from here.
threadID := id.NewULID()
if err := p.state.DB.PutThread(
ctx,
&gtsmodel.Thread{

44
internal/processing/status/create_test.go
View file

@ -242,6 +242,50 @@ func (suite *StatusCreateTestSuite) TestProcessLanguageWithScriptPart() {
suite.Equal("zh-Hans", *apiStatus.Language)
}
func (suite *StatusCreateTestSuite) TestProcessReplyToUnthreadedRemoteStatus() {
ctx := context.Background()
creatingAccount := suite.testAccounts["local_account_1"]
creatingApplication := suite.testApplications["application_1"]
inReplyTo := suite.testStatuses["remote_account_1_status_1"]
// Reply to a remote status that
// doesn't have a threadID set on it.
statusCreateForm := &apimodel.AdvancedStatusCreateForm{
StatusCreateRequest: apimodel.StatusCreateRequest{
Status: "boobies",
MediaIDs: []string{},
Poll: nil,
InReplyToID: inReplyTo.ID,
Sensitive: false,
SpoilerText: "this is a reply",
Visibility: apimodel.VisibilityPublic,
ScheduledAt: "",
Language: "en",
ContentType: apimodel.StatusContentTypePlain,
},
AdvancedVisibilityFlagsForm: apimodel.AdvancedVisibilityFlagsForm{
Federated: nil,
Boostable: nil,
Replyable: nil,
Likeable: nil,
},
}
apiStatus, err := suite.status.Create(ctx, creatingAccount, creatingApplication, statusCreateForm)
suite.NoError(err)
suite.NotNil(apiStatus)
// ThreadID should be set on the status,
// even though the replied-to status does
// not have a threadID.
dbStatus, dbErr := suite.state.DB.GetStatusByID(ctx, apiStatus.ID)
if dbErr != nil {
suite.FailNow(err.Error())
}
suite.NotEmpty(dbStatus.ThreadID)
}
func TestStatusCreateTestSuite(t *testing.T) {
suite.Run(t, new(StatusCreateTestSuite))
}