merge: upstream

This commit is contained in:
Mar0xy 2023-10-03 15:20:49 +02:00
commit 38e35e1472
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
185 changed files with 4442 additions and 2501 deletions

View file

@ -6,7 +6,7 @@
/*
* Notification manager for SW
*/
import type { BadgeNames, PushNotificationDataMap } from '@/types';
import type { BadgeNames, PushNotificationDataMap } from '@/types.js';
import { char2fileName } from '@/scripts/twemoji-base.js';
import { cli } from '@/scripts/operations.js';
import { getAccountFromId } from '@/scripts/get-account-from-id.js';

View file

@ -8,7 +8,7 @@
*
*/
import * as Misskey from 'misskey-js';
import type { SwMessage, SwMessageOrderType } from '@/types';
import type { SwMessage, SwMessageOrderType } from '@/types.js';
import { getAccountFromId } from '@/scripts/get-account-from-id.js';
import { getUrlWithLoginId } from '@/scripts/login-id.js';