dkforest

commit 5e8cddd2841c3c4552821f0b4568bdfe832a910e
parent 5067a607a9ab2ce884101f12e39896474a400a36
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 17:52:54 -0700

cleanup

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
6
+++---
M
pkg/database/tableChatRooms.go
 | 
4
++++

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -458,7 +458,7 @@ func (d *DkfDB) CreateMsg(raw, txt, roomKey string, roomID RoomID, userID UserID
 		out.ToUserID = toUserID
 	}
 	err = d.db.Create(&out).Error
-	MsgPubSub.Pub("room_"+utils.FormatInt64(int64(roomID)), ChatMessageType{Typ: 0, Msg: &out})
+	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: 0, Msg: &out})
 	return
 }
 
@@ -473,7 +473,7 @@ func (d *DkfDB) CreateSysMsg(raw, txt, roomKey string, roomID RoomID, userID Use
 	msg := makeMsg(raw, txt, roomID, userID)
 	msg.System = true
 	err := d.db.Create(&msg).Error
-	MsgPubSub.Pub("room_"+utils.FormatInt64(int64(roomID)), ChatMessageType{Typ: 0, Msg: &msg})
+	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: 0, Msg: &msg})
 	return err
 }
 
@@ -536,7 +536,7 @@ func (d *DkfDB) CreateOrEditMessage(
 		}
 	}
 	editMsg.DoSave(d)
-	MsgPubSub.Pub("room_"+utils.FormatInt64(int64(roomID)), ChatMessageType{Typ: typ, Msg: editMsg})
+	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: typ, Msg: editMsg})
 	return editMsg.ID, nil
 }
 
diff --git a/pkg/database/tableChatRooms.go b/pkg/database/tableChatRooms.go
@@ -12,6 +12,10 @@ import (
 
 type RoomID int64
 
+func (r RoomID) String() string {
+	return utils.FormatInt64(int64(r))
+}
+
 type ChatRoom struct {
 	ID           RoomID
 	Name         string