From 77d755e330d41e681097b0606088281c255c18e0 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:22:05 +0200 Subject: [PATCH] [chore] Don't cc Accept of likes to followers (#3417) --- internal/typeutils/internaltoas.go | 90 ++++++++++++++++++------- internal/typeutils/internaltoas_test.go | 47 ++++++++++++- 2 files changed, 112 insertions(+), 25 deletions(-) diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go index d9d18e1c7..cfc790bd4 100644 --- a/internal/typeutils/internaltoas.go +++ b/internal/typeutils/internaltoas.go @@ -1988,16 +1988,6 @@ func (c *Converter) InteractionReqToASAccept( return nil, gtserror.Newf("invalid interacting account uri: %w", err) } - publicIRI, err := url.Parse(pub.PublicActivityPubIRI) - if err != nil { - return nil, gtserror.Newf("invalid public uri: %w", err) - } - - followersIRI, err := url.Parse(req.TargetAccount.FollowersURI) - if err != nil { - return nil, gtserror.Newf("invalid followers uri: %w", err) - } - // Set id to the URI of // interaction request. ap.SetJSONLDId(accept, acceptID) @@ -2013,8 +2003,39 @@ func (c *Converter) InteractionReqToASAccept( // of interaction URI. ap.AppendTo(accept, toIRI) - // Cc to the actor's followers, and to Public. - ap.AppendCc(accept, publicIRI, followersIRI) + // Whether or not we cc this Accept to + // followers and public depends on the + // type of interaction it Accepts. + + var cc bool + switch req.InteractionType { + + case gtsmodel.InteractionLike: + // Accept of Like doesn't get cc'd + // because it's not that important. + + case gtsmodel.InteractionReply: + // Accept of reply gets cc'd. + cc = true + + case gtsmodel.InteractionAnnounce: + // Accept of announce gets cc'd. + cc = true + } + + if cc { + publicIRI, err := url.Parse(pub.PublicActivityPubIRI) + if err != nil { + return nil, gtserror.Newf("invalid public uri: %w", err) + } + + followersIRI, err := url.Parse(req.TargetAccount.FollowersURI) + if err != nil { + return nil, gtserror.Newf("invalid followers uri: %w", err) + } + + ap.AppendCc(accept, publicIRI, followersIRI) + } return accept, nil } @@ -2047,16 +2068,6 @@ func (c *Converter) InteractionReqToASReject( return nil, gtserror.Newf("invalid interacting account uri: %w", err) } - publicIRI, err := url.Parse(pub.PublicActivityPubIRI) - if err != nil { - return nil, gtserror.Newf("invalid public uri: %w", err) - } - - followersIRI, err := url.Parse(req.TargetAccount.FollowersURI) - if err != nil { - return nil, gtserror.Newf("invalid followers uri: %w", err) - } - // Set id to the URI of // interaction request. ap.SetJSONLDId(reject, rejectID) @@ -2072,8 +2083,39 @@ func (c *Converter) InteractionReqToASReject( // of interaction URI. ap.AppendTo(reject, toIRI) - // Cc to the actor's followers, and to Public. - ap.AppendCc(reject, publicIRI, followersIRI) + // Whether or not we cc this Reject to + // followers and public depends on the + // type of interaction it Rejects. + + var cc bool + switch req.InteractionType { + + case gtsmodel.InteractionLike: + // Reject of Like doesn't get cc'd + // because it's not that important. + + case gtsmodel.InteractionReply: + // Reject of reply gets cc'd. + cc = true + + case gtsmodel.InteractionAnnounce: + // Reject of announce gets cc'd. + cc = true + } + + if cc { + publicIRI, err := url.Parse(pub.PublicActivityPubIRI) + if err != nil { + return nil, gtserror.Newf("invalid public uri: %w", err) + } + + followersIRI, err := url.Parse(req.TargetAccount.FollowersURI) + if err != nil { + return nil, gtserror.Newf("invalid followers uri: %w", err) + } + + ap.AppendCc(reject, publicIRI, followersIRI) + } return reject, nil } diff --git a/internal/typeutils/internaltoas_test.go b/internal/typeutils/internaltoas_test.go index d0ed4204c..a97eee2b8 100644 --- a/internal/typeutils/internaltoas_test.go +++ b/internal/typeutils/internaltoas_test.go @@ -1143,7 +1143,7 @@ func (suite *InternalToASTestSuite) TestPollVoteToASCreate() { }`, string(bytes)) } -func (suite *InternalToASTestSuite) TestInteractionReqToASAccept() { +func (suite *InternalToASTestSuite) TestInteractionReqToASAcceptAnnounce() { acceptingAccount := suite.testAccounts["local_account_1"] interactingAccount := suite.testAccounts["remote_account_1"] @@ -1192,6 +1192,51 @@ func (suite *InternalToASTestSuite) TestInteractionReqToASAccept() { }`, string(b)) } +func (suite *InternalToASTestSuite) TestInteractionReqToASAcceptLike() { + acceptingAccount := suite.testAccounts["local_account_1"] + interactingAccount := suite.testAccounts["remote_account_1"] + + req := >smodel.InteractionRequest{ + ID: "01J1AKMZ8JE5NW0ZSFTRC1JJNE", + CreatedAt: testrig.TimeMustParse("2022-06-09T13:12:00Z"), + TargetAccountID: acceptingAccount.ID, + TargetAccount: acceptingAccount, + InteractingAccountID: interactingAccount.ID, + InteractingAccount: interactingAccount, + InteractionURI: "https://fossbros-anonymous.io/users/foss_satan/statuses/01J1AKRRHQ6MDDQHV0TP716T2K", + InteractionType: gtsmodel.InteractionLike, + URI: "http://localhost:8080/users/the_mighty_zork/accepts/01J1AKMZ8JE5NW0ZSFTRC1JJNE", + AcceptedAt: testrig.TimeMustParse("2022-06-09T13:12:00Z"), + } + + accept, err := suite.typeconverter.InteractionReqToASAccept( + context.Background(), + req, + ) + if err != nil { + suite.FailNow(err.Error()) + } + + i, err := ap.Serialize(accept) + if err != nil { + suite.FailNow(err.Error()) + } + + b, err := json.MarshalIndent(i, "", " ") + if err != nil { + suite.FailNow(err.Error()) + } + + suite.Equal(`{ + "@context": "https://www.w3.org/ns/activitystreams", + "actor": "http://localhost:8080/users/the_mighty_zork", + "id": "http://localhost:8080/users/the_mighty_zork/accepts/01J1AKMZ8JE5NW0ZSFTRC1JJNE", + "object": "https://fossbros-anonymous.io/users/foss_satan/statuses/01J1AKRRHQ6MDDQHV0TP716T2K", + "to": "http://fossbros-anonymous.io/users/foss_satan", + "type": "Accept" +}`, string(b)) +} + func TestInternalToASTestSuite(t *testing.T) { suite.Run(t, new(InternalToASTestSuite)) }