Skip to content

Commit

Permalink
feat: followButtonをフォロー時の通知に載せる
Browse files Browse the repository at this point in the history
  • Loading branch information
n1lsqn committed Mar 29, 2024
1 parent 2cb43a1 commit 2a843c3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions packages/frontend/src/components/MkNotification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkA>
<template v-else-if="notification.type === 'follow'">
<span :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}</span>
<MkFollowButton :class="$style.follow" :user="notification.user" full/>
</template>
<span v-else-if="notification.type === 'followRequestAccepted'" :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.followRequestAccepted }}</span>
<template v-else-if="notification.type === 'receiveFollowRequest'">
Expand Down Expand Up @@ -146,6 +147,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { ref } from 'vue';
import * as Misskey from 'misskey-js';
import MkFollowButton from './MkFollowButton.vue';
import MkReactionIcon from '@/components/MkReactionIcon.vue';
import MkButton from '@/components/MkButton.vue';
import { getNoteSummary } from '@/scripts/get-note-summary.js';
Expand Down
8 changes: 4 additions & 4 deletions packages/frontend/src/pages/user/index.activity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ function showMenu(ev: MouseEvent) {
action: () => {
chartSrc.value = 'per-user-pv';
},
}, /*, {
}, {
text: i18n.ts.following,
action: () => {
chartSrc = 'per-user-following';
chartSrc.value = 'per-user-following';
}
}, {
text: i18n.ts.followers,
action: () => {
chartSrc = 'per-user-followers';
chartSrc.value = 'per-user-followers';
}
}*/], ev.currentTarget ?? ev.target);
}], ev.currentTarget ?? ev.target);
}
</script>

0 comments on commit 2a843c3

Please sign in to comment.