From 6d16daea0dc653343ee8e3566ce8c1a755a14771 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 13 Aug 2020 02:36:15 +0300
Subject: [PATCH] Add new attachment storage option: "original"

---
 src/data/attachments.js  | 32 ++++++++++++++++++++++----------
 src/data/cfg.schema.json |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/data/attachments.js b/src/data/attachments.js
index 3d3ae16..c26d056 100644
--- a/src/data/attachments.js
+++ b/src/data/attachments.js
@@ -26,8 +26,17 @@ function getErrorResult(msg = null) {
 }
 
 /**
- * Attempts to download and save the given attachement
- * @param {Object} attachment
+ * An attachment storage option that simply forwards the original attachment URL
+ * @param {Eris.Attachment} attachment
+ * @returns {{url: string}}
+ */
+function passthroughOriginalAttachment(attachment) {
+  return { url: attachment.url };
+}
+
+/**
+ * An attachment storage option that downloads each attachment and serves them from a local web server
+ * @param {Eris.Attachment} attachment
  * @param {Number=0} tries
  * @returns {Promise<{ url: string }>}
  */
@@ -54,7 +63,7 @@ async function saveLocalAttachment(attachment) {
 }
 
 /**
- * @param {Object} attachment
+ * @param {Eris.Attachment} attachment
  * @param {Number} tries
  * @returns {Promise<{ path: string, cleanup: function }>}
  */
@@ -108,7 +117,9 @@ function getLocalAttachmentUrl(attachmentId, desiredName = null) {
 }
 
 /**
- * @param {Object} attachment
+ * An attachment storage option that downloads each attachment and re-posts them to a specified Discord channel.
+ * The re-posted attachment is then linked in the actual thread.
+ * @param {Eris.Attachment} attachment
  * @returns {Promise<{ url: string }>}
  */
 async function saveDiscordAttachment(attachment) {
@@ -153,19 +164,19 @@ async function createDiscordAttachmentMessage(channel, file, tries = 0) {
 
 /**
  * Turns the given attachment into a file object that can be sent forward as a new attachment
- * @param {Object} attachment
- * @returns {Promise<{file, name: string}>}
+ * @param {Eris.Attachment} attachment
+ * @returns {Promise<Eris.MessageFile>}
  */
 async function attachmentToDiscordFileObject(attachment) {
   const downloadResult = await downloadAttachment(attachment);
   const data = await readFile(downloadResult.path);
   downloadResult.cleanup();
-  return {file: data, name: attachment.filename};
+  return { file: data, name: attachment.filename };
 }
 
 /**
  * Saves the given attachment based on the configured storage system
- * @param {Object} attachment
+ * @param {Eris.Attachment} attachment
  * @returns {Promise<{ url: string }>}
  */
 function saveAttachment(attachment) {
@@ -190,8 +201,9 @@ function addStorageType(name, handler) {
   attachmentStorageTypes[name] = handler;
 }
 
-attachmentStorageTypes.local = saveLocalAttachment;
-attachmentStorageTypes.discord = saveDiscordAttachment;
+addStorageType("original", passthroughOriginalAttachment);
+addStorageType("local", saveLocalAttachment);
+addStorageType("discord", saveDiscordAttachment);
 
 module.exports = {
   getLocalAttachmentPath,
diff --git a/src/data/cfg.schema.json b/src/data/cfg.schema.json
index acf5c33..e03c913 100644
--- a/src/data/cfg.schema.json
+++ b/src/data/cfg.schema.json
@@ -206,7 +206,7 @@
 
     "attachmentStorage": {
       "type": "string",
-      "default": "local"
+      "default": "original"
     },
     "attachmentStorageChannelId": {
       "type": "string"