feat: Improve Push Notification (#7667)
* clean up * ev => data * refactor * clean up * add type * antenna * channel * fix * add Packed type * add PackedRef * fix lint * add emoji schema * add reversiGame * add reversiMatching * remove signin schema (use Signin entity) * add schemas refs, fix Packed type * wip PackedHoge => Packed<'Hoge'> * add Packed type * note-reaction * user * user-group * user-list * note * app, messaging-message * notification * drive-file * drive-folder * following * muting * blocking * hashtag * page * app (with modifying schema) * import user? * channel * antenna * clip * gallery-post * emoji * Packed * reversi-matching * update stream.ts * https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339 * fix lint * clean up? * add app * fix * nanka iroiro * wip * wip * fix lint * fix loginId * fix * refactor * refactor * remove follow action * clean up * Revert "remove follow action" This reverts commitdefbb41648. * Revert "clean up" This reverts commitf94919cb9c. * remove fetch specification * renoteの条件追加 * apiFetch => cli * bypass fetch? * fix * refactor: use path alias * temp: add submodule * remove submodule * enhane: unison-reloadに指定したパスに移動できるように * null * null * feat: ログインするアカウントのIDをクエリ文字列で指定する機能 * null * await? * rename * rename * Update read.ts * merge * get-note-summary * fix * swパッケージに * add missing packages * fix getNoteSummary * add webpack-cli * ✌️ * remove plugins * sw-inject分離したがテストしてない * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix * ✌️ * clean up config * typesを戻した * Update packages/client/src/components/notification.vue Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * disconnect * oops * Failed to load the script unexpectedly回避 sw.jsとlib.tsを分離してみた * truncate notification * Update packages/client/src/ui/_common_/common.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * clean up * clean up * キャッシュ対策 * Truncate push notification message * クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正 * components/drive-file-thumbnail.vue * components/drive-select-dialog.vue * components/drive-window.vue * merge * fix * Service Workerのビルドにesbuildを使うようにする * return createEmptyNotification() * fix * i18n.ts * update * ✌️ * remove ts-loader * fix * fix * enhance: Service Workerを常に登録するように * pollEnded * URLをsw.jsに戻す * clean up Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
		| @@ -1,4 +1,5 @@ | ||||
| import { publishMainStream } from '@/services/stream.js'; | ||||
| import { pushNotification } from '@/services/push-notification.js'; | ||||
| import define from '../../define.js'; | ||||
| import { Notifications } from '@/models/index.js'; | ||||
|  | ||||
| @@ -28,4 +29,5 @@ export default define(meta, paramDef, async (ps, user) => { | ||||
|  | ||||
| 	// 全ての通知を読みましたよというイベントを発行 | ||||
| 	publishMainStream(user.id, 'readAllNotifications'); | ||||
| 	pushNotification(user.id, 'readAllNotifications', undefined); | ||||
| }); | ||||
|   | ||||
| @@ -1,10 +1,12 @@ | ||||
| import { publishMainStream } from '@/services/stream.js'; | ||||
| import define from '../../define.js'; | ||||
| import { Notifications } from '@/models/index.js'; | ||||
| import { readNotification } from '../../common/read-notification.js'; | ||||
| import { ApiError } from '../../error.js'; | ||||
|  | ||||
| export const meta = { | ||||
| 	desc: { | ||||
| 		'ja-JP': '通知を既読にします。', | ||||
| 		'en-US': 'Mark a notification as read.' | ||||
| 	}, | ||||
|  | ||||
| 	tags: ['notifications', 'account'], | ||||
|  | ||||
| 	requireCredential: true, | ||||
| @@ -21,23 +23,26 @@ export const meta = { | ||||
| } as const; | ||||
|  | ||||
| export const paramDef = { | ||||
| 	type: 'object', | ||||
| 	properties: { | ||||
| 		notificationId: { type: 'string', format: 'misskey:id' }, | ||||
| 	}, | ||||
| 	required: ['notificationId'], | ||||
| 	oneOf: [ | ||||
| 		{ | ||||
| 			type: 'object', | ||||
| 			properties: { | ||||
| 				notificationId: { type: 'string', format: 'misskey:id' }, | ||||
| 			}, | ||||
| 			required: ['notificationId'], | ||||
| 		}, | ||||
| 		{ | ||||
| 			type: 'object', | ||||
| 			properties: { | ||||
| 				notificationIds: { type: 'array', items: { type: 'string', format: 'misskey:id' } }, | ||||
| 			}, | ||||
| 			required: ['notificationIds'], | ||||
| 		}, | ||||
| 	], | ||||
| } as const; | ||||
|  | ||||
| // eslint-disable-next-line import/no-default-export | ||||
| export default define(meta, paramDef, async (ps, user) => { | ||||
| 	const notification = await Notifications.findOneBy({ | ||||
| 		notifieeId: user.id, | ||||
| 		id: ps.notificationId, | ||||
| 	}); | ||||
|  | ||||
| 	if (notification == null) { | ||||
| 		throw new ApiError(meta.errors.noSuchNotification); | ||||
| 	} | ||||
|  | ||||
| 	readNotification(user.id, [notification.id]); | ||||
| 	if ('notificationId' in ps) return readNotification(user.id, [ps.notificationId]); | ||||
| 	return readNotification(user.id, ps.notificationIds); | ||||
| }); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 tamaina
					tamaina