summaryrefslogtreecommitdiff
path: root/src/web/app
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-17 17:53:35 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-17 17:53:35 +0900
commit7bb19f5b9b8a0ea9fcbf944b4e3fbbb3adb4a928 (patch)
tree4e4e16c7d8a25efb49d5138d7658dd1a8b750e20 /src/web/app
parentMerge branch 'master' of https://github.com/syuilo/misskey (diff)
downloadsharkey-7bb19f5b9b8a0ea9fcbf944b4e3fbbb3adb4a928.tar.gz
sharkey-7bb19f5b9b8a0ea9fcbf944b4e3fbbb3adb4a928.tar.bz2
sharkey-7bb19f5b9b8a0ea9fcbf944b4e3fbbb3adb4a928.zip
#1252
Diffstat (limited to 'src/web/app')
-rw-r--r--src/web/app/common/scripts/compose-notification.ts7
-rw-r--r--src/web/app/desktop/script.ts8
2 files changed, 15 insertions, 0 deletions
diff --git a/src/web/app/common/scripts/compose-notification.ts b/src/web/app/common/scripts/compose-notification.ts
index d0e0c2098d..e1dbd3bc13 100644
--- a/src/web/app/common/scripts/compose-notification.ts
+++ b/src/web/app/common/scripts/compose-notification.ts
@@ -54,6 +54,13 @@ export default function(type, data): Notification {
icon: data.user.avatar_url + '?thumbnail&size=64'
};
+ case 'othello_invited':
+ return {
+ title: '対局への招待があります',
+ body: `${data.parent.name}さんから`,
+ icon: data.parent.avatar_url + '?thumbnail&size=64'
+ };
+
default:
return null;
}
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index 25a60d7ecc..2362613cdc 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -150,5 +150,13 @@ function registerNotifications(stream: HomeStreamManager) {
};
setTimeout(n.close.bind(n), 7000);
});
+
+ connection.on('othello_invited', matching => {
+ const _n = composeNotification('othello_invited', matching);
+ const n = new Notification(_n.title, {
+ body: _n.body,
+ icon: _n.icon
+ });
+ });
}
}