MrPunyapal · Oct 28, 2026 · Oct 28, 2026 · Nov 6, 2026 · Nov 6, 2026 · coderabbitai
diff --git a/KNOWLEDGE_BASE.md b/KNOWLEDGE_BASE.md
@@ -510,7 +510,7 @@ Settings → Appearance offers:
 
 These appearance choices are saved in the browser, not on the account, so each browser keeps its own. Settings → Profile lets you choose one of six lane colors (Orange, Green, Violet, Teal, Rose, Ochre), a custom color, or the automatic color used around your identity and activity graph.
 
-Profile settings also let you share a timezone. Timestamps can show the author's local time as well as the viewer's when a timezone is shared. Leaving it unset uses the browser's timezone for your display without publishing your timezone. A separate, off-by-default setting shows your current local time on your profile, next to your location and website; it only applies while a timezone is set, and clearing the timezone turns it off. These /dev/null preferences are separate from your GitHub-managed profile information.
+Profile settings also let you share a timezone. Timestamps can show the author's local time as well as the viewer's when a timezone is shared. Leaving it unset uses the browser's timezone for your display without publishing your timezone. A separate, off-by-default setting shows your current local time on your profile, next to your location and website, in direct Remote headers, and beside members who have opted in on group Remotes. It only applies while a timezone is set, and clearing the timezone turns it off. These /dev/null preferences are separate from your GitHub-managed profile information.
 
 Sources: [appearance settings](resources/js/pages/appearance/update.tsx), [lane picker](resources/js/components/lane-picker.tsx), [timezone picker](resources/js/components/timezone-picker.tsx), [local time](resources/js/components/local-time.tsx), [timestamp tooltip](resources/js/components/timestamp-tooltip.tsx).
 

diff --git a/app/Http/Controllers/ConversationController.php b/app/Http/Controllers/ConversationController.php
@@ -7,6 +7,7 @@
 use App\Actions\UpdateConversationReadThrough;
 use App\Http\Requests\ListConversationsRequest;
 use App\Http\Requests\ShowConversationRequest;
+use App\Http\Resources\ConversationResource;
 use App\Models\Conversation;
 use App\Models\User;
 use App\Queries\ConversationsQuery;
@@ -20,7 +21,12 @@
     public function index(ListConversationsRequest $request, #[CurrentUser] User $user, ConversationsQuery $conversations): Response
     {
         return Inertia::render('conversation/index', [
-            'inbox' => fn (): array => $conversations->get($user),
+            'inbox' => function () use ($request, $user, $conversations): array {
+                $inbox = $conversations->get($user);
+                $inbox['conversations'] = ConversationResource::collection($inbox['conversations'])->resolve($request);
+
+                return $inbox;
+            },
             'partner' => null,
             'thread' => null,
         ]);
@@ -44,8 +50,16 @@ public function show(ShowConversationRequest $request, #[CurrentUser] User $user
 
                 return $thread;
             },
-            'inbox' => fn (): array => $conversations->get($user),
-            'partner' => $partner,
+            'inbox' => function () use ($request, $user, $conversations): array {
+                $inbox = $conversations->get($user);
+                $inbox['conversations'] = ConversationResource::collection($inbox['conversations'])->resolve($request);
+
+                return $inbox;
+            },
+            'partner' => [
+                ...$partner->toArray(),
+                'timezone' => $partner->show_local_time ? $partner->timezone : null,
+            ],
         ]);
     }
 }
diff --git a/app/Http/Controllers/InboxController.php b/app/Http/Controllers/InboxController.php
@@ -5,6 +5,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\ListInboxRequest;
+use App\Http\Resources\ConversationResource;
 use App\Models\User;
 use App\Queries\ConversationsQuery;
 use Illuminate\Container\Attributes\CurrentUser;
