diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-13 18:48:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 18:48:07 +0100 |
| commit | e4feef6b5c0d655068daa7554422e8c019a0e3ed (patch) | |
| tree | 072ee635a105e9138d03f499ed2f666bc1bf102c /app/lib | |
| parent | 2fe0cb16239ed86016ebea352425862a561b63a2 (diff) | |
| parent | 6ce7e74b46d47863f95f1fe3209437e24a4644b7 (diff) | |
Merge pull request #817 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -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 45079e2b3..9d2ddd3f6 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -177,7 +177,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity updated = tag['updated'] emoji = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain) - return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && emoji.updated_at >= updated) + return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at) emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri) emoji.image_remote_url = image_url |