fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
# Conflicts:
#	app/javascript/mastodon/initial_state.js
This commit is contained in:
Jeremy Kescher 2022-11-02 21:12:42 +01:00
commit 3d2fc73ecb
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.production.sample
View file

@ -282,6 +282,10 @@ MAX_POLL_OPTION_CHARS=100
# Only relevant when elasticsearch is installed # Only relevant when elasticsearch is installed
# MAX_SEARCH_RESULTS=20 # 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 # Maximum custom emoji file sizes
# If undefined or smaller than MAX_EMOJI_SIZE, the value # If undefined or smaller than MAX_EMOJI_SIZE, the value
# of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE # of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE

2
app/controllers/api/v1/trends/tags_controller.rb
View file

@ -5,7 +5,7 @@ class Api::V1::Trends::TagsController < Api::BaseController
after_action :insert_pagination_headers after_action :insert_pagination_headers
DEFAULT_TAGS_LIMIT = 10 DEFAULT_TAGS_LIMIT = (ENV['MAX_TRENDING_TAGS'] || 10).to_i
def index def index
render json: @tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@tags, current_user&.account_id) render json: @tags, each_serializer: REST::TagSerializer, relationships: TagRelationshipsPresenter.new(@tags, current_user&.account_id)

5
app/javascript/mastodon/initial_state.js
View file

@ -129,7 +129,10 @@ export const version = getMeta('version');
export const translationEnabled = getMeta('translation_enabled'); export const translationEnabled = getMeta('translation_enabled');
export const languages = initialState?.languages; 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 const pollLimits = (initialState && initialState.poll_limits);
export default initialState; export default initialState;