diff options
| author | Starfall <us@starfall.systems> | 2022-04-29 09:20:51 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-29 09:20:51 -0500 |
| commit | 4eb291e5db6114c8aa564f0c9e7f04d13805b5cc (patch) | |
| tree | 1a6affcf635974ccf6d0f650a3bbe2be75c7929e /app/lib/activitypub | |
| parent | bcaacc42334d75bd361f330989041a9beba101a9 (diff) | |
| parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 2 | ||||
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index f599e1b58..3c51a7a51 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -164,7 +164,7 @@ class ActivityPub::Activity end def lock_or_fail(key, expire_after = 15.minutes.seconds) - RedisLock.acquire({ redis: Redis.current, key: key, autorelease: expire_after }) do |lock| + RedisLock.acquire({ redis: redis, key: key, autorelease: expire_after }) do |lock| if lock.acquired? yield else diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 1ac509f18..09fe08d45 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -117,7 +117,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity language: @status_parser.language, spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''), created_at: @status_parser.created_at, - edited_at: @status_parser.edited_at, + edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? @status_parser.edited_at : nil, override_timestamps: @options[:override_timestamps], reply: @status_parser.reply, sensitive: @account.sensitized? || @status_parser.sensitive || false, |