Merge pull request #2630 from traPtitech/fix/roomStatesEventHandler

fix: update room state handling to use roomStates for consistency

Author: Pugma

service/notification/handlers.go

@@ -15,6 +15,7 @@ import (
 	"github.com/traPtitech/traQ/model"
 	"github.com/traPtitech/traQ/repository"
 	"github.com/traPtitech/traQ/service/fcm"
+	"github.com/traPtitech/traQ/service/qall"
 	"github.com/traPtitech/traQ/service/viewer"
 	"github.com/traPtitech/traQ/service/ws"
 	"github.com/traPtitech/traQ/utils/message"
@@ -612,8 +613,7 @@ func qallRoomStateChangedHandler(ns *Service, ev hub.Message) {
 	broadcast(ns,
 		"QALL_ROOM_STATE_CHANGED",
 		map[string]interface{}{
-			"room_id": ev.Fields["room_id"].(uuid.UUID),
-			"state":   ev.Fields["state"],
+			"roomStates": ev.Fields["roomStates"].(qall.RoomWithParticipants),
 		},
 	)
 }

service/qall/roomstate_impl.go

@@ -51,7 +51,7 @@ func (r *Repository) AddParticipantToRoomState(room *livekit.Room, participant *
 				r.Hub.Publish(hub.Message{
 					Name: event.QallRoomStateChanged,
 					Fields: hub.Fields{
-						"roomState": r.RoomState,
+						"roomStates": r.RoomState,
 					},
 				})
 			}
@@ -73,7 +73,7 @@ func (r *Repository) UpdateParticipantCanPublish(roomID string, participantID st
 						r.Hub.Publish(hub.Message{
 							Name: event.QallRoomStateChanged,
 							Fields: hub.Fields{
-								"roomState": r.RoomState,
+								"roomStates": r.RoomState,
 							},
 						})
 					}
@@ -105,7 +105,7 @@ func (r *Repository) UpdateParticipant(roomID string, participant *livekit.Parti
 						r.Hub.Publish(hub.Message{
 							Name: event.QallRoomStateChanged,
 							Fields: hub.Fields{
-								"roomState": r.RoomState,
+								"roomStates": r.RoomState,
 							},
 						})
 					}
@@ -130,7 +130,7 @@ func (r *Repository) RemoveParticipant(roomID string, participantID string) {
 						r.Hub.Publish(hub.Message{
 							Name: event.QallRoomStateChanged,
 							Fields: hub.Fields{
-								"roomState": r.RoomState,
+								"roomStates": r.RoomState,
 							},
 						})
 					}
@@ -161,7 +161,7 @@ func (r *Repository) AddRoomState(room RoomWithParticipants) {
 		r.Hub.Publish(hub.Message{
 			Name: event.QallRoomStateChanged,
 			Fields: hub.Fields{
-				"roomState": r.RoomState,
+				"roomStates": r.RoomState,
 			},
 		})
 	}
@@ -177,7 +177,7 @@ func (r *Repository) UpdateRoomMetadata(roomID string, metadata Metadata) {
 				r.Hub.Publish(hub.Message{
 					Name: event.QallRoomStateChanged,
 					Fields: hub.Fields{
-						"roomState": r.RoomState,
+						"roomStates": r.RoomState,
 					},
 				})
 			}
@@ -197,7 +197,7 @@ func (r *Repository) RemoveRoomState(roomID string) {
 				r.Hub.Publish(hub.Message{
 					Name: event.QallRoomStateChanged,
 					Fields: hub.Fields{
-						"roomState": r.RoomState,
+						"roomStates": r.RoomState,
 					},
 				})
 			}