chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2018-11-24 14:04:09 -07:00 committed by GitHub
parent 19a2d8040e bfde0fdea6
commit 2129155ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Console/Commands/UpdateCommand.php
View File

@ -33,6 +33,7 @@ class UpdateCommand extends Command
'0.1.7',
'0.1.8',
'0.1.9',
'0.2.1',
];
protected $version;
@ -76,10 +77,15 @@ class UpdateCommand extends Command
case '0.1.8':
$this->info('You are running an older version that doesn\'t require any updates!');
break;
case '0.1.9':
$this->update019();
break;
case '0.2.1':
$this->update021();
break;
default:
# code...
break;
@ -127,6 +133,34 @@ class UpdateCommand extends Command
$bar->finish();
}
public function update021()
{
$this->buildVersionFile();
$v = $this->getVersionFile();
if($v['updated'] == true) {
$this->info('Already up to date!');
exit;
}
$statusCount = Status::count();
$this->info('Running updates ...');
$bar = $this->output->createProgressBar($statusCount);
Status::has('media')->chunk(200, function($statuses) use ($bar) {
foreach($statuses as $status) {
if($status->firstMedia()) {
$media = $status->firstMedia();
if(in_array($media->mime, ['image/jpeg', 'image/png'])) {
ImageThumbnail::dispatch($media);
}
}
$bar->advance();
}
});
$this->updateVersionFile('0.2.1', true);
$bar->finish();
}
protected function buildVersionFile()
{
$path = storage_path('app/version.json');

40
app/Util/ActivityPub/Helpers.php
View File

@ -20,7 +20,7 @@ use App\Jobs\AvatarPipeline\CreateAvatar;
use App\Jobs\RemoteFollowPipeline\RemoteFollowImportRecent;
use App\Jobs\ImageOptimizePipeline\{ImageOptimize,ImageThumbnail};
use App\Jobs\StatusPipeline\NewStatusPipeline;
use HttpSignatures\{GuzzleHttpSignatures, KeyStore, Context, Verifier};
use App\Util\HttpSignatures\{GuzzleHttpSignatures, KeyStore, Context, Verifier};
use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
class Helpers {
@ -309,31 +309,27 @@ class Helpers {
{
$profile = $senderProfile;
$keyId = $profile->keyId();
$privateKey = openssl_pkey_get_private($profile->private_key);
$date = date('D, d M Y h:i:s').' GMT';
$date = new \DateTime('UTC');
$date = $date->format('D, d M Y H:i:s \G\M\T');
$host = parse_url($url, PHP_URL_HOST);
$path = parse_url($url, PHP_URL_PATH);
$headers = [
'(request-target)' => 'post '.parse_url($url, PHP_URL_PATH),
'Date' => $date,
'Host' => $host,
'Content-Type' => 'application/activity+json',
'date' => $date,
'host' => $host,
'content-type' => 'application/activity+json',
];
if($body) {
$payload = is_string($body) ? $body : json_encode($body);
$digest = base64_encode(hash('sha256', $payload, true));
$headers['Digest'] = 'SHA-256=' . $digest;
}
$stringToSign = self::_headersToSigningString($headers);
$signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
openssl_sign($stringToSign, $signature, $privateKey, OPENSSL_ALGO_SHA256);
openssl_free_key($privateKey);
$signature = base64_encode($signature);
$signatureHeader = 'keyId="'.$keyId.'",headers="'.$signedHeaders.'",algorithm="rsa-sha256",signature="'.$signature.'"';
unset($headers['(request-target)']);
$headers['Signature'] = $signatureHeader;
Zttp::withHeaders($headers)->post($url, $body);
$context = new Context([
'keys' => [$profile->keyId() => $profile->private_key],
'algorithm' => 'rsa-sha256',
'headers' => ['(request-target)', 'date', 'host', 'content-type'],
]);
$handlerStack = GuzzleHttpSignatures::defaultHandlerFromContext($context);
$client = new Client(['handler' => $handlerStack]);
$response = $client->request('POST', $url, ['headers' => $headers, 'json' => $body]);
return;
}