Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-21 17:17:20 +00:00
parent 2649cce3a0 d97903a358
commit 6290cd7969
14 changed files with 105 additions and 57 deletions
@@ -16,7 +16,7 @@ class ActivityPub::ProcessAccountService < BaseService

    RedisLock.acquire(lock_options) do |lock|
      if lock.acquired?
-        @account        = Account.find_by(uri: @uri)
+        @account        = Account.find_remote(@username, @domain)
        @old_public_key = @account&.public_key
        @old_protocol   = @account&.protocol