From 56eb1da0f5a794f0aa6cfb640d60e78252d4cb75 Mon Sep 17 00:00:00 2001 From: prplecake Date: Tue, 1 Nov 2022 12:06:07 -0500 Subject: [PATCH 1/2] Fix CharacterCount in vanilla UI (#1883) --- app/javascript/mastodon/initial_state.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index bb05dafdf7..a8a9de34d7 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -129,4 +129,7 @@ export const version = getMeta('version'); export const translationEnabled = getMeta('translation_enabled'); export const languages = initialState?.languages; +// Glitch-soc-specific settings +export const maxChars = (initialState && initialState.max_toot_chars) || 500; + export default initialState; From f359b15303e243b94c6923f789c5ae80330d5320 Mon Sep 17 00:00:00 2001 From: prplecake Date: Wed, 2 Nov 2022 03:20:47 -0500 Subject: [PATCH 2/2] Allow number of trending hashtags to be customizable (#1884) --- .env.production.sample | 4 ++++ app/controllers/api/v1/trends/tags_controller.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.production.sample b/.env.production.sample index 08247c19fe..da4c7fe4c8 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -279,6 +279,10 @@ MAX_POLL_OPTION_CHARS=100 # Only relevant when elasticsearch is installed # MAX_SEARCH_RESULTS=20 +# Maximum hashtags to display +# Customize the number of hashtags shown in 'Explore' +# MAX_TRENDING_TAGS=10 + # Maximum custom emoji file sizes # If undefined or smaller than MAX_EMOJI_SIZE, the value # of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE diff --git a/app/controllers/api/v1/trends/tags_controller.rb b/app/controllers/api/v1/trends/tags_controller.rb index 21adfa2a1f..885a4ad7e8 100644 --- a/app/controllers/api/v1/trends/tags_controller.rb +++ b/app/controllers/api/v1/trends/tags_controller.rb @@ -5,7 +5,7 @@ class Api::V1::Trends::TagsController < Api::BaseController after_action :insert_pagination_headers - DEFAULT_TAGS_LIMIT = 10 + DEFAULT_TAGS_LIMIT = (ENV['MAX_TRENDING_TAGS'] || 10).to_i def index render json: @tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@tags, current_user&.account_id)