Added test for ensuring a block's object is not present in the recipients list

Changes

2 changed files (+41/-1)

• src/activitypub/activity.go
  • @@ -470,3 +470,10 @@ func (i *IntransitiveActivity) RecipientsDeduplication() {
    actor.Append(i.Actor) recipientsDeduplication(&actor, &i.To, &i.CC, &i.BCC) } + + func (b *Block) RecipientsDeduplication() { + var dedupObjects ObjectsArr + dedupObjects.Append(b.Actor) + dedupObjects.Append(b.Object) + recipientsDeduplication(&dedupObjects, &b.To, &b.CC, &b.BCC) + }
• tests/server_to_server_test.go
  • @@ -250,7 +250,40 @@ S2S Server: Do-not-deliver considerations
    Server does not deliver Block activities to their object. ` - t.Skip(desc) + t.Log(desc) + + p := activitypub.PersonNew("blocked") + + bob := activitypub.PersonNew("bob") + jane := activitypub.PersonNew("jane doe") + + b := activitypub.BlockNew("block actor", p) + b.Actor = activitypub.Actor(*bob) + + b.To.Append(jane) + b.To.Append(p) + b.To.Append(bob) + + b.RecipientsDeduplication() + + checkActor := func(list activitypub.ObjectsArr, ob activitypub.ObjectOrLink) error { + for _, rec := range list { + if rec.Object().ID == ob.Object().ID { + return fmt.Errorf("%T[%s] of activity should not be in the recipients list", rec, ob.Object().ID) + } + } + return nil + } + + var err error + err = checkActor(b.To, b.Object) + if err != nil { + t.Error(err) + } + err = checkActor(b.To, b.Actor) + if err != nil { + t.Error(err) + } } // S2S Sever: Support for sharedInbox