From 1617f428e4f8573f0e8e7e6d1e05808ef096250e Mon Sep 17 00:00:00 2001
From: JustTestingV <JustTestingV@gmail.com>
Date: Fri, 15 Sep 2023 19:17:19 +0300
Subject: [PATCH] PrefixedNick creation raw, not Result

---
 src/projections/irc/mod.rs | 4 ++--
 src/protos/irc/user.rs     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/projections/irc/mod.rs b/src/projections/irc/mod.rs
index ca628be..803118f 100644
--- a/src/projections/irc/mod.rs
+++ b/src/projections/irc/mod.rs
@@ -669,8 +669,8 @@ async fn produce_on_join_cmd_messages(
     }
     .write_async(writer)
     .await?;
-    let prefixed_members: Vec<PrefixedNick> = room_info.members.iter().map(|member| PrefixedNick::fromPlayerId(member.clone()).unwrap()).collect();
-    let non_empty_members: NonEmpty<PrefixedNick> = NonEmpty::from_vec(prefixed_members).unwrap_or(nonempty![PrefixedNick::fromStr(user.nickname.clone()).unwrap()]);
+    let prefixed_members: Vec<PrefixedNick> = room_info.members.iter().map(|member| PrefixedNick::fromPlayerId(member.clone())).collect();
+    let non_empty_members: NonEmpty<PrefixedNick> = NonEmpty::from_vec(prefixed_members).unwrap_or(nonempty![PrefixedNick::fromStr(user.nickname.clone())]);
 
     ServerMessage {
         tags: vec![],
diff --git a/src/protos/irc/user.rs b/src/protos/irc/user.rs
index 4f2d0cd..2360925 100644
--- a/src/protos/irc/user.rs
+++ b/src/protos/irc/user.rs
@@ -20,11 +20,11 @@ pub struct PrefixedNick {
     pub nick: Str,
 }
 impl PrefixedNick {
-    pub fn fromStr(nick: Str) -> Result<PrefixedNick> {
-        Ok(PrefixedNick { prefix: Prefix::empty, nick } )
+    pub fn fromStr(nick: Str) -> PrefixedNick {
+        PrefixedNick { prefix: Prefix::empty, nick }
     }
 
-    pub fn fromPlayerId(id: PlayerId) -> Result<PrefixedNick> {
-        Ok(PrefixedNick { prefix: Prefix::empty, nick: id.into_inner() } )
+    pub fn fromPlayerId(id: PlayerId) -> PrefixedNick {
+        PrefixedNick { prefix: Prefix::empty, nick: id.into_inner() }
     }
 }
\ No newline at end of file