🐛 Fix points_enabled (#2783)

Traewelling · Jul 19, 2024 · a443fa2 · a443fa2
1 parent 0ed27a4
commit a443fa2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/Http/Controllers/Backend/LeaderboardController.php b/app/Http/Controllers/Backend/LeaderboardController.php
@@ -83,7 +83,7 @@ public static function getLeaderboard(
     }
 
     public static function getMonthlyLeaderboard(Carbon $date): Collection {
-        if (auth()->user()?->likesEnabled === false) {
+        if (auth()->user()?->points_enabled === false) {
             return collect();
         }
 

diff --git a/app/Http/Resources/TransportResource.php b/app/Http/Resources/TransportResource.php
@@ -28,7 +28,7 @@
 class TransportResource extends JsonResource
 {
     public function toArray($request): array {
-        $likesEnabled = $request->user()?->likesEnabled ?? true;
+        $pointsEnabled = $request->user()?->points_enabled ?? true;
         /** @var Checkin $this */
         return [
             'trip'            => (int) $this->trip->id,
@@ -38,7 +38,7 @@ public function toArray($request): array {
             'lineName'        => (string) $this->trip->linename,
             'journeyNumber'   => $this->trip->journey_number,
             'distance'        => (int) $this->distance,
-            'points'          => (int) $likesEnabled ? $this->points : 0,
+            'points'          => (int) $pointsEnabled ? $this->points : 0,
             'duration'        => (int) $this->duration,
             'manualDeparture' => $this->manual_departure?->toIso8601String(),
             'manualArrival'   => $this->manual_arrival?->toIso8601String(),

diff --git a/app/Http/Resources/UserAuthResource.php b/app/Http/Resources/UserAuthResource.php
@@ -28,6 +28,7 @@
 class UserAuthResource extends JsonResource
 {
     public function toArray($request): array {
+        $pointsEnabled = $request->user()?->points_enabled ?? true;
         return [
             'id'                      => (int) $this->id,
             'displayName'             => (string) $this->name,
@@ -37,7 +38,7 @@ public function toArray($request): array {
             'totalDistance'           => (float) $this->train_distance,
             'trainDuration'           => (int) $this->train_duration, // @deprecated: remove after 2024-08
             'totalDuration'           => (int) $this->train_duration,
-            'points'                  => (int) $this->points,
+            'points'                  => (int) $pointsEnabled ? $this->points : 0,
             'mastodonUrl'             => $this->mastodonUrl ?? null,
             'privateProfile'          => (bool) $this->private_profile,
             'preventIndex'            => $this->prevent_index,

diff --git a/app/Http/Resources/UserBaseResource.php b/app/Http/Resources/UserBaseResource.php
@@ -9,7 +9,7 @@
 class UserBaseResource extends JsonResource
 {
     public function toArray($request): array {
-        $likesEnabled = $request->user()?->likesEnabled ?? true;
+        $pointsEnabled = $request->user()?->points_enabled ?? true;
         return [
             'id'             => (int) $this->id,
             'displayName'    => (string) $this->name,
@@ -19,7 +19,7 @@ public function toArray($request): array {
             'totalDistance'  => (float) $this->train_distance,
             'trainDuration'  => (int) $this->train_duration, // @deprecated: remove after 2024-08
             'totalDuration'  => (int) $this->train_duration,
-            'points'         => (int) $likesEnabled ? $this->points : 0,
+            'points'         => (int) $pointsEnabled ? $this->points : 0,
             'mastodonUrl'    => $this->mastodonUrl ?? null,
             'privateProfile' => (bool) $this->private_profile,
             'preventIndex'   => $this->prevent_index,