gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-07 12:16:14 +00:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Fix bookmarks and favourites not being filtered (#34260)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/mastodon/features/bookmarked_statuses/index.jsx
View File

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

1
app/javascript/mastodon/features/favourited_statuses/index.jsx
View File

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

2
app/javascript/mastodon/selectors/index.js
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', 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) => {

3
app/javascript/mastodon/utils/filters.ts
View File

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