Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/_common_/common.ts
This commit is contained in:
mattyatea 2023-11-01 05:23:55 +09:00
commit 56ea04cb0b
17 changed files with 220 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/server/api/endpoints/notifications/create.ts
View file

@ -42,8 +42,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
this.notificationService.createNotification(user.id, 'app', {
appAccessTokenId: token ? token.id : null,
customBody: ps.body,
customHeader: ps.header,
customIcon: ps.icon,
customHeader: ps.header ?? token?.name,
customIcon: ps.icon ?? token?.iconUrl,
});
});
}

2
packages/backend/src/server/api/stream/channels/home-timeline.ts
View file

@ -56,7 +56,7 @@ class HomeTimelineChannel extends Channel {
if (note.visibility === 'followers') {
if (!isMe && !Object.hasOwn(this.following, note.userId)) return;
} else if (note.visibility === 'specified') {
if (!note.visibleUserIds!.includes(this.user!.id)) return;
if (!isMe && !note.visibleUserIds!.includes(this.user!.id)) return;
}
if (note.reply) {

2
packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
View file

@ -67,7 +67,7 @@ class HybridTimelineChannel extends Channel {
if (note.visibility === 'followers') {
if (!isMe && !Object.hasOwn(this.following, note.userId)) return;
} else if (note.visibility === 'specified') {
if (!note.visibleUserIds!.includes(this.user!.id)) return;
if (!isMe && !note.visibleUserIds!.includes(this.user!.id)) return;
}
// Ignore notes from instances the user has muted