diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-07 17:43:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 17:43:42 +0200 |
| commit | 3a3475450e46f670e8beaf4bf804b820ad39a5f9 (patch) | |
| tree | 60600a840e74668818db64d5d55be2f4a0601fb3 /app/models | |
| parent | 057db0ecd0049c76c113cbe5412e098d686f0700 (diff) | |
Encode custom emojis as resolveable objects in ActivityPub (#5243)
* Encode custom emojis as resolveable objects in ActivityPub * Improve code style
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/custom_emoji.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 258b50c82..65d9840d5 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -13,6 +13,8 @@ # created_at :datetime not null # updated_at :datetime not null # disabled :boolean default(FALSE), not null +# uri :string +# image_remote_url :string # class CustomEmoji < ApplicationRecord @@ -37,6 +39,10 @@ class CustomEmoji < ApplicationRecord domain.nil? end + def object_type + :emoji + end + class << self def from_text(text, domain) return [] if text.blank? |