From 72b8489ae759368d0624fa50f39babeb13afdae0 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 20 Nov 2022 20:06:03 +0100
Subject: [PATCH] client: display move notification

---
 .../notification-badges/suitcase-solid.png       | Bin 0 -> 1123 bytes
 packages/client/src/components/notification.vue  |   5 +++++
 packages/sw/src/scripts/create-notification.ts   |  14 ++++++++++++++
 packages/sw/src/sw.ts                            |   3 +++
 4 files changed, 22 insertions(+)
 create mode 100644 packages/backend/assets/notification-badges/suitcase-solid.png

diff --git a/packages/backend/assets/notification-badges/suitcase-solid.png b/packages/backend/assets/notification-badges/suitcase-solid.png
new file mode 100644
index 0000000000000000000000000000000000000000..b52688586cc00f1d224b397871906acb291f0c1b
GIT binary patch
literal 1123
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3oCO|{#S9Egk3g8wbJq_RprB-l
zYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&3=GU4JY5_^D(1Ys>)$b@ROa}{
z@86fV?u=TOn*Gvo&yprF&j(Arr>JfXx~OQ=#^R{bv7(f7VRvkk!v`tFQjO%r&FrU-
z2LCtP$ahs$D<;^mDQr#X$JdEv?&Wi5);_uU^Y6abHE{;*b1T#8?$0zgw*G9>e*Dhd
zpffp=AD9d{Y*^MXh^5IrRx;rF!&Spq^X%Po<MRb`cc<@Xs6Akp!1Ezty5WP|gv8G4
z$BOnlpUF`*V6mB1`Y`&t@P?~*>(B4ZxTcV{jq8V$#EESgw&@MN@BX>3V+~%{dS*@k
zvGgx7os1h~B#bua{J*}5mGK+HYvXn1(Q<5MPos2ByI(u9edYZI*Vy<q*2fyITJEcT
zTGhVi#GPKo4H6Z0$DMXI*-X!zn<sT<<B2~q-3-}UImL_>;ug1`MlO?PC^P<Sz2j8z
z3f=Gt>{>aS@87-u@|TM4jF}gIEWCBHOJ?(vUngFz-f(v1I{%CJ=8JAy`AH`0^v|u~
zS^*OhL{ubLIo%wa0w*MB{pT~>?0UfKLEVFMVzd7|ey41j7MY&re{Dy-?CV!|Zk{n?
z`m39_i)9Y8-_GByUi@Z<C+>A`_-n$Kf39T7+lcn#nzbSYVS2Lj?r-G!{y+86);kwI
zn&xjlko7?M!7E*!H40bt!W*3rtP1Ndz5HLmxSH(;V};~~m)pH_*>afcOg68*oIgkC
z$eC@-@eJRe%v`%%myK`sO>OhIn><Nr{mkqQl{492r+#i|PWyJ`i74lRGrt-SZ~6C4
z<!&kahmA9J8(+Vlu)X1TSFg(HhP@0Y&rD-lKYgxygZY^?_7^Qob}sm0awzt|=FZ!X
zE55%?GGNU1_E+@H7P{J3?k&f!7WH0ave7%=jPD*Q%N{Ep)bKFi66$GUS*$QX%*hQO
zFFAW$u3-A7W!q}ftCq0ki^!!CE5^f1mrq!>UdSM%iYrsf>%e!1xy9}$-~8aSn7F6#
z+`QPO%LVV1l>0Nhv*W3WD4RF$TjTC}&ft29eOxucY4hfpG3_z?>2BPy`@jEVAI{_4
zJXcq@H7>vVcmGN4WpAtszkfaueBk$iscRO0ou+-D`aoLw|KG=?^KMOl`fmE2TJ{Z$
zKc*bJsg+vR!#tni_1)U#yW{8WbG#kAe%J5w2fWkD%r~%B@I>(OY}tAGBww@4TANRI
zOq_oEPuYAx@<H?ipryB8Hs(C?nJUy$wx1m-WQ%!orp|q_t~zituz+CjboFyt=akR{
E092#{G5`Po

literal 0
HcmV?d00001

diff --git a/packages/client/src/components/notification.vue b/packages/client/src/components/notification.vue
index 43ceb38a4..ee0c446b6 100644
--- a/packages/client/src/components/notification.vue
+++ b/packages/client/src/components/notification.vue
@@ -15,6 +15,7 @@
 			<i v-else-if="notification.type === 'quote'" class="fas fa-quote-left"></i>
 			<i v-else-if="notification.type === 'pollVote'" class="fas fa-poll-h"></i>
 			<i v-else-if="notification.type === 'pollEnded'" class="fas fa-poll-h"></i>
+			<i v-else-if="notification.type === 'move'" class="fas fa-suitcase"></i>
 			<!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 -->
 			<MkEmoji
 				v-else-if="notification.type === 'reaction'"
@@ -86,6 +87,10 @@
 				<button class="_textButton" @click="rejectGroupInvitation()">{{ i18n.ts.reject }}</button>
 			</div>
 		</span>
+		<span v-if="notification.type === 'move'" class="text" style="opacity: 0.6;">
+			{{ i18n.ts.moved }}
+			<div v-if="full"><MkFollowButton :user="notification.moveTarget" :full="true"/></div>
+		</span>
 		<span v-if="notification.type === 'app'" class="text">
 			<Mfm :text="notification.body" :nowrap="!full"/>
 		</span>
diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts
index 9d5e31335..873840943 100644
--- a/packages/sw/src/scripts/create-notification.ts
+++ b/packages/sw/src/scripts/create-notification.ts
@@ -217,6 +217,20 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
 						],
 					}];
 
+				case 'move':
+					return [t('_notification.moved', { name: getUserName(data.body.user) }), {
+						body: getUserName(data.body.moveTarget),
+						icon: data.body.moveTarget.avatarUrl,
+						badge: iconUrl('suitcase'),
+						data,
+						action: [
+							{
+								action: 'accept',
+								title: t('follow'),
+							},
+						],
+					}];
+
 				case 'app':
 						return [data.body.header || data.body.body, {
 							body: data.body.header && data.body.body,
diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts
index 10cfc69d3..67846cea6 100644
--- a/packages/sw/src/sw.ts
+++ b/packages/sw/src/sw.ts
@@ -96,6 +96,9 @@ self.addEventListener('notificationclick', <K extends keyof pushNotificationData
 							case 'groupInvited':
 								await swos.api('users/groups/invitations/accept', id, { invitationId: data.body.invitation.id });
 								break;
+							case 'move':
+								await swos.api('following/create', id, { userId: data.body.moveTarget.id });
+								break;
 						}
 						break;
 					case 'reject':