@@ -14,10 +15,15 @@
 {
     public function index(ListInboxRequest $request, #[CurrentUser] User $user, ConversationsQuery $conversations): JsonResponse
     {
+        $inbox = $conversations->get($user, $request->tab(), $request->term(), $request->beforeId());
+        $inbox['conversations'] = ConversationResource::collection($inbox['conversations'])->resolve($request);
+
         return response()->json([
             ...($request->notificationBaseline() ? ['notification_baseline' => $conversations->notificationBaseline($user)] : []),
-            ...$conversations->get($user, $request->tab(), $request->term(), $request->beforeId()),
-            ...($request->notificationConversations() ? ['notification_conversations' => $conversations->get($user, pinnedFirst: false)['conversations']] : []),
+            ...$inbox,
+            ...($request->notificationConversations() ? [
+                'notification_conversations' => ConversationResource::collection($conversations->get($user, pinnedFirst: false)['conversations'])->resolve($request),
+            ] : []),
             'unread' => $conversations->unreadCount($user),
             'requests' => $conversations->requestCount($user),
         ])->header('Cache-Control', 'private, no-store');

diff --git a/app/Http/Controllers/OrgController.php b/app/Http/Controllers/OrgController.php
@@ -10,6 +10,7 @@
 use App\Http\Requests\CreateOrgRequest;
 use App\Http\Requests\ShowOrgRequest;
 use App\Http\Requests\UpdateOrgRequest;
+use App\Http\Resources\ConversationResource;
 use App\Models\Conversation;
 use App\Models\User;
 use App\Queries\ConversationsQuery;
@@ -32,11 +33,25 @@ public function show(ShowOrgRequest $request, #[CurrentUser] User $user, Convers
             'thread' => function () use ($user, $org, $threads, $action): array {
                 $thread = $threads->org($user, $org);
 
+                $thread['members'] = $thread['members']->map(function (array $member): array {
+                    $member['user'] = [
+                        ...$member['user']->toArray(),
+                        'timezone' => $member['user']->show_local_time ? $member['user']->timezone : null,
+                    ];
+
+                    return $member;
+                });
+
                 $action->handle($user, $org, $thread['messages']->last()->id ?? 0);
 
                 return $thread;
             },
-            'inbox' => fn (): array => $conversations->get($user),
+            'inbox' => function () use ($request, $user, $conversations): array {
+                $inbox = $conversations->get($user);
+                $inbox['conversations'] = ConversationResource::collection($inbox['conversations'])->resolve($request);
+
+                return $inbox;
+            },
             'partner' => null,
             'org' => ['id' => $org->id, 'name' => $org->name],
         ]);

diff --git a/app/Http/Controllers/OrgMessageController.php b/app/Http/Controllers/OrgMessageController.php
@@ -17,9 +17,19 @@
 {
     public function index(ListOrgMessagesRequest $request, #[CurrentUser] User $user, Conversation $org, ConversationThreadQuery $threads): JsonResponse
     {
+        $thread = $threads->org($user, $org, $request->afterId(), $request->beforeId(), $request->reactionsAfter());
+        $thread['members'] = $thread['members']->map(function (array $member): array {
+            $member['user'] = [
+                ...$member['user']->toArray(),
+                'timezone' => $member['user']->show_local_time ? $member['user']->timezone : null,
+            ];
+
+            return $member;
+        });
+
         return response()->json([
             'org' => ['id' => $org->id, 'name' => $org->name],
-            ...$threads->org($user, $org, $request->afterId(), $request->beforeId(), $request->reactionsAfter()),
+            ...$thread,
         ])->header('Cache-Control', 'private, no-store');
     }
 

diff --git a/app/Http/Resources/ConversationResource.php b/app/Http/Resources/ConversationResource.php
@@ -30,7 +30,9 @@ public function toArray(Request $request): array
 
         return [
             ...$conversation,
-            'partner' => $conversation['partner'] instanceof User ? UserResource::make($conversation['partner']) : null,
+            'partner' => $conversation['partner'] instanceof User ? [
+                ...UserResource::make($conversation['partner'])->toArray($request),
+            ] : null,
             'members' => $conversation['members']?->map(fn (array $member): array => [
                 'user' => UserResource::make($member['user']),
                 'role' => $member['role'],

diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
@@ -36,6 +36,8 @@ public function toArray(Request $request): array
             'bio' => $this->bio,
             'company' => $this->company,
             'location' => $this->location,
+            'timezone' => $this->show_local_time ? $this->timezone : null,
+            'show_local_time' => $this->show_local_time,
             'website' => $this->website,
             'github_url' => "https://github.com/{$this->handle}",
             'html_url' => route('user.show', $this->resource),

diff --git a/resources/js/components/chat/chat-dock.tsx b/resources/js/components/chat/chat-dock.tsx
@@ -15,6 +15,7 @@ import { ConversationActions } from '@/components/chat/conversation-actions';
 import { ConversationThread } from '@/components/chat/conversation-thread';
 import { InboxPanel } from '@/components/chat/inbox-panel';
 import { MemberStack, OrgHeader, orgTitle } from '@/components/chat/org';
+import { RemoteLocalTime } from '@/components/chat/remote-local-time';
 import { SearchDialog } from '@/components/search-dialog';
 import {
     Tooltip,
@@ -63,8 +64,9 @@ function DockedChat({ user }: { user: User }) {
     const target: ChatTarget | null =
         dock.conversation === null
             ? null
-            : (threads[dock.conversation]?.target ??
-              (summary === undefined ? null : targetOf(summary)));
+            : summary === undefined
+              ? (threads[dock.conversation]?.target ?? null)
+              : targetOf(summary);
     const thread = target === null ? undefined : threads[targetKey(target)];
 
     const open = (next: ChatTarget) => {
@@ -217,17 +219,22 @@ function DockedChat({ user }: { user: User }) {
                                     avatarClassName="size-6"
                                 />
                             )}
-                            <span className="min-w-0 truncate text-sm font-semibold">
-                                {target.kind === 'direct'
-                                    ? target.partner.name
-                                    : orgTitle(
-                                          target.org,
-                                          thread?.members ??
-                                              summary?.members ??
-                                              null,
-                                          user,
-                                      )}
-                            </span>
+                            <div className="min-w-0 flex-1">
+                                <span className="block truncate text-sm font-semibold">
+                                    {target.kind === 'direct'
+                                        ? target.partner.name
+                                        : orgTitle(
+                                              target.org,
+                                              thread?.members ??
+                                                  summary?.members ??
+                                                  null,
+                                              user,
+                                          )}
+                                </span>
+                                {target.kind === 'direct' && (
+                                    <RemoteLocalTime partner={target.partner} />
+                                )}
+                            </div>
                             {unread > 0 && (
                                 <span
                                     title={`${unread} unread conversations`}
@@ -310,7 +317,7 @@ function DirectDockHeader({
             <Link
                 href={show(partner)}
                 prefetch
-                className="group min-w-0 rounded-md"
+                className="group min-w-0 flex-1 rounded-md"
                 title={partner.name}
             >
                 <span className="block truncate text-sm font-semibold group-hover:underline">
@@ -319,6 +326,7 @@ function DirectDockHeader({
                 <span className="block truncate font-mono text-[11px] text-muted-foreground">
                     @{partner.handle}
                 </span>
+                <RemoteLocalTime partner={partner} />
             </Link>
             <ConversationActions
                 target={{ kind: 'direct', partner }}

diff --git a/resources/js/components/chat/org.tsx b/resources/js/components/chat/org.tsx
@@ -4,6 +4,7 @@ import type { FormEvent, ReactNode } from 'react';
 import { useEffect, useRef, useState } from 'react';
 import { toast } from 'sonner';
 import { ConversationActions } from '@/components/chat/conversation-actions';
+import { RemoteLocalTime } from '@/components/chat/remote-local-time';
 import { Button } from '@/components/ui/button';
 import { Checkbox } from '@/components/ui/checkbox';
 import {
@@ -532,6 +533,7 @@ function MemberRow({
                 <span className="flex min-w-0 items-center gap-1 font-mono text-xs text-muted-foreground">
                     <span className="truncate">@{member.user.handle}</span>
                 </span>
+                <RemoteLocalTime partner={member.user} />
             </span>
             <span
                 className={cn(

diff --git a/resources/js/components/chat/remote-local-time.tsx b/resources/js/components/chat/remote-local-time.tsx
@@ -0,0 +1,22 @@
+import { LocalTime } from '@/components/local-time';
+import type { User } from '@/types';
+
+export function RemoteLocalTime({
+    partner,
+}: {
+    partner: Pick<User, 'timezone' | 'show_local_time'>;
+}) {
+    if (!partner.show_local_time || !partner.timezone) {
+        return null;
+    }
+
+    return (
+        <ul
+            title={partner.timezone}
+            className="min-h-4 min-w-0 font-mono text-[11px] text-muted-foreground [&_li]:min-w-0 [&_li]:gap-1 [&_li_span]:truncate [&_svg]:size-3 [&_svg]:shrink-0"
+            data-test="remote-local-time"
+        >
+            <LocalTime timeZone={partner.timezone} />
+        </ul>
+    );
+}
diff --git a/resources/js/components/timezone-picker.tsx b/resources/js/components/timezone-picker.tsx
@@ -71,7 +71,7 @@ export default function TimezonePicker() {
         <section className="px-4 py-6 sm:px-6">
             <Heading
                 title="Timezone"
-                description="Hover a commit or reply time to see it in your timezone, and in the author's when they have set one. Others see yours the same way. Leave it unset to use your browser's timezone without sharing it. Your local time only shows on your profile if you turn that on below."
+                description="Hover a commit or reply time to see it in your timezone, and in the author's when they have set one. Others see yours the same way. Leave it unset to use your browser's timezone without sharing it. Your current local time is also visible on your profile and in Remotes if you opt in below."
             />
 
             <Form
@@ -206,10 +206,12 @@ export default function TimezonePicker() {
                                 htmlFor="show-local-time"
                                 className="block text-sm leading-snug font-normal"
                             >
-                                Show my local time on my profile
+                                Show my local time on my profile and in direct
+                                and group Remotes
                                 <span className="block text-muted-foreground">
-                                    Anyone who opens your profile sees the
-                                    current time in your timezone.
+                                    People viewing your profile or in a direct
+                                    or group remote with you can see your
+                                    current local time.
                                 </span>
                             </Label>
                         </div>

diff --git a/resources/js/pages/conversation/index.tsx b/resources/js/pages/conversation/index.tsx
@@ -12,6 +12,7 @@ import { ConversationActions } from '@/components/chat/conversation-actions';
 import { ConversationThread } from '@/components/chat/conversation-thread';
 import { InboxPanel } from '@/components/chat/inbox-panel';
 import { OrgHeader, OrgPeopleDialog } from '@/components/chat/org';
+import { RemoteLocalTime } from '@/components/chat/remote-local-time';
 import { RemoteSettingsMenu } from '@/components/chat/remote-settings-menu';
 import { SearchDialog } from '@/components/search-dialog';
 import { Button } from '@/components/ui/button';
@@ -43,13 +44,22 @@ export default function Index({
     thread: Thread | OrgThread | null;
 }) {
     const { user } = useUser();
+    const conversations = useInbox();
     const dock = useChatDock();
     const [isPicking, setIsPicking] = useState(false);
     const [isStartingOrg, setIsStartingOrg] = useState(false);
     const [seededFrom, setSeededFrom] = useState<object | null>(null);
+    const currentPartner =
+        partner === null
+            ? null
+            : (conversations?.find(
+                  (conversation) =>
+                      conversation.kind === 'direct' &&
+                      conversation.partner?.id === partner.id,
+              )?.partner ?? partner);
     const target: ChatTarget | null =
-        partner !== null
-            ? { kind: 'direct', partner }
+        currentPartner !== null
+            ? { kind: 'direct', partner: currentPartner }
             : org !== null
               ? { kind: 'org', org }
               : null;
@@ -63,8 +73,6 @@ export default function Index({
         }
     }
 
-    useInbox();
-
     // Keeps the inbox's tab and search while moving between conversations.
     const visit = (href: Parameters<typeof router.visit>[0]) =>
         router.visit(href, { preserveScroll: true, preserveState: true });
@@ -90,8 +98,8 @@ export default function Index({
         <>
             <Head
                 title={
-                    partner
-                        ? `@${partner.handle} · Remotes`
+                    currentPartner
+                        ? `@${currentPartner.handle} · Remotes`
                         : org
                           ? `${org.name ?? 'Org'} · Remotes`
                           : 'Remotes'
@@ -287,7 +295,7 @@ function ThreadHeader({
                         } as React.CSSProperties
                     }
                 />
-                <span className="min-w-0">
+                <div className="min-w-0">
                     <span
                         className="block truncate text-[15px] font-semibold hover:underline"
                         title={partner.name}
@@ -297,7 +305,8 @@ function ThreadHeader({
                     <span className="block truncate font-mono text-xs text-muted-foreground">
                         @{partner.handle}
                     </span>
-                </span>
+                    <RemoteLocalTime partner={partner} />
+                </div>
             </Link>
             <ConversationActions
                 target={{ kind: 'direct', partner }}

diff --git a/tests/Feature/Controllers/Api/MentionSuggestionControllerTest.php b/tests/Feature/Controllers/Api/MentionSuggestionControllerTest.php
@@ -24,6 +24,32 @@
         ->assertJsonMissingPath('data.0.email');
 });
 
+it('shares a suggested user timezone only when they opt in', function (): void {
+    $sharing = User::factory()->create([
+        'handle' => 'sharing',
+        'timezone' => 'America/Los_Angeles',
+        'show_local_time' => true,
+    ]);
+    $private = User::factory()->create([
+        'handle' => 'private',
+        'timezone' => 'Asia/Tokyo',
+        'show_local_time' => false,
+    ]);
+    $this->user->following()->attach([$sharing->id, $private->id]);
+
+    $users = collect(signedApiRequest($this->keyPair, 'GET', route('api-mention-suggestion.index'))
+        ->assertOk()
+        ->json('data'))->keyBy('handle');
+
+    expect($users['sharing'])->toMatchArray([
+        'timezone' => 'America/Los_Angeles',
+        'show_local_time' => true,
+    ])->and($users['private'])->toMatchArray([
+        'timezone' => null,
+        'show_local_time' => false,
+    ]);
+});
+
 it('suggests matches, people the user follows first, leaving out muted people and people across a block', function (): void {
     User::factory()->create(['handle' => 'taylor', 'name' => 'Taylor']);
     $followed = User::factory()->create(['handle' => 'taylorotwell', 'name' => 'Taylor Otwell']);