paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "recent: Remove participant avatars from PM rows."

Browse Source 
This reverts commit 7e1fe7e569.
This commit is contained in:
Aman Agrawal
2022-11-18 17:25:51 +00:00
committed by Tim Abbott
parent 3fe2f208ae
commit eab2dbab1e
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/js/recent_topics_ui.js
View File

@@ -426,15 +426,9 @@ function format_conversation(conversation_data) {
context.pm_url = last_msg.pm_with_url; context.pm_url = last_msg.pm_with_url;
context.is_group = last_msg.display_recipient.length > 2; context.is_group = last_msg.display_recipient.length > 2;
// Don't show participant avatars for PMs. // Display in most recent sender first order
// "Participants" column on "Recent topics" does not provide accurate information for PM conversations. all_senders = last_msg.display_recipient;
// In particular, it duplicates the PM recipients list under "Topics" senders = all_senders.slice(-MAX_AVATAR).map((sender) => sender.id);
// (with the addition of the current user), but does not depend on who sent messages to the thread.
// TODO: https://github.com/zulip/zulip/issues/23563
all_senders = [];
senders = [];
extra_sender_ids = [];
displayed_other_senders = [];
if (!context.is_group) { if (!context.is_group) {
const user_id = Number.parseInt(last_msg.to_user_ids, 10); const user_id = Number.parseInt(last_msg.to_user_ids, 10);
@@ -447,6 +441,12 @@ function format_conversation(conversation_data) {
context.user_circle_class = buddy_data.get_user_circle_class(user_id); context.user_circle_class = buddy_data.get_user_circle_class(user_id);
} }
} }
// Collect extra senders fullname for tooltip.
extra_sender_ids = all_senders.slice(0, -MAX_AVATAR);
displayed_other_senders = extra_sender_ids
.slice(-MAX_EXTRA_SENDERS)
.map((sender) => sender.id);
} }
context.senders = people.sender_info_for_recent_topics_row(senders); context.senders = people.sender_info_for_recent_topics_row(senders);

3
static/templates/recent_topic_row.hbs
View File

@@ -70,8 +70,6 @@
</td> </td>
<td class='recent_topic_users'> <td class='recent_topic_users'>
<ul class="recent_topics_participants"> <ul class="recent_topics_participants">
{{#if is_private}}
{{else}}
{{#if other_senders_count}} {{#if other_senders_count}}
<li class="recent_topics_participant_item tippy-zulip-tooltip" data-tooltip-template-id="recent_topics_participant_overflow_tooltip:{{conversation_key}}"> <li class="recent_topics_participant_item tippy-zulip-tooltip" data-tooltip-template-id="recent_topics_participant_overflow_tooltip:{{conversation_key}}">
<span class="recent_topics_participant_overflow">+{{other_senders_count}}</span> <span class="recent_topics_participant_overflow">+{{other_senders_count}}</span>
@@ -89,7 +87,6 @@
</li> </li>
{{/if}} {{/if}}
{{/each}} {{/each}}
{{/if}}
</ul> </ul>
</td> </td>
<td class="recent_topic_timestamp"> <td class="recent_topic_timestamp">