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:
		| @@ -21,6 +21,7 @@ import { popup, popups, pendingApiRequestsCount } from '@/os'; | ||||
| import { uploads } from '@/scripts/upload'; | ||||
| import * as sound from '@/scripts/sound'; | ||||
| import { $i } from '@/account'; | ||||
| import { swInject } from './sw-inject'; | ||||
| import { stream } from '@/stream'; | ||||
|  | ||||
| export default defineComponent({ | ||||
| @@ -49,6 +50,11 @@ export default defineComponent({ | ||||
| 		if ($i) { | ||||
| 			const connection = stream.useChannel('main', null, 'UI'); | ||||
| 			connection.on('notification', onNotification); | ||||
|  | ||||
| 			//#region Listen message from SW | ||||
| 			if ('serviceWorker' in navigator) { | ||||
| 				swInject(); | ||||
| 			} | ||||
| 		} | ||||
|  | ||||
| 		return { | ||||
|   | ||||
							
								
								
									
										45
									
								
								packages/client/src/ui/_common_/sw-inject.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								packages/client/src/ui/_common_/sw-inject.ts
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,45 @@ | ||||
| import { inject } from 'vue'; | ||||
| import { post } from '@/os'; | ||||
| import { $i, login } from '@/account'; | ||||
| import { defaultStore } from '@/store'; | ||||
| import { getAccountFromId } from '@/scripts/get-account-from-id'; | ||||
| import { router } from '@/router'; | ||||
|  | ||||
| export function swInject() { | ||||
| 	const navHook = inject('navHook', null); | ||||
| 	const sideViewHook = inject('sideViewHook', null); | ||||
|  | ||||
| 	navigator.serviceWorker.addEventListener('message', ev => { | ||||
| 		if (_DEV_) { | ||||
| 			console.log('sw msg', ev.data); | ||||
| 		} | ||||
|  | ||||
| 		const data = ev.data; // as SwMessage | ||||
| 		if (data.type !== 'order') return; | ||||
|  | ||||
| 		if (data.loginId !== $i?.id) { | ||||
| 			return getAccountFromId(data.loginId).then(account => { | ||||
| 				if (!account) return; | ||||
| 				return login(account.token, data.url); | ||||
| 			}); | ||||
| 		} | ||||
|  | ||||
| 		switch (data.order) { | ||||
| 			case 'post': | ||||
| 				return post(data.options); | ||||
| 			case 'push': | ||||
| 				if (router.currentRoute.value.path === data.url) { | ||||
| 					return window.scroll({ top: 0, behavior: 'smooth' }); | ||||
| 				} | ||||
| 				if (navHook) { | ||||
| 					return navHook(data.url); | ||||
| 				} | ||||
| 				if (sideViewHook && defaultStore.state.defaultSideView && data.url !== '/') { | ||||
| 					return sideViewHook(data.url); | ||||
| 				} | ||||
| 				return router.push(data.url); | ||||
| 			default: | ||||
| 				return; | ||||
| 		} | ||||
| 	}); | ||||
| } | ||||
		Reference in New Issue
	
	Block a user
	 tamaina
					tamaina