dkforest

commit 8f3b1b867d99e69f0c0a49b0db4b267fad1e0019
parent 78f416ee4494879f7278feb1ca9d84a0eef2c0fe
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sat, 27 May 2023 06:12:41 -0700

censor more timestamps

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

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/pkg/web/handlers/api/v1/handlers.go b/pkg/web/handlers/api/v1/handlers.go
@@ -69,6 +69,8 @@ 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} (?i)[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 tz3Rgx = regexp.MustCompile(`(\d{4}-\d{1,2}-\d{1,2} \d{1,6})`)                                // Screenshot 2023-05-20 202351.png
+var tz4Rgx = regexp.MustCompile(`(\d{4}-\d{1,2}-\d{1,2}_\d{1,2}_\d{1,2}_\d{1,2})`)                // Screenshot_2023-05-20_11_13_14.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
@@ -49,6 +49,8 @@ func handleUploadedFile(db *database.DkfDB, file multipart.File, handler *multip
 	}
 	origFileName = tzRgx.ReplaceAllString(origFileName, "xxxx-xx-xx at xx.xx.xx XX")
 	origFileName = tz1Rgx.ReplaceAllString(origFileName, "xxxx-xx-xx xx-xx-xx")
+	origFileName = tz3Rgx.ReplaceAllString(origFileName, "xxxx-xx-xx xxxxxx")
+	origFileName = tz4Rgx.ReplaceAllString(origFileName, "xxxx-xx-xx_xx_xx_xx")
 	fileBytes, err := ioutil.ReadAll(file)
 	if err != nil {
 		return nil, err