From 41792eea56d2ef19de84e95a7235624b074c3b24 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 18 May 2021 22:45:04 -0600
Subject: [PATCH] Update config() to config_cache()

---
 app/Http/Controllers/ComposeController.php     | 2 +-
 app/Jobs/AvatarPipeline/RemoteAvatarFetch.php  | 6 +++---
 app/Jobs/MediaPipeline/MediaDeletePipeline.php | 6 +++---
 app/Services/MediaStorageService.php           | 2 +-
 app/Util/ActivityPub/Helpers.php               | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php
index ee317ad2c..5058a786d 100644
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@@ -646,7 +646,7 @@ class ComposeController extends Controller
 			case 'image/jpeg':
 			case 'image/png':
 			case 'video/mp4':
-				$finished = config('pixelfed.cloud_storage') ? (bool) $media->cdn_url : (bool) $media->processed_at;
+				$finished = config_cache('pixelfed.cloud_storage') ? (bool) $media->cdn_url : (bool) $media->processed_at;
 				break;
 
 			default:
diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
index d324a51a4..6817ac55b 100644
--- a/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
+++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
@@ -51,7 +51,7 @@ class RemoteAvatarFetch implements ShouldQueue
 	{
 		$profile = $this->profile;
 
-		if(config('pixelfed.cloud_storage') !== true) {
+		if(config_cache('pixelfed.cloud_storage') !== true) {
 			return 1;
 		}
 
@@ -75,7 +75,7 @@ class RemoteAvatarFetch implements ShouldQueue
 			return 1;
 		}
 
-		if( !isset($person['icon']) || 
+		if( !isset($person['icon']) ||
 			!isset($person['icon']['type']) ||
 			!isset($person['icon']['url'])
 		) {
@@ -99,4 +99,4 @@ class RemoteAvatarFetch implements ShouldQueue
 
 		return 1;
 	}
-}
\ No newline at end of file
+}
diff --git a/app/Jobs/MediaPipeline/MediaDeletePipeline.php b/app/Jobs/MediaPipeline/MediaDeletePipeline.php
index 9d89f9449..f44d080ce 100644
--- a/app/Jobs/MediaPipeline/MediaDeletePipeline.php
+++ b/app/Jobs/MediaPipeline/MediaDeletePipeline.php
@@ -27,7 +27,7 @@ class MediaDeletePipeline implements ShouldQueue
 		$media = $this->media;
 		$path = $media->media_path;
 		$thumb = $media->thumbnail_path;
-		
+
 		if(!$path) {
 			return 1;
 		}
@@ -36,7 +36,7 @@ class MediaDeletePipeline implements ShouldQueue
 		array_pop($e);
 		$i = implode('/', $e);
 
-		if(config('pixelfed.cloud_storage') == true) {
+		if(config_cache('pixelfed.cloud_storage') == true) {
 			$disk = Storage::disk(config('filesystems.cloud'));
 			if($disk->exists($path)) {
 				$disk->delete($path);
@@ -64,4 +64,4 @@ class MediaDeletePipeline implements ShouldQueue
 		return 1;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php
index 17e866da6..2c44c4ca3 100644
--- a/app/Services/MediaStorageService.php
+++ b/app/Services/MediaStorageService.php
@@ -20,7 +20,7 @@ class MediaStorageService {
 
 	public static function store(Media $media)
 	{
-		if(config('pixelfed.cloud_storage') == true) {
+		if(config_cache('pixelfed.cloud_storage') == true) {
 			(new self())->cloudStore($media);
 		}
 
diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index c5c176fc3..34bb889c6 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -441,7 +441,7 @@ class Helpers {
 			$media->version = 3;
 			$media->save();
 
-			if(config('pixelfed.cloud_storage') == true) {
+			if(config_cache('pixelfed.cloud_storage') == true) {
 				MediaStoragePipeline::dispatch($media);
 			}
 		}
@@ -511,7 +511,7 @@ class Helpers {
 						$profile->webfinger = Purify::clean($webfinger);
 						$profile->last_fetched_at = now();
 						$profile->save();
-						if(config('pixelfed.cloud_storage') == true) {
+						if(config_cache('pixelfed.cloud_storage') == true) {
 							RemoteAvatarFetch::dispatch($profile);
 						}
 						return $profile;
@@ -528,7 +528,7 @@ class Helpers {
 					$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) && Helpers::validateUrl($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
 					$profile->save();
 				}
-				if(config('pixelfed.cloud_storage') == true) {
+				if(config_cache('pixelfed.cloud_storage') == true) {
 					RemoteAvatarFetch::dispatch($profile);
 				}
 			}