From e8d4ce1888c9c7846209eb6feaab01175a174b2c Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 6 Jun 2023 06:01:49 -0600
Subject: [PATCH] Update MediaStorageService

---
 app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php | 5 +++++
 app/Services/MediaStorageService.php                 | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
index a3f88f009..932372a50 100644
--- a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
+++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
@@ -13,9 +13,11 @@ use App\Util\ActivityPub\Helpers;
 use Illuminate\Support\Str;
 use Zttp\Zttp;
 use App\Http\Controllers\AvatarController;
+use Cache;
 use Storage;
 use Log;
 use Illuminate\Http\File;
+use App\Services\AccountService;
 use App\Services\MediaStorageService;
 use App\Services\ActivityPubFetchService;
 
@@ -84,6 +86,9 @@ class RemoteAvatarFetchFromUrl implements ShouldQueue
 			$avatar->save();
 		}
 
+		Cache::forget('avatar:' . $avatar->profile_id);
+		AccountService::del($avatar->profile_id);
+
 		MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false, true);
 
 		return 1;
diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php
index 60b194879..fd70e3a0f 100644
--- a/app/Services/MediaStorageService.php
+++ b/app/Services/MediaStorageService.php
@@ -221,6 +221,9 @@ class MediaStorageService {
 			}
 		}
 
+		Cache::forget('avatar:' . $avatar->profile_id);
+		AccountService::del($avatar->profile_id);
+
 		// handle pleroma edge case
 		if(Str::endsWith($mime, '; charset=utf-8')) {
 			$mime = str_replace('; charset=utf-8', '', $mime);
@@ -268,7 +271,7 @@ class MediaStorageService {
 		$avatar->save();
 
 		Cache::forget('avatar:' . $avatar->profile_id);
-		Cache::forget(AccountService::CACHE_KEY . $avatar->profile_id);
+		AccountService::del($avatar->profile_id);
 
 		unlink($tmpName);
 	}