Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
|
@ -1,5 +0,0 @@
|
||||||
Font Awesome Icons
|
|
||||||
-------------------------
|
|
||||||
|
|
||||||
Ⓒ Font Awesome
|
|
||||||
CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
|
|
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 577 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 844 B |
Before Width: | Height: | Size: 507 B |
Before Width: | Height: | Size: 689 B |
Before Width: | Height: | Size: 772 B |
Before Width: | Height: | Size: 930 B |
Before Width: | Height: | Size: 798 B |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 991 B |
|
@ -0,0 +1,24 @@
|
||||||
|
Tabler Icons
|
||||||
|
https://github.com/tabler/tabler-icons/blob/master/LICENSE
|
||||||
|
====
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2020-2022 Paweł Kuna
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
After Width: | Height: | Size: 516 B |
After Width: | Height: | Size: 952 B |
After Width: | Height: | Size: 2.8 KiB |
After Width: | Height: | Size: 829 B |
After Width: | Height: | Size: 2.3 KiB |
After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 174 B |
After Width: | Height: | Size: 414 B |
After Width: | Height: | Size: 1011 B |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.9 KiB |
|
@ -3,14 +3,21 @@
|
||||||
*/
|
*/
|
||||||
import { swLang } from '@/scripts/lang';
|
import { swLang } from '@/scripts/lang';
|
||||||
import { cli } from '@/scripts/operations';
|
import { cli } from '@/scripts/operations';
|
||||||
import { pushNotificationDataMap } from '@/types';
|
import { badgeNames, pushNotificationDataMap } from '@/types';
|
||||||
import getUserName from '@/scripts/get-user-name';
|
import getUserName from '@/scripts/get-user-name';
|
||||||
import { I18n } from '@/scripts/i18n';
|
import { I18n } from '@/scripts/i18n';
|
||||||
import { getAccountFromId } from '@/scripts/get-account-from-id';
|
import { getAccountFromId } from '@/scripts/get-account-from-id';
|
||||||
import { char2fileName } from '@/scripts/twemoji-base';
|
import { char2fileName } from '@/scripts/twemoji-base';
|
||||||
import * as url from '@/scripts/url';
|
import * as url from '@/scripts/url';
|
||||||
|
|
||||||
const iconUrl = (name: string) => `/static-assets/notification-badges/${name}.png`;
|
const iconUrl = (name: badgeNames) => `/static-assets/tabler-badges/${name}.png`;
|
||||||
|
/* How to add a new badge:
|
||||||
|
* 1. Find the icon and download png from https://tabler-icons.io/
|
||||||
|
* 2. vips resize ~/Downloads/icon-name.png vipswork.png 0.4; vips scRGB2BW vipswork.png ~/icon-name.png"[compression=9,strip]"; rm vipswork.png;
|
||||||
|
* 3. mv ~/icon-name.png ~/misskey/packages/backend/assets/tabler-badges/
|
||||||
|
* 4. Add 'icon-name' to badgeNames
|
||||||
|
* 5. Add `badge: iconUrl('icon-name'),`
|
||||||
|
*/
|
||||||
|
|
||||||
export async function createNotification<K extends keyof pushNotificationDataMap>(data: pushNotificationDataMap[K]) {
|
export async function createNotification<K extends keyof pushNotificationDataMap>(data: pushNotificationDataMap[K]) {
|
||||||
const n = await composeNotification(data);
|
const n = await composeNotification(data);
|
||||||
|
@ -75,7 +82,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
return [t('_notification.youGotReply', { name: getUserName(data.body.user) }), {
|
return [t('_notification.youGotReply', { name: getUserName(data.body.user) }), {
|
||||||
body: data.body.note.text || '',
|
body: data.body.note.text || '',
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('reply'),
|
badge: iconUrl('arrow-back-up'),
|
||||||
data,
|
data,
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
|
@ -89,7 +96,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
return [t('_notification.youRenoted', { name: getUserName(data.body.user) }), {
|
return [t('_notification.youRenoted', { name: getUserName(data.body.user) }), {
|
||||||
body: data.body.note.text || '',
|
body: data.body.note.text || '',
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('retweet'),
|
badge: iconUrl('repeat'),
|
||||||
data,
|
data,
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
|
@ -103,7 +110,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
return [t('_notification.youGotQuote', { name: getUserName(data.body.user) }), {
|
return [t('_notification.youGotQuote', { name: getUserName(data.body.user) }), {
|
||||||
body: data.body.note.text || '',
|
body: data.body.note.text || '',
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('quote-right'),
|
badge: iconUrl('quote'),
|
||||||
data,
|
data,
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
|
@ -171,7 +178,8 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
case 'pollEnded':
|
case 'pollEnded':
|
||||||
return [t('_notification.pollEnded'), {
|
return [t('_notification.pollEnded'), {
|
||||||
body: data.body.note.text || '',
|
body: data.body.note.text || '',
|
||||||
badge: iconUrl('clipboard-check-solid'),
|
badge: iconUrl('chart-arrows'),
|
||||||
|
tag: `poll:${data.body.note.id}`,
|
||||||
data,
|
data,
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
@ -179,7 +187,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
return [t('_notification.youReceivedFollowRequest'), {
|
return [t('_notification.youReceivedFollowRequest'), {
|
||||||
body: getUserName(data.body.user),
|
body: getUserName(data.body.user),
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('clock'),
|
badge: iconUrl('user-plus'),
|
||||||
data,
|
data,
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
|
@ -197,14 +205,14 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
return [t('_notification.yourFollowRequestAccepted'), {
|
return [t('_notification.yourFollowRequestAccepted'), {
|
||||||
body: getUserName(data.body.user),
|
body: getUserName(data.body.user),
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('check'),
|
badge: iconUrl('circle-check'),
|
||||||
data,
|
data,
|
||||||
}];
|
}];
|
||||||
|
|
||||||
case 'groupInvited':
|
case 'groupInvited':
|
||||||
return [t('_notification.youWereInvitedToGroup', { userName: getUserName(data.body.user) }), {
|
return [t('_notification.youWereInvitedToGroup', { userName: getUserName(data.body.user) }), {
|
||||||
body: data.body.invitation.group.name,
|
body: data.body.invitation.group.name,
|
||||||
badge: iconUrl('id-card-alt'),
|
badge: iconUrl('users'),
|
||||||
data,
|
data,
|
||||||
actions: [
|
actions: [
|
||||||
{
|
{
|
||||||
|
@ -232,7 +240,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
if (data.body.groupId === null) {
|
if (data.body.groupId === null) {
|
||||||
return [t('_notification.youGotMessagingMessageFromUser', { name: getUserName(data.body.user) }), {
|
return [t('_notification.youGotMessagingMessageFromUser', { name: getUserName(data.body.user) }), {
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('comments'),
|
badge: iconUrl('messages'),
|
||||||
tag: `messaging:user:${data.body.userId}`,
|
tag: `messaging:user:${data.body.userId}`,
|
||||||
data,
|
data,
|
||||||
renotify: true,
|
renotify: true,
|
||||||
|
@ -240,7 +248,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
}
|
}
|
||||||
return [t('_notification.youGotMessagingMessageFromGroup', { name: data.body.group.name }), {
|
return [t('_notification.youGotMessagingMessageFromGroup', { name: data.body.group.name }), {
|
||||||
icon: data.body.user.avatarUrl,
|
icon: data.body.user.avatarUrl,
|
||||||
badge: iconUrl('comments'),
|
badge: iconUrl('messages'),
|
||||||
tag: `messaging:group:${data.body.groupId}`,
|
tag: `messaging:group:${data.body.groupId}`,
|
||||||
data,
|
data,
|
||||||
renotify: true,
|
renotify: true,
|
||||||
|
@ -249,7 +257,7 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
|
||||||
return [t('_notification.unreadAntennaNote', { name: data.body.antenna.name }), {
|
return [t('_notification.unreadAntennaNote', { name: data.body.antenna.name }), {
|
||||||
body: `${getUserName(data.body.note.user)}: ${data.body.note.text || ''}`,
|
body: `${getUserName(data.body.note.user)}: ${data.body.note.text || ''}`,
|
||||||
icon: data.body.note.user.avatarUrl,
|
icon: data.body.note.user.avatarUrl,
|
||||||
badge: iconUrl('satellite'),
|
badge: iconUrl('antenna'),
|
||||||
tag: `antenna:${data.body.antenna.id}`,
|
tag: `antenna:${data.body.antenna.id}`,
|
||||||
data,
|
data,
|
||||||
renotify: true,
|
renotify: true,
|
||||||
|
|
|
@ -36,3 +36,18 @@ export type pushNotificationData<K extends keyof pushNotificationDataSourceMap>
|
||||||
export type pushNotificationDataMap = {
|
export type pushNotificationDataMap = {
|
||||||
[K in keyof pushNotificationDataSourceMap]: pushNotificationData<K>;
|
[K in keyof pushNotificationDataSourceMap]: pushNotificationData<K>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type badgeNames =
|
||||||
|
'null'
|
||||||
|
| 'antenna'
|
||||||
|
| 'arrow-back-up'
|
||||||
|
| 'at'
|
||||||
|
| 'chart-arrows'
|
||||||
|
| 'circle-check'
|
||||||
|
| 'messages'
|
||||||
|
| 'plus'
|
||||||
|
| 'quote'
|
||||||
|
| 'repeat'
|
||||||
|
| 'user-plus'
|
||||||
|
| 'users'
|
||||||
|
;
|
||||||
|
|