From 0c80942777728fc976540db4b8833767765eccff Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 24 Jul 2020 23:29:12 +0300
Subject: [PATCH] Rename Auto linker to Link Formatter

---
 src/lang/en.js                                     |  2 +-
 .../{AutoLinker.vue => LinkFormatter.vue}          | 14 +++++++-------
 src/views/settings/components/index.js             |  2 +-
 src/views/settings/components/tabs.js              |  8 ++++----
 src/views/settings/index.vue                       |  8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename src/views/settings/components/{AutoLinker.vue => LinkFormatter.vue} (80%)

diff --git a/src/lang/en.js b/src/lang/en.js
index e11740d9..3b644597 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -358,10 +358,10 @@ export default {
     instance: 'Instance',
     upload: 'Upload',
     mailer: 'Mailer',
+    linkFormatter: 'Link Formatter',
     logger: 'Logger',
     activityPub: 'ActivityPub',
     auth: 'Authentication',
-    autoLinker: 'Auto Linker',
     captcha: 'Captcha',
     frontend: 'Frontend',
     http: 'HTTP',
diff --git a/src/views/settings/components/AutoLinker.vue b/src/views/settings/components/LinkFormatter.vue
similarity index 80%
rename from src/views/settings/components/AutoLinker.vue
rename to src/views/settings/components/LinkFormatter.vue
index 93a3d23a..cb44a457 100644
--- a/src/views/settings/components/AutoLinker.vue
+++ b/src/views/settings/components/LinkFormatter.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="!loading" :class="isSidebarOpen" class="form-container">
-    <el-form :model="autoLinkerData" :label-position="labelPosition" :label-width="labelWidth">
-      <setting :setting-group="autoLinker" :data="autoLinkerData"/>
+    <el-form :model="linkFormatterData" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="linkFormatter" :data="linkFormatterData"/>
     </el-form>
     <div class="submit-button-container">
       <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
@@ -16,17 +16,17 @@ import Setting from './Setting'
 import _ from 'lodash'
 
 export default {
-  name: 'AutoLinker',
+  name: 'LinkFormatter',
   components: { Setting },
   computed: {
     ...mapGetters([
       'settings'
     ]),
-    autoLinker() {
-      return this.settings.description.find(setting => setting.key === ':opts')
+    linkFormatter() {
+      return this.settings.description.find(setting => setting.key === 'Pleroma.Formatter')
     },
-    autoLinkerData() {
-      return _.get(this.settings.settings, [':auto_linker', ':opts']) || {}
+    linkFormatterData() {
+      return _.get(this.settings.settings, [':pleroma', 'Pleroma.Formatter']) || {}
     },
     isMobile() {
       return this.$store.state.app.device === 'mobile'
diff --git a/src/views/settings/components/index.js b/src/views/settings/components/index.js
index 165f43f1..75f10e33 100644
--- a/src/views/settings/components/index.js
+++ b/src/views/settings/components/index.js
@@ -1,6 +1,5 @@
 export { default as ActivityPub } from './ActivityPub'
 export { default as Authentication } from './Authentication'
-export { default as AutoLinker } from './AutoLinker'
 export { default as Captcha } from './Captcha'
 export { default as Esshd } from './Esshd'
 export { default as Frontend } from './Frontend'
@@ -8,6 +7,7 @@ export { default as Gopher } from './Gopher'
 export { default as Http } from './Http'
 export { default as Instance } from './Instance'
 export { default as JobQueue } from './JobQueue'
+export { default as LinkFormatter } from './LinkFormatter'
 export { default as Logger } from './Logger'
 export { default as Mailer } from './Mailer'
 export { default as MediaProxy } from './MediaProxy'
diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js
index 7190dddd..bf3c752f 100644
--- a/src/views/settings/components/tabs.js
+++ b/src/views/settings/components/tabs.js
@@ -7,10 +7,6 @@ export const tabs = {
     label: 'settings.auth',
     settings: [':auth', ':ldap', ':oauth2', 'Pleroma.Web.Auth.Authenticator']
   },
-  'auto-linker': {
-    label: 'settings.autoLinker',
-    settings: [':opts']
-  },
   'esshd': {
     label: 'settings.esshd',
     settings: [':esshd']
@@ -39,6 +35,10 @@ export const tabs = {
     label: 'settings.jobQueue',
     settings: ['Pleroma.ActivityExpiration', 'Oban', ':workers']
   },
+  'link-formatter': {
+    label: 'settings.linkFormatter',
+    settings: ['Pleroma.Formatter']
+  },
   'logger': {
     label: 'settings.logger',
     settings: [':console', ':ex_syslogger', ':quack', ':logger']
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index 6f02a451..02d7b034 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -69,7 +69,7 @@
       <div class="settings-search-input-container"/>
       <activity-pub v-if="activeTab === 'activityPub'"/>
       <authentication v-if="activeTab === 'auth'"/>
-      <auto-linker v-if="activeTab === 'autoLinker'"/>
+      <link-formatter v-if="activeTab === 'linkFormatter'"/>
       <esshd v-if="activeTab === 'esshd'"/>
       <captcha v-if="activeTab === 'captcha'"/>
       <frontend v-if="activeTab === 'frontend'"/>
@@ -97,7 +97,6 @@ import { tabs } from './components/tabs'
 import {
   ActivityPub,
   Authentication,
-  AutoLinker,
   Captcha,
   Esshd,
   Frontend,
@@ -105,6 +104,7 @@ import {
   Http,
   Instance,
   JobQueue,
+  LinkFormatter,
   Logger,
   Mailer,
   MediaProxy,
@@ -122,7 +122,6 @@ export default {
   components: {
     ActivityPub,
     Authentication,
-    AutoLinker,
     Captcha,
     Esshd,
     Frontend,
@@ -130,6 +129,7 @@ export default {
     Http,
     Instance,
     JobQueue,
+    LinkFormatter,
     Logger,
     Mailer,
     MediaProxy,
@@ -147,7 +147,7 @@ export default {
       options: [
         { value: 'activityPub', label: i18n.t('settings.activityPub') },
         { value: 'auth', label: i18n.t('settings.auth') },
-        { value: 'autoLinker', label: i18n.t('settings.autoLinker') },
+        { value: 'linkFormatter', label: i18n.t('settings.linkFormatter') },
         { value: 'esshd', label: i18n.t('settings.esshd') },
         { value: 'captcha', label: i18n.t('settings.captcha') },
         { value: 'frontend', label: i18n.t('settings.frontend') },