Allow non-image attachments

Author: mdbenito

src/utils.ts

@@ -34,7 +34,7 @@ export const generateUserProjectRegex = () => {
 
 // Creates new attachments and replaces old links
 export const migrateAttachments = async (body: string, githubRepoId: number | undefined, s3: S3Settings, gitlabHelper: GitlabHelper) => {
-  const regexp = /!\[([^\]]+)\]\((\/uploads[^)]+)\)/g;
+  const regexp = /(!?)\[([^\]]+)\]\((\/uploads[^)]+)\)/g;
 
   // Maps link offset to a new name in S3
   const offsetToAttachment: {
@@ -45,11 +45,12 @@ export const migrateAttachments = async (body: string, githubRepoId: number | un
   const matches = body.matchAll(regexp);
 
   for (const match of matches) {
-    const name = match[1];
-    const url = match[2];
+    const prefix = match[1] || '';
+    const name = match[2];
+    const url = match[3];
+
     if (s3 && s3.bucket) {
       const basename = path.basename(url);
-      const extension = path.extname(url);
       const mimeType = mime.lookup(basename);
       const attachmentBuffer = await gitlabHelper.getAttachment(url);
       if (!attachmentBuffer) {
@@ -59,7 +60,7 @@ export const migrateAttachments = async (body: string, githubRepoId: number | un
       // // Generate file name for S3 bucket from URL
       const hash = crypto.createHash('sha256');
       hash.update(url);
-      const newFileName = hash.digest('hex') + extension
+      const newFileName = hash.digest('hex') + '/' + basename
       const relativePath = githubRepoId ? `${githubRepoId}/${newFileName}` : newFileName;
       // Doesn't seem like it is easy to upload an issue to github, so upload to S3
       //https://stackoverflow.com/questions/41581151/how-to-upload-an-image-to-use-in-issue-comments-via-github-api
@@ -86,13 +87,13 @@ export const migrateAttachments = async (body: string, githubRepoId: number | un
       });
 
       // Add the new URL to the map
-      offsetToAttachment[match.index] = `![${name}](${s3url})`;
+      offsetToAttachment[match.index] = `${prefix}[${name}](${s3url})`;
     } else {
       // Not using S3: default to old URL, adding absolute path
       const host = gitlabHelper.host.endsWith('/') 
                     ? gitlabHelper.host : gitlabHelper.host + '/';
       const attachmentUrl = host + gitlabHelper.projectPath + url;
-      offsetToAttachment[match.index] = `![${name}](${attachmentUrl})`;
+      offsetToAttachment[match.index] = `${prefix}[${name}](${attachmentUrl})`;
     }
   }