dkforest

commit c1c8a4a7b7d67608b4cc8064f9821d45ffb68f37
parent bef03bdb0d7a018c7f095c31b8fdadd71aac72cb
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed,  9 Nov 2022 16:00:47 -0800

remove hardcoded user IDs code

Diffstat:
M
pkg/database/tableChatMessages.go
 | 
4
++--
M
pkg/utils/utils.go
 | 
10
----------
M
pkg/web/handlers/api/v1/slashInterceptor.go
 | 
8
++++----

3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/pkg/database/tableChatMessages.go b/pkg/database/tableChatMessages.go
@@ -156,8 +156,8 @@ func (m *ChatMessage) UserCanDelete(user User) bool {
 	if user.IsAdmin {
 		return true
 	}
-	// Dawn cannot moderate some users
-	if user.ID == 1139 && !utils.CanDawnModerate(m.UserID) {
+	// Moderators cannot delete vetted user messages
+	if m.User.Vetted {
 		return false
 	}
 	// Mod cannot delete admin
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -859,16 +859,6 @@ func ReencodeJpg(in []byte) (out []byte, err error) {
 	return buf.Bytes(), nil
 }
 
-// CanDawnModerate either or not dawn can moderate a user
-func CanDawnModerate(userID int64) bool {
-	if userID == 12693 { // Cannot moderate faggot
-		return false
-	} else if userID == 17022 { // Cannot moderate LightFox
-		return false
-	}
-	return true
-}
-
 func Must[T any](v T, err error) T {
 	if err != nil {
 		panic(err)
diff --git a/pkg/web/handlers/api/v1/slashInterceptor.go b/pkg/web/handlers/api/v1/slashInterceptor.go
@@ -157,7 +157,7 @@ func handleKickCmd(c *Command) (handled bool) {
 			c.err = ErrRedirect
 			return true
 		}
-		if c.authUser.ID == 1139 && !utils.CanDawnModerate(user.ID) {
+		if !c.authUser.IsAdmin && user.Vetted {
 			c.err = ErrRedirect
 			return true
 		}
@@ -247,7 +247,7 @@ func handleLogoutCmd(c *Command) (handled bool) {
 			c.err = ErrRedirect
 			return true
 		}
-		if c.authUser.ID == 1139 && !utils.CanDawnModerate(user.ID) {
+		if !c.authUser.IsAdmin && user.Vetted {
 			c.err = ErrRedirect
 			return true
 		}
@@ -274,7 +274,7 @@ func handleResetTutorialCmd(c *Command) (handled bool) {
 			c.err = ErrRedirect
 			return true
 		}
-		if c.authUser.ID == 1139 && !utils.CanDawnModerate(user.ID) {
+		if !c.authUser.IsAdmin && user.Vetted {
 			c.err = ErrRedirect
 			return true
 		}
@@ -297,7 +297,7 @@ func handleHellbanCmd(c *Command) (handled bool) {
 			c.err = ErrRedirect
 			return true
 		}
-		if c.authUser.ID == 1139 && !utils.CanDawnModerate(user.ID) {
+		if !c.authUser.IsAdmin && user.Vetted {
 			c.err = ErrRedirect
 			return true
 		}