From c12d3c0451864154967b991e8b1edf0a3f8e26d4 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 31 Jul 2020 23:29:16 +0300
Subject: [PATCH] Add favicons and welcome messages settings on Instance tab

---
 src/views/settings/components/Instance.vue | 22 +++++++++++++++++++++-
 src/views/settings/components/tabs.js      |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue
index 245d53d8..362393fe 100644
--- a/src/views/settings/components/Instance.vue
+++ b/src/views/settings/components/Instance.vue
@@ -8,6 +8,10 @@
       <setting :setting-group="adminToken" :data="adminTokenData"/>
     </el-form>
     <el-divider v-if="adminToken" class="divider thick-line"/>
+    <el-form :model="welcomeData" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="welcome" :data="welcomeData"/>
+    </el-form>
+    <el-divider v-if="welcome" class="divider thick-line"/>
     <el-form :model="scheduledActivityData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="scheduledActivity" :data="scheduledActivityData"/>
     </el-form>
@@ -20,6 +24,10 @@
       <setting :setting-group="pleromaUser" :data="pleromaUserData"/>
     </el-form>
     <el-divider v-if="pleromaUser" class="divider thick-line"/>
+    <el-form :model="faviconsData" :label-position="labelPosition" :label-width="labelWidth">
+      <setting :setting-group="favicons" :data="faviconsData"/>
+    </el-form>
+    <el-divider v-if="favicons" class="divider thick-line"/>
     <el-form :model="uriSchemesData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="uriSchemes" :data="uriSchemesData"/>
     </el-form>
@@ -27,7 +35,7 @@
     <el-form :model="feedData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="feed" :data="feedData"/>
     </el-form>
-    <el-divider v-if="uriSchemes" class="divider thick-line"/>
+    <el-divider v-if="feed" class="divider thick-line"/>
     <el-form :model="streamerData" :label-position="labelPosition" :label-width="labelWidth">
       <setting :setting-group="streamer" :data="streamerData"/>
     </el-form>
@@ -58,6 +66,12 @@ export default {
     adminTokenData() {
       return _.get(this.settings.settings, [':pleroma', ':admin_token']) || {}
     },
+    favicons() {
+      return this.settings.description.find(setting => setting.key === ':instances_favicons')
+    },
+    faviconsData() {
+      return _.get(this.settings.settings, [':pleroma', ':instances_favicons']) || {}
+    },
     feed() {
       return this.settings.description.find(setting => setting.key === ':feed')
     },
@@ -123,6 +137,12 @@ export default {
     },
     uriSchemesData() {
       return _.get(this.settings.settings, [':pleroma', ':uri_schemes']) || {}
+    },
+    welcome() {
+      return this.settings.description.find(setting => setting.key === ':welcome')
+    },
+    welcomeData() {
+      return _.get(this.settings.settings, [':pleroma', ':welcome']) || {}
     }
   },
   methods: {
diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js
index 9a5f9b4e..24f03b6f 100644
--- a/src/views/settings/components/tabs.js
+++ b/src/views/settings/components/tabs.js
@@ -30,7 +30,7 @@ export const tabs = description => {
     },
     'instance': {
       label: 'settings.instance',
-      settings: [':admin_token', ':instance', ':manifest', 'Pleroma.User', 'Pleroma.ScheduledActivity', ':uri_schemes', ':feed', ':streamer']
+      settings: [':admin_token', ':instance', ':instances_favicons', ':welcome', ':manifest', 'Pleroma.User', 'Pleroma.ScheduledActivity', ':uri_schemes', ':feed', ':streamer']
     },
     'job-queue': {
       label: 'settings.jobQueue',