HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

try to fix streaming

Browse source
This commit is contained in:
ThatOneCalculator 2022-07-29 08:57:53 -07:00
parent 669ee2c600
commit 2d14777573
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/backend/src/server/api/stream/channels/recommended-timeline.ts
View file

@ -2,12 +2,13 @@ import Channel from '../channel.js';
import { fetchMeta } from '@/misc/fetch-meta.js'; import { fetchMeta } from '@/misc/fetch-meta.js';
import { checkWordMute } from '@/misc/check-word-mute.js'; import { checkWordMute } from '@/misc/check-word-mute.js';
import { isUserRelated } from '@/misc/is-user-related.js'; import { isUserRelated } from '@/misc/is-user-related.js';
import { isInstanceMuted } from '@/misc/is-instance-muted.js';
import { Packed } from '@/misc/schema.js'; import { Packed } from '@/misc/schema.js';
export default class extends Channel { export default class extends Channel {
public readonly chName = 'recommendedTimeline'; public readonly chName = 'recommendedTimeline';
public static shouldShare = true; public static shouldShare = true;
public static requireCredential = false; public static requireCredential = true;
constructor(id: string, connection: Channel['connection']) { constructor(id: string, connection: Channel['connection']) {
super(id, connection); super(id, connection);
@ -16,19 +17,24 @@ export default class extends Channel {
public async init(params: any) { public async init(params: any) {
const meta = await fetchMeta(); const meta = await fetchMeta();
if (meta.disableRecommendedTimeline) { if (meta.disableLocalTimeline && !this.user!.isAdmin && !this.user!.isModerator) return;
if (this.user == null || (!this.user.isAdmin && !this.user.isModerator)) return;
}
// Subscribe events // Subscribe events
this.subscriber.on('notesStream', this.onNote); this.subscriber.on('notesStream', this.onNote);
} }
private async onNote(note: Packed<'Note'>) { private async onNote(note: Packed<'Note'>) {
// チャンネルの投稿ではなく、自分自身の投稿 または
// チャンネルの投稿ではなく、その投稿のユーザーをフォローしている または
// チャンネルの投稿ではなく、全体公開のローカルの投稿 または
// フォローしているチャンネルの投稿 の場合だけ
const meta = await fetchMeta(); const meta = await fetchMeta();
if (note.user.host !== null && !meta.recommendedInstances.includes(note.user.host)) return; if (!(
if (note.visibility !== 'public') return; ((note.user.host == null || meta.recommendedInstances.includes(note.user.host)) && note.visibility === 'public')
if (note.channelId != null && !this.followingChannels.has(note.channelId)) return; )) return;
// Ignore notes from instances the user has muted
if (isInstanceMuted(note, new Set<string>(this.userProfile?.mutedInstances ?? []))) return;
// 関係ない返信は除外 // 関係ない返信は除外
if (note.reply && !this.user!.showTimelineReplies) { if (note.reply && !this.user!.showTimelineReplies) {