gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge f486d38e88 into 002632c3bb

Browse Source
This commit is contained in:
Claire 2025-11-26 17:05:14 +00:00 committed by GitHub
commit d5d9d13f4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/search/index.tsx
View File

@ -53,7 +53,7 @@ const renderHashtags = (hashtags: HashtagType[]) =>
const renderStatuses = (statusIds: string[]) => const renderStatuses = (statusIds: string[]) =>
hidePeek<string>(statusIds).map((id) => ( hidePeek<string>(statusIds).map((id) => (
<StatusQuoteManager key={id} id={id} /> <StatusQuoteManager contextType='search' key={id} id={id} />
)); ));
type SearchType = 'all' | ApiSearchType; type SearchType = 'all' | ApiSearchType;
@ -189,7 +189,7 @@ export const SearchResults: React.FC<{ multiColumn: boolean }> = ({
onClickMore={handleSelectStatuses} onClickMore={handleSelectStatuses}
> >
{results.statuses.slice(0, INITIAL_DISPLAY).map((id) => ( {results.statuses.slice(0, INITIAL_DISPLAY).map((id) => (
<StatusQuoteManager key={id} id={id} /> <StatusQuoteManager contextType='search' key={id} id={id} />
))} ))}
</SearchSection> </SearchSection>
)} )}

2
app/javascript/mastodon/selectors/index.js
View File

@ -14,7 +14,7 @@ const getStatusInputSelectors = [
(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 }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType), (_, { contextType }) => ['detailed', 'bookmarks', 'favourites', 'search'].includes(contextType),
]; ];
function getStatusResultFunction( function getStatusResultFunction(