diff options
| -rw-r--r-- | .env.production.sample | 4 | ||||
| -rw-r--r-- | app/controllers/api/v1/search_controller.rb | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/.env.production.sample b/.env.production.sample index 3388d380a..a2a9246d4 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -175,6 +175,10 @@ STREAMING_CLUSTER_NUM=1 # MAX_IMAGE_SIZE=8388608 # MAX_VIDEO_SIZE=41943040 +# Maximum search results to display +# Only relevant when elasticsearch is installed +# MAX_SEARCH_RESULTS=20 + # LDAP authentication (optional) # LDAP_ENABLED=true # LDAP_HOST=localhost diff --git a/app/controllers/api/v1/search_controller.rb b/app/controllers/api/v1/search_controller.rb index 6131cbbb6..4fb869bb9 100644 --- a/app/controllers/api/v1/search_controller.rb +++ b/app/controllers/api/v1/search_controller.rb @@ -3,7 +3,7 @@ class Api::V1::SearchController < Api::BaseController include Authorization - RESULTS_LIMIT = 20 + RESULTS_LIMIT = (ENV['MAX_SEARCH_RESULTS'] || 20).to_i before_action -> { doorkeeper_authorize! :read, :'read:search' } before_action :require_user! diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index e94ce6dfe..7c08ae4e8 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -476,7 +476,7 @@ class Status extends ImmutablePureComponent { featured, ...other } = this.props; - const { isExpanded, isCollapsed } = this.state; + const { isExpanded, isCollapsed, forceFilter } = this.state; let background = null; let attachments = null; let media = null; @@ -496,7 +496,8 @@ class Status extends ImmutablePureComponent { ); } - if ((status.get('filtered') || status.getIn(['reblog', 'filtered'])) && (this.state.forceFilter === true || settings.get('filtering_behavior') !== 'content_warning')) { + const filtered = (status.get('filtered') || status.getIn(['reblog', 'filtered'])) && settings.get('filtering_behavior') !== 'content_warning'; + if (forceFilter === undefined ? filtered : forceFilter) { const minHandlers = this.props.muted ? {} : { moveUp: this.handleHotkeyMoveUp, moveDown: this.handleHotkeyMoveDown, |