From a66bb599cedcd152fd7898abe901e47fed32f190 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 24 Oct 2019 23:15:40 +0200
Subject: [PATCH 1/8] Add try/catch to actions that moderate users

---
 src/store/modules/users.js | 79 ++++++++++++++++++++++++++++++--------
 src/views/users/index.vue  | 13 +------
 2 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index ae5ed146..5513d7ca 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -1,3 +1,5 @@
+import { Message } from 'element-ui'
+import i18n from '@/lang'
 import {
   activateUsers,
   addRight,
@@ -78,8 +80,13 @@ const users = {
       commit('SWAP_USERS', updatedUsers)
 
       const usersNicknames = users.map(user => user.nickname)
-      await activateUsers(usersNicknames, getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await activateUsers(usersNicknames, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
     },
     async AddRight({ commit, dispatch, getters, state }, { users, right }) {
       const updatedUsers = users.map(user => {
@@ -88,8 +95,13 @@ const users = {
       commit('SWAP_USERS', updatedUsers)
 
       const usersNicknames = users.map(user => user.nickname)
-      await addRight(usersNicknames, right, getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await addRight(usersNicknames, right, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
     },
     async AddTag({ commit, dispatch, getters, state }, { users, tag }) {
       const updatedUsers = users.map(user => {
@@ -98,16 +110,31 @@ const users = {
       commit('SWAP_USERS', updatedUsers)
 
       const nicknames = users.map(user => user.nickname)
-      await tagUser(nicknames, [tag], getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await tagUser(nicknames, [tag], getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
     },
     async ClearFilters({ commit, dispatch, state }) {
       commit('CLEAR_USERS_FILTERS')
       dispatch('SearchUsers', { query: state.searchQuery, page: 1 })
     },
     async CreateNewAccount({ dispatch, getters, state }, { nickname, email, password }) {
-      await createNewAccount(nickname, email, password, getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await createNewAccount(nickname, email, password, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
+      Message({
+        message: i18n.t('users.accountCreated'),
+        type: 'success',
+        duration: 5 * 1000
+      })
     },
     async DeactivateUsers({ commit, dispatch, getters, state }, users) {
       const updatedUsers = users.map(user => {
@@ -116,8 +143,13 @@ const users = {
       commit('SWAP_USERS', updatedUsers)
 
       const usersNicknames = users.map(user => user.nickname)
-      await deactivateUsers(usersNicknames, getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await deactivateUsers(usersNicknames, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
     },
     async DeleteRight({ commit, dispatch, getters, state }, { users, right }) {
       const updatedUsers = users.map(user => {
@@ -126,16 +158,24 @@ const users = {
       commit('SWAP_USERS', updatedUsers)
 
       const usersNicknames = users.map(user => user.nickname)
-      await deleteRight(usersNicknames, right, getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await deleteRight(usersNicknames, right, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
     },
     async DeleteUsers({ commit, getters, state }, users) {
+      const usersNicknames = users.map(user => user.nickname)
+      try {
+        await deleteUsers(usersNicknames, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      }
       const deletedUsersIds = users.map(deletedUser => deletedUser.id)
       const updatedUsers = state.fetchedUsers.filter(user => !deletedUsersIds.includes(user.id))
       commit('SET_USERS', updatedUsers)
-
-      const usersNicknames = users.map(user => user.nickname)
-      await deleteUsers(usersNicknames, getters.authHost, getters.token)
     },
     async RequirePasswordReset({ getters }, user) {
       await requirePasswordReset(user.nickname, getters.authHost, getters.token)
@@ -161,8 +201,13 @@ const users = {
       commit('SWAP_USERS', updatedUsers)
 
       const nicknames = users.map(user => user.nickname)
-      await untagUser(nicknames, [tag], getters.authHost, getters.token)
-      dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      try {
+        await untagUser(nicknames, [tag], getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
+      }
     },
     async SearchUsers({ commit, dispatch, state, getters }, { query, page }) {
       if (query.length === 0) {
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 9e592846..4e67ee70 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -245,17 +245,8 @@ export default {
       this.$refs.usersTable.clearSelection()
     },
     async createNewAccount(accountData) {
-      try {
-        await this.$store.dispatch('CreateNewAccount', accountData)
-      } catch (_e) {
-        return
-      } finally {
-        this.createAccountDialogOpen = false
-      }
-      this.$message({
-        type: 'success',
-        message: this.$t('users.accountCreated')
-      })
+      await this.$store.dispatch('CreateNewAccount', accountData)
+      this.createAccountDialogOpen = false
     },
     getFirstLetter(str) {
       return str.charAt(0).toUpperCase()

From 453cde8435da2ca32638125843d96bc0348d7823 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 24 Oct 2019 23:24:56 +0200
Subject: [PATCH 2/8] Move try/catch and success message from view files to
 action in module

---
 src/store/modules/settings.js                    | 13 +++++++++++--
 src/views/settings/components/ActivityPub.vue    | 13 ++-----------
 src/views/settings/components/Authentication.vue | 13 ++-----------
 src/views/settings/components/AutoLinker.vue     | 13 ++-----------
 src/views/settings/components/Captcha.vue        | 13 ++-----------
 src/views/settings/components/Database.vue       | 13 ++-----------
 src/views/settings/components/Endpoint.vue       | 13 ++-----------
 src/views/settings/components/Esshd.vue          | 13 ++-----------
 src/views/settings/components/Frontend.vue       | 13 ++-----------
 src/views/settings/components/Gopher.vue         | 13 ++-----------
 src/views/settings/components/Http.vue           | 13 ++-----------
 src/views/settings/components/Instance.vue       | 13 ++-----------
 src/views/settings/components/JobQueue.vue       | 13 ++-----------
 src/views/settings/components/Logger.vue         | 13 ++-----------
 src/views/settings/components/MRF.vue            | 13 ++-----------
 src/views/settings/components/Mailer.vue         | 13 ++-----------
 src/views/settings/components/MediaProxy.vue     | 13 ++-----------
 src/views/settings/components/Metadata.vue       | 13 ++-----------
 src/views/settings/components/Other.vue          | 13 ++-----------
 src/views/settings/components/RateLimiters.vue   | 13 ++-----------
 src/views/settings/components/Upload.vue         | 13 ++-----------
 src/views/settings/components/WebPush.vue        | 13 ++-----------
 22 files changed, 53 insertions(+), 233 deletions(-)

diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index bb6bd8c1..9c3a2c79 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,5 +1,7 @@
+import i18n from '@/lang'
 import { fetchSettings, updateSettings, uploadMedia } from '@/api/settings'
 import { filterIgnored, parseTuples, valueHasTuples, wrapConfig } from './normalizers'
+import { Message } from 'element-ui'
 
 const settings = {
   state: {
@@ -124,10 +126,17 @@ const settings = {
     async SubmitChanges({ getters, commit, state }, data) {
       const filteredSettings = filterIgnored(state.settings, state.ignoredIfNotEnabled)
       const configs = data || wrapConfig(filteredSettings)
-      const response = await updateSettings(configs, getters.authHost, getters.token)
-      if (data) {
+      try {
+        const response = await updateSettings(configs, getters.authHost, getters.token)
         commit('SET_SETTINGS', response.data.configs)
+      } catch (_e) {
+        return
       }
+      Message({
+        message: i18n.t('settings.success'),
+        type: 'success',
+        duration: 5 * 1000
+      })
     },
     UpdateSettings({ commit }, { tab, data }) {
       commit('UPDATE_SETTINGS', { tab, data })
diff --git a/src/views/settings/components/ActivityPub.vue b/src/views/settings/components/ActivityPub.vue
index 903e34fe..2067be0a 100644
--- a/src/views/settings/components/ActivityPub.vue
+++ b/src/views/settings/components/ActivityPub.vue
@@ -37,7 +37,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'ActivityPub',
@@ -57,16 +56,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Authentication.vue b/src/views/settings/components/Authentication.vue
index a2084327..da458d5c 100644
--- a/src/views/settings/components/Authentication.vue
+++ b/src/views/settings/components/Authentication.vue
@@ -232,7 +232,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'Authentication',
@@ -259,16 +258,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/AutoLinker.vue b/src/views/settings/components/AutoLinker.vue
index e84f3394..0b151467 100644
--- a/src/views/settings/components/AutoLinker.vue
+++ b/src/views/settings/components/AutoLinker.vue
@@ -52,7 +52,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'AutoLinker',
@@ -107,16 +106,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Captcha.vue b/src/views/settings/components/Captcha.vue
index 4bff5c0b..bdd7ec91 100644
--- a/src/views/settings/components/Captcha.vue
+++ b/src/views/settings/components/Captcha.vue
@@ -33,7 +33,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'Captcha',
@@ -53,16 +52,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Database.vue b/src/views/settings/components/Database.vue
index ab9d42a8..c0748f89 100644
--- a/src/views/settings/components/Database.vue
+++ b/src/views/settings/components/Database.vue
@@ -135,7 +135,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -157,16 +156,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Endpoint.vue b/src/views/settings/components/Endpoint.vue
index aa1f661a..4cfd5bde 100644
--- a/src/views/settings/components/Endpoint.vue
+++ b/src/views/settings/components/Endpoint.vue
@@ -172,7 +172,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 import AceEditor from 'vue2-ace-editor'
 import 'brace/mode/elixir'
@@ -246,16 +245,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Esshd.vue b/src/views/settings/components/Esshd.vue
index 512ca7a4..ded2cec8 100644
--- a/src/views/settings/components/Esshd.vue
+++ b/src/views/settings/components/Esshd.vue
@@ -55,7 +55,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -82,16 +81,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Frontend.vue b/src/views/settings/components/Frontend.vue
index eac9b478..6282384b 100644
--- a/src/views/settings/components/Frontend.vue
+++ b/src/views/settings/components/Frontend.vue
@@ -318,7 +318,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 
 export default {
@@ -419,16 +418,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Gopher.vue b/src/views/settings/components/Gopher.vue
index b4f0b2d4..a173ba96 100644
--- a/src/views/settings/components/Gopher.vue
+++ b/src/views/settings/components/Gopher.vue
@@ -23,7 +23,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -43,16 +42,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue
index 08e8da7c..f6c66311 100644
--- a/src/views/settings/components/Http.vue
+++ b/src/views/settings/components/Http.vue
@@ -129,7 +129,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -161,16 +160,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Instance.vue b/src/views/settings/components/Instance.vue
index 05539e13..feab3597 100644
--- a/src/views/settings/components/Instance.vue
+++ b/src/views/settings/components/Instance.vue
@@ -337,7 +337,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 
@@ -396,16 +395,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/JobQueue.vue b/src/views/settings/components/JobQueue.vue
index f18cc853..a8fe0c77 100644
--- a/src/views/settings/components/JobQueue.vue
+++ b/src/views/settings/components/JobQueue.vue
@@ -51,7 +51,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -72,16 +71,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Logger.vue b/src/views/settings/components/Logger.vue
index a58c286c..6be523f5 100644
--- a/src/views/settings/components/Logger.vue
+++ b/src/views/settings/components/Logger.vue
@@ -173,7 +173,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 
 export default {
@@ -212,16 +211,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/MRF.vue b/src/views/settings/components/MRF.vue
index 043f3b7d..fd581e97 100644
--- a/src/views/settings/components/MRF.vue
+++ b/src/views/settings/components/MRF.vue
@@ -145,7 +145,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 import { options } from './options'
 
 export default {
@@ -257,16 +256,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Mailer.vue b/src/views/settings/components/Mailer.vue
index 87979815..fde11492 100644
--- a/src/views/settings/components/Mailer.vue
+++ b/src/views/settings/components/Mailer.vue
@@ -202,7 +202,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 import AceEditor from 'vue2-ace-editor'
@@ -249,16 +248,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/MediaProxy.vue b/src/views/settings/components/MediaProxy.vue
index 0c0a73a8..86d7a235 100644
--- a/src/views/settings/components/MediaProxy.vue
+++ b/src/views/settings/components/MediaProxy.vue
@@ -75,7 +75,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 
@@ -126,16 +125,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Metadata.vue b/src/views/settings/components/Metadata.vue
index 2f63ddd0..7631fe2e 100644
--- a/src/views/settings/components/Metadata.vue
+++ b/src/views/settings/components/Metadata.vue
@@ -52,7 +52,6 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import i18n from '@/lang'
 
 export default {
   name: 'Metadata',
@@ -72,16 +71,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Other.vue b/src/views/settings/components/Other.vue
index 99ab16ff..c285309b 100644
--- a/src/views/settings/components/Other.vue
+++ b/src/views/settings/components/Other.vue
@@ -30,7 +30,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -65,16 +64,8 @@ export default {
       }, {})
       this.updateSetting(updatedValue, 'types', 'value')
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     },
     parseMimeTypes(value, inputType, index) {
       const updatedValue = this.mimeTypes.reduce((acc, el, i) => {
diff --git a/src/views/settings/components/RateLimiters.vue b/src/views/settings/components/RateLimiters.vue
index 491ad51b..943d9774 100644
--- a/src/views/settings/components/RateLimiters.vue
+++ b/src/views/settings/components/RateLimiters.vue
@@ -223,7 +223,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -379,16 +378,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/Upload.vue b/src/views/settings/components/Upload.vue
index 776c9ed6..f9cffe33 100644
--- a/src/views/settings/components/Upload.vue
+++ b/src/views/settings/components/Upload.vue
@@ -144,7 +144,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 import { options } from './options'
 
@@ -207,16 +206,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }
diff --git a/src/views/settings/components/WebPush.vue b/src/views/settings/components/WebPush.vue
index 7dbe87ea..4e5a45b7 100644
--- a/src/views/settings/components/WebPush.vue
+++ b/src/views/settings/components/WebPush.vue
@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import i18n from '@/lang'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -41,16 +40,8 @@ export default {
     updateSetting(value, tab, input) {
       this.$store.dispatch('UpdateSettings', { tab, data: { [input]: value }})
     },
-    async onSubmit() {
-      try {
-        await this.$store.dispatch('SubmitChanges')
-      } catch (e) {
-        return
-      }
-      this.$message({
-        type: 'success',
-        message: i18n.t('settings.success')
-      })
+    onSubmit() {
+      this.$store.dispatch('SubmitChanges')
     }
   }
 }

From 679c4433d1daec926b20a2be6a87c43b126db421 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 00:00:23 +0200
Subject: [PATCH 3/8] Move try/catch and success message from multiple users
 menu view to action

---
 src/store/modules/users.js                    | 29 +++++++++++++------
 .../users/components/MultipleUsersMenu.vue    | 11 +------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 5513d7ca..5d7fb257 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -87,6 +87,7 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
+      dispatch('SuccessMessage')
     },
     async AddRight({ commit, dispatch, getters, state }, { users, right }) {
       const updatedUsers = users.map(user => {
@@ -102,6 +103,7 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
+      dispatch('SuccessMessage')
     },
     async AddTag({ commit, dispatch, getters, state }, { users, tag }) {
       const updatedUsers = users.map(user => {
@@ -117,6 +119,7 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
+      dispatch('SuccessMessage')
     },
     async ClearFilters({ commit, dispatch, state }) {
       commit('CLEAR_USERS_FILTERS')
@@ -130,11 +133,7 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
-      Message({
-        message: i18n.t('users.accountCreated'),
-        type: 'success',
-        duration: 5 * 1000
-      })
+      dispatch('SuccessMessage')
     },
     async DeactivateUsers({ commit, dispatch, getters, state }, users) {
       const updatedUsers = users.map(user => {
@@ -150,6 +149,7 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
+      dispatch('SuccessMessage')
     },
     async DeleteRight({ commit, dispatch, getters, state }, { users, right }) {
       const updatedUsers = users.map(user => {
@@ -165,8 +165,9 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
+      dispatch('SuccessMessage')
     },
-    async DeleteUsers({ commit, getters, state }, users) {
+    async DeleteUsers({ commit, dispatch, getters, state }, users) {
       const usersNicknames = users.map(user => user.nickname)
       try {
         await deleteUsers(usersNicknames, getters.authHost, getters.token)
@@ -176,9 +177,7 @@ const users = {
       const deletedUsersIds = users.map(deletedUser => deletedUser.id)
       const updatedUsers = state.fetchedUsers.filter(user => !deletedUsersIds.includes(user.id))
       commit('SET_USERS', updatedUsers)
-    },
-    async RequirePasswordReset({ getters }, user) {
-      await requirePasswordReset(user.nickname, getters.authHost, getters.token)
+      dispatch('SuccessMessage')
     },
     async FetchUsers({ commit, dispatch, getters, state }, { page }) {
       commit('SET_LOADING', true)
@@ -208,6 +207,11 @@ const users = {
       } finally {
         dispatch('SearchUsers', { query: state.searchQuery, page: state.currentPage })
       }
+      dispatch('SuccessMessage')
+    },
+    async RequirePasswordReset({ dispatch, getters }, user) {
+      await requirePasswordReset(user.nickname, getters.authHost, getters.token)
+      dispatch('SuccessMessage')
     },
     async SearchUsers({ commit, dispatch, state, getters }, { query, page }) {
       if (query.length === 0) {
@@ -223,6 +227,13 @@ const users = {
         loadUsers(commit, page, response.data)
       }
     },
+    SuccessMessage() {
+      return Message({
+        message: i18n.t('users.completed'),
+        type: 'success',
+        duration: 5 * 1000
+      })
+    },
     async ToggleUsersFilter({ commit, dispatch, state }, filters) {
       const defaultFilters = {
         local: false,
diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue
index 53f778b8..1122f237 100644
--- a/src/views/users/components/MultipleUsersMenu.vue
+++ b/src/views/users/components/MultipleUsersMenu.vue
@@ -151,16 +151,7 @@ export default {
   methods: {
     mappers() {
       const applyAction = async(users, dispatchAction) => {
-        try {
-          await dispatchAction(users)
-        } catch (err) {
-          console.log(err)
-          return
-        }
-        this.$message({
-          type: 'success',
-          message: this.$t('users.completed')
-        })
+        await dispatchAction(users)
         this.$emit('apply-action')
       }
       return {

From aa9ea40961bba32b3220b2f9bf1c306ca6b3ba7a Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 00:47:04 +0200
Subject: [PATCH 4/8] Filter users when password reset is required

---
 src/store/modules/users.js                       | 6 +++++-
 src/views/users/components/MultipleUsersMenu.vue | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/users.js b/src/store/modules/users.js
index 5d7fb257..0290b888 100644
--- a/src/store/modules/users.js
+++ b/src/store/modules/users.js
@@ -210,7 +210,11 @@ const users = {
       dispatch('SuccessMessage')
     },
     async RequirePasswordReset({ dispatch, getters }, user) {
-      await requirePasswordReset(user.nickname, getters.authHost, getters.token)
+      try {
+        await requirePasswordReset(user.nickname, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      }
       dispatch('SuccessMessage')
     },
     async SearchUsers({ commit, dispatch, state, getters }, { query, page }) {
diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue
index 1122f237..f3be52cf 100644
--- a/src/views/users/components/MultipleUsersMenu.vue
+++ b/src/views/users/components/MultipleUsersMenu.vue
@@ -206,7 +206,9 @@ export default {
           applyAction(filtered, removeTagFn)
         },
         requirePasswordReset: () => {
-          this.selectedUsers.map(user => this.$store.dispatch('RequirePasswordReset', user))
+          const filtered = this.selectedUsers.filter(user => user.local)
+          filtered.map(user => this.$store.dispatch('RequirePasswordReset', user))
+          this.$emit('apply-action')
         }
       }
     },

From b2c9308b80fc8c3d9301c158df6514703b943779 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 18:24:52 +0200
Subject: [PATCH 5/8] Implement try/catch error handling in invite module

---
 src/store/modules/invites.js | 27 +++++++++++++++++++++++----
 src/views/invites/index.vue  | 13 ++-----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/store/modules/invites.js b/src/store/modules/invites.js
index bdf43ce3..730b25d1 100644
--- a/src/store/modules/invites.js
+++ b/src/store/modules/invites.js
@@ -1,4 +1,6 @@
 import { generateInviteToken, inviteViaEmail, listInviteTokens, revokeToken } from '@/api/invites'
+import { Message } from 'element-ui'
+import i18n from '@/lang'
 
 const invites = {
   state: {
@@ -25,18 +27,35 @@ const invites = {
       commit('SET_LOADING', false)
     },
     async GenerateInviteToken({ commit, dispatch, getters }, { maxUse, expiresAt }) {
-      const { data } = await generateInviteToken(maxUse, expiresAt, getters.authHost, getters.token)
-      commit('SET_NEW_TOKEN', { token: data.token, maxUse: data.max_use, expiresAt: data.expires_at })
+      try {
+        const { data } = await generateInviteToken(maxUse, expiresAt, getters.authHost, getters.token)
+        commit('SET_NEW_TOKEN', { token: data.token, maxUse: data.max_use, expiresAt: data.expires_at })
+      } catch (_e) {
+        return
+      }
       dispatch('FetchInviteTokens')
     },
     async InviteUserViaEmail({ commit, dispatch, getters }, { email, name }) {
-      await inviteViaEmail(email, name, getters.authHost, getters.token)
+      try {
+        await inviteViaEmail(email, name, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      }
+      Message({
+        message: i18n.t('invites.emailSent'),
+        type: 'success',
+        duration: 5 * 1000
+      })
     },
     RemoveNewToken({ commit }) {
       commit('SET_NEW_TOKEN', {})
     },
     async RevokeToken({ commit, dispatch, getters }, token) {
-      await revokeToken(token, getters.authHost, getters.token)
+      try {
+        await revokeToken(token, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      }
       dispatch('FetchInviteTokens')
     }
   }
diff --git a/src/views/invites/index.vue b/src/views/invites/index.vue
index 783e897a..e8ca75fd 100644
--- a/src/views/invites/index.vue
+++ b/src/views/invites/index.vue
@@ -192,17 +192,8 @@ export default {
     async inviteUserViaEmail() {
       this.$refs['inviteUserForm'].validate(async(valid) => {
         if (valid) {
-          try {
-            await this.$store.dispatch('InviteUserViaEmail', this.$data.inviteUserForm)
-          } catch (_e) {
-            return
-          } finally {
-            this.closeDialogWindow()
-          }
-          this.$message({
-            type: 'success',
-            message: this.$t('invites.emailSent')
-          })
+          await this.$store.dispatch('InviteUserViaEmail', this.$data.inviteUserForm)
+          this.closeDialogWindow()
         } else {
           this.$message({
             type: 'error',

From c4b13ebb9f526e469d134c9f8262e302c53c6619 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 18:32:47 +0200
Subject: [PATCH 6/8] Move try/catch error handling from view file to relays
 module

---
 src/store/modules/relays.js              | 20 ++++++++++++++++----
 src/views/settings/components/Relays.vue | 16 ++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/store/modules/relays.js b/src/store/modules/relays.js
index 6353569e..3a0d15cc 100644
--- a/src/store/modules/relays.js
+++ b/src/store/modules/relays.js
@@ -28,15 +28,27 @@ const relays = {
       commit('SET_RELAYS', response.data.relays)
       commit('SET_LOADING', false)
     },
-    async AddRelay({ commit, getters }, relay) {
+    async AddRelay({ commit, dispatch, getters }, relay) {
       commit('ADD_RELAY', relay)
 
-      await addRelay(relay, getters.authHost, getters.token)
+      try {
+        await addRelay(relay, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('FetchRelays')
+      }
     },
-    async DeleteRelay({ commit, getters }, relay) {
+    async DeleteRelay({ commit, dispatch, getters }, relay) {
       commit('DELETE_RELAY', relay)
 
-      await deleteRelay(relay, getters.authHost, getters.token)
+      try {
+        await deleteRelay(relay, getters.authHost, getters.token)
+      } catch (_e) {
+        return
+      } finally {
+        dispatch('FetchRelays')
+      }
     }
   }
 }
diff --git a/src/views/settings/components/Relays.vue b/src/views/settings/components/Relays.vue
index ef9264b4..18db6f5b 100644
--- a/src/views/settings/components/Relays.vue
+++ b/src/views/settings/components/Relays.vue
@@ -52,22 +52,10 @@ export default {
   },
   methods: {
     followRelay() {
-      try {
-        this.$store.dispatch('AddRelay', this.newRelay)
-      } catch (_e) {
-        return
-      } finally {
-        this.$store.dispatch('FetchRelays')
-      }
+      this.$store.dispatch('AddRelay', this.newRelay)
     },
     deleteRelay(relay) {
-      try {
-        this.$store.dispatch('DeleteRelay', relay)
-      } catch (_e) {
-        return
-      } finally {
-        this.$store.dispatch('FetchRelays')
-      }
+      this.$store.dispatch('DeleteRelay', relay)
     }
   }
 }

From ed33b1569e8214192213400bc44081587dbc4050 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 18:48:30 +0200
Subject: [PATCH 7/8] Add translations to emojiPacks module and alphabetize it

---
 src/lang/en.js                  |  8 ++++-
 src/store/modules/emojiPacks.js | 55 ++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 8575144a..6e6a892e 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -365,7 +365,13 @@ export default {
     deletePack: 'Delete pack',
     downloadSharedPack: 'Download shared pack to current instance',
     downloadAsOptional: 'Download as (optional)',
-    downloadPackArchive: 'Download pack archive'
+    downloadPackArchive: 'Download pack archive',
+    successfullyDownloaded: 'Successfully downloaded',
+    successfullyImported: 'Successfully imported',
+    nowNewPacksToImport: 'No new packs to import',
+    successfullyUpdated: 'Successfully updated',
+    metadatLowerCase: 'metadata',
+    files: 'files'
   },
   invites: {
     inviteTokens: 'Invite tokens',
diff --git a/src/store/modules/emojiPacks.js b/src/store/modules/emojiPacks.js
index 6a14e406..c118b71f 100644
--- a/src/store/modules/emojiPacks.js
+++ b/src/store/modules/emojiPacks.js
@@ -8,7 +8,7 @@ import {
   savePackMetadata,
   importFromFS,
   updatePackFile } from '@/api/emojiPacks'
-
+import i18n from '@/lang'
 import { Message } from 'element-ui'
 
 import Vue from 'vue'
@@ -44,34 +44,30 @@ const packs = {
     }
   },
   actions: {
-    async SetLocalEmojiPacks({ commit, getters, state }) {
-      const { data } = await listPacks(getters.authHost)
-      commit('SET_LOCAL_PACKS', data)
+    async CreatePack({ getters }, { name }) {
+      await createPack(getters.authHost, getters.token, name)
     },
-    async SetRemoteEmojiPacks({ commit, getters, state }, { remoteInstance }) {
-      const { data } = await listRemotePacks(getters.authHost, getters.token, remoteInstance)
-
-      commit('SET_REMOTE_PACKS', data)
+    async DeletePack({ getters }, { name }) {
+      await deletePack(getters.authHost, getters.token, name)
     },
-    async DownloadFrom({ commit, getters, state }, { instanceAddress, packName, as }) {
+    async DownloadFrom({ getters }, { instanceAddress, packName, as }) {
       const result = await downloadFrom(getters.authHost, instanceAddress, packName, as, getters.token)
 
       if (result.data === 'ok') {
         Message({
-          message: `Successfully downloaded ${packName}`,
+          message: `${i18n.t('settings.successfullyDownloaded')} ${packName}`,
           type: 'success',
           duration: 5 * 1000
         })
       }
     },
-    async ReloadEmoji({ commit, getters, state }) {
-      await reloadEmoji(getters.authHost, getters.token)
-    },
-    async ImportFromFS({ commit, getters, state }) {
+    async ImportFromFS({ getters }) {
       const result = await importFromFS(getters.authHost, getters.token)
 
       if (result.status === 200) {
-        const message = result.data.length > 0 ? `Successfully imported ${result.data}` : 'No new packs to import'
+        const message = result.data.length > 0
+          ? `${i18n.t('settings.successfullyImported')} ${result.data}`
+          : i18n.t('settings.nowNewPacksToImport')
 
         Message({
           message,
@@ -80,17 +76,9 @@ const packs = {
         })
       }
     },
-    async DeletePack({ commit, getters, state }, { name }) {
-      await deletePack(getters.authHost, getters.token, name)
+    async ReloadEmoji({ getters }) {
+      await reloadEmoji(getters.authHost, getters.token)
     },
-    async CreatePack({ commit, getters, state }, { name }) {
-      await createPack(getters.authHost, getters.token, name)
-    },
-
-    async UpdateLocalPackVal({ commit, getters, state }, args) {
-      commit('UPDATE_LOCAL_PACK_VAL', args)
-    },
-
     async SavePackMetadata({ commit, getters, state }, { packName }) {
       const result =
         await savePackMetadata(
@@ -102,7 +90,7 @@ const packs = {
 
       if (result.status === 200) {
         Message({
-          message: `Successfully updated ${packName} metadata`,
+          message: `${i18n.t('settings.successfullyUpdated')} ${packName} ${i18n.t('settings.metadatLowerCase')}`,
           type: 'success',
           duration: 5 * 1000
         })
@@ -110,21 +98,32 @@ const packs = {
         commit('UPDATE_LOCAL_PACK_PACK', { name: packName, pack: result.data })
       }
     },
+    async SetLocalEmojiPacks({ commit, getters }) {
+      const { data } = await listPacks(getters.authHost)
+      commit('SET_LOCAL_PACKS', data)
+    },
+    async SetRemoteEmojiPacks({ commit, getters }, { remoteInstance }) {
+      const { data } = await listRemotePacks(getters.authHost, getters.token, remoteInstance)
 
-    async UpdateAndSavePackFile({ commit, getters, state }, args) {
+      commit('SET_REMOTE_PACKS', data)
+    },
+    async UpdateAndSavePackFile({ commit, getters }, args) {
       const result = await updatePackFile(getters.authHost, getters.token, args)
 
       if (result.status === 200) {
         const { packName } = args
 
         Message({
-          message: `Successfully updated ${packName} files`,
+          message: `${i18n.t('settings.successfullyUpdated')} ${packName} ${i18n.t('settings.metadatLowerCase')}`,
           type: 'success',
           duration: 5 * 1000
         })
 
         commit('UPDATE_LOCAL_PACK_FILES', { name: packName, files: result.data })
       }
+    },
+    async UpdateLocalPackVal({ commit }, args) {
+      commit('UPDATE_LOCAL_PACK_VAL', args)
     }
   }
 }

From c6ce97c69d1a5b1c4f8541623bcd53e3a66ee258 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 25 Oct 2019 19:09:30 +0200
Subject: [PATCH 8/8] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 734a5ed5..bb2b750d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - remove fetching initial data for configuring server settings
 - Actions in users module (ActivateUsers, AddRight, DeactivateUsers, DeleteRight, DeleteUsers) now accept an array of users instead of one user
 - Leave dropdown menu open after clicking an action
+- Move current try/catch error handling from view files to module, add it where necessary
 
 ### Added