summaryrefslogtreecommitdiff
path: root/src/client/app/common
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-05-14 02:53:05 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-05-14 02:53:05 +0900
commitb128b593c205df895d8d9d3c5763d87f7e7ebd71 (patch)
tree1fbc3ff96055b263c9524d0f422e0cb1a3910976 /src/client/app/common
parentFix meta tags (#4918) (diff)
downloadmisskey-b128b593c205df895d8d9d3c5763d87f7e7ebd71.tar.gz
misskey-b128b593c205df895d8d9d3c5763d87f7e7ebd71.tar.bz2
misskey-b128b593c205df895d8d9d3c5763d87f7e7ebd71.zip
Fix: user menu (#4845) (#4920)
* Fix: Firefoxで自分のメニューが開けないなど * 自分のユーザーメニューにはミュートなどを表示しないようになど
Diffstat (limited to 'src/client/app/common')
-rw-r--r--src/client/app/common/views/components/user-menu.vue31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/client/app/common/views/components/user-menu.vue b/src/client/app/common/views/components/user-menu.vue
index 0af0fdb7e4..7cbffa9f9a 100644
--- a/src/client/app/common/views/components/user-menu.vue
+++ b/src/client/app/common/views/components/user-menu.vue
@@ -7,7 +7,6 @@
<script lang="ts">
import Vue from 'vue';
import i18n from '../../../i18n';
-import copyToClipboard from '../../../common/scripts/copy-to-clipboard';
import { faExclamationCircle, faMicrophoneSlash } from '@fortawesome/free-solid-svg-icons';
import { faSnowflake } from '@fortawesome/free-regular-svg-icons';
@@ -27,19 +26,23 @@ export default Vue.extend({
icon: ['fas', 'list'],
text: this.$t('push-to-list'),
action: this.pushList
- }, null, {
- icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'],
- text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'),
- action: this.toggleMute
- }, {
- icon: 'ban',
- text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
- action: this.toggleBlock
- }, null, {
- icon: faExclamationCircle,
- text: this.$t('report-abuse'),
- action: this.reportAbuse
- }];
+ }] as any;
+
+ if (this.$store.getters.isSignedIn && this.$store.state.i.id != this.user.id) {
+ menu = menu.concat([null, {
+ icon: this.user.isMuted ? ['fas', 'eye'] : ['far', 'eye-slash'],
+ text: this.user.isMuted ? this.$t('unmute') : this.$t('mute'),
+ action: this.toggleMute
+ }, {
+ icon: 'ban',
+ text: this.user.isBlocking ? this.$t('unblock') : this.$t('block'),
+ action: this.toggleBlock
+ }, null, {
+ icon: faExclamationCircle,
+ text: this.$t('report-abuse'),
+ action: this.reportAbuse
+ }]);
+ }
if (this.$store.getters.isSignedIn && (this.$store.state.i.isAdmin || this.$store.state.i.isModerator)) {
menu = menu.concat([null, {