Merge remote-tracking branch 'upstream/main' into develop

# Conflicts:
#	app/javascript/mastodon/initial_state.js

.env.production.sample

@@ -282,6 +282,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

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)

app/javascript/mastodon/initial_state.js

@@ -129,7 +129,10 @@ export const version = getMeta('version');
 export const translationEnabled = getMeta('translation_enabled');
 export const languages = initialState?.languages;
 
-// CatCatNya~ specific setting for vanilla flavor
+// Glitch-soc-specific settings
+export const maxChars = (initialState && initialState.max_toot_chars) || 500;
+
+// CatCatNya~ specific settings
 export const pollLimits = (initialState && initialState.poll_limits);
 
 export default initialState;