mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add username to the status regex filter

pull/2294/head
Zack Wardi 2023-07-13 00:30:45 +00:00
parent bb98d970e3
commit 22fca8d4d6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
View File

@ -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;