Merge pull request #602 from h3poteto/iss-577

closes #577 Add mute/block menu
2018-09-13 08:10:49 +09:00 · 2018-09-13 08:10:49 +09:00 · 566fa7282a
parent 9d17c88d85 7140eadc61
commit 566fa7282a
12 changed files with 244 additions and 9 deletions
--- a/src/config/locales/de/translation.json
+++ b/src/config/locales/de/translation.json
@ -159,6 +159,12 @@
    "list_membership": {
      "title": "Listen-Mitgliedschaften"
    },
+    "mute_confirm": {
+      "title": "Are you sure to mute?",
+      "body": "Hide notification from this user?",
+      "cancel": "Cancel",
+      "ok": "Mute"
+    },
    "shortcut": {
      "title": "Keyboard shortcuts",
      "ctrl_number": "Switch accounts",
@ -203,6 +209,10 @@
      "follow_requested": "Folgen Sie angefordert",
      "open_in_browser": "Im Browser öffnen",
      "manage_list_memberships": "Listen-Mitgliedschaften verwalten",
+      "mute": "Mute",
+      "unmute": "Unmute",
+      "unblock": "Unblock",
+      "block": "Block",
      "toots": "Toots",
      "follows": "Follows",
      "followers": "Follower"
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@ -164,6 +164,12 @@
    "list_membership": {
      "title": "List Memberships"
    },
+    "mute_confirm": {
+      "title": "Are you sure to mute?",
+      "body": "Hide notification from this user?",
+      "cancel": "Cancel",
+      "ok": "Mute"
+    },
    "shortcut": {
      "title": "Keyboard shortcuts",
      "ctrl_number": "Switch accounts",
@ -208,6 +214,10 @@
      "follow_requested": "Follow requested",
      "open_in_browser": "Open in Browser",
      "manage_list_memberships": "Manage List Memberships",
+      "mute": "Mute",
+      "unmute": "Unmute",
+      "unblock": "Unblock",
+      "block": "Block",
      "toots": "Toots",
      "follows": "Follows",
      "followers": "Followers"
--- a/src/config/locales/fr/translation.json
+++ b/src/config/locales/fr/translation.json
@ -159,6 +159,12 @@
    "list_membership": {
      "title": "Éditer la liste"
    },
+    "mute_confirm": {
+      "title": "Are you sure to mute?",
+      "body": "Hide notification from this user?",
+      "cancel": "Cancel",
+      "ok": "Mute"
+    },
    "shortcut": {
      "title": "Keyboard shortcuts",
      "ctrl_number": "Switch accounts",
@ -203,6 +209,10 @@
      "follow_requested": "Suivre demande",
      "open_in_browser": "Ouvrir dans un navigateur",
      "manage_list_memberships": "Inscriptions aux listes",
+      "mute": "Mute",
+      "unmute": "Unmute",
+      "unblock": "Unblock",
+      "block": "Block",
      "toots": "Pouets",
      "follows": "Abonnements",
      "followers": "Abonné⋅e⋅s"
--- a/src/config/locales/ja/translation.json
+++ b/src/config/locales/ja/translation.json
@ -159,6 +159,12 @@
    "list_membership": {
      "title": "リストメンバー管理"
    },
+    "mute_confirm": {
+      "title": "本当にミュートしますか？",
+      "body": "このユーザからの通知もミュートしますか？",
+      "cancel": "キャンセル",
+      "ok": "ミュートする"
+    },
    "shortcut": {
      "title": "キーボードショートカット",
      "ctrl_number": "アカウントの切り替え",
@ -203,6 +209,10 @@
      "follow_requested": "フォロー承認待ち",
      "open_in_browser": "ブラウザで開く",
      "manage_list_memberships": "リストの管理",
+      "mute": "ミュート",
+      "unmute": "ミュートを解除",
+      "unblock": "ブロックを解除",
+      "block": "ブロック",
      "toots": "トゥート",
      "follows": "フォロー",
      "followers": "フォロワー"
--- a/src/config/locales/ko/translation.json
+++ b/src/config/locales/ko/translation.json
@ -164,6 +164,12 @@
    "list_membership": {
      "title": "리스트 멤버"
    },
+    "mute_confirm": {
+      "title": "Are you sure to mute?",
+      "body": "Hide notification from this user?",
+      "cancel": "Cancel",
+      "ok": "Mute"
+    },
    "shortcut": {
      "title": "키보드 단축키",
      "ctrl_number": "계정 변경",
@ -208,6 +214,10 @@
      "follow_requested": "팔로우 요청중",
      "open_in_browser": "브라우저에서 열기",
      "manage_list_memberships": "리스트 멤버 관리",
+      "mute": "Mute",
+      "unmute": "Unmute",
+      "unblock": "Unblock",
+      "block": "Block",
      "toots": "툿",
      "follows": "팔로잉",
      "followers": "팔로워"
--- a/src/config/locales/pl/translation.json
+++ b/src/config/locales/pl/translation.json
@ -159,6 +159,12 @@
    "list_membership": {
      "title": "Należy do grup"
    },
+    "mute_confirm": {
+      "title": "Are you sure to mute?",
+      "body": "Hide notification from this user?",
+      "cancel": "Cancel",
+      "ok": "Mute"
+    },
    "shortcut": {
      "title": "Keyboard shortcuts",
      "ctrl_number": "Switch accounts",
@ -203,6 +209,10 @@
      "follow_requested": "Śledź prośbę",
      "open_in_browser": "Otwórz w przeglądarce",
      "manage_list_memberships": "Zarządzaj przynależnością do grup",
+      "mute": "Mute",
+      "unmute": "Unmute",
+      "unblock": "Unblock",
+      "block": "Block",
      "toots": "Wpisy",
      "follows": "Śledzeni",
      "followers": "Śledzący"
--- a/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue
+++ b/src/renderer/components/TimelineSpace/Contents/SideBar/AccountProfile.vue
@ -23,6 +23,18 @@
                <li role="button" @click="addToList(account)">
                  {{ $t('side_bar.account_profile.manage_list_memberships') }}
                </li>
+                <li role="button" @click="unmute(account)" v-if="muting">
+                  {{ $t('side_bar.account_profile.unmute') }}
+                </li>
+                <li role="button" @click="confirmMute(account)" v-else>
+                  {{ $t('side_bar.account_profile.mute') }}
+                </li>
+                <li role="button" @click="unblock(account)" v-if="blocking">
+                  {{ $t('side_bar.account_profile.unblock') }}
+                </li>
+                <li role="button" @click="block(account)" v-else>
+                  {{ $t('side_bar.account_profile.block') }}
+                </li>
              </ul>
            </div>

@ -104,10 +116,7 @@ export default {
  },
  computed: {
    ...mapState({
-      account: state => state.TimelineSpace.Contents.SideBar.AccountProfile.account,
      user: state => state.TimelineSpace.account,
-      relationship: state => state.TimelineSpace.Contents.SideBar.AccountProfile.relationship,
-      loading: state => state.TimelineSpace.Contents.SideBar.AccountProfile.loading,
      theme: (state) => {
        return {
          '--theme-mask-color': state.App.theme.wrapper_mask_color,
@ -115,6 +124,13 @@ export default {
          '--theme-primary-color': state.App.theme.primary_color
        }
      }
+    }),
+    ...mapState('TimelineSpace/Contents/SideBar/AccountProfile', {
+      account: state => state.account,
+      relationship: state => state.relationship,
+      loading: state => state.loading,
+      muting: state => state.relationship && state.relationship.muting,
+      blocking: state => state.relationship && state.relationship.blocking
    })
  },
  watch: {
@ -168,6 +184,23 @@ export default {
      this.$store.dispatch('TimelineSpace/Modals/ListMembership/setAccount', account)
      this.$store.dispatch('TimelineSpace/Modals/ListMembership/changeModal', true)
      this.$refs.popper.doClose()
+    },
+    confirmMute (account) {
+      this.$store.dispatch('TimelineSpace/Modals/MuteConfirm/changeAccount', account)
+      this.$store.dispatch('TimelineSpace/Modals/MuteConfirm/changeModal', true)
+      this.$refs.popper.doClose()
+    },
+    unmute (account) {
+      this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/unmute', account)
+      this.$refs.popper.doClose()
+    },
+    block (account) {
+      this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/block', account)
+      this.$refs.popper.doClose()
+    },
+    unblock (account) {
+      this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/unblock', account)
+      this.$refs.popper.doClose()
    }
  }
 }
--- a/src/renderer/components/TimelineSpace/Modals.vue
+++ b/src/renderer/components/TimelineSpace/Modals.vue
@ -5,6 +5,7 @@
    <image-viewer></image-viewer>
    <list-membership></list-membership>
    <add-list-member></add-list-member>
+    <mute-confirm></mute-confirm>
    <shortcut></shortcut>
  </div>
 </template>
@ -15,6 +16,7 @@ import Jump from './Modals/Jump'
 import ImageViewer from './Modals/ImageViewer'
 import ListMembership from './Modals/ListMembership'
 import AddListMember from './Modals/AddListMember'
+import MuteConfirm from './Modals/MuteConfirm'
 import Shortcut from './Modals/Shortcut'

 export default {
@ -25,6 +27,7 @@ export default {
    ImageViewer,
    ListMembership,
    AddListMember,
+    MuteConfirm,
    Shortcut
  }
 }
--- a/src/renderer/components/TimelineSpace/Modals/MuteConfirm.vue
+++ b/src/renderer/components/TimelineSpace/Modals/MuteConfirm.vue
@ -0,0 +1,66 @@
+<template>
+<el-dialog
+  :title="$t('modals.mute_confirm.title')"
+  :visible.sync="muteConfirmModal"
+  width="400px"
+  custom-class="mute-confirm"
+  >
+  <div class="description">
+    <span class="label">
+      {{ $t('modals.mute_confirm.body') }}
+    </span>
+    <el-switch v-model="notify"></el-switch>
+  </div>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="closeModal">{{ $t('modals.mute_confirm.cancel') }}</el-button>
+    <el-button type="primary" @click="submit">{{ $t('modals.mute_confirm.ok') }}</el-button>
+  </span>
+</el-dialog>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'MuteConfirm',
+  data () {
+    return {
+      notify: true
+    }
+  },
+  computed: {
+    ...mapState('TimelineSpace/Modals/MuteConfirm', {
+      account: state => state.account
+    }),
+    muteConfirmModal: {
+      get () {
+        return this.$store.state.TimelineSpace.Modals.MuteConfirm.modalOpen
+      },
+      set (value) {
+        this.$store.dispatch('TimelineSpace/Modals/MuteConfirm/changeModal', value)
+      }
+    }
+  },
+  methods: {
+    closeModal () {
+      this.muteConfirmModal = false
+    },
+    async submit () {
+      this.closeModal()
+      await this.$store.dispatch('TimelineSpace/Modals/MuteConfirm/submit', this.notify)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.description {
+  text-align: center;
+
+  .label {
+    font-size: 14px;
+    color: #606266;
+    padding: 0 32px 0 0;
+  }
+}
+</style>
--- a/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js
+++ b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js
@ -71,7 +71,7 @@ const AccountProfile = {
          throw err
        })
    },
-    unfollow ({ state, commit, rootState }, account) {
+    unfollow ({ commit, rootState }, account) {
      commit('changeLoading', true)
      const client = new Mastodon(
        rootState.TimelineSpace.account.accessToken,
@ -79,17 +79,48 @@ const AccountProfile = {
      )
      return client.post(`/accounts/${account.id}/unfollow`)
        .then(res => {
-          commit('changeLoading', false)
          commit('changeRelationship', res.data)
          return res.data
        })
-        .catch(err => {
+        .finally(() => {
          commit('changeLoading', false)
-          throw err
        })
    },
    close ({ commit }) {
      commit('changeAccount', null)
+    },
+    unmute ({ rootState, commit }, account) {
+      const client = new Mastodon(
+        rootState.TimelineSpace.account.accessToken,
+        rootState.TimelineSpace.account.baseURL + '/api/v1'
+      )
+      return client.post(`/accounts/${account.id}/unmute`)
+        .then(res => {
+          commit('changeRelationship', res.data)
+          return res.data
+        })
+    },
+    block ({ rootState, commit }, account) {
+      const client = new Mastodon(
+        rootState.TimelineSpace.account.accessToken,
+        rootState.TimelineSpace.account.baseURL + '/api/v1'
+      )
+      return client.post(`/accounts/${account.id}/block`)
+        .then(res => {
+          commit('changeRelationship', res.data)
+          return res.data
+        })
+    },
+    unblock ({ rootState, commit }, account) {
+      const client = new Mastodon(
+        rootState.TimelineSpace.account.accessToken,
+        rootState.TimelineSpace.account.baseURL + '/api/v1'
+      )
+      return client.post(`/accounts/${account.id}/unblock`)
+        .then(res => {
+          commit('changeRelationship', res.data)
+          return res.data
+        })
    }
  }
 }
--- a/src/renderer/store/TimelineSpace/Modals.js
+++ b/src/renderer/store/TimelineSpace/Modals.js
@ -3,6 +3,7 @@ import ImageViewer from './Modals/ImageViewer'
 import Jump from './Modals/Jump'
 import ListMembership from './Modals/ListMembership'
 import AddListMember from './Modals/AddListMember'
+import MuteConfirm from './Modals/MuteConfirm'
 import Shortcut from './Modals/Shortcut'

 const Modals = {
@ -13,6 +14,7 @@ const Modals = {
    Jump,
    ListMembership,
    AddListMember,
+    MuteConfirm,
    Shortcut
  },
  getters: {
@ -22,8 +24,9 @@ const Modals = {
      const jump = rootState.TimelineSpace.Modals.Jump.modalOpen
      const listMembership = rootState.TimelineSpace.Modals.ListMembership.modalOpen
      const addListMember = rootState.TimelineSpace.Modals.AddListMember.modalOpen
-      const shortcut = rootState.TimelineSpace.Modals.Jump.modalOpen
-      return imageViewer || newToot || jump || listMembership || addListMember || shortcut
+      const shortcut = rootState.TimelineSpace.Modals.Shortcut.modalOpen
+      const muteConfirm = rootState.TimelineSpace.Modals.MuteConfirm.modalOpen
+      return imageViewer || newToot || jump || listMembership || addListMember || shortcut || muteConfirm
    }
  }
 }
--- a/src/renderer/store/TimelineSpace/Modals/MuteConfirm.js
+++ b/src/renderer/store/TimelineSpace/Modals/MuteConfirm.js
@ -0,0 +1,39 @@
+import Mastodon from 'megalodon'
+
+export default {
+  namespaced: true,
+  state: {
+    modalOpen: false,
+    account: {}
+  },
+  mutations: {
+    changeModal (state, value) {
+      state.modalOpen = value
+    },
+    changeAccount (state, account) {
+      state.account = account
+    }
+  },
+  actions: {
+    changeModal ({ commit }, value) {
+      commit('changeModal', value)
+    },
+    changeAccount ({ commit }, account) {
+      commit('changeAccount', account)
+    },
+    async submit ({ state, rootState, dispatch }, notify) {
+      const client = new Mastodon(
+        rootState.TimelineSpace.account.accessToken,
+        rootState.TimelineSpace.account.baseURL + '/api/v1'
+      )
+      return client.post(`/accounts/${state.account.id}/mute`, {
+        notifications: notify
+      })
+        .then(res => {
+          // Reload relationship
+          dispatch('TimelineSpace/Contents/SideBar/AccountProfile/fetchRelationship', state.account, { root: true })
+          return res.data
+        })
+    }
+  }
+}