Admin interface for listing, adding and removing custom emojis (#5002)
* Admin interface for listing, adding and removing custom emojis * Only display local ones in the list
This commit is contained in:
		
							parent
							
								
									d43944143a
								
							
						
					
					
						commit
						09a94b575e
					
				|  | @ -0,0 +1,34 @@ | ||||||
|  | # frozen_string_literal: true | ||||||
|  | 
 | ||||||
|  | module Admin | ||||||
|  |   class CustomEmojisController < BaseController | ||||||
|  |     def index | ||||||
|  |       @custom_emojis = CustomEmoji.where(uri: nil) | ||||||
|  |     end | ||||||
|  | 
 | ||||||
|  |     def new | ||||||
|  |       @custom_emoji = CustomEmoji.new | ||||||
|  |     end | ||||||
|  | 
 | ||||||
|  |     def create | ||||||
|  |       @custom_emoji = CustomEmoji.new(resource_params) | ||||||
|  | 
 | ||||||
|  |       if @custom_emoji.save | ||||||
|  |         redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.created_msg') | ||||||
|  |       else | ||||||
|  |         render :new | ||||||
|  |       end | ||||||
|  |     end | ||||||
|  | 
 | ||||||
|  |     def destroy | ||||||
|  |       CustomEmoji.find(params[:id]).destroy | ||||||
|  |       redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.destroyed_msg') | ||||||
|  |     end | ||||||
|  | 
 | ||||||
|  |     private | ||||||
|  | 
 | ||||||
|  |     def resource_params | ||||||
|  |       params.require(:custom_emoji).permit(:shortcode, :image) | ||||||
|  |     end | ||||||
|  |   end | ||||||
|  | end | ||||||
|  | @ -26,6 +26,7 @@ class BlockDomainService < BaseService | ||||||
|   def clear_media! |   def clear_media! | ||||||
|     clear_account_images |     clear_account_images | ||||||
|     clear_account_attachments |     clear_account_attachments | ||||||
|  |     clear_emojos | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|   def suspend_accounts! |   def suspend_accounts! | ||||||
|  | @ -51,6 +52,10 @@ class BlockDomainService < BaseService | ||||||
|     end |     end | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|  |   def clear_emojos | ||||||
|  |     emojis_from_blocked_domains.destroy_all | ||||||
|  |   end | ||||||
|  | 
 | ||||||
|   def blocked_domain |   def blocked_domain | ||||||
|     domain_block.domain |     domain_block.domain | ||||||
|   end |   end | ||||||
|  | @ -62,4 +67,8 @@ class BlockDomainService < BaseService | ||||||
|   def media_from_blocked_domain |   def media_from_blocked_domain | ||||||
|     MediaAttachment.joins(:account).merge(blocked_domain_accounts).reorder(nil) |     MediaAttachment.joins(:account).merge(blocked_domain_accounts).reorder(nil) | ||||||
|   end |   end | ||||||
|  | 
 | ||||||
|  |   def emojis_from_blocked_domains | ||||||
|  |     CustomEmoji.where(domain: blocked_domain) | ||||||
|  |   end | ||||||
| end | end | ||||||
|  |  | ||||||
|  | @ -0,0 +1,7 @@ | ||||||
|  | %tr | ||||||
|  |   %td | ||||||
|  |     = image_tag custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:" | ||||||
|  |   %td | ||||||
|  |     %samp= ":#{custom_emoji.shortcode}:" | ||||||
|  |   %td | ||||||
|  |     = table_link_to 'times', t('admin.custom_emojis.delete'), admin_custom_emoji_path(custom_emoji), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } | ||||||
|  | @ -0,0 +1,14 @@ | ||||||
|  | - content_for :page_title do | ||||||
|  |   = t('admin.custom_emojis.title') | ||||||
|  | 
 | ||||||
|  | .table-wrapper | ||||||
|  |   %table.table | ||||||
|  |     %thead | ||||||
|  |       %tr | ||||||
|  |         %th= t('admin.custom_emojis.emoji') | ||||||
|  |         %th= t('admin.custom_emojis.shortcode') | ||||||
|  |         %th | ||||||
|  |     %tbody | ||||||
|  |       = render @custom_emojis | ||||||
|  | 
 | ||||||
|  | = link_to t('admin.custom_emojis.upload'), new_admin_custom_emoji_path, class: 'button' | ||||||
|  | @ -0,0 +1,12 @@ | ||||||
|  | - content_for :page_title do | ||||||
|  |   = t('.title') | ||||||
|  | 
 | ||||||
|  | = simple_form_for @custom_emoji, url: admin_custom_emojis_path do |f| | ||||||
|  |   = render 'shared/error_messages', object: @custom_emoji | ||||||
|  | 
 | ||||||
|  |   .fields-group | ||||||
|  |     = f.input :shortcode, placeholder: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint') | ||||||
|  |     = f.input :image, input_html: { accept: 'image/png' }, hint: t('admin.custom_emojis.image_hint') | ||||||
|  | 
 | ||||||
|  |   .actions | ||||||
|  |     = f.button :button, t('admin.custom_emojis.upload'), type: :submit | ||||||
|  | @ -108,6 +108,18 @@ en: | ||||||
|       unsubscribe: Unsubscribe |       unsubscribe: Unsubscribe | ||||||
|       username: Username |       username: Username | ||||||
|       web: Web |       web: Web | ||||||
|  |     custom_emojis: | ||||||
|  |       created_msg: Emoji successfully created! | ||||||
|  |       delete: Delete | ||||||
|  |       destroyed_msg: Emojo successfully destroyed! | ||||||
|  |       emoji: Emoji | ||||||
|  |       image_hint: PNG up to 50KB | ||||||
|  |       new: | ||||||
|  |         title: Add new custom emoji | ||||||
|  |       shortcode: Shortcode | ||||||
|  |       shortcode_hint: At least 2 characters, only alphanumeric characters and underscores | ||||||
|  |       title: Custom emojis | ||||||
|  |       upload: Upload | ||||||
|     domain_blocks: |     domain_blocks: | ||||||
|       add_new: Add new |       add_new: Add new | ||||||
|       created_msg: Domain block is now being processed |       created_msg: Domain block is now being processed | ||||||
|  |  | ||||||
|  | @ -28,6 +28,7 @@ SimpleNavigation::Configuration.run do |navigation| | ||||||
|       admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' } |       admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' } | ||||||
|       admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' } |       admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' } | ||||||
|       admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url |       admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url | ||||||
|  |       admin.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis} | ||||||
|     end |     end | ||||||
| 
 | 
 | ||||||
|     primary.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' } |     primary.item :logout, safe_join([fa_icon('sign-out fw'), t('auth.logout')]), destroy_user_session_url, link_html: { 'data-method' => 'delete' } | ||||||
|  |  | ||||||
|  | @ -136,6 +136,8 @@ Rails.application.routes.draw do | ||||||
|     resources :users, only: [] do |     resources :users, only: [] do | ||||||
|       resource :two_factor_authentication, only: [:destroy] |       resource :two_factor_authentication, only: [:destroy] | ||||||
|     end |     end | ||||||
|  | 
 | ||||||
|  |     resources :custom_emojis, only: [:index, :new, :create, :destroy] | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|   get '/admin', to: redirect('/admin/settings/edit', status: 302) |   get '/admin', to: redirect('/admin/settings/edit', status: 302) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue