about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authornullkal <nullkal@nil.nu>2017-11-07 22:49:32 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-11-07 14:49:32 +0100
commitb6e2e999bd4c603bc36b1234af484184644104e9 (patch)
treef1aa9fc571fc656780e9b22a2c1dccb3f521997c /app/models
parent782224c99151665470b138add583d50df17b4380 (diff)
Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy
Diffstat (limited to 'app/models')
-rw-r--r--app/models/custom_emoji.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 28b6a2b0b..a77b53c98 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -25,6 +25,8 @@ class CustomEmoji < ApplicationRecord
     :(#{SHORTCODE_RE_FRAGMENT}):
     (?=[^[:alnum:]:]|$)/x
 
+  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' } }
 
   validates_attachment :image, content_type: { content_type: 'image/png' }, presence: true, size: { in: 0..50.kilobytes }