UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-13 01:54:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2597 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-01-30 09:48:09 -07:00 committed by GitHub
commit 25fd23a81b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -3,6 +3,10 @@
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.10...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.10...dev)
### Added ### Added
### Updated
- Updated AdminController, fix variable name in updateSpam method. ([6edaf940](https://github.com/pixelfed/pixelfed/commit/6edaf940))
- Updated RemotAvatarFetch, only dispatch jobs if cloud storage is enabled. ([4f40f6f5](https://github.com/pixelfed/pixelfed/commit/4f40f6f5))
## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10) ## [v0.10.10 (2021-01-28)](https://github.com/pixelfed/pixelfed/compare/v0.10.9...v0.10.10)
### Added ### Added

8
app/Http/Controllers/AdminController.php
View file

@ -139,8 +139,8 @@ class AdminController extends Controller
$appeal->appeal_handled_at = now(); $appeal->appeal_handled_at = now();
$appeal->save(); $appeal->save();
Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $status->profile_id); Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
Cache::forget('pf:bouncer_v0:recent_by_pid:' . $status->profile_id); Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
return redirect('/i/admin/reports/autospam'); return redirect('/i/admin/reports/autospam');
} }
@ -154,8 +154,8 @@ class AdminController extends Controller
$appeal->appeal_handled_at = now(); $appeal->appeal_handled_at = now();
$appeal->save(); $appeal->save();
Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $status->profile_id); Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
Cache::forget('pf:bouncer_v0:recent_by_pid:' . $status->profile_id); Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
return redirect('/i/admin/reports/autospam'); return redirect('/i/admin/reports/autospam');
} }

4
app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
View file

@ -51,6 +51,10 @@ class RemoteAvatarFetch implements ShouldQueue
{ {
$profile = $this->profile; $profile = $this->profile;
if(config('pixelfed.cloud_storage') !== true) {
return 1;
}
if($profile->domain == null || $profile->private_key) { if($profile->domain == null || $profile->private_key) {
return 1; return 1;
} }

4
app/Util/ActivityPub/Helpers.php
View file

@ -474,7 +474,9 @@ class Helpers {
$profile->webfinger = strtolower(Purify::clean($webfinger)); $profile->webfinger = strtolower(Purify::clean($webfinger));
$profile->last_fetched_at = now(); $profile->last_fetched_at = now();
$profile->save(); $profile->save();
if(config('pixelfed.cloud_storage') == true) {
RemoteAvatarFetch::dispatch($profile); RemoteAvatarFetch::dispatch($profile);
}
return $profile; return $profile;
}); });
} else { } else {
@ -488,8 +490,10 @@ class Helpers {
$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) && Helpers::validateUrl($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null; $profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) && Helpers::validateUrl($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
$profile->save(); $profile->save();
} }
if(config('pixelfed.cloud_storage') == true) {
RemoteAvatarFetch::dispatch($profile); RemoteAvatarFetch::dispatch($profile);
} }
}
return $profile; return $profile;
}); });
return $profile; return $profile;