From f7b078ce6f0a807a7ecf4bdcda5d257f4179b903 Mon Sep 17 00:00:00 2001 From: Akinator31 Date: Wed, 14 Jan 2026 11:13:57 +0100 Subject: [PATCH] refactor(annoymous): display staff name in anonymous inbox staff message --- crates/rustmail/src/commands/edit/message_ops.rs | 6 ++---- crates/rustmail/src/utils/message/message_builder.rs | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/crates/rustmail/src/commands/edit/message_ops.rs b/crates/rustmail/src/commands/edit/message_ops.rs index c99e93ed..a13c979b 100644 --- a/crates/rustmail/src/commands/edit/message_ops.rs +++ b/crates/rustmail/src/commands/edit/message_ops.rs @@ -77,12 +77,10 @@ pub async fn format_new_message<'a>( } if thread_message.is_anonymous { - let mut inbox_builder = MessageBuilder::anonymous_staff_message(ctx, config, user.id) + let inbox_builder = MessageBuilder::anonymous_staff_message(ctx, config, user.id) + .as_staff(user.id, format!("{} ({})", user.name.clone(), "Anonymous")) .content(content.to_string()) .with_message_number(message_number); - if let Some(role_name) = &top_role_name { - inbox_builder = inbox_builder.with_role(role_name.clone()); - } let mut dm_builder = MessageBuilder::anonymous_staff_message(ctx, config, user.id) .content(content.to_string()); diff --git a/crates/rustmail/src/utils/message/message_builder.rs b/crates/rustmail/src/utils/message/message_builder.rs index 601194f0..74e4c135 100644 --- a/crates/rustmail/src/utils/message/message_builder.rs +++ b/crates/rustmail/src/utils/message/message_builder.rs @@ -806,6 +806,10 @@ impl<'a> StaffReply<'a> { let mut thread_builder = if self.is_anonymous { MessageBuilder::anonymous_staff_message(self.ctx, self.config, self.staff_user_id) + .as_staff( + self.staff_user_id, + format!("{} ({})", self.staff_username, "Anonymous"), + ) } else { MessageBuilder::staff_message( self.ctx, @@ -814,6 +818,7 @@ impl<'a> StaffReply<'a> { self.staff_username.clone(), ) }; + if !self.is_anonymous && let Some(role_name) = &top_role_name {