diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-11-27 00:54:40 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-11-27 00:54:40 +0000 |
| commit | 384a602fd4117a73338542c59985f54acf5fb3f8 (patch) | |
| tree | 2885959ad124784985daa7709cd645a5a8802a07 /app/lib | |
| parent | 72444f73ef4e04118f9c66b965c3c903cff8ef37 (diff) | |
| parent | 6b6e633c095485f95350c4308a942192e5fe8806 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 | ||||
| -rw-r--r-- | app/lib/request.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/app/lib/request.rb b/app/lib/request.rb index 36c211dbf..73b495ce1 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -94,7 +94,7 @@ class Request end def timeout - { write: 10, connect: 10, read: 10 } + { connect: 1, read: 10, write: 10 } end def http_client |