diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-28 21:36:50 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-28 21:36:50 +0200 |
commit | 3922b518f79cd3098db19c392d5d10084839c200 (patch) | |
tree | edef2c9d647e420aff33024a267d1d96cd721795 /app/models/custom_emoji.rb | |
parent | f7c0e326ab11a597b17a22dd8889f0690d7ffd73 (diff) | |
parent | 4f5b221be21e62257c16e47e998cdf757991f871 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/custom_emoji.rb')
-rw-r--r-- | app/models/custom_emoji.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index e73cd9bd2..514cf4845 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -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' } } |