sidebars: Show "(you)" after user's own name in user lists.

Co-authored-by: Lauryn Menard <lauryn@zulip.com>
This commit is contained in:
Harsh
2025-02-09 12:42:44 +05:30
committed by Tim Abbott
parent 57ce1371a8
commit 20e3262233
4 changed files with 13 additions and 1 deletions

View File

@@ -38,6 +38,7 @@ export function get_active_user_ids_string(): string | undefined {
type DisplayObject = {
recipients: string;
user_ids_string: string;
is_current_user: boolean;
unread: number;
is_zero: boolean;
is_active: boolean;
@@ -94,6 +95,7 @@ export function get_conversations(search_string = ""): DisplayObject[] {
let user_circle_class;
let status_emoji_info;
let is_bot = false;
let is_current_user = false;
if (!is_group) {
const user_id = Number.parseInt(user_ids_string, 10);
@@ -104,6 +106,7 @@ export function get_conversations(search_string = ""): DisplayObject[] {
// We display the bot icon rather than a user circle for bots.
is_bot = true;
} else {
is_current_user = people.is_my_user_id(user_id);
status_emoji_info = user_status.get_status_emoji(user_id);
}
}
@@ -121,6 +124,7 @@ export function get_conversations(search_string = ""): DisplayObject[] {
is_bot,
has_unread_mention,
is_deactivated,
is_current_user,
};
display_objects.push(display_object);
}

View File

@@ -8,7 +8,9 @@
{{/if}}
<a href="{{url}}" class="conversation-partners">
<span class="conversation-partners-list">{{recipients}} {{> status_emoji status_emoji_info}}
<span class="conversation-partners-list">{{recipients}}
{{#if is_current_user}}<span class="my_user_status">{{t '(you)'}}</span>{{/if}}
{{> status_emoji status_emoji_info}}
{{#if is_bot}}
<i class="zulip-icon zulip-icon-bot" aria-label="{{t 'Bot' }}"></i>
{{/if}}

View File

@@ -3,3 +3,4 @@
{{else}}
<span class="user-name">{{name}}</span>
{{/if}}
{{#if is_current_user}}&nbsp;<span class="my_user_status">{{t '(you)'}}</span>{{/if}}

View File

@@ -119,6 +119,7 @@ test("get_conversations", ({override}) => {
const expected_data = [
{
is_bot: false,
is_current_user: true,
is_active: false,
is_deactivated: false,
is_group: false,
@@ -135,6 +136,7 @@ test("get_conversations", ({override}) => {
},
{
recipients: "Alice, Bob",
is_current_user: false,
user_ids_string: "101,102",
unread: 1,
is_zero: false,
@@ -171,6 +173,7 @@ test("get_conversations", ({override}) => {
is_zero: true,
is_active: true,
is_deactivated: false,
is_current_user: false,
url: "#narrow/dm/106-Iago",
status_emoji_info: {emoji_code: "20"},
user_circle_class: "user-circle-offline",
@@ -208,6 +211,7 @@ test("get_conversations bot", ({override}) => {
{
recipients: "Outgoing webhook",
user_ids_string: "314",
is_current_user: false,
unread: 1,
is_zero: false,
is_active: false,
@@ -222,6 +226,7 @@ test("get_conversations bot", ({override}) => {
{
recipients: "Alice, Bob",
user_ids_string: "101,102",
is_current_user: false,
unread: 1,
is_zero: false,
is_active: false,