From b0a712bd6e2d657e49ba83d1091a94cc3905e26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Ro=C3=9Fbacher?= <moritzrossbacher@gmail.com>
Date: Mon, 23 Oct 2023 16:07:27 +0200
Subject: [PATCH] improved lfg

---
 src/commands/lfg.rs | 40 ++++++++++++++++++++++++++--------------
 src/main.rs         |  7 ++++---
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/commands/lfg.rs b/src/commands/lfg.rs
index e5af020..73e2f0c 100644
--- a/src/commands/lfg.rs
+++ b/src/commands/lfg.rs
@@ -1,11 +1,16 @@
+//
 use crate::commands::lfg::Difficulty::Normal;
-use crate::commands::lfg::Mode::Casual;
+use crate::commands::lfg::Map::*;
+use crate::commands::lfg::Mode::*;
+//from main.rs
 use crate::Context;
 use crate::Error;
+//
 use serenity::model::id::RoleId;
 use serenity::model::mention::Mention;
 use serenity::model::mention::Mention::Role;
 use serenity::prelude::Mentionable;
+
 #[derive(Debug, poise::ChoiceParameter)]
 pub enum Map {
     #[name = "Dead End"]
@@ -37,7 +42,10 @@ pub enum Difficulty {
 pub(crate) async fn lfg(
     ctx: Context<'_>,
     #[rename = "map"] map: Map,
-    #[rename = "difficulty"] difficulty: Option<Difficulty>,
+
+    #[description = "Normal"]
+    #[rename = "difficulty"]
+    difficulty: Option<Difficulty>,
 
     #[rename = "mode"]
     #[description = "play-style"]
@@ -67,22 +75,26 @@ pub(crate) async fn lfg(
     let ping: Mention;
     match mode.unwrap_or(Casual) {
         Casual => match map {
-            Map::DeadEnd => ping = Role(RoleId(1005837123921915914)),
-            Map::BadBlood => ping = Role(RoleId(1140190470698438666)),
-            Map::AlienArcadium => ping = Role(RoleId(1105917281898336356)),
+            DeadEnd => ping = Role(RoleId(1005837123921915914)),
+            BadBlood => ping = Role(RoleId(1140190470698438666)),
+            AlienArcadium => ping = Role(RoleId(1105917281898336356)),
         },
-        Mode::Speedrun => ping = Role(RoleId(1005836989595144243)),
-        Mode::Challenge => ping = Role(RoleId(1005836864680361994)),
+        Speedrun => ping = Role(RoleId(1005836989595144243)),
+        Challenge => ping = Role(RoleId(1005836864680361994)),
     }
 
     let mut reply = format!(
-        "{} is looking for {}\n{}/{} {} {}",
-        ctx.author().mention(),
-        ping,
-        current,
-        desired,
-        map.name(),
-        difficulty.unwrap_or(Normal).name()
+        "{c}/{d} {e} {f} {b}",
+        //a = ctx.author().mention(),
+        b = ping,
+        c = current,
+        d = desired,
+        e = map.name(),
+        f = if map != AlienArcadium {
+            difficulty.unwrap_or(Normal).name()
+        } else {
+            Normal.name()
+        }
     );
     if note.is_some() {
         reply.push_str(format!("\nNote: {}", note.unwrap()).as_str())
diff --git a/src/main.rs b/src/main.rs
index c7c7950..d6354ec 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,9 @@
 mod commands;
 
-use std::collections::HashSet;
-use std::convert::Into;
 use poise::serenity_prelude as serenity;
 use serenity::model::id::UserId;
+use std::collections::HashSet;
+use std::convert::Into;
 
 type Error = Box<dyn std::error::Error + Send + Sync>;
 type Context<'a> = poise::Context<'a, Data, Error>;
@@ -34,7 +34,8 @@ async fn main() {
                         other => poise::builtins::on_error(other).await.unwrap(),
                     }
                 })
-            },owners,
+            },
+            owners,
             ..Default::default()
         })
         .token(std::env::var("DISCORD_TOKEN").unwrap())