Merge pull request #2597 from pixelfed/staging

Staging

CHANGELOG.md

@@ -3,6 +3,10 @@
 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.10.10...dev)
 ### 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)
 ### Added

app/Http/Controllers/AdminController.php

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

app/Jobs/AvatarPipeline/RemoteAvatarFetch.php

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

app/Util/ActivityPub/Helpers.php

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