dkforest

commit b045fdd950e08fd97481842202d7849b2c8b5be6
parent 8c21706eaab0b82c1b77f87d24fd2a506c2230e0
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 22 May 2023 19:40:33 -0700

constants

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
16
++++++++++++----
M
pkg/web/handlers/handlers.go
 | 
2
+-

2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -488,7 +488,7 @@ func (d *DkfDB) createMsg(raw, txt, roomKey string, roomID RoomID, userID UserID
 	}
 	out.System = system
 	err = d.db.Create(&out).Error
-	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: 0, Msg: &out})
+	MsgPubSub.Pub("room_"+roomID.String(), ChatMessageType{Typ: CreateMsg, Msg: &out})
 	return
 }
 
@@ -510,9 +510,9 @@ func (d *DkfDB) CreateOrEditMessage(
 		}
 	}
 
-	typ := 0
+	typ := CreateMsg
 	if editMsg != nil {
-		typ = 1
+		typ = EditMsg
 		editMsg.Message = message
 		editMsg.RawMessage = raw
 		editMsg.Rev++
@@ -535,8 +535,16 @@ func (d *DkfDB) CreateOrEditMessage(
 	return editMsg.ID, nil
 }
 
+type PubSubMessageType int
+
+const (
+	CreateMsg PubSubMessageType = iota
+	EditMsg
+	ForceRefresh
+)
+
 type ChatMessageType struct {
-	Typ int
+	Typ PubSubMessageType
 	Msg *ChatMessage
 }
 
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -4995,7 +4995,7 @@ Loop:
 		isFirstMsg := false
 		s := v1.RenderMessage(1, *msg, authUser, data, baseTopBarURL, &readMarkerRendered, &isFirstMsg, csrf, config.NullUsername)
 		_, _ = c.Response().Write([]byte(fmt.Sprintf(`%s`, s)))
-		if msgTyp.Typ == 1 {
+		if msgTyp.Typ == database.EditMsg {
 			_, _ = c.Response().Write([]byte(fmt.Sprintf(`<style>.msgidc-%s-%d{display:none;}</style>`, msg.UUID, msg.Rev-1)))
 		}
 		c.Response().Flush()