UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-21 12:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4134 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-01-31 00:17:37 -07:00 committed by GitHub
commit 81424e7939
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Settings/HomeSettings.php
View file

@ -17,6 +17,7 @@ use Mail;
use Purify; use Purify;
use App\Mail\PasswordChange; use App\Mail\PasswordChange;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Services\AccountService;
use App\Services\PronounService; use App\Services\PronounService;
trait HomeSettings trait HomeSettings
@ -99,10 +100,10 @@ trait HomeSettings
} }
if ($changes === true) { if ($changes === true) {
Cache::forget('user:account:id:'.$user->id);
$user->save(); $user->save();
$profile->save(); $profile->save();
Cache::forget('user:account:id:'.$user->id);
AccountService::del($profile->id);
return redirect('/settings/home')->with('status', 'Profile successfully updated!'); return redirect('/settings/home')->with('status', 'Profile successfully updated!');
} }

10
app/Jobs/SharePipeline/SharePipeline.php
View file

@ -127,13 +127,15 @@ class SharePipeline implements ShouldQueue
'timeout' => config('federation.activitypub.delivery.timeout') 'timeout' => config('federation.activitypub.delivery.timeout')
]); ]);
$requests = function($audience) use ($client, $activity, $profile, $payload) { $version = config('pixelfed.version');
$appUrl = config('app.url');
$userAgent = "(Pixelfed/{$version}; +{$appUrl})";
$requests = function($audience) use ($client, $activity, $profile, $payload, $userAgent) {
foreach($audience as $url) { foreach($audience as $url) {
$version = config('pixelfed.version');
$appUrl = config('app.url');
$headers = HttpSignature::sign($profile, $url, $activity, [ $headers = HttpSignature::sign($profile, $url, $activity, [
'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => "(Pixelfed/{$version}; +{$appUrl})", 'User-Agent' => $userAgent,
]); ]);
yield function() use ($client, $url, $headers, $payload) { yield function() use ($client, $url, $headers, $payload) {
return $client->postAsync($url, [ return $client->postAsync($url, [

10
app/Jobs/SharePipeline/UndoSharePipeline.php
View file

@ -90,13 +90,15 @@ class UndoSharePipeline implements ShouldQueue
'timeout' => config('federation.activitypub.delivery.timeout') 'timeout' => config('federation.activitypub.delivery.timeout')
]); ]);
$requests = function($audience) use ($client, $activity, $profile, $payload) { $version = config('pixelfed.version');
$appUrl = config('app.url');
$userAgent = "(Pixelfed/{$version}; +{$appUrl})";
$requests = function($audience) use ($client, $activity, $profile, $payload, $userAgent) {
foreach($audience as $url) { foreach($audience as $url) {
$version = config('pixelfed.version');
$appUrl = config('app.url');
$headers = HttpSignature::sign($profile, $url, $activity, [ $headers = HttpSignature::sign($profile, $url, $activity, [
'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => "(Pixelfed/{$version}; +{$appUrl})", 'User-Agent' => $userAgent,
]); ]);
yield function() use ($client, $url, $headers, $payload) { yield function() use ($client, $url, $headers, $payload) {
return $client->postAsync($url, [ return $client->postAsync($url, [

10
app/Jobs/StatusPipeline/StatusActivityPubDeliver.php
View file

@ -85,13 +85,15 @@ class StatusActivityPubDeliver implements ShouldQueue
'timeout' => config('federation.activitypub.delivery.timeout') 'timeout' => config('federation.activitypub.delivery.timeout')
]); ]);
$requests = function($audience) use ($client, $activity, $profile, $payload) { $version = config('pixelfed.version');
$appUrl = config('app.url');
$userAgent = "(Pixelfed/{$version}; +{$appUrl})";
$requests = function($audience) use ($client, $activity, $profile, $payload, $userAgent) {
foreach($audience as $url) { foreach($audience as $url) {
$version = config('pixelfed.version');
$appUrl = config('app.url');
$headers = HttpSignature::sign($profile, $url, $activity, [ $headers = HttpSignature::sign($profile, $url, $activity, [
'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => "(Pixelfed/{$version}; +{$appUrl})", 'User-Agent' => $userAgent,
]); ]);
yield function() use ($client, $url, $headers, $payload) { yield function() use ($client, $url, $headers, $payload) {
return $client->postAsync($url, [ return $client->postAsync($url, [

10
app/Jobs/StatusPipeline/StatusDelete.php
View file

@ -164,13 +164,15 @@ class StatusDelete implements ShouldQueue
'timeout' => config('federation.activitypub.delivery.timeout') 'timeout' => config('federation.activitypub.delivery.timeout')
]); ]);
$requests = function($audience) use ($client, $activity, $profile, $payload) { $version = config('pixelfed.version');
$appUrl = config('app.url');
$userAgent = "(Pixelfed/{$version}; +{$appUrl})";
$requests = function($audience) use ($client, $activity, $profile, $payload, $userAgent) {
foreach($audience as $url) { foreach($audience as $url) {
$version = config('pixelfed.version');
$appUrl = config('app.url');
$headers = HttpSignature::sign($profile, $url, $activity, [ $headers = HttpSignature::sign($profile, $url, $activity, [
'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
'User-Agent' => "(Pixelfed/{$version}; +{$appUrl})", 'User-Agent' => $userAgent,
]); ]);
yield function() use ($client, $url, $headers, $payload) { yield function() use ($client, $url, $headers, $payload) {
return $client->postAsync($url, [ return $client->postAsync($url, [

1
app/Services/AccountService.php
View file

@ -71,6 +71,7 @@ class AccountService
public static function del($id) public static function del($id)
{ {
Cache::forget('pf:activitypub:user-object:by-id:' . $id);
return Cache::forget(self::CACHE_KEY . $id); return Cache::forget(self::CACHE_KEY . $id);
} }