diff options
| author | Reverite <github@reverite.sh> | 2019-06-28 22:48:00 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-28 22:48:00 -0700 |
| commit | 01e77afe9a0dc126506cfc98d8f5d330f4a2f076 (patch) | |
| tree | 387f07d7180c0852832f7923a34562c9f385d91f /app/models/custom_emoji.rb | |
| parent | 9861df046853b71370cede86afbba1a371714756 (diff) | |
| parent | 98c2d2aa46c2725b360907cf5537338ac6d052ed (diff) | |
Merge branch 'glitch' into production
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' } } |