From 6e7081984004accad08042f2391236129059a548 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 24 Nov 2023 10:27:54 +0100
Subject: [PATCH] Change search popout to not list unusable search options when
logged out (#27918)
---
.../mastodon/features/compose/components/search.jsx | 11 ++++++++---
app/javascript/mastodon/locales/en.json | 1 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/search.jsx b/app/javascript/mastodon/features/compose/components/search.jsx
index caae965a63..5d55330dcb 100644
--- a/app/javascript/mastodon/features/compose/components/search.jsx
+++ b/app/javascript/mastodon/features/compose/components/search.jsx
@@ -275,6 +275,7 @@ class Search extends PureComponent {
}
_calculateOptions (value) {
+ const { signedIn } = this.context.identity;
const trimmedValue = value.trim();
const options = [];
@@ -299,7 +300,7 @@ class Search extends PureComponent {
const couldBeStatusSearch = searchEnabled;
- if (couldBeStatusSearch) {
+ if (couldBeStatusSearch && signedIn) {
options.push({ key: 'status-search', label: <FormattedMessage id='search.quick_action.status_search' defaultMessage='Posts matching {x}' values={{ x: <mark>{trimmedValue}</mark> }} />, action: this.handleStatusSearch });
}
@@ -376,7 +377,7 @@ class Search extends PureComponent {
<h4><FormattedMessage id='search_popout.options' defaultMessage='Search options' /></h4>
- {searchEnabled ? (
+ {searchEnabled && signedIn ? (
<div className='search__popout__menu'>
{this.defaultOptions.map(({ key, label, action }, i) => (
<button key={key} onMouseDown={action} className={classNames('search__popout__menu__item', { selected: selectedOption === ((options.length || recent.size) + i) })}>
@@ -386,7 +387,11 @@ class Search extends PureComponent {
</div>
) : (
<div className='search__popout__menu__message'>
- <FormattedMessage id='search_popout.full_text_search_disabled_message' defaultMessage='Not available on {domain}.' values={{ domain }} />
+ {searchEnabled ? (
+ <FormattedMessage id='search_popout.full_text_search_logged_out_message' defaultMessage='Only available when logged in.' />
+ ) : (
+ <FormattedMessage id='search_popout.full_text_search_disabled_message' defaultMessage='Not available on {domain}.' values={{ domain }} />
+ )}
</div>
)}
</div>
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index ed8bfe1668..05d7d16564 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -606,6 +606,7 @@
"search.quick_action.status_search": "Posts matching {x}",
"search.search_or_paste": "Search or paste URL",
"search_popout.full_text_search_disabled_message": "Not available on {domain}.",
+ "search_popout.full_text_search_logged_out_message": "Only available when logged in.",
"search_popout.language_code": "ISO language code",
"search_popout.options": "Search options",
"search_popout.quick_actions": "Quick actions",