Fix bookmarks and favourites not being filtered (#34260)
This commit is contained in:
parent
d6442b5455
commit
105e5b1d76
4 changed files with 6 additions and 1 deletions
|
@ -99,6 +99,7 @@ class Bookmarks extends ImmutablePureComponent {
|
||||||
onLoadMore={this.handleLoadMore}
|
onLoadMore={this.handleLoadMore}
|
||||||
emptyMessage={emptyMessage}
|
emptyMessage={emptyMessage}
|
||||||
bindToDocument={!multiColumn}
|
bindToDocument={!multiColumn}
|
||||||
|
timelineId='bookmarks'
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Helmet>
|
<Helmet>
|
||||||
|
|
|
@ -99,6 +99,7 @@ class Favourites extends ImmutablePureComponent {
|
||||||
onLoadMore={this.handleLoadMore}
|
onLoadMore={this.handleLoadMore}
|
||||||
emptyMessage={emptyMessage}
|
emptyMessage={emptyMessage}
|
||||||
bindToDocument={!multiColumn}
|
bindToDocument={!multiColumn}
|
||||||
|
timelineId='favourites'
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Helmet>
|
<Helmet>
|
||||||
|
|
|
@ -15,7 +15,7 @@ export const makeGetStatus = () => {
|
||||||
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
|
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
|
||||||
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
|
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
|
||||||
getFilters,
|
getFilters,
|
||||||
(_, { contextType }) => contextType === 'detailed',
|
(_, { contextType }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType),
|
||||||
],
|
],
|
||||||
|
|
||||||
(statusBase, statusReblog, accountBase, accountReblog, filters, warnInsteadOfHide) => {
|
(statusBase, statusReblog, accountBase, accountReblog, filters, warnInsteadOfHide) => {
|
||||||
|
|
|
@ -8,6 +8,9 @@ export const toServerSideType = (columnType: string) => {
|
||||||
return columnType;
|
return columnType;
|
||||||
case 'detailed':
|
case 'detailed':
|
||||||
return 'thread';
|
return 'thread';
|
||||||
|
case 'bookmarks':
|
||||||
|
case 'favourites':
|
||||||
|
return 'home';
|
||||||
default:
|
default:
|
||||||
if (columnType.includes('list:')) {
|
if (columnType.includes('list:')) {
|
||||||
return 'home';
|
return 'home';
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue