mirror of
https://codeberg.org/yeentown/barkey
synced 2024-12-02 11:07:27 +00:00
a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
397 lines
13 KiB
Vue
397 lines
13 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div :class="$style.root">
|
|
<div :class="$style.head">
|
|
<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && notification.note" :class="$style.icon" :user="notification.note.user" link preview/>
|
|
<MkAvatar v-else-if="['roleAssigned', 'achievementEarned'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
|
|
<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
|
|
<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
|
|
<img v-else-if="notification.type === 'test'" :class="$style.icon" :src="infoImageUrl"/>
|
|
<MkAvatar v-else-if="notification.user" :class="$style.icon" :user="notification.user" link preview/>
|
|
<img v-else-if="notification.icon" :class="[$style.icon, $style.icon_app]" :src="notification.icon" alt=""/>
|
|
<div
|
|
:class="[$style.subIcon, {
|
|
[$style.t_follow]: notification.type === 'follow',
|
|
[$style.t_followRequestAccepted]: notification.type === 'followRequestAccepted',
|
|
[$style.t_receiveFollowRequest]: notification.type === 'receiveFollowRequest',
|
|
[$style.t_renote]: notification.type === 'renote',
|
|
[$style.t_reply]: notification.type === 'reply',
|
|
[$style.t_mention]: notification.type === 'mention',
|
|
[$style.t_quote]: notification.type === 'quote',
|
|
[$style.t_pollEnded]: notification.type === 'pollEnded',
|
|
[$style.t_achievementEarned]: notification.type === 'achievementEarned',
|
|
[$style.t_roleAssigned]: notification.type === 'roleAssigned' && notification.role.iconUrl == null,
|
|
}]"
|
|
>
|
|
<i v-if="notification.type === 'follow'" class="ti ti-plus"></i>
|
|
<i v-else-if="notification.type === 'receiveFollowRequest'" class="ti ti-clock"></i>
|
|
<i v-else-if="notification.type === 'followRequestAccepted'" class="ti ti-check"></i>
|
|
<i v-else-if="notification.type === 'renote'" class="ti ti-repeat"></i>
|
|
<i v-else-if="notification.type === 'reply'" class="ti ti-arrow-back-up"></i>
|
|
<i v-else-if="notification.type === 'mention'" class="ti ti-at"></i>
|
|
<i v-else-if="notification.type === 'quote'" class="ti ti-quote"></i>
|
|
<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
|
|
<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
|
|
<template v-else-if="notification.type === 'roleAssigned'">
|
|
<img v-if="notification.role.iconUrl" style="height: 1.3em; vertical-align: -22%;" :src="notification.role.iconUrl" alt=""/>
|
|
<i v-else class="ti ti-badges"></i>
|
|
</template>
|
|
<MkReactionIcon
|
|
v-else-if="notification.type === 'reaction'"
|
|
:withTooltip="true"
|
|
:reaction="notification.reaction.replace(/^:(\w+):$/, ':$1@.:')"
|
|
:noStyle="true"
|
|
style="width: 100%; height: 100%;"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div :class="$style.tail">
|
|
<header :class="$style.header">
|
|
<span v-if="notification.type === 'pollEnded'">{{ i18n.ts._notification.pollEnded }}</span>
|
|
<span v-else-if="notification.type === 'note'">{{ i18n.ts._notification.newNote }}: <MkUserName :user="notification.note.user"/></span>
|
|
<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
|
|
<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
|
|
<span v-else-if="notification.type === 'test'">{{ i18n.ts._notification.testNotification }}</span>
|
|
<MkA v-else-if="notification.type === 'follow' || notification.type === 'mention' || notification.type === 'reply' || notification.type === 'renote' || notification.type === 'quote' || notification.type === 'reaction' || notification.type === 'receiveFollowRequest' || notification.type === 'followRequestAccepted'" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
|
|
<span v-else-if="notification.type === 'reaction:grouped'">{{ i18n.tsx._notification.reactedBySomeUsers({ n: notification.reactions.length }) }}</span>
|
|
<span v-else-if="notification.type === 'renote:grouped'">{{ i18n.tsx._notification.renotedBySomeUsers({ n: notification.users.length }) }}</span>
|
|
<span v-else-if="notification.type === 'app'">{{ notification.header }}</span>
|
|
<MkTime v-if="withTime" :time="notification.createdAt" :class="$style.headerTime"/>
|
|
</header>
|
|
<div>
|
|
<MkA v-if="notification.type === 'reaction' || notification.type === 'reaction:grouped'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
|
</MkA>
|
|
<MkA v-else-if="notification.type === 'renote' || notification.type === 'renote:grouped'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note.renote)">
|
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
|
<Mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="true" :author="notification.note.renote.user"/>
|
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
|
</MkA>
|
|
<MkA v-else-if="notification.type === 'reply'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
|
</MkA>
|
|
<MkA v-else-if="notification.type === 'mention'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
|
</MkA>
|
|
<MkA v-else-if="notification.type === 'quote'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
|
</MkA>
|
|
<MkA v-else-if="notification.type === 'note'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
|
</MkA>
|
|
<MkA v-else-if="notification.type === 'pollEnded'" :class="$style.text" :to="notePage(notification.note)" :title="getNoteSummary(notification.note)">
|
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
|
<Mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="true" :author="notification.note.user"/>
|
|
<i class="ti ti-quote" :class="$style.quote"></i>
|
|
</MkA>
|
|
<div v-else-if="notification.type === 'roleAssigned'" :class="$style.text">
|
|
{{ notification.role.name }}
|
|
</div>
|
|
<MkA v-else-if="notification.type === 'achievementEarned'" :class="$style.text" to="/my/achievements">
|
|
{{ i18n.ts._achievements._types['_' + notification.achievement].title }}
|
|
</MkA>
|
|
<template v-else-if="notification.type === 'follow'">
|
|
<span :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.youGotNewFollower }}</span>
|
|
</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'">
|
|
<span :class="$style.text" style="opacity: 0.6;">{{ i18n.ts.receiveFollowRequest }}</span>
|
|
<div v-if="full && !followRequestDone" :class="$style.followRequestCommands">
|
|
<MkButton :class="$style.followRequestCommandButton" rounded primary @click="acceptFollowRequest()"><i class="ti ti-check"/> {{ i18n.ts.accept }}</MkButton>
|
|
<MkButton :class="$style.followRequestCommandButton" rounded danger @click="rejectFollowRequest()"><i class="ti ti-x"/> {{ i18n.ts.reject }}</MkButton>
|
|
</div>
|
|
</template>
|
|
<span v-else-if="notification.type === 'test'" :class="$style.text">{{ i18n.ts._notification.notificationWillBeDisplayedLikeThis }}</span>
|
|
<span v-else-if="notification.type === 'app'" :class="$style.text">
|
|
<Mfm :text="notification.body" :nowrap="false"/>
|
|
</span>
|
|
|
|
<div v-if="notification.type === 'reaction:grouped'">
|
|
<div v-for="reaction of notification.reactions" :key="reaction.user.id + reaction.reaction" :class="$style.reactionsItem">
|
|
<MkAvatar :class="$style.reactionsItemAvatar" :user="reaction.user" link preview/>
|
|
<div :class="$style.reactionsItemReaction">
|
|
<MkReactionIcon
|
|
:withTooltip="true"
|
|
:reaction="reaction.reaction.replace(/^:(\w+):$/, ':$1@.:')"
|
|
:noStyle="true"
|
|
style="width: 100%; height: 100%;"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div v-else-if="notification.type === 'renote:grouped'">
|
|
<div v-for="user of notification.users" :key="user.id" :class="$style.reactionsItem">
|
|
<MkAvatar :class="$style.reactionsItemAvatar" :user="user" link preview/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { ref } from 'vue';
|
|
import * as Misskey from 'misskey-js';
|
|
import MkReactionIcon from '@/components/MkReactionIcon.vue';
|
|
import MkButton from '@/components/MkButton.vue';
|
|
import { getNoteSummary } from '@/scripts/get-note-summary.js';
|
|
import { notePage } from '@/filters/note.js';
|
|
import { userPage } from '@/filters/user.js';
|
|
import { i18n } from '@/i18n.js';
|
|
import { misskeyApi } from '@/scripts/misskey-api.js';
|
|
import { signinRequired } from '@/account.js';
|
|
import { infoImageUrl } from '@/instance.js';
|
|
|
|
const $i = signinRequired();
|
|
|
|
const props = withDefaults(defineProps<{
|
|
notification: Misskey.entities.Notification;
|
|
withTime?: boolean;
|
|
full?: boolean;
|
|
}>(), {
|
|
withTime: false,
|
|
full: false,
|
|
});
|
|
|
|
const followRequestDone = ref(false);
|
|
|
|
const acceptFollowRequest = () => {
|
|
if (props.notification.user == null) return;
|
|
followRequestDone.value = true;
|
|
misskeyApi('following/requests/accept', { userId: props.notification.user.id });
|
|
};
|
|
|
|
const rejectFollowRequest = () => {
|
|
if (props.notification.user == null) return;
|
|
followRequestDone.value = true;
|
|
misskeyApi('following/requests/reject', { userId: props.notification.user.id });
|
|
};
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.root {
|
|
position: relative;
|
|
box-sizing: border-box;
|
|
padding: 24px 32px;
|
|
font-size: 0.9em;
|
|
overflow-wrap: break-word;
|
|
display: flex;
|
|
contain: content;
|
|
}
|
|
|
|
.head {
|
|
position: sticky;
|
|
top: 0;
|
|
flex-shrink: 0;
|
|
width: 42px;
|
|
height: 42px;
|
|
margin-right: 8px;
|
|
}
|
|
|
|
.icon {
|
|
display: block;
|
|
width: 100%;
|
|
height: 100%;
|
|
}
|
|
|
|
.icon_reactionGroup,
|
|
.icon_renoteGroup {
|
|
display: grid;
|
|
align-items: center;
|
|
justify-items: center;
|
|
width: 80%;
|
|
height: 80%;
|
|
font-size: 15px;
|
|
border-radius: 100%;
|
|
color: #fff;
|
|
}
|
|
|
|
.icon_reactionGroup {
|
|
background: #e99a0b;
|
|
}
|
|
|
|
.icon_renoteGroup {
|
|
background: #36d298;
|
|
}
|
|
|
|
.icon_app {
|
|
border-radius: 6px;
|
|
}
|
|
|
|
.subIcon {
|
|
position: absolute;
|
|
z-index: 1;
|
|
bottom: -2px;
|
|
right: -2px;
|
|
width: 20px;
|
|
height: 20px;
|
|
box-sizing: border-box;
|
|
border-radius: 100%;
|
|
background: var(--panel);
|
|
box-shadow: 0 0 0 3px var(--panel);
|
|
font-size: 11px;
|
|
text-align: center;
|
|
color: #fff;
|
|
|
|
&:empty {
|
|
display: none;
|
|
}
|
|
}
|
|
|
|
.t_follow, .t_followRequestAccepted, .t_receiveFollowRequest {
|
|
padding: 3px;
|
|
background: #36aed2;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_renote {
|
|
padding: 3px;
|
|
background: #36d298;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_quote {
|
|
padding: 3px;
|
|
background: #36d298;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_reply {
|
|
padding: 3px;
|
|
background: #007aff;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_mention {
|
|
padding: 3px;
|
|
background: #88a6b7;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_pollEnded {
|
|
padding: 3px;
|
|
background: #88a6b7;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_achievementEarned {
|
|
padding: 3px;
|
|
background: #cb9a11;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.t_roleAssigned {
|
|
padding: 3px;
|
|
background: #88a6b7;
|
|
pointer-events: none;
|
|
}
|
|
|
|
.tail {
|
|
flex: 1;
|
|
min-width: 0;
|
|
}
|
|
|
|
.header {
|
|
display: flex;
|
|
align-items: baseline;
|
|
white-space: nowrap;
|
|
}
|
|
|
|
.headerName {
|
|
text-overflow: ellipsis;
|
|
white-space: nowrap;
|
|
min-width: 0;
|
|
overflow: hidden;
|
|
}
|
|
|
|
.headerTime {
|
|
margin-left: auto;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
.text {
|
|
display: flex;
|
|
width: 100%;
|
|
overflow: clip;
|
|
}
|
|
|
|
.quote {
|
|
vertical-align: super;
|
|
font-size: 50%;
|
|
opacity: 0.5;
|
|
}
|
|
|
|
.quote:first-child {
|
|
margin-right: 4px;
|
|
position: relative;
|
|
|
|
&:before {
|
|
position: absolute;
|
|
transform: rotate(180deg);
|
|
}
|
|
}
|
|
|
|
.quote:last-child {
|
|
margin-left: 4px;
|
|
}
|
|
|
|
.followRequestCommands {
|
|
display: flex;
|
|
gap: 8px;
|
|
max-width: 300px;
|
|
margin-top: 8px;
|
|
}
|
|
.followRequestCommandButton {
|
|
flex: 1;
|
|
}
|
|
|
|
.reactionsItem {
|
|
display: inline-block;
|
|
position: relative;
|
|
width: 38px;
|
|
height: 38px;
|
|
margin-top: 8px;
|
|
margin-right: 8px;
|
|
}
|
|
|
|
.reactionsItemAvatar {
|
|
width: 100%;
|
|
height: 100%;
|
|
}
|
|
|
|
.reactionsItemReaction {
|
|
position: absolute;
|
|
z-index: 1;
|
|
bottom: -2px;
|
|
right: -2px;
|
|
width: 20px;
|
|
height: 20px;
|
|
box-sizing: border-box;
|
|
border-radius: 100%;
|
|
background: var(--panel);
|
|
box-shadow: 0 0 0 3px var(--panel);
|
|
font-size: 11px;
|
|
text-align: center;
|
|
color: #fff;
|
|
}
|
|
|
|
@container (max-width: 600px) {
|
|
.root {
|
|
padding: 16px;
|
|
font-size: 0.9em;
|
|
}
|
|
}
|
|
|
|
@container (max-width: 500px) {
|
|
.root {
|
|
padding: 12px;
|
|
font-size: 0.85em;
|
|
}
|
|
}
|
|
</style>
|