dkforest

commit 548c96513e4112b261a5842dce341692b3f587a1
parent c1c8a4a7b7d67608b4cc8064f9821d45ffb68f37
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed,  9 Nov 2022 16:33:59 -0800

cleanup

Diffstat:
M
pkg/config/config.go
 | 
3
+++
M
pkg/database/tableChatMessages.go
 | 
4
++--
M
pkg/web/handlers/api/v1/slashInterceptor.go
 | 
2
+-
M
pkg/web/handlers/api/v1/topBarHandler.go
 | 
2
+-

4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -4,6 +4,7 @@ import (
 	wallet1 "github.com/monero-ecosystem/go-monero-rpc-client/wallet"
 	"net"
 	"sync"
+	"time"
 
 	"dkforest/pkg/atom"
 	"dkforest/pkg/ratecounter"
@@ -34,6 +35,8 @@ const (
 	GeneralRoomID = 1
 )
 
+const EditMessageTimeLimit = 2 * time.Minute
+
 const NullUsername = "0"
 
 var NullUserPrivateKey string
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -148,7 +148,7 @@ func (m *ChatMessage) UserCanSee(user User) bool {
 }
 
 func (m *ChatMessage) CanBeEdited() bool {
-	return time.Since(m.CreatedAt) <= 2*time.Minute
+	return time.Since(m.CreatedAt) <= config.EditMessageTimeLimit
 }
 
 func (m *ChatMessage) UserCanDelete(user User) bool {
@@ -196,7 +196,7 @@ func (m *ChatMessage) TooOldToDelete() bool {
 	if m.UserID == 12693 {
 		return time.Since(m.CreatedAt) > 20*time.Second
 	}
-	return time.Since(m.CreatedAt) > 2*time.Minute
+	return time.Since(m.CreatedAt) > config.EditMessageTimeLimit
 }
 
 func (m *ChatMessage) IsMe() bool {
diff --git a/pkg/web/handlers/api/v1/slashInterceptor.go b/pkg/web/handlers/api/v1/slashInterceptor.go
@@ -663,7 +663,7 @@ func handleEditCmd(c *Command) (handled bool) {
 		date := m[1]
 		newMsg := m[2]
 		if dt, err := utils.ParsePrevDatetimeAt(date, clockwork.NewRealClock()); err == nil {
-			if time.Since(dt) <= 2*time.Minute {
+			if time.Since(dt) <= config.EditMessageTimeLimit {
 				if msg, err := database.GetRoomChatMessageByDate(c.room.ID, c.authUser.ID, dt.UTC()); err == nil {
 					c.editMsg = &msg
 					c.origMessage = newMsg
diff --git a/pkg/web/handlers/api/v1/topBarHandler.go b/pkg/web/handlers/api/v1/topBarHandler.go
@@ -425,7 +425,7 @@ func handleGetQuote(msgUUID, roomKey string, room database.ChatRoom, authUser *d
 
 func handleGetEdit(hourMinSec, roomKey string, room database.ChatRoom, authUser *database.User) (dataMessage string, err error) {
 	if dt, err := utils.ParsePrevDatetimeAt(hourMinSec, clockwork.NewRealClock()); err == nil {
-		if time.Since(dt) <= 2*time.Minute {
+		if time.Since(dt) <= config.EditMessageTimeLimit {
 			if msg, err := database.GetRoomChatMessageByDate(room.ID, authUser.ID, dt.UTC()); err == nil {
 				decrypted, err := msg.GetRawMessage(roomKey)
 				if err != nil {