From 824e65483ef84302d942fa0d37831d04052c440a Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Sun, 9 Mar 2025 16:53:54 -0400 Subject: [PATCH] BetterBlockedUsers: Better Patches --- src/equicordplugins/betterActivities/index.tsx | 11 ----------- src/equicordplugins/betterBlockedUsers/index.tsx | 14 +++++++++----- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/equicordplugins/betterActivities/index.tsx b/src/equicordplugins/betterActivities/index.tsx index 0ca51dc9..8b40ba00 100644 --- a/src/equicordplugins/betterActivities/index.tsx +++ b/src/equicordplugins/betterActivities/index.tsx @@ -123,17 +123,6 @@ const ActivityTooltip = ({ activity, application, user }: Readonly<{ activity: A ); }; -function getActivityApplication(activity: Activity | null) { - if (!activity) return undefined; - const { application_id } = activity; - if (!application_id) return undefined; - let application = ApplicationStore.getApplication(application_id); - if (!application && fetchedApplications.has(application_id)) { - application = fetchedApplications.get(application_id) ?? null; - } - return application ?? undefined; -} - function getApplicationIcons(activities: Activity[], preferSmall = false) { const applicationIcons: ApplicationIcon[] = []; const applications = activities.filter(activity => activity.application_id || activity.platform); diff --git a/src/equicordplugins/betterBlockedUsers/index.tsx b/src/equicordplugins/betterBlockedUsers/index.tsx index 30c11d1a..1ebc2e07 100644 --- a/src/equicordplugins/betterBlockedUsers/index.tsx +++ b/src/equicordplugins/betterBlockedUsers/index.tsx @@ -22,13 +22,17 @@ export default definePlugin({ find: '"],{numberOfBlockedUsers:', replacement: [ { - match: /(function \S+\((\S{1,3})\).{0,100}className:_\.header,children:\[.{0,500}numberOfIgnoredUsers:\S{1,3}}\)}\)]}\))/, - replace: "$1,$2.listType==='blocked'?$self.renderSearchInput():null" + match: /(?<=\}=(\i).*?\]\}\))/, + replace: ",$1.listType==='blocked'?$self.renderSearchInput():null" }, { - match: /(function \S+\((\S{1,3})\).{0,100},\[\S{1,3},\S{1,3}]=(\S{1,3})\.useState\(\d\);)(.{0,200}children:)(\S{1,3})(\.slice\(\d,\S{1,3})/, - replace: "$1let [searchResults,setSearchResults]=$3.useState([]);$self.setUpdateFunc($2,setSearchResults);$4(searchResults.length?searchResults:$5)$6" - } + match: /(?<=\}=(\i).{0,10}(\i).useState\(.{0,1}\);)/, + replace: "let [searchResults,setSearchResults]=$2.useState([]);$self.setUpdateFunc($1,setSearchResults);" + }, + { + match: /(usersList,children:)(\i)/, + replace: "$1(searchResults.length?searchResults:$2)" + }, ] } ],