Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
workspace:
- backend
- misskey-js
- sw
steps:
- uses: actions/checkout@v3.3.0
with:
Expand Down
14 changes: 8 additions & 6 deletions packages/misskey-js/etc/misskey-js.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ export type Channels = {
readAllAntennas: () => void;
unreadAntenna: (payload: Antenna) => void;
readAllAnnouncements: () => void;
readAllChannels: () => void;
unreadChannel: (payload: Note['id']) => void;
myTokenRegenerated: () => void;
reversiNoInvites: () => void;
reversiInvited: (payload: FIXME) => void;
Expand Down Expand Up @@ -2353,6 +2355,7 @@ type MeDetailed = UserDetailed & {
hasPendingReceivedFollowRequest: boolean;
hasUnreadAnnouncement: boolean;
hasUnreadAntenna: boolean;
hasUnreadChannel: boolean;
hasUnreadMentions: boolean;
hasUnreadMessagingMessage: boolean;
hasUnreadNotification: boolean;
Expand Down Expand Up @@ -2484,6 +2487,9 @@ type Notification_2 = {
user: User;
userId: User['id'];
note: Note;
} | {
type: 'pollEnded';
note: Note;
} | {
type: 'follow';
user: User;
Expand Down Expand Up @@ -2609,11 +2615,7 @@ export class Stream extends EventEmitter<StreamEvents> {
// (undocumented)
removeSharedConnectionPool(pool: Pool): void;
// (undocumented)
send(typeOrPayload: string): void;
// (undocumented)
send(typeOrPayload: string, payload: any): void;
// (undocumented)
send(typeOrPayload: Record<string, any> | any[]): void;
send(typeOrPayload: any, payload?: any): void;
// (undocumented)
state: 'initializing' | 'reconnecting' | 'connected';
// (undocumented)
Expand Down Expand Up @@ -2710,7 +2712,7 @@ type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+u
// src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
// src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
// src/api.types.ts:594:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
// src/streaming.types.ts:33:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts

// (No @packageDocumentation comment for this package)

Expand Down
3 changes: 3 additions & 0 deletions packages/misskey-js/src/entities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ export type Notification = {
user: User;
userId: User['id'];
note: Note;
} | {
type: 'pollEnded';
note: Note;
} | {
type: 'follow';
user: User;
Expand Down
2 changes: 1 addition & 1 deletion packages/sw/src/scripts/create-notification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ async function composeNotification(data: pushNotificationDataMap[keyof pushNotif

case 'pollEnded':
return [t('_notification.pollEnded'), {
body: data.body.note.text || '',
body: data.body.note.text ?? '',
badge: iconUrl('chart-arrows'),
tag: `poll:${data.body.note.id}`,
data,
Expand Down
1 change: 0 additions & 1 deletion packages/sw/src/scripts/operations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
*/
import * as Misskey from 'misskey-js';
import { SwMessage, swMessageOrderType } from '@/types';
import { acct as getAcct } from '@/filters/user';
import { getAccountFromId } from '@/scripts/get-account-from-id';
import { getUrlWithLoginId } from '@/scripts/login-id';

Expand Down