reformat and remove unnecessary logs, TODO squash

Author: sommerf-lf

services/mailer/mail.go

@@ -426,53 +426,32 @@ func inlineImages(body string, ctx *mailCommentContext) (string, error) {
 // Helper function to convert attachment source to data URI
 
 func attachmentSrcToDataURI(attachmentPath string, ctx *mailCommentContext) (string, error) {
-	// Extract the UUID from the attachment path
 	parts := strings.Split(attachmentPath, "/attachments/")
-	attachmentUUID := ""
-	if len(parts) > 1 {
-		attachmentUUID = parts[1]
-	} else {
+	if len(parts) <= 1 {
 		return "", fmt.Errorf("Invalid attachment path: %s", attachmentPath)
 	}
-	// Retrieve the attachment using the UUID
+
+	attachmentUUID := parts[len(parts)-1]
 	attachment, err := repo_model.GetAttachmentByUUID(ctx, attachmentUUID)
-	log.Trace("attachmentUUID: %s", attachmentUUID)
 	if err != nil {
 		return "", err
 	}
 
-	// log attachment.DownloadPath
-	log.Trace("attachment.DownloadURL(): %s", attachment.DownloadURL())
-
 	fr, err := storage.Attachments.Open(attachment.RelativePath())
 	if err != nil {
 		return "", err
 	}
-	defer func(fr storage.Object) {
-		err := fr.Close()
-		if err != nil {
-		}
-	}(fr)
+	defer fr.Close()
 
-	// fr is io.ReadSeeker
-	// get this as bytes:
 	content := make([]byte, attachment.Size)
-	_, err = fr.Read(content)
-	if err != nil {
+	if _, err := fr.Read(content); err != nil {
 		return "", err
 	}
 
-	// Detect the MIME type
 	mimeType := http.DetectContentType(content)
-
-	log.Trace("MIME type: %s", mimeType)
-
-	// Encode the content to base64
 	encoded := base64.StdEncoding.EncodeToString(content)
-	log.Trace("First 100 characters of encoded content: %s", encoded[:100])
-
-	// Construct the data URI
 	dataURI := fmt.Sprintf("data:%s;base64,%s", mimeType, encoded)
+
 	return dataURI, nil
 }