diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 13:34:51 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 15:10:34 +0200 |
commit | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/services/activitypub/process_account_service.rb | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
Diffstat (limited to 'app/services/activitypub/process_account_service.rb')
-rw-r--r-- | app/services/activitypub/process_account_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 7f95678b0..ac19bf933 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -226,7 +226,7 @@ class ActivityPub::ProcessAccountService < BaseService updated = tag['updated'] emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) - return unless emoji.nil? || emoji.updated_at >= updated + return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && emoji.updated_at >= updated) emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri) emoji.image_remote_url = image_url |