dkforest

commit e38d1d4fca2aa8c82f20ccce7bc13850ba2d4dd8
parent 9cc26121cb860a0191ed5eb5fca2e8536fe8e003
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu,  2 Mar 2023 23:00:30 -0800

cleanup

Diffstat:
M
pkg/database/tableUploads.go
 | 
4
++++
M
pkg/web/handlers/api/v1/topBarHandler.go
 | 
10
++++------

2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pkg/database/tableUploads.go b/pkg/database/tableUploads.go
@@ -25,6 +25,10 @@ type Upload struct {
 	User         User
 }
 
+func (u *Upload) GetHTMLLink() string {
+	return `<a href="/uploads/` + u.FileName + `" rel="noopener noreferrer" target="_blank">` + u.OrigFileName + `</a>`
+}
+
 func (u *Upload) GetContent() (os.FileInfo, []byte, error) {
 	filePath1 := filepath.Join(config.Global.ProjectUploadsPath(), u.FileName)
 	f, err := os.Open(filePath1)
diff --git a/pkg/web/handlers/api/v1/topBarHandler.go b/pkg/web/handlers/api/v1/topBarHandler.go
@@ -1051,7 +1051,7 @@ func convertPGPMessageToFile(html string, authUserID database.UserID) string {
 		upload, _ := database.CreateUpload("pgp.txt", []byte(tmp), authUserID)
 		msgBefore := html[0:startIdx]
 		msgAfter := html[endIdx+len(pgpSuffix):]
-		html = msgBefore + ` [<a href="/uploads/` + upload.FileName + `" rel="noopener noreferrer" target="_blank">` + upload.OrigFileName + `</a>] ` + msgAfter
+		html = msgBefore + ` [` + upload.GetHTMLLink() + `] ` + msgAfter
 		html = strings.TrimSpace(html)
 	}
 	return html
@@ -1065,12 +1065,10 @@ func convertPGPPublicKeyToFile(html string, authUserID database.UserID) string {
 		pkeySubSlice := html[startIdx : endIdx+len(pgpPKeySuffix)]
 		unescapedPkey := html2.UnescapeString(pkeySubSlice)
 		tmp := convertInlinePGPPublicKey(unescapedPkey)
-
 		upload, _ := database.CreateUpload("pgp_pkey.txt", []byte(tmp), authUserID)
-
 		msgBefore := html[0:startIdx]
 		msgAfter := html[endIdx+len(pgpPKeySuffix):]
-		html = msgBefore + ` [<a href="/uploads/` + upload.FileName + `" rel="noopener noreferrer" target="_blank">` + upload.OrigFileName + `</a>] ` + msgAfter
+		html = msgBefore + ` [` + upload.GetHTMLLink() + `] ` + msgAfter
 		html = strings.TrimSpace(html)
 	}
 	return html
@@ -1084,7 +1082,7 @@ func convertPGPClearsignToFile(html string, authUserID database.UserID) string {
 		upload, _ := database.CreateUpload("pgp_clearsign.txt", []byte(tmp), authUserID)
 		msgBefore := html[0:startIdx]
 		msgAfter := html[endIdx+len(pgpSignedSuffix):]
-		html = msgBefore + ` [<a href="/uploads/` + upload.FileName + `" rel="noopener noreferrer" target="_blank">` + upload.OrigFileName + `</a>] ` + msgAfter
+		html = msgBefore + ` [` + upload.GetHTMLLink() + `] ` + msgAfter
 		html = strings.TrimSpace(html)
 	}
 	return html
@@ -1143,7 +1141,7 @@ func convertAgeMessageToFile(html string, authUserID database.UserID) string {
 		upload, _ := database.CreateUpload("age.txt", []byte(tmp), authUserID)
 		msgBefore := html[0:startIdx]
 		msgAfter := html[endIdx+len(ageSuffix):]
-		html = msgBefore + ` [<a href="/uploads/` + upload.FileName + `" rel="noopener noreferrer" target="_blank">` + upload.OrigFileName + `</a>] ` + msgAfter
+		html = msgBefore + ` [` + upload.GetHTMLLink() + `] ` + msgAfter
 		html = strings.TrimSpace(html)
 	}
 	return html