Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add categories for custom emojis (#11196)

Browse source 
Fix #7940
This commit is contained in:
Eugen Rochko 2019-06-28 15:54:10 +02:00 • committed by GitHub
parent 072158ee97
commit e64e6a03dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 86 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/custom_emoji.rb
View file

@ -16,6 +16,7 @@
# uri :string
# image_remote_url :string
# visible_in_picker :boolean default(TRUE), not null
# category_id :bigint(8)
#
class CustomEmoji < ApplicationRecord
@ -27,6 +28,7 @@ class CustomEmoji < ApplicationRecord
:(#{SHORTCODE_RE_FRAGMENT}):
(?=[^[:alnum:]:]|$)/x
belongs_to :category, class_name: 'CustomEmojiCategory', optional: true
has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode
has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }