From 3feccb7ebc84125b18fc3cd05bb161fb8a714618 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:09:07 +0300 Subject: [PATCH 1/8] fix date setting --- src/components/settings_modal/tabs/filtering_tab.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js index 37da9cc91..5ff137062 100644 --- a/src/components/settings_modal/tabs/filtering_tab.js +++ b/src/components/settings_modal/tabs/filtering_tab.js @@ -112,6 +112,8 @@ const FilteringTab = { date.getFullYear(), '-', fmt.format(date.getMonth() + 1), + '-', + fmt.format(date.getDate()), 'T', fmt.format(date.getHours()), ':', From 921c6fd2028aa2862438101730761f77d444038f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:12:47 +0300 Subject: [PATCH 2/8] fix info popup --- src/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/en.json b/src/i18n/en.json index 01de88223..019beba1c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -439,7 +439,7 @@ "import_failure": "The selected file is not a supported Pleroma filter.", "help": { "word": "Simple and RegExp filters test against post's content and subject.", - "user": "User filter matches full user handle (user@domain) in the following: author, reply-to and mentions", + "user": "User filter matches full user handle (user{'@'}domain) in the following: author, reply-to and mentions", "regexp": "Regex variants are more advanced and use {link} to match instead of simple substring search.", "regexp_link": "Regular Expressions", "regexp_url": "https://en.wikipedia.org/wiki/Regular_expression" From fc8fdf7bc3ba3534fc99dea44bdd379e72870634 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:49:42 +0300 Subject: [PATCH 3/8] fix filters not being case-insensitive --- src/services/status_parser/status_parser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/services/status_parser/status_parser.js b/src/services/status_parser/status_parser.js index c9e15552d..b8a98cf82 100644 --- a/src/services/status_parser/status_parser.js +++ b/src/services/status_parser/status_parser.js @@ -13,7 +13,8 @@ export const muteFilterHits = (muteFilters, status) => { if (expires !== null && expires < Date.now()) return false switch (type) { case 'word': { - if (statusText.includes(value) || statusSummary.includes(value)) { + const lowercaseValue = value.toLowerCase() + if (statusText.toLowerCase().includes(lowercaseValue) || statusSummary.toLowerCase().includes(lowercaseValue)) { return { hide, name } } break From 8fa2781745861ede15b4a9e1889c1c1b23ebfd76 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:53:11 +0300 Subject: [PATCH 4/8] method instead of weird computed --- src/components/conversation/conversation.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index b339dfd3f..491a8543f 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -339,11 +339,6 @@ const conversation = { canDive () { return this.isTreeView && this.isExpanded }, - focused () { - return (id) => { - return (this.isExpanded) && id === this.highlight - } - }, maybeHighlight () { return this.isExpanded ? this.highlight : null }, @@ -406,6 +401,9 @@ const conversation = { }) } }, + isFocused (id) { + return (this.isExpanded) && id === this.highlight + }, getReplies (id) { return this.replies[id] || [] }, From e8ee3d474c016d48730fa96ed4c2622acaf30eeb Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:53:32 +0300 Subject: [PATCH 5/8] don't mute status if it's focused --- src/components/status/status.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/status/status.js b/src/components/status/status.js index 5b566fceb..37b00a1eb 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -313,6 +313,7 @@ const Status = { (relationshipReblog && relationshipReblog.muting) }, shouldNotMute () { + if (this.isFocused) return true const { status } = this const { reblog } = status return ( From 7f30b3291a148c8322d6586ee066fe15e769264a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:54:12 +0300 Subject: [PATCH 6/8] fix unrendered statuses breaking UI --- src/components/status/status.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/status/status.js b/src/components/status/status.js index 37b00a1eb..7ee2632bd 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -536,6 +536,7 @@ const Status = { this.controlledToggleThreadDisplay() }, scrollIfHighlighted (highlightId) { + if (this.$el.getBoundingClientRect == null) return const id = highlightId if (this.status.id === id) { const rect = this.$el.getBoundingClientRect() From 84f77f2948a38db31fc122d390d9069792eab0de Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 17:54:35 +0300 Subject: [PATCH 7/8] clean up naming --- src/components/conversation/conversation.vue | 6 +++--- src/components/thread_tree/thread_tree.js | 2 +- src/components/thread_tree/thread_tree.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index c37a2ca26..2f3de3a86 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -94,7 +94,7 @@ :statusoid="status" :expandable="!isExpanded" :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]" - :focused="focused(status.id)" + :focused="isFocused(status.id)" :in-conversation="isExpanded" :highlight="getHighlight()" :replies="getReplies(status.id)" @@ -168,7 +168,7 @@ :pinned-status-ids-object="pinnedStatusIdsObject" :profile-user-id="profileUserId" - :focused="focused" + :is-focused-function="isFocused" :get-replies="getReplies" :highlight="maybeHighlight" :set-highlight="setHighlight" @@ -199,7 +199,7 @@ :statusoid="status" :expandable="!isExpanded" :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]" - :focused="focused(status.id)" + :focused="isFocused(status.id)" :in-conversation="isExpanded" :highlight="getHighlight()" :replies="getReplies(status.id)" diff --git a/src/components/thread_tree/thread_tree.js b/src/components/thread_tree/thread_tree.js index 3e9c87273..2afe4e571 100644 --- a/src/components/thread_tree/thread_tree.js +++ b/src/components/thread_tree/thread_tree.js @@ -26,7 +26,7 @@ const ThreadTree = { pinnedStatusIdsObject: Object, profileUserId: String, - focused: Function, + isFocusedFunction: Function, highlight: String, getReplies: Function, setHighlight: Function, diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue index d881e8a12..4ffe463fe 100644 --- a/src/components/thread_tree/thread_tree.vue +++ b/src/components/thread_tree/thread_tree.vue @@ -7,7 +7,7 @@ :statusoid="status" :expandable="!isExpanded" :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]" - :focused="focused(status.id)" + :focused="isFocusedFunction(status.id)" :in-conversation="isExpanded" :highlight="highlight" :replies="getReplies(status.id)" @@ -52,7 +52,7 @@ :pinned-status-ids-object="pinnedStatusIdsObject" :profile-user-id="profileUserId" - :focused="focused" + :is-focused-function="isFocusedFunction" :get-replies="getReplies" :highlight="highlight" :set-highlight="setHighlight" From 2f7f0cdcefad2efcc1a3d3f25b2fe51af613226b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 13 May 2025 18:06:49 +0300 Subject: [PATCH 8/8] clog --- changelog.d/filter-fixes.skip | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 changelog.d/filter-fixes.skip diff --git a/changelog.d/filter-fixes.skip b/changelog.d/filter-fixes.skip new file mode 100644 index 000000000..e69de29bb