Skip to content

Commit 57eef21

Browse files
authored
Merge pull request #254 from Rustmail/dev
refactor(move): refactor move command format
2 parents 463f326 + 1225c02 commit 57eef21

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

rustmail/src/commands/move_thread/slash_command/move_thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl RegistrableCommand for MoveCommand {
131131

132132
let mut params = HashMap::new();
133133
params.insert("category".to_string(), category_name.to_string());
134-
params.insert("staff".to_string(), command.user.name.clone());
134+
params.insert("staff".to_string(), command.user.id.to_string());
135135

136136
let response = MessageBuilder::system_message(&ctx, &config)
137137
.translated_content(

rustmail/src/commands/move_thread/text_command/move_thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub async fn move_thread(
4545

4646
let mut params = HashMap::new();
4747
params.insert("category".to_string(), category_name.to_string());
48-
params.insert("staff".to_string(), msg.author.name.clone());
48+
params.insert("staff".to_string(), msg.author.id.to_string());
4949

5050
let confirmation_msg = get_translated_message(
5151
config,

rustmail/src/i18n/language/en.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ pub fn load_english_messages(dict: &mut ErrorDictionary) {
474474
);
475475
dict.messages.insert(
476476
"move_thread.success".to_string(),
477-
DictionaryMessage::new("✅ Thread moved to category '{category}' by {staff}")
477+
DictionaryMessage::new("✅ Thread moved to category **{category}** by <@{staff}>")
478478
.with_description("The thread has been successfully moved to the new category"),
479479
);
480480
dict.messages.insert(
@@ -604,7 +604,9 @@ pub fn load_english_messages(dict: &mut ErrorDictionary) {
604604
);
605605
dict.messages.insert(
606606
"close.auto_canceled_on_message".to_string(),
607-
DictionaryMessage::new("Scheduled closure has been automatically canceled because a message was received."),
607+
DictionaryMessage::new(
608+
"Scheduled closure has been automatically canceled because a message was received.",
609+
),
608610
);
609611
dict.messages.insert(
610612
"close.replacing_existing_closure".to_string(),

rustmail/src/i18n/language/fr.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ pub fn load_french_messages(dict: &mut ErrorDictionary) {
502502
);
503503
dict.messages.insert(
504504
"move_thread.success".to_string(),
505-
DictionaryMessage::new("✅ Thread déplacé vers la catégorie '{category}' par {staff}")
505+
DictionaryMessage::new("✅ Thread déplacé vers la catégorie **{category}** par <@{staff}>")
506506
.with_description("Le thread a été déplacé avec succès vers la nouvelle catégorie"),
507507
);
508508
dict.messages.insert(
@@ -632,7 +632,9 @@ pub fn load_french_messages(dict: &mut ErrorDictionary) {
632632
);
633633
dict.messages.insert(
634634
"close.auto_canceled_on_message".to_string(),
635-
DictionaryMessage::new("La fermeture programmée a été automatiquement annulée car un message a été reçu."),
635+
DictionaryMessage::new(
636+
"La fermeture programmée a été automatiquement annulée car un message a été reçu.",
637+
),
636638
);
637639
dict.messages.insert(
638640
"close.replacing_existing_closure".to_string(),

0 commit comments

Comments
 (0)