diff --git a/app/javascript/mastodon/features/explore/results.jsx b/app/javascript/mastodon/features/explore/results.jsx index 355c0f1c4c..2ee6e8c7f1 100644 --- a/app/javascript/mastodon/features/explore/results.jsx +++ b/app/javascript/mastodon/features/explore/results.jsx @@ -52,7 +52,7 @@ const renderHashtags = hashtags => hidePeek(hashtags).map(hashtag => ( )); const renderStatuses = statuses => hidePeek(statuses).map(id => ( - + )); class Results extends PureComponent { @@ -181,7 +181,7 @@ class Results extends PureComponent { {statuses.size > 0 && ( } onClickMore={this.handleLoadMoreStatuses}> - {statuses.take(INITIAL_DISPLAY).map(id => )} + {statuses.take(INITIAL_DISPLAY).map(id => )} )} diff --git a/app/javascript/mastodon/features/explore/statuses.jsx b/app/javascript/mastodon/features/explore/statuses.jsx index 414b47fcdd..0054cda753 100644 --- a/app/javascript/mastodon/features/explore/statuses.jsx +++ b/app/javascript/mastodon/features/explore/statuses.jsx @@ -61,6 +61,7 @@ class Statuses extends PureComponent { prepend={} alwaysPrepend timelineId='explore' + contextType='explore' statusIds={statusIds} scrollKey='explore-statuses' hasMore={hasMore} diff --git a/app/javascript/mastodon/utils/filters.ts b/app/javascript/mastodon/utils/filters.ts index f15d841326..5d334fe509 100644 --- a/app/javascript/mastodon/utils/filters.ts +++ b/app/javascript/mastodon/utils/filters.ts @@ -5,6 +5,7 @@ export const toServerSideType = (columnType: string) => { case 'public': case 'thread': case 'account': + case 'explore': return columnType; default: if (columnType.includes('list:') || columnType.includes('antenna:')) { diff --git a/app/models/custom_filter.rb b/app/models/custom_filter.rb index 865f7bdbbc..4125c18502 100644 --- a/app/models/custom_filter.rb +++ b/app/models/custom_filter.rb @@ -29,6 +29,7 @@ class CustomFilter < ApplicationRecord public thread account + explore ).freeze include Expireable diff --git a/config/locales/en.yml b/config/locales/en.yml index 2955685c8f..7978e4eb24 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1434,6 +1434,7 @@ en: filters: contexts: account: Profiles + explore: Trends and search results home: Home and lists notifications: Notifications public: Public timelines diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 983b327c45..e44b0041e4 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1422,6 +1422,7 @@ ja: filters: contexts: account: プロフィール + explore: トレンド・検索 home: ホームおよびリスト notifications: 通知 public: 公開タイムライン