mirror
/
pixelfed
kopia lustrzana https://github.com/pixelfed/pixelfed
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update AccountTransformer, fix follower/following count visibility bug

pull/4964/head
Daniel Supernault 2024-02-29 04:59:13 -07:00
rodzic 402a4607c9
commit 542d110673
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 23740873EE6F76A1
3 zmienionych plików z 37 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/Http/Controllers/Api/ApiV1Controller.php
Wyświetl plik

@ -409,6 +409,7 @@ class ApiV1Controller extends Controller
if($settings->show_profile_follower_count != $show_profile_follower_count) {
$settings->show_profile_follower_count = $show_profile_follower_count;
$changes = true;
Cache::forget('pf:acct-trans:hideFollowers:' . $profile->id);
}
}
@ -417,6 +418,7 @@ class ApiV1Controller extends Controller
if($settings->show_profile_following_count != $show_profile_following_count) {
$settings->show_profile_following_count = $show_profile_following_count;
$changes = true;
Cache::forget('pf:acct-trans:hideFollowing:' . $profile->id);
}
}

17
app/Http/Controllers/Settings/PrivacySettings.php
Wyświetl plik

@ -84,14 +84,17 @@ trait PrivacySettings
}
$settings->save();
}
Cache::forget('profile:settings:' . $profile->id);
$pid = $profile->id;
Cache::forget('profile:settings:' . $pid);
Cache::forget('user:account:id:' . $profile->user_id);
Cache::forget('profile:follower_count:' . $profile->id);
Cache::forget('profile:following_count:' . $profile->id);
Cache::forget('profile:atom:enabled:' . $profile->id);
Cache::forget('profile:embed:' . $profile->id);
Cache::forget('pf:acct:settings:hidden-followers:' . $profile->id);
Cache::forget('pf:acct:settings:hidden-following:' . $profile->id);
Cache::forget('profile:follower_count:' . $pid);
Cache::forget('profile:following_count:' . $pid);
Cache::forget('profile:atom:enabled:' . $pid);
Cache::forget('profile:embed:' . $pid);
Cache::forget('pf:acct:settings:hidden-followers:' . $pid);
Cache::forget('pf:acct:settings:hidden-following:' . $pid);
Cache::forget('pf:acct-trans:hideFollowing:' . $pid);
Cache::forget('pf:acct-trans:hideFollowers:' . $pid);
return redirect(route('settings.privacy'))->with('status', 'Settings successfully updated!');
}

30
app/Transformer/Api/AccountTransformer.php
Wyświetl plik

@ -6,14 +6,15 @@ use Auth;
use Cache;
use App\Profile;
use App\User;
use App\UserSetting;
use League\Fractal;
use App\Services\PronounService;
class AccountTransformer extends Fractal\TransformerAbstract
{
protected $defaultIncludes = [
// 'relationship',
];
protected $defaultIncludes = [
// 'relationship',
];
public function transform(Profile $profile)
{
@ -26,6 +27,25 @@ class AccountTransformer extends Fractal\TransformerAbstract
});
$local = $profile->private_key != null;
$local = $profile->user_id && $profile->private_key != null;
$hideFollowing = false;
$hideFollowers = false;
if($local) {
$hideFollowing = Cache::remember('pf:acct-trans:hideFollowing:' . $profile->id, 2592000, function() use($profile) {
$settings = UserSetting::whereUserId($profile->user_id)->first();
if(!$settings) {
return false;
}
return $settings->show_profile_following_count == false;
});
$hideFollowers = Cache::remember('pf:acct-trans:hideFollowers:' . $profile->id, 2592000, function() use($profile) {
$settings = UserSetting::whereUserId($profile->user_id)->first();
if(!$settings) {
return false;
}
return $settings->show_profile_follower_count == false;
});
}
$is_admin = !$local ? false : in_array($profile->id, $adminIds);
$acct = $local ? $profile->username : substr($profile->username, 1);
$username = $local ? $profile->username : explode('@', $acct)[0];
@ -36,8 +56,8 @@ class AccountTransformer extends Fractal\TransformerAbstract
'display_name' => $profile->name,
'discoverable' => true,
'locked' => (bool) $profile->is_private,
'followers_count' => (int) $profile->followers_count,
'following_count' => (int) $profile->following_count,
'followers_count' => $hideFollowers ? 0 : (int) $profile->followers_count,
'following_count' => $hideFollowing ? 0 : (int) $profile->following_count,
'statuses_count' => (int) $profile->status_count,
'note' => $profile->bio ?? '',
'note_text' => $profile->bio ? strip_tags($profile->bio) : null,