dkforest

commit a4a7fcffac7d4e776d67c0c8cfcf2ef9f6708260
parent d0018474f37b3baa698c33018085101b9b100ab1
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 24 May 2023 21:27:49 -0700

fix groups for stream

Diffstat:
M
pkg/database/tableChatRoomGroups.go
 | 
5
+++++
M
pkg/web/handlers/handlers.go
 | 
4
++++

2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/pkg/database/tableChatRoomGroups.go b/pkg/database/tableChatRoomGroups.go
@@ -39,6 +39,11 @@ func (d *DkfDB) GetRoomGroupByName(roomID RoomID, groupName string) (out ChatRoo
 	return
 }
 
+func (d *DkfDB) GetRoomGroupByID(roomID RoomID, groupID GroupID) (out ChatRoomGroup, err error) {
+	err = d.db.First(&out, "room_id = ? AND id = ?", roomID, groupID).Error
+	return
+}
+
 func (d *DkfDB) IsUserInGroupByID(userID UserID, groupID GroupID) bool {
 	var count int64
 	d.db.Model(ChatRoomUserGroup{}).Where("group_id = ? AND user_id = ?", groupID, userID).Count(&count)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -5072,6 +5072,10 @@ Loop:
 		if msg.User.ID == 0 {
 			msg.User, _ = db.GetUserByID(msg.UserID)
 		}
+		if msg.GroupID != nil {
+			group, _ := db.GetRoomGroupByID(msg.RoomID, *msg.GroupID)
+			msg.Group = &group
+		}
 		if msg.ToUserID != nil {
 			if msg.ToUser == nil {
 				toUser, _ := db.GetUserByID(*msg.ToUserID)