Remove overly using the stream name in fediverse engagement messages

2 files changed, 7 insertions, 3 deletions

diff --git a/activitypub/apmodels/activity.go b/activitypub/apmodels/activity.go
index 070bd1bf4..cb6b19a5f 100644
--- a/activitypub/apmodels/activity.go
+++ b/activitypub/apmodels/activity.go
@@ -34,6 +34,10 @@ func MakeCreateActivity(activityID *url.URL) vocab.ActivityStreamsCreate {
 		cc := streams.NewActivityStreamsCcProperty()
 		cc.AppendIRI(public)
 		activity.SetActivityStreamsCc(cc)
+
+		bcc := streams.NewActivityStreamsBccProperty()
+		bcc.AppendIRI(public)
+		activity.SetActivityStreamsBcc(bcc)
 	}
 
 	return activity
diff --git a/activitypub/inbox/chat.go b/activitypub/inbox/chat.go
index 67ff31013..3b75427d9 100644
--- a/activitypub/inbox/chat.go
+++ b/activitypub/inbox/chat.go
@@ -34,15 +34,15 @@ func handleEngagementActivity(eventType events.EventType, isLiveNotification boo
 	userPrefix := fmt.Sprintf("%s ", actorName)
 	var suffix string
 	if isLiveNotification && action == events.FediverseEngagementLike {
-		suffix = fmt.Sprintf("liked that %s went live.", data.GetServerName())
+		suffix = "liked that this stream went live."
 	} else if action == events.FediverseEngagementLike {
 		suffix = fmt.Sprintf("liked a post from %s.", data.GetServerName())
 	} else if isLiveNotification && action == events.FediverseEngagementRepost {
-		suffix = fmt.Sprintf("shared that %s went live.", data.GetServerName())
+		suffix = "shared this stream with their followers."
 	} else if action == events.FediverseEngagementRepost {
 		suffix = fmt.Sprintf("shared a post from %s.", data.GetServerName())
 	} else if action == events.FediverseEngagementFollow {
-		suffix = fmt.Sprintf("followed %s.", data.GetServerName())
+		suffix = "followed this stream."
 	} else {
 		return fmt.Errorf("could not handle event for sending to chat: %s", action)
 	}