mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-16 15:07:36 -07:00
dcea130932
* ストリーミング以外は一通り実装
* ストリーミング分も適用
* 通知のグローバル設定をサーバーサイドに保存
* グローバル通知を使うようにしたら更新されなくなるのを修正
* サーバーサイド処理
* i/notifications のパラメーター includeTypes に空配列を渡すと全部の通知が来る問題を修正
* 全て有効/無効ボタンを実装
* Squashed commit of the following:
commit c3c111529e7aab640c37679ac3478918bd4781eb
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 22:29:04 2020 +0900
12.47.0
commit 2dbab66cfe2d4a100a61b25770f65582d9a913ef
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)
commit 01238d6b1a5ba37a08c278a10d4a91a27839cbe3
Author: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Date: Wed Aug 19 22:24:02 2020 +0900
Update README.md [AUTOGEN] (#6593)
commit c34f302b1c91bd3b091cd03fa60fae86b385f902
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 21:47:18 2020 +0900
enhance(client): サーバーから切断されたときにダイアログで警告を表示できるように
commit 6870262f8d50407115160979b483a43503ee854f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 17:52:11 2020 +0900
enhance(client): Better element visible detection
commit c54d5e70401d8a417f1fe816fc354c9851a23d20
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Wed Aug 19 17:51:31 2020 +0900
fix(clinet): 誤字によりスクロールイベントリスナが解除されていなかったのを修正
commit 0ace009a54f6b781def9386298a2b053f3224bc6
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
commit 48e8ee440bcff712710666861262b0a6492a3794
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue Aug 18 22:48:52 2020 +0900
WebPのアニメーションが失われるのを修正 Fix #6625 (#6649)
commit 9855405b8989713b81709fc1700e2ead97423467
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
commit 122076e8eaa5517ee3fab6caacd0d12e61654125
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat Aug 15 04:27:19 2020 +0900
Sign (request-target) Fix #6652 (#6656)
commit 7c5ac2cbb407fbcdd06f7561ccbcff56c9da6a14
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Fri Aug 14 15:24:55 2020 +0900
perf(server): Add isSensitive index to improve query performance
commit ccda2181c1c0a02a3d9feeb47e40644ca043bb11
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri Aug 14 00:54:33 2020 +0900
GCSに大きいファイルがアップロードできないのを修正 Fix #6254 (#6648)
commit b5fe4ba9bef376a5977c23c82f4666458abcecfd
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 23:02:43 2020 +0900
WIP: Improve admin dashboard
commit fd9c7d525a9d57666edd7fc2b717ee2a1b6fa231
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
commit 080574e13d46075e537249d926781a91a490eb38
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 21:27:06 2020 +0900
WIP: Improve admin dashboard
commit ee0a44559040e83ce7d184bef57372f9c3602a75
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Thu Aug 13 20:05:01 2020 +0900
Option objectStorageSetPublicRead (#6645)
commit bb342c76016d71fddb9c272c855292bec604fc87
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 19:56:46 2020 +0900
WIP: Improve admin dashboard
commit ed17636fb9852263b33e37fe9cc6eb20d2aafbc8
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Thu Aug 13 17:58:16 2020 +0900
WIP: Improve admin dashboard
commit c59d7d941ad5b241b12e9adb580c35804a86a465
Author: syuilo <Syuilotan@yahoo.co.jp>
Date: Wed Aug 12 17:42:12 2020 +0900
Update README.md
Close #6644
commit 377377595abb56f10b24db43774da4661b6e9f06
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 20:23:51 2020 +0900
enhance(client): Improve admin page
commit d63aef9963bf727d35eb868360cced774ae8d733
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 13:55:00 2020 +0900
chore(client): Fix style
commit e9b28fa3c00c7e1dc98c567d47111b33fbba2bf7
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 13:00:10 2020 +0900
chore(client): Design tweaks
commit be255dc583dade8c1168e4dd71c9d11ab2ac45e9
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:42:51 2020 +0900
chore(client): Design tweak
commit 18eb7c6087129d15873c0d05740839ccf0a53f17
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:31:22 2020 +0900
chore(client): Design tweaks
commit cf29e69813888c372867a166525a251e1f0d8c60
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:28:35 2020 +0900
chore(client): Fix bug
commit 132da7e3c06bc40b6680bffc299ca354ddac1cd8
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:20:58 2020 +0900
Update ja-JP.yml
commit 26df23bb6463133a516217b89c0a9ec992f4ac3f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:18:02 2020 +0900
chore(client): fix style
commit 76389ad619ff63e3015643c9e32a5ecfd7c34d33
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 12:15:58 2020 +0900
chore(client): Design tweaks
commit 7cde8cfbf2c840186f4c2025fb34cc108bb84c50
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 11:51:43 2020 +0900
chore(client): Design tweaks
commit 4eb2ddac4e6d4dead85613f12155865cc053f17f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 11:24:30 2020 +0900
chore(client): Design tweaks
commit dc51eef27c97798bfa3fed62c0d4013a5efbd3f8
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
commit bff8a23cbc2a7046924d44e8da8b23d4207f3edf
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Mon Aug 10 10:37:57 2020 +0900
chore(client): Design tweaks
commit 9c5efb9da0a166add3edbc8d51156ea260e814a8
Author: rinsuki <428rinsuki+git@gmail.com>
Date: Mon Aug 10 01:33:01 2020 +0900
Dockerのビルド時にgitを入れるように (#6639)
917d3d0bd3
でgitの依存関係が追加されたのにgitが入っていないのでコケていた
commit 48b8320e5ec6971d19b7734e22b0a1518b545f1e
Author: rinsuki <428rinsuki+git@gmail.com>
Date: Mon Aug 10 01:32:27 2020 +0900
Fix #6637 (#6638)
* Fix #6637
* fix lint
commit 9b2ed96c1cb0e311fcc51d367dc0411e833b1698
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 9 15:59:38 2020 +0900
chore: Clean up
commit 69d9aa71f25ab06d8024b04ce341909425d053d6
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
commit 13683780cdfa6c71767127ce75e2755b40c03356
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 9 13:49:44 2020 +0900
✌️
commit d780e5b251c8f4f593f7bece72439e411a3c0b66
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 9 13:46:19 2020 +0900
enhance(client): ミュートされたノート数を表示するようにしたり
commit 917d3d0bd3e7746b722f154860c604c4d6c92c69
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sat Aug 8 10:30:38 2020 +0900
chore: Update dependencies 🚀
commit 4b19c53697e3edae1ffd5dff1f78d25837cafe7f
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sat Aug 8 10:27:37 2020 +0900
client: テーマコードをコピーできるようにしたり
commit 2d40a15d2bc7356fdd82dd980cce202d6e9acdbc
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Fri Aug 7 11:27:37 2020 +0900
refactor: Extract well-known services
commit 2bdcd22ad44aed94eb406f788f1546d73fcdf73e
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Tue Aug 4 23:09:48 2020 +0900
enhance(api): アクセストークンを作成する際、createdAtをlastUsedAtを揃えるようにして、未使用かどうかを判定できるように
commit f73a4e1304317fcfb06aedd5ad4890d03d704d73
Author: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue Aug 4 21:12:55 2020 +0900
Update .dockerignore (#6620)
commit b265cdbd8453edb65a5aab739bc4d3dfd3ce075d
Author: Xeltica <7106976+Xeltica@users.noreply.github.com>
Date: Mon Aug 3 13:40:32 2020 +0900
Update CHANGELOG.md
commit a04d8b95c24ec3935fa4ac3d6df9d714d5758e93
Author: Xeltica <7106976+Xeltica@users.noreply.github.com>
Date: Mon Aug 3 13:40:13 2020 +0900
Update CHANGELOG.md
commit 0e9a8c0cd48361cb07b78740fd2b1eeddbc6cd55
Author: syuilo <syuilotan@yahoo.co.jp>
Date: Sun Aug 2 13:59:05 2020 +0900
fix(client): Message read state is not reactive
commit 5ae8a3c7e8531154d0dd870aaeb92c4c0c14e15d
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>
128 lines
2.8 KiB
Vue
128 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>
|