dkforest

commit 87a6f163d9c1cbf081075e9f114c712fa75eb2df
parent ce57a4403c116f8d4cac48af0699d7928a407f72
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 14 Jan 2023 10:31:49 -0800

censor screenshot timestamp

Diffstat:
M
pkg/web/handlers/api/v1/handlers.go
 | 
1
+
M
pkg/web/handlers/api/v1/uploadInterceptor.go
 | 
1
+

2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -63,6 +63,7 @@ var tagRgx = regexp.MustCompile(`@(` + userOr0 + `)`)
 var autoTagRgx = regexp.MustCompile(`@(\w+)\*`)
 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 tz1Rgx = regexp.MustCompile(`(\d{4}-\d{1,2}-\d{1,2} \d{1,2}-\d{1,2}-\d{1,2})`)            // Screenshot from 2022-02-04 11-58-58.png
 var addGroupRgx = regexp.MustCompile(`^/addgroup (` + groupName + `)$`)
 var rmGroupRgx = regexp.MustCompile(`^/rmgroup (` + groupName + `)$`)
 var lockGroupRgx = regexp.MustCompile(`^/glock (` + groupName + `)$`)
diff --git a/pkg/web/handlers/api/v1/uploadInterceptor.go b/pkg/web/handlers/api/v1/uploadInterceptor.go
@@ -45,6 +45,7 @@ func handleUploadedFile(file multipart.File, handler *multipart.FileHeader, auth
 		return nil, errors.New("invalid file name, 3-50 characters")
 	}
 	origFileName = tzRgx.ReplaceAllString(origFileName, "xxxx-xx-xx at xx.xx.xx XX")
+	origFileName = tz1Rgx.ReplaceAllString(origFileName, "xxxx-xx-xx xx-xx-xx")
 	fileBytes, err := ioutil.ReadAll(file)
 	if err != nil {
 		return nil, err