diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-13 16:28:07 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-13 16:28:07 +0100 |
| commit | bfe2b9cc501205a07628b59b0a38a8643a4ca11c (patch) | |
| tree | 78fa8ee6336dca2719ab0775b81ff98fe34808c6 /app/lib/activitypub | |
| parent | 2fe0cb16239ed86016ebea352425862a561b63a2 (diff) | |
| parent | c875f19673e923e7a6e3c2b6656e96b863ca5915 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 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 |