dkforest

commit a60a6aa0f139eb832e824801fc27c73bde2d56b8
parent 9f5a3b9180cd2fc7f9928e852614b47bf84e97d9
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon, 19 Dec 2022 22:09:23 -0800

avoid name collision

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

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -26,7 +26,7 @@ import (
 var usernameF = `\w{3,20}` // username (regex Fragment)
 var userOr0 = usernameF + `|0`
 var groupName = `\w{3,20}`
-var roomName = `\w{3,50}`
+var roomNameF = `\w{3,50}`
 var chatTs = `\d{2}:\d{2}:\d{2}`
 var optAtGUser = `@?(` + usernameF + `)`  // Optional @, Grouped, Username
 var optAtGUserOr0 = `@?(` + userOr0 + `)` // Optional @, Grouped, Username or 0
@@ -56,7 +56,7 @@ var unhellbanRgx = regexp.MustCompile(`^/(?:unhellban|uhb) ` + optAtGUser)
 var tokenRgx = regexp.MustCompile(`^/token (\d{1,2})$`)
 var tagRgx = regexp.MustCompile(`@(` + userOr0 + `)`)
 var autoTagRgx = regexp.MustCompile(`@(\w+)\*`)
-var roomTagRgx = regexp.MustCompile(`#(` + roomName + `)`)
+var roomTagRgx = regexp.MustCompile(`#(` + roomNameF + `)`)
 var tzRgx = regexp.MustCompile(`(\d{4}-\d{1,2}-\d{1,2} at \d{1,2}\.\d{1,2}\.\d{1,2} [A|P]M)`) // Screen Shot 2022-02-04 at 11.58.58 PM
 var addGroupRgx = regexp.MustCompile(`^/addgroup (` + groupName + `)$`)
 var rmGroupRgx = regexp.MustCompile(`^/rmgroup (` + groupName + `)$`)
@@ -65,7 +65,7 @@ var unlockGroupRgx = regexp.MustCompile(`^/gunlock (` + groupName + `)$`)
 var groupUsersRgx = regexp.MustCompile(`^/gusers (` + groupName + `)$`)
 var groupAddUserRgx = regexp.MustCompile(`^/gadduser (` + groupName + `) ` + optAtGUser + `$`)
 var groupRmUserRgx = regexp.MustCompile(`^/grmuser (` + groupName + `) ` + optAtGUser + `$`)
-var unsubscribeRgx = regexp.MustCompile(`^/unsubscribe (` + roomName + `)$`)
+var unsubscribeRgx = regexp.MustCompile(`^/unsubscribe (` + roomNameF + `)$`)
 var bsRgx = regexp.MustCompile(`^/pm ` + optAtGUser + ` /bs\s?([A-J]\d)?$`)
 var cRgx = regexp.MustCompile(`^/pm ` + optAtGUser + ` /c\s?(move)?$`)