Merge pull request #1378 from pixelfed/frontend-ui-refactor

Frontend ui refactor
This commit is contained in:
daniel 2019-06-09 19:17:25 -06:00 committed by GitHub
commit fae882704a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -57,9 +57,9 @@ class InboxValidator implements ShouldQueue
} }
if($this->verifySignature($headers, $profile, $payload) == true) { if($this->verifySignature($headers, $profile, $payload) == true) {
InboxWorker::dispatch($headers, $profile, $payload); InboxWorker::dispatchNow($headers, $profile, $payload)->onQueue('high');
} else if($this->blindKeyRotation($headers, $profile, $payload) == true) { } else if($this->blindKeyRotation($headers, $profile, $payload) == true) {
InboxWorker::dispatch($headers, $profile, $payload); InboxWorker::dispatchNow($headers, $profile, $payload)->onQueue('high');
} else { } else {
return; return;
} }
@ -99,7 +99,8 @@ class InboxValidator implements ShouldQueue
} }
$actor = Profile::whereKeyId($keyId)->first(); $actor = Profile::whereKeyId($keyId)->first();
if(!$actor) { if(!$actor) {
$actor = Helpers::profileFirstOrNew($bodyDecoded['actor']); $actorUrl = is_array($bodyDecoded['actor']) ? $bodyDecoded['actor'][0] : $bodyDecoded['actor'];
$actor = Helpers::profileFirstOrNew($actorUrl);
} }
if(!$actor) { if(!$actor) {
return false; return false;