mirrors/mastodon
1
0
Fork 1
mirror of https://github.com/glitch-soc/mastodon synced 2025-04-24 17:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 22fca8d4d6 into e866641a2b

Browse source
This commit is contained in:
Zack Wardi 2025-04-22 21:15:46 +00:00 • committed by GitHub
commit 0ad35a8749
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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 || id === 'inline-follow-suggestions') 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;