dkforest

commit beb268d98beec4b841fbef1f267d36ea88cb622f
parent b03d151ab83ec2e223b0ff827713d8d707d38d80
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon,  5 Jun 2023 21:45:19 -0700

cleanup

Diffstat:
M
pkg/web/handlers/api/v1/topBarHandler.go
 | 
12
+++++++-----

1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkg/web/handlers/api/v1/topBarHandler.go b/pkg/web/handlers/api/v1/topBarHandler.go
@@ -452,20 +452,22 @@ func (c *Command) zeroProcMsgRoom(rawMsg, roomKey string, roomID database.RoomID
 }
 
 func (c *Command) zeroProcMsgRoomToUser(rawMsg, roomKey string, roomID database.RoomID, toUser *database.User) {
-	zeroUser := c.getZeroUser()
 	procMsg, _, _ := ProcessRawMessage(c.db, rawMsg, roomKey, c.authUser.ID, roomID, nil, true)
-	rawMsgRoom(c.db, zeroUser, toUser, rawMsg, procMsg, roomKey, roomID)
+	c.zeroRawMsg(toUser, rawMsg, procMsg)
 }
 
 // Have the "zero" bot account send a message to the authUser
 func (c *Command) zeroMsg(msg string) {
-	zeroUser := c.getZeroUser()
-	c.rawMsg(zeroUser, c.authUser, msg, msg)
+	c.zeroRawMsg(c.authUser, msg, msg)
 }
 
 func (c *Command) zeroPublicMsg(raw, msg string) {
+	c.zeroRawMsg(nil, raw, msg)
+}
+
+func (c *Command) zeroRawMsg(user2 *database.User, raw, msg string) {
 	zeroUser := c.getZeroUser()
-	c.rawMsg(zeroUser, nil, raw, msg)
+	c.rawMsg(zeroUser, user2, raw, msg)
 }
 
 func (c *Command) rawMsg(user1 database.User, user2 *database.User, raw, msg string) {