random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
mgabdev
2020-03-04 17:50:15 -05:00
parent 198fe127a0
commit d31d5fcd81
75 changed files with 806 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/gabsocial/selectors/index.js
View File

@@ -74,7 +74,7 @@ export const makeGetStatus = () => {
getFilters,
],
(statusBase, statusReblog, accountBase, accountReblog, username, filters) => {
(statusBase, statusRepost, accountBase, accountRepost, username, filters) => {
if (!statusBase) {
return null;
}
@@ -85,17 +85,17 @@ export const makeGetStatus = () => {
return null;
}
if (statusReblog) {
statusReblog = statusReblog.set('account', accountReblog);
if (statusRepost) {
statusRepost = statusRepost.set('account', accountRepost);
} else {
statusReblog = null;
statusRepost = null;
}
const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters);
const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
const regex = (accountRepost || accountBase).get('id') !== me && regexFromFilters(filters);
const filtered = regex && regex.test(statusBase.get('reblog') ? statusRepost.get('search_index') : statusBase.get('search_index'));
return statusBase.withMutations(map => {
map.set('reblog', statusReblog);
map.set('reblog', statusRepost);
map.set('account', accountBase);
map.set('filtered', filtered);
});