tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jenkins committed 2018-03-20 19:17:20 +00:00
2 parents 2649cce3a0 ac49c7932d
commit e8aeec4fea
8 files changed
+79 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/services/activitypub/process_account_service.rb
+1 -1
View File
@@ -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