Fix bookmarks and favourites not being filtered ()

This commit is contained in:
Claire 2025-03-25 16:20:36 +01:00 committed by GitHub
parent 8c3eeb4d29
commit 2eb6d815d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 1 deletions
app/javascript/mastodon
features
bookmarked_statuses
favourited_statuses
selectors
utils

View file

@ -99,6 +99,7 @@ class Bookmarks extends ImmutablePureComponent {
onLoadMore={this.handleLoadMore}
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
timelineId='bookmarks'
/>
<Helmet>

View file

@ -99,6 +99,7 @@ class Favourites extends ImmutablePureComponent {
onLoadMore={this.handleLoadMore}
emptyMessage={emptyMessage}
bindToDocument={!multiColumn}
timelineId='favourites'
/>
<Helmet>

View file

@ -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', state.getIn(['statuses', id, 'reblog']), 'account'])]),
getFilters,
(_, { contextType }) => contextType === 'detailed',
(_, { contextType }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType),
],
(statusBase, statusReblog, accountBase, accountReblog, filters, warnInsteadOfHide) => {

View file

@ -8,6 +8,9 @@ export const toServerSideType = (columnType: string) => {
return columnType;
case 'detailed':
return 'thread';
case 'bookmarks':
case 'favourites':
return 'home';
default:
if (columnType.includes('list:')) {
return 'home';