mirror of
https://github.com/kokonect-link/cherrypick
synced 2024-12-16 07:38:18 +09:00
cd0f8a4ef9
* ストリーミング以外は一通り実装 * ストリーミング分も適用 * 通知のグローバル設定をサーバーサイドに保存 * グローバル通知を使うようにしたら更新されなくなるのを修正 * サーバーサイド処理 * i/notifications のパラメーター includeTypes に空配列を渡すと全部の通知が来る問題を修正 * 全て有効/無効ボタンを実装 * Squashed commit of the following: commitc3c111529e
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 22:29:04 2020 +0900 12.47.0 commit2dbab66cfe
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Wed Aug 19 22:24:39 2020 +0900 New Crowdin updates (#6617) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Japanese, Kansai) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Korean) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) commit01238d6b1a
Author: Acid Chicken (硫酸鶏) <root@acid-chicken.com> Date: Wed Aug 19 22:24:02 2020 +0900 Update README.md [AUTOGEN] (#6593) commitc34f302b1c
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 21:47:18 2020 +0900 enhance(client): サーバーから切断されたときにダイアログで警告を表示できるように commit6870262f8d
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 17:52:11 2020 +0900 enhance(client): Better element visible detection commitc54d5e7040
Author: syuilo <syuilotan@yahoo.co.jp> Date: Wed Aug 19 17:51:31 2020 +0900 fix(clinet): 誤字によりスクロールイベントリスナが解除されていなかったのを修正 commit0ace009a54
Author: syuilo <syuilotan@yahoo.co.jp> Date: Tue Aug 18 22:52:54 2020 +0900 fix(server): Prevent error when recieve non-json data from websocket Fix #6658 commit48e8ee440b
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue Aug 18 22:48:52 2020 +0900 WebPのアニメーションが失われるのを修正 Fix #6625 (#6649) commit9855405b89
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Tue Aug 18 22:44:21 2020 +0900 Channel (#6621) * wip * wip * wip * wip * wip * wip * wip * wip * wop * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * add notes * wip * wip * wip * wip * sound * wip * add kick_gaba2 * wip commit122076e8ea
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat Aug 15 04:27:19 2020 +0900 Sign (request-target) Fix #6652 (#6656) commit7c5ac2cbb4
Author: syuilo <syuilotan@yahoo.co.jp> Date: Fri Aug 14 15:24:55 2020 +0900 perf(server): Add isSensitive index to improve query performance commitccda2181c1
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri Aug 14 00:54:33 2020 +0900 GCSに大きいファイルがアップロードできないのを修正 Fix #6254 (#6648) commitb5fe4ba9be
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 23:02:43 2020 +0900 WIP: Improve admin dashboard commitfd9c7d525a
Merge:080574e13
ee0a44559
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 21:27:10 2020 +0900 Merge branch 'develop' of https://github.com/syuilo/misskey into develop commit080574e13d
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 21:27:06 2020 +0900 WIP: Improve admin dashboard commitee0a445590
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu Aug 13 20:05:01 2020 +0900 Option objectStorageSetPublicRead (#6645) commitbb342c7601
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 19:56:46 2020 +0900 WIP: Improve admin dashboard commited17636fb9
Author: syuilo <syuilotan@yahoo.co.jp> Date: Thu Aug 13 17:58:16 2020 +0900 WIP: Improve admin dashboard commitc59d7d941a
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Wed Aug 12 17:42:12 2020 +0900 Update README.md Close #6644 commit377377595a
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 20:23:51 2020 +0900 enhance(client): Improve admin page commitd63aef9963
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 13:55:00 2020 +0900 chore(client): Fix style commite9b28fa3c0
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 13:00:10 2020 +0900 chore(client): Design tweaks commitbe255dc583
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:42:51 2020 +0900 chore(client): Design tweak commit18eb7c6087
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:31:22 2020 +0900 chore(client): Design tweaks commitcf29e69813
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:28:35 2020 +0900 chore(client): Fix bug commit132da7e3c0
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:20:58 2020 +0900 Update ja-JP.yml commit26df23bb64
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:18:02 2020 +0900 chore(client): fix style commit76389ad619
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 12:15:58 2020 +0900 chore(client): Design tweaks commit7cde8cfbf2
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 11:51:43 2020 +0900 chore(client): Design tweaks commit4eb2ddac4e
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 11:24:30 2020 +0900 chore(client): Design tweaks commitdc51eef27c
Merge:bff8a23cb
9c5efb9da
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 10:38:00 2020 +0900 Merge branch 'develop' of https://github.com/syuilo/misskey into develop commitbff8a23cbc
Author: syuilo <syuilotan@yahoo.co.jp> Date: Mon Aug 10 10:37:57 2020 +0900 chore(client): Design tweaks commit9c5efb9da0
Author: rinsuki <428rinsuki+git@gmail.com> Date: Mon Aug 10 01:33:01 2020 +0900 Dockerのビルド時にgitを入れるように (#6639)917d3d0bd3
でgitの依存関係が追加されたのにgitが入っていないのでコケていた commit48b8320e5e
Author: rinsuki <428rinsuki+git@gmail.com> Date: Mon Aug 10 01:32:27 2020 +0900 Fix #6637 (#6638) * Fix #6637 * fix lint commit9b2ed96c1c
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 9 15:59:38 2020 +0900 chore: Clean up commit69d9aa71f2
Author: syuilo <Syuilotan@yahoo.co.jp> Date: Sun Aug 9 15:51:02 2020 +0900 Full view mode (#6636) * wuip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update folder.vue * wip * Update size.ts * wip * wip * Update index.vue * wip commit13683780cd
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 9 13:49:44 2020 +0900 ✌️ commitd780e5b251
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 9 13:46:19 2020 +0900 enhance(client): ミュートされたノート数を表示するようにしたり commit917d3d0bd3
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sat Aug 8 10:30:38 2020 +0900 chore: Update dependencies 🚀 commit4b19c53697
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sat Aug 8 10:27:37 2020 +0900 client: テーマコードをコピーできるようにしたり commit2d40a15d2b
Author: syuilo <syuilotan@yahoo.co.jp> Date: Fri Aug 7 11:27:37 2020 +0900 refactor: Extract well-known services commit2bdcd22ad4
Author: syuilo <syuilotan@yahoo.co.jp> Date: Tue Aug 4 23:09:48 2020 +0900 enhance(api): アクセストークンを作成する際、createdAtをlastUsedAtを揃えるようにして、未使用かどうかを判定できるように commitf73a4e1304
Author: MeiMei <30769358+mei23@users.noreply.github.com> Date: Tue Aug 4 21:12:55 2020 +0900 Update .dockerignore (#6620) commitb265cdbd84
Author: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Mon Aug 3 13:40:32 2020 +0900 Update CHANGELOG.md commita04d8b95c2
Author: Xeltica <7106976+Xeltica@users.noreply.github.com> Date: Mon Aug 3 13:40:13 2020 +0900 Update CHANGELOG.md commit0e9a8c0cd4
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 2 13:59:05 2020 +0900 fix(client): Message read state is not reactive commit5ae8a3c7e8
Author: syuilo <syuilotan@yahoo.co.jp> Date: Sun Aug 2 13:49:28 2020 +0900 refactor * fix: includeTypes 未指定時に通知が返ってこなくなるバグを修正 * 最適化とバグ修正 * 挙動を修正 * Update ja-JP.yml * 不要なimportを削除 * ✌ * 不要なコードの削除 * Update notification-setting-window.vue * Update notification-setting-window.vue * 🎨 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
129 lines
2.8 KiB
Vue
129 lines
2.8 KiB
Vue
<template>
|
|
<div class="mfcuwfyp">
|
|
<x-list class="notifications" :items="items" v-slot="{ item: notification }">
|
|
<x-note v-if="['reply', 'quote', 'mention'].includes(notification.type)" :note="notification.note" @updated="noteUpdated(notification.note, $event)" :key="notification.id"/>
|
|
<x-notification v-else :notification="notification" :with-time="true" :full="true" class="_panel notification" :key="notification.id"/>
|
|
</x-list>
|
|
|
|
<button class="_panel _button" ref="loadMore" v-show="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
|
|
<template v-if="!moreFetching">{{ $t('loadMore') }}</template>
|
|
<template v-if="moreFetching"><mk-loading inline/></template>
|
|
</button>
|
|
|
|
<p class="empty" v-if="empty">{{ $t('noNotifications') }}</p>
|
|
|
|
<mk-error v-if="error" @retry="init()"/>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import Vue, { PropType } from 'vue';
|
|
import paging from '../scripts/paging';
|
|
import XNotification from './notification.vue';
|
|
import XList from './date-separated-list.vue';
|
|
import XNote from './note.vue';
|
|
import { notificationTypes } from '../../types';
|
|
|
|
export default Vue.extend({
|
|
components: {
|
|
XNotification,
|
|
XList,
|
|
XNote,
|
|
},
|
|
|
|
mixins: [
|
|
paging({}),
|
|
],
|
|
|
|
props: {
|
|
includeTypes: {
|
|
type: Array as PropType<typeof notificationTypes[number][]>,
|
|
required: false,
|
|
default: null,
|
|
},
|
|
},
|
|
|
|
data() {
|
|
return {
|
|
connection: null,
|
|
pagination: {
|
|
endpoint: 'i/notifications',
|
|
limit: 10,
|
|
params: () => ({
|
|
includeTypes: this.allIncludeTypes || undefined,
|
|
})
|
|
},
|
|
};
|
|
},
|
|
|
|
computed: {
|
|
allIncludeTypes() {
|
|
return this.includeTypes ?? this.$store.state.i.includingNotificationTypes;
|
|
}
|
|
},
|
|
|
|
watch: {
|
|
includeTypes() {
|
|
this.reload();
|
|
},
|
|
'$store.state.i.includingNotificationTypes'() {
|
|
if (this.includeTypes === null) {
|
|
this.reload();
|
|
}
|
|
}
|
|
},
|
|
|
|
mounted() {
|
|
this.connection = this.$root.stream.useSharedConnection('main');
|
|
this.connection.on('notification', this.onNotification);
|
|
},
|
|
|
|
beforeDestroy() {
|
|
this.connection.dispose();
|
|
},
|
|
|
|
methods: {
|
|
onNotification(notification) {
|
|
//
|
|
const isMuted = !!this.allIncludeTypes && !this.allIncludeTypes.includes(notification.type);
|
|
if (isMuted || document.visibilityState === 'visible') {
|
|
this.$root.stream.send('readNotification', {
|
|
id: notification.id
|
|
});
|
|
}
|
|
|
|
if (!isMuted) {
|
|
this.prepend({
|
|
...notification,
|
|
isRead: document.visibilityState === 'visible'
|
|
});
|
|
}
|
|
},
|
|
|
|
noteUpdated(oldValue, newValue) {
|
|
const i = this.items.findIndex(n => n.note === oldValue);
|
|
Vue.set(this.items, i, {
|
|
...this.items[i],
|
|
note: newValue
|
|
});
|
|
},
|
|
}
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" scoped>
|
|
.mfcuwfyp {
|
|
> .empty {
|
|
margin: 0;
|
|
padding: 16px;
|
|
text-align: center;
|
|
color: var(--fg);
|
|
}
|
|
|
|
> .placeholder {
|
|
padding: 32px;
|
|
opacity: 0.3;
|
|
}
|
|
}
|
|
</style>
|