mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-01 12:34:32 +00:00
92c06a1113
Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.
84 lines
2.3 KiB
Ruby
84 lines
2.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
module Admin
|
|
class CustomEmojisController < BaseController
|
|
def index
|
|
authorize :custom_emoji, :index?
|
|
|
|
@custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page])
|
|
@form = Form::CustomEmojiBatch.new
|
|
end
|
|
|
|
def new
|
|
authorize :custom_emoji, :create?
|
|
|
|
@custom_emoji = CustomEmoji.new
|
|
end
|
|
|
|
def create
|
|
authorize :custom_emoji, :create?
|
|
|
|
@custom_emoji = CustomEmoji.new(resource_params)
|
|
|
|
if @custom_emoji.save
|
|
log_action :create, @custom_emoji
|
|
redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.created_msg')
|
|
else
|
|
render :new
|
|
end
|
|
end
|
|
|
|
def batch
|
|
authorize :custom_emoji, :index?
|
|
|
|
@form = Form::CustomEmojiBatch.new(form_custom_emoji_batch_params.merge(current_account: current_account, action: action_from_button))
|
|
@form.save
|
|
rescue ActionController::ParameterMissing
|
|
flash[:alert] = I18n.t('admin.accounts.no_account_selected')
|
|
rescue Mastodon::NotPermittedError
|
|
flash[:alert] = I18n.t('admin.custom_emojis.not_permitted')
|
|
rescue ActiveRecord::RecordInvalid => e
|
|
error_message = action_from_button == 'copy' ? 'admin.custom_emojis.batch_copy_error' : 'admin.custom_emojis.batch_error'
|
|
flash[:alert] = I18n.t(error_message, message: e.message)
|
|
ensure
|
|
redirect_to admin_custom_emojis_path(filter_params)
|
|
end
|
|
|
|
private
|
|
|
|
def resource_params
|
|
params.require(:custom_emoji).permit(:shortcode, :image, :visible_in_picker)
|
|
end
|
|
|
|
def filtered_custom_emojis
|
|
CustomEmojiFilter.new(filter_params).results
|
|
end
|
|
|
|
def filter_params
|
|
params.slice(:page, *CustomEmojiFilter::KEYS).permit(:page, *CustomEmojiFilter::KEYS)
|
|
end
|
|
|
|
def action_from_button
|
|
if params[:update]
|
|
'update'
|
|
elsif params[:list]
|
|
'list'
|
|
elsif params[:unlist]
|
|
'unlist'
|
|
elsif params[:enable]
|
|
'enable'
|
|
elsif params[:disable]
|
|
'disable'
|
|
elsif params[:copy]
|
|
'copy'
|
|
elsif params[:delete]
|
|
'delete'
|
|
end
|
|
end
|
|
|
|
def form_custom_emoji_batch_params
|
|
params.require(:form_custom_emoji_batch).permit(:action, :category_id, :category_name, custom_emoji_ids: [])
|
|
end
|
|
end
|
|
end
|