From 22fca8d4d663e91aa7ee2efaaf3a707a9007cec3 Mon Sep 17 00:00:00 2001
From: Zack Wardi <122111600+zackarired@users.noreply.github.com>
Date: Thu, 13 Jul 2023 00:30:45 +0000
Subject: [PATCH] Add username to the status regex filter

---
 .../glitch/features/ui/containers/status_list_container.js  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
index 5f34f5cd2e..4853e495b5 100644
--- a/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
+++ b/app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
@@ -26,7 +26,8 @@ const makeGetStatusIds = (pending = false) => createSelector([
   (state, { type }) => state.getIn(['timelines', type, pending ? 'pendingItems' : 'items'], ImmutableList()),
   (state)           => state.get('statuses'),
   getRegex,
-], (columnSettings, statusIds, statuses, regex) => {
+  (state)           => state.get('accounts'),
+], (columnSettings, statusIds, statuses, regex, accounts) => {
   return statusIds.filter(id => {
     if (id === null) return true;
 
@@ -49,7 +50,8 @@ const makeGetStatusIds = (pending = false) => createSelector([
 
     if (showStatus && regex) {
       const searchIndex = statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'search_index']) : statusForId.get('search_index');
-      showStatus = !regex.test(searchIndex);
+      const acct = accounts.getIn([statusForId.get('account'), 'acct']);
+      showStatus = !regex.test(acct + '\n' + searchIndex);
     }
 
     return showStatus;