diff options
| author | anatawa12 <anatawa12@icloud.com> | 2023-12-04 14:38:21 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-04 14:38:21 +0900 |
| commit | 18109fcef760dee8171364fd0382375c4047b8e7 (patch) | |
| tree | 20bc2c25c8e90070ea8aa77c06cb3b7fa3a28810 /packages/frontend/src/ui/deck/tl-column.vue | |
| parent | fix dev build (#12566) (diff) | |
| download | misskey-18109fcef760dee8171364fd0382375c4047b8e7.tar.gz misskey-18109fcef760dee8171364fd0382375c4047b8e7.tar.bz2 misskey-18109fcef760dee8171364fd0382375c4047b8e7.zip | |
Filter User / Instance Mutes in FanoutTimelineEndpointService (#12565)
* fix: unnecessary logging in FanoutTimelineEndpointService
* chore: TimelineOptions
* chore: add FanoutTimelineName type
* chore: forbid specifying both withReplies and withFiles since it's not implemented correctly
* chore: filter mutes, replies, renotes, files in FanoutTimelineEndpointService
* revert unintended changes
* use isReply in NoteCreateService
* fix: excludePureRenotes is not implemented
* fix: replies to me is excluded from local timeline
* chore(frontend): forbid enabling both withReplies and withFiles
* docs(changelog): インスタンスミュートが効かない問題の修正について言及
Diffstat (limited to 'packages/frontend/src/ui/deck/tl-column.vue')
| -rw-r--r-- | packages/frontend/src/ui/deck/tl-column.vue | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue index 9f24ea31ed..41582bbfe3 100644 --- a/packages/frontend/src/ui/deck/tl-column.vue +++ b/packages/frontend/src/ui/deck/tl-column.vue @@ -120,10 +120,12 @@ const menu = [{ type: 'switch', text: i18n.ts.showRepliesToOthersInTimeline, ref: $$(withReplies), + disabled: $$(onlyFiles), } : undefined, { type: 'switch', text: i18n.ts.fileAttachedOnly, ref: $$(onlyFiles), + disabled: props.column.tl === 'local' || props.column.tl === 'social' ? $$(withReplies) : false, }]; </script> |