wip

resources/views/livewire/usage.blade.php

@@ -70,7 +70,7 @@ class="rounded-md border-gray-200 text-gray-700 py-1 text-sm"
                                                 {{ $userRequestCount['user']['name'] }}
                                             </div>
                                             <div class="text-xs text-gray-500 truncate">
-                                                {{ $userRequestCount['user']['email'] }}
+                                                {{ $userRequestCount['user']['extra'] }}
                                             </div>
                                         </div>
                                     </div>

src/Pulse.php

@@ -49,7 +49,7 @@ class Pulse
     /**
      * The users resolver.
      *
-     * @var ?(callable(\Illuminate\Support\Collection<int, string|int>): iterable<int, array{id: int|string, name: string, 'email'?: ?string}>)
+     * @var ?(callable(\Illuminate\Support\Collection<int, string|int>): iterable<int, array{id: int|string, name: string, 'extra'?: ?string}>)
      */
     protected $usersResolver = null;
 
@@ -274,7 +274,7 @@ protected function shouldRecord(Entry|Update $entry): bool
     /**
      * Resolve the user's details using the given closure.
      *
-     * @param  (callable(\Illuminate\Support\Collection<int, string|int>): iterable<int, array{id: int|string, name: string, 'email'?: ?string}>)  $callback
+     * @param  (callable(\Illuminate\Support\Collection<int, string|int>): iterable<int, array{id: int|string, name: string, 'extra'?: ?string}>)  $callback
      */
     public function resolveUsersUsing(callable $callback): self
     {
@@ -287,7 +287,7 @@ public function resolveUsersUsing(callable $callback): self
      * Resolve the user's details using the given closure.
      *
      * @param  \Illuminate\Support\Collection<int, string|int>  $ids
-     * @return  \Illuminate\Support\Collection<int, array{id: string|int, name: string, 'email'?: ?string}>
+     * @return  \Illuminate\Support\Collection<int, array{id: string|int, name: string, 'extra'?: ?string}>
      */
     public function resolveUsers(Collection $ids): Collection
     {
@@ -296,11 +296,23 @@ public function resolveUsers(Collection $ids): Collection
         }
 
         if (class_exists(\App\Models\User::class)) {
-            return \App\Models\User::whereKey($ids)->get(['id', 'name', 'email']);
+            return \App\Models\User::whereKey($ids)
+                ->get(['id', 'name', 'email'])
+                ->map(fn (User $user) => [
+                    'id' => $user->id,
+                    'name' => $user->name,
+                    'extra' => $user->email,
+                ]);
         }
 
         if (class_exists(\App\User::class)) {
-            return \App\User::whereKey($ids)->get(['id', 'name', 'email']);
+            return \App\User::whereKey($ids)
+                ->get(['id', 'name', 'email'])
+                ->map(fn (User $user) => [
+                    'id' => $user->id,
+                    'name' => $user->name,
+                    'extra' => $user->email,
+                ]);
         }
 
         return $ids->map(fn (string|int $id) => [

src/Queries/Usage.php

@@ -32,7 +32,7 @@ public function __construct(
     /**
      * Run the query.
      *
-     * @return \Illuminate\Support\Collection<int, array{count: int, user: array{name: string, 'email': ?string}}>
+     * @return \Illuminate\Support\Collection<int, array{count: int, user: array{name: string, 'extra': ?string}}>
      */
     public function __invoke(Interval $interval, string $type): Collection
     {
@@ -61,9 +61,8 @@ public function __invoke(Interval $interval, string $type): Collection
                 'count' => (int) $row->count,
                 'user' => [
                     'name' => $user['name'],
-                    // "extra" rather than 'email'
-                    'email' => $user['email'] ?? null,
-                    'avatar' => $user['avatar'] ?? null,
+                    'extra' => $user['extra'] ?? $user['email'],
+                    'avatar' => $user['avatar'] ?? ($user['email'] ?? false) ? "https://unavatar.io/{$user['email']}?fallback=".rawurlencode("https://source.boringavatars.com/marble/120/{$user['email']}?colors=2f2bad,ad2bad,e42692,f71568,f7db15") : null,
                 ],
             ] : null;
         })