diff options
author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/lib/activitypub | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 00479fd9a..79efc95d3 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -107,7 +107,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity 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 |