diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.tsx b/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.tsx
index c11874e7d4..fafe186cb4 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.tsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.tsx
@@ -197,13 +197,16 @@ export const HashtagHeader: React.FC<{
/>
)}
-
+ {signedIn && (
+
+ )}
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index 791f494d3d..36049d4331 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -16,7 +16,7 @@ import { expandHashtagTimeline, clearTimeline } from 'mastodon/actions/timelines
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';
import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { remoteTopicFeedAccess, me } from 'mastodon/initial_state';
+import { remoteTopicFeedAccess, me, localTopicFeedAccess } from 'mastodon/initial_state';
import StatusListContainer from '../ui/containers/status_list_container';
@@ -25,9 +25,11 @@ import ColumnSettingsContainer from './containers/column_settings_container';
const mapStateToProps = (state, props) => {
const local = props.params.local || (!me && remoteTopicFeedAccess !== 'public');
+ const hasFeedAccess = !!me || localTopicFeedAccess === 'public';
return ({
local,
+ hasFeedAccess,
hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${local ? ':local' : ''}`, 'unread']) > 0,
});
};
@@ -127,11 +129,13 @@ class HashtagTimeline extends PureComponent {
}
_load() {
- const { dispatch, local } = this.props;
+ const { dispatch, local, hasFeedAccess } = this.props;
const { id, tags } = this.props.params;
- this._subscribe(dispatch, id, tags, local);
- dispatch(expandHashtagTimeline(id, { tags, local }));
+ if (hasFeedAccess) {
+ this._subscribe(dispatch, id, tags, local);
+ dispatch(expandHashtagTimeline(id, { tags, local }));
+ }
}
componentDidMount () {
@@ -164,7 +168,7 @@ class HashtagTimeline extends PureComponent {
};
render () {
- const { hasUnread, columnId, multiColumn, local } = this.props;
+ const { hasUnread, columnId, multiColumn, local, hasFeedAccess } = this.props;
const { id } = this.props.params;
const pinned = !!columnId;
@@ -192,7 +196,20 @@ class HashtagTimeline extends PureComponent {
scrollKey={`hashtag_timeline-${columnId}`}
timelineId={`hashtag:${id}${local ? ':local' : ''}`}
onLoadMore={this.handleLoadMore}
- emptyMessage={}
+ initialLoadingState={hasFeedAccess}
+ emptyMessage={
+ hasFeedAccess ? (
+
+ ) : (
+
+ )
+ }
bindToDocument={!multiColumn}
/>
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index a624796a08..d581ad5fe4 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -40,10 +40,10 @@ const makeMapStateToProps = () => {
const getStatusIds = makeGetStatusIds();
const getPendingStatusIds = makeGetStatusIds(true);
- const mapStateToProps = (state, { timelineId }) => ({
+ const mapStateToProps = (state, { timelineId, initialLoadingState = true }) => ({
statusIds: getStatusIds(state, { type: timelineId }),
lastId: state.getIn(['timelines', timelineId, 'items'])?.last(),
- isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true),
+ isLoading: state.getIn(['timelines', timelineId, 'isLoading'], initialLoadingState),
isPartial: state.getIn(['timelines', timelineId, 'isPartial'], false),
hasMore: state.getIn(['timelines', timelineId, 'hasMore']),
numPending: getPendingStatusIds(state, { type: timelineId }).size,
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 11ed322739..1108f8194e 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -357,6 +357,7 @@
"empty_column.notification_requests": "All clear! There is nothing here. When you receive new notifications, they will appear here according to your settings.",
"empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+ "error.no_hashtag_feed_access": "Join or log in to view and follow this hashtag.",
"error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
"error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
"error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",