FoundKeyGang/FoundKey
FoundKeyGang/FoundKey
7
19
Fork 22
Code Issues 37 Pull requests 4 Releases Activity

activitypub: process Move activities and movedTo field on actors #309

Manually merged
Johann150 merged 10 commits from account-moving into main 2023-03-23 20:48:19 +00:00
Conversation 5 Commits 10 Files changed 17 +22
4 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8ff6b5dd60 - Show all commits

BIN
packages/backend/assets/notification-badges/suitcase-solid.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

5
packages/client/src/components/notification.vue
View file

@ -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;">
Johann150 marked this conversation as resolved
amybones commented 2023-03-21 22:31:58 +00:00
Review
Copy link

Something that might be worth refactoring in this PR but is otherwise fine: The CSS class text is used several times with a local override of opacity: 0.6 it might be worth factoring out a dedicated CSS class for this like dim-notification-text or even just a class that only applies the opacity. IIRC this will help a bit with rendering performance.

Something that might be worth refactoring in this PR but is otherwise fine: The CSS class `text` is used several times with a local override of `opacity: 0.6` it might be worth factoring out a dedicated CSS class for this like `dim-notification-text` or even just a class that only applies the opacity. IIRC this will help a bit with rendering performance.
Johann150 commented 2023-03-22 21:31:48 +00:00
Review
Copy link

Good idea in general, but this has nothing to do with Move activities so it should be done outside of this PR.

Good idea in general, but this has nothing to do with `Move` activities so it should be done outside of this PR.
{{ 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>

14
packages/sw/src/scripts/create-notification.ts
View file

@ -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,

3
packages/sw/src/sw.ts
View file

@ -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':