From c2bba3f5addf4c6b851bd2d2e7e53d7e897c0115 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:28:35 -0500
Subject: [PATCH 1/2] Remove unused noAttachmentLinks option

---
 src/boot/after_store.js | 1 -
 src/modules/instance.js | 1 -
 static/config.json      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 34f6d6e7..abdba305 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -108,7 +108,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('subjectLineBehavior')
   copyInstanceOption('postContentType')
   copyInstanceOption('alwaysShowSubjectInput')
-  copyInstanceOption('noAttachmentLinks')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
 
diff --git a/src/modules/instance.js b/src/modules/instance.js
index ffece311..0f430e81 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -32,7 +32,6 @@ const defaultState = {
   hideSitename: false,
   nsfwCensorImage: undefined,
   vapidPublicKey: undefined,
-  noAttachmentLinks: false,
   showFeaturesPanel: true,
   minimalScopesMode: false,
   greentext: false,
diff --git a/static/config.json b/static/config.json
index c8267869..0ce85f99 100644
--- a/static/config.json
+++ b/static/config.json
@@ -16,7 +16,6 @@
   "hideUserStats": false,
   "loginMethod": "password",
   "webPushNotifications": false,
-  "noAttachmentLinks": false,
   "nsfwCensorImage": "",
   "showFeaturesPanel": true,
   "minimalScopesMode": false

From eea6d772ad53665ea926d714ed2df6059dec197d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 13 May 2020 14:31:00 -0500
Subject: [PATCH 2/2] Also remove from docs

---
 docs/CONFIGURATION.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
index 0a9bbd7a..f9de664d 100644
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@@ -68,9 +68,6 @@ Hide counters for posts and users respectively, i.e. hiding repeats/favorites co
 ### `webPushNotifications`
 Enables [PushAPI](https://developer.mozilla.org/en-US/docs/Web/API/Push_API) - based notifications for users. Instance-default.
 
-### `noAttachmentLinks`
-**TODO Currently doesn't seem to be doing anything code-wise**, but implication is to disable adding links for attachments, which looks nicer but breaks compatibility with old GNU/Social servers.
-
 ### `nsfwCensorImage`
 Use custom image for NSFW'd images