From 9f174bb380c0302730f435074f7867a5a535c624 Mon Sep 17 00:00:00 2001 From: tamaina Date: Tue, 21 Sep 2021 03:22:52 +0900 Subject: [PATCH] Revert "remove follow action" This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a. --- locales/ja-JP.yml | 1 + src/client/sw/create-notification.ts | 10 ++++++++++ src/client/sw/sw.ts | 3 +++ 3 files changed, 14 insertions(+) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 0dacaa6929..a3d516b631 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1709,6 +1709,7 @@ _notification: app: "連携アプリからの通知" _actions: + followBack: "フォローバック" reply: "返信" renote: "Renote" diff --git a/src/client/sw/create-notification.ts b/src/client/sw/create-notification.ts index 6803348f3b..77d3460ce5 100644 --- a/src/client/sw/create-notification.ts +++ b/src/client/sw/create-notification.ts @@ -36,10 +36,20 @@ async function composeNotification(data case 'notification': switch (data.body.type) { case 'follow': + // users/showの型定義をswos.apiへ当てはめるのが困難なのでapiFetch.requestを直接使用 + const account = await getAccountFromId(data.userId); + if (!account) return null; + const userDetail = apiFetch.request('users/show', { userId: data.body.userId }, account.token); return [t('_notification.youWereFollowed'), { body: getUserName(data.body.user), icon: data.body.user.avatarUrl, data, + actions: userDetail.isFollowing ? [] : [ + { + action: 'follow', + title: t('_notification._actions.followBack') + } + ], }]; case 'mention': diff --git a/src/client/sw/sw.ts b/src/client/sw/sw.ts index abb2b20683..162502959f 100644 --- a/src/client/sw/sw.ts +++ b/src/client/sw/sw.ts @@ -108,6 +108,9 @@ self.addEventListener('notificationclick',