diff --git a/packages/backend/src/core/FanoutTimelineEndpointService.ts b/packages/backend/src/core/FanoutTimelineEndpointService.ts index 5cdf5fc3e3..5531f0b0ae 100644 --- a/packages/backend/src/core/FanoutTimelineEndpointService.ts +++ b/packages/backend/src/core/FanoutTimelineEndpointService.ts @@ -31,7 +31,6 @@ type TimelineOptions = { useDbFallback: boolean, redisTimelines: FanoutTimelineName[], noteFilter?: (note: MiNote) => boolean, - alwaysIncludeMyNotes?: boolean; ignoreAuthorFromBlock?: boolean; ignoreAuthorFromMute?: boolean; ignoreAuthorFromInstanceBlock?: boolean; @@ -88,12 +87,6 @@ export class FanoutTimelineEndpointService { if (!shouldFallbackToDb) { let filter = ps.noteFilter ?? (_note => true); - if (ps.alwaysIncludeMyNotes && ps.me) { - const me = ps.me; - const parentFilter = filter; - filter = (note) => note.userId === me.id || parentFilter(note); - } - if (ps.excludeNoFiles) { const parentFilter = filter; filter = (note) => note.fileIds.length !== 0 && parentFilter(note); diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts index 13d8b41d47..7ad1b0bf6e 100644 --- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts @@ -153,7 +153,6 @@ export default class extends Endpoint { // eslint- me, redisTimelines: timelineConfig, useDbFallback: this.serverSettings.enableFanoutTimelineDbFallback, - alwaysIncludeMyNotes: true, excludePureRenotes: !ps.withRenotes, excludeBots: !ps.withBots, dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({ diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts index 2379bf8a6a..73725f9af2 100644 --- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts @@ -129,7 +129,6 @@ export default class extends Endpoint { // eslint- : ps.withReplies ? ['localTimeline', 'localTimelineWithReplies'] : me ? ['localTimeline', `localTimelineWithReplyTo:${me.id}`] : ['localTimeline'], - alwaysIncludeMyNotes: true, excludePureRenotes: !ps.withRenotes, excludeBots: !ps.withBots, dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({ diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts index 3fbcd82e9b..27ba7399a7 100644 --- a/packages/backend/src/server/api/endpoints/notes/timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts @@ -105,7 +105,6 @@ export default class extends Endpoint { // eslint- me, useDbFallback: this.serverSettings.enableFanoutTimelineDbFallback, redisTimelines: ps.withFiles ? [`homeTimelineWithFiles:${me.id}`] : [`homeTimeline:${me.id}`], - alwaysIncludeMyNotes: true, excludePureRenotes: !ps.withRenotes, dbFallback: async (untilId, sinceId, limit) => await this.getFromDb({ untilId, diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts index f6022093e1..7fb671a446 100644 --- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts +++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts @@ -125,7 +125,6 @@ export default class extends Endpoint { // eslint- me, useDbFallback: this.serverSettings.enableFanoutTimelineDbFallback, redisTimelines: ps.withFiles ? [`userListTimelineWithFiles:${list.id}`] : [`userListTimeline:${list.id}`], - alwaysIncludeMyNotes: true, excludePureRenotes: !ps.withRenotes, ignoreAuthorFromUserSilence: true, dbFallback: async (untilId, sinceId, limit) => await this.getFromDb(list, {