push: only group host messages are pushed

Author: Jeff Yanta

push/messaging.go

@@ -64,11 +64,6 @@ func (h *EventHandler) handleMessage(ctx context.Context, chatID *commonpb.ChatI
 		h.log.Debug("Dropping push, no content")
 		return nil
 	}
-	// todo: filter by speakers?
-	if msg.WasSenderOffStage {
-		h.log.Debug("Dropping push, sender was off stage")
-		return nil
-	}
 
 	sender, err := h.profiles.GetProfile(ctx, msg.SenderId)
 	if errors.Is(err, profile.ErrNotFound) {
@@ -82,6 +77,33 @@ func (h *EventHandler) handleMessage(ctx context.Context, chatID *commonpb.ChatI
 		return fmt.Errorf("failed to get chat: %w", err)
 	}
 
+	var title string
+	switch md.Type {
+	case chatpb.Metadata_GROUP:
+		if md.Owner == nil || !bytes.Equal(md.Owner.Value, msg.SenderId.Value) {
+			h.log.Debug("Dropping push, sender is not owner")
+			return nil
+		}
+
+		title = fmt.Sprintf("#%d", md.RoomNumber)
+		if len(md.DisplayName) > 0 {
+			title = fmt.Sprintf("#%d: %s", md.RoomNumber, md.DisplayName)
+		}
+	case chatpb.Metadata_TWO_WAY:
+		title = sender.DisplayName
+	}
+
+	var pushPreview string
+	switch typed := msg.Content[0].Type.(type) {
+	case *messagingpb.Content_Text:
+		pushPreview = typed.Text.Text
+	case *messagingpb.Content_Reply:
+		// todo: this needs tests
+		pushPreview = typed.Reply.ReplyText
+	default:
+		return nil
+	}
+
 	members, err := h.chats.GetMembers(ctx, chatID)
 	if err != nil {
 		return fmt.Errorf("failed to get chat members: %w", err)
@@ -103,28 +125,6 @@ func (h *EventHandler) handleMessage(ctx context.Context, chatID *commonpb.ChatI
 		return nil
 	}
 
-	var pushPreview string
-	switch typed := msg.Content[0].Type.(type) {
-	case *messagingpb.Content_Text:
-		pushPreview = typed.Text.Text
-	case *messagingpb.Content_Reply:
-		// todo: this needs tests
-		pushPreview = typed.Reply.ReplyText
-	default:
-		return nil
-	}
-
-	var title string
-	switch md.Type {
-	case chatpb.Metadata_GROUP:
-		title = fmt.Sprintf("#%d", md.RoomNumber)
-		if len(md.DisplayName) > 0 {
-			title = fmt.Sprintf("#%d: %s", md.RoomNumber, md.DisplayName)
-		}
-	case chatpb.Metadata_TWO_WAY:
-		title = sender.DisplayName
-	}
-
 	data := make(map[string]string)
 	if err := h.pusher.SendPushes(ctx, chatID, pushMembers, title, pushPreview, &sender.DisplayName, data); err != nil {
 		h.log.Warn("Failed to send pushes", zap.String("chat_id", base64.StdEncoding.EncodeToString(chatID.Value)), zap.Error(err))

push/tests/messaging.go

@@ -160,6 +160,7 @@ func testEventHandler_HandleMessage(t *testing.T, _ push.TokenStore, profileStor
 				md, err := chatStore.CreateChat(ctx, &chatpb.Metadata{
 					ChatId: chatID,
 					Type:   chatpb.Metadata_GROUP,
+					Owner:  sender,
 				})
 				if err != nil {
 					return nil, err
@@ -198,6 +199,7 @@ func testEventHandler_HandleMessage(t *testing.T, _ push.TokenStore, profileStor
 				md, err := chatStore.CreateChat(ctx, &chatpb.Metadata{
 					ChatId: chatID,
 					Type:   chatpb.Metadata_GROUP,
+					Owner:  sender,
 				})
 				if err != nil {
 					return nil, err
@@ -272,6 +274,45 @@ func testEventHandler_HandleMessage(t *testing.T, _ push.TokenStore, profileStor
 			},
 			expectedPushes: nil,
 		},
+		{
+			name: "push_disabled_sender_not_group_host",
+			setupChat: func() (*chatpb.Metadata, error) {
+				chatID := model.MustGenerateChatID()
+				md, err := chatStore.CreateChat(ctx, &chatpb.Metadata{
+					ChatId: chatID,
+					Type:   chatpb.Metadata_GROUP,
+					Owner:  recipient,
+				})
+				if err != nil {
+					return nil, err
+				}
+				for _, user := range []*commonpb.UserId{sender, recipient} {
+					err = chatStore.AddMember(ctx, chatID, chat.Member{UserID: user})
+					if err != nil {
+						return nil, err
+					}
+
+					err = chatStore.SetPushState(ctx, chatID, user, false)
+					if err != nil {
+						return nil, err
+					}
+				}
+				return md, nil
+			},
+			message: &messagingpb.Message{
+				SenderId: sender,
+				Content: []*messagingpb.Content{
+					{
+						Type: &messagingpb.Content_Text{
+							Text: &messagingpb.TextContent{
+								Text: "Hello from non-host",
+							},
+						},
+					},
+				},
+			},
+			expectedPushes: nil,
+		},
 	}
 
 	for i, tt := range tests {