diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-01 20:24:50 -0500 |
| commit | eb39db7f93061c936fcb0bb24d5ba0c9a6186993 (patch) | |
| tree | e12b5f5c9fec1d698024c88cd9f3ea9fe5b249cd /app/models | |
| parent | f0bb3ff53307aac7b9c64ec8a48d4ba1d2019513 (diff) | |
| parent | f890d2a766ae4c7fd8611dd4f3a15a13408f68c3 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/account.rb | 4 | ||||
| -rw-r--r-- | app/models/remote_profile.rb | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 95ecc3c1c..4b73f1fa3 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -352,6 +352,10 @@ class Account < ApplicationRecord end end + def emojis + CustomEmoji.from_text(note, domain) + end + before_create :generate_keys before_validation :normalize_domain before_validation :prepare_contents, if: :local? diff --git a/app/models/remote_profile.rb b/app/models/remote_profile.rb index 613911c57..742d2b56f 100644 --- a/app/models/remote_profile.rb +++ b/app/models/remote_profile.rb @@ -41,6 +41,10 @@ class RemoteProfile @header ||= link_href_from_xml(author, 'header') end + def emojis + @emojis ||= author.xpath('./xmlns:link[@rel="emoji"]', xmlns: OStatus::TagManager::XMLNS) + end + def locked? scope == 'private' end |