From e3fcdf1428dd4b38941476ee5a6fac16d1bec183 Mon Sep 17 00:00:00 2001
From: "xmppftw@kl.netlib.re" <xmppftw@kl.netlib.re>
Date: Sat, 30 Dec 2023 13:18:12 +0100
Subject: [PATCH] Move handling of MessageType::Chat to message::receive::chat
 module

---
 xmpp/src/message/receive/chat.rs | 50 ++++++++++++++++++++++++++++++
 xmpp/src/message/receive/mod.rs  | 53 +++++---------------------------
 2 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 xmpp/src/message/receive/chat.rs

diff --git a/xmpp/src/message/receive/chat.rs b/xmpp/src/message/receive/chat.rs
new file mode 100644
index 0000000..7191ba8
--- /dev/null
+++ b/xmpp/src/message/receive/chat.rs
@@ -0,0 +1,50 @@
+// Copyright (c) 2023 xmpp-rs contributors.
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use tokio_xmpp::{
+    parsers::{message::Message, muc::user::MucUser},
+    Jid,
+};
+
+use crate::{Agent, Event};
+
+pub async fn handle_message_chat(
+    agent: &mut Agent,
+    events: &mut Vec<Event>,
+    from: Jid,
+    message: &Message,
+) {
+    let langs: Vec<&str> = agent.lang.iter().map(String::as_str).collect();
+    if let Some((_lang, body)) = message.get_best_body(langs) {
+        let mut found_special_message = false;
+
+        for payload in &message.payloads {
+            if let Ok(_) = MucUser::try_from(payload.clone()) {
+                let event = match from.clone() {
+                    Jid::Bare(bare) => {
+                        // TODO: Can a service message be of type Chat/Normal and not Groupchat?
+                        warn!("Received misformed MessageType::Chat in muc#user namespace from a bare JID.");
+                        Event::ServiceMessage(message.id.clone(), bare, body.clone())
+                    }
+                    Jid::Full(full) => Event::RoomPrivateMessage(
+                        message.id.clone(),
+                        full.to_bare(),
+                        full.resource_str().to_owned(),
+                        body.clone(),
+                    ),
+                };
+
+                found_special_message = true;
+                events.push(event);
+            }
+        }
+
+        if !found_special_message {
+            let event = Event::ChatMessage(message.id.clone(), from.to_bare(), body.clone());
+            events.push(event);
+        }
+    }
+}
diff --git a/xmpp/src/message/receive/mod.rs b/xmpp/src/message/receive/mod.rs
index 521513a..9f2a4b3 100644
--- a/xmpp/src/message/receive/mod.rs
+++ b/xmpp/src/message/receive/mod.rs
@@ -4,69 +4,30 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-use tokio_xmpp::{
-    parsers::{
-        message::{Message, MessageType},
-        muc::user::MucUser,
-        ns,
-    },
-    Jid,
+use tokio_xmpp::parsers::{
+    message::{Message, MessageType},
+    ns,
 };
 
 use crate::{pubsub, Agent, Event};
 
+pub mod chat;
 pub mod group_chat;
 
 pub async fn handle_message(agent: &mut Agent, message: Message) -> Vec<Event> {
     let mut events = vec![];
     let from = message.from.clone().unwrap();
-    //let langs: Vec<&str> = agent.lang.iter().map(String::as_str).collect();
-    let langs = agent.lang.to_vec();
-    let langs = langs.iter().map(|x| x.as_str()).collect();
 
     match message.type_ {
         MessageType::Groupchat => {
             group_chat::handle_message_group_chat(agent, &mut events, from.clone(), &message).await;
         }
+        MessageType::Chat | MessageType::Normal => {
+            chat::handle_message_chat(agent, &mut events, from.clone(), &message).await;
+        }
         _ => {}
     }
 
-    match message.get_best_body(langs) {
-        Some((_lang, body)) => match message.type_ {
-            MessageType::Chat | MessageType::Normal => {
-                let mut found_special_message = false;
-
-                for payload in &message.payloads {
-                    if let Ok(_) = MucUser::try_from(payload.clone()) {
-                        let event = match from.clone() {
-                            Jid::Bare(bare) => {
-                                // TODO: Can a service message be of type Chat/Normal and not Groupchat?
-                                warn!("Received misformed MessageType::Chat in muc#user namespace from a bare JID.");
-                                Event::ServiceMessage(message.id.clone(), bare, body.clone())
-                            }
-                            Jid::Full(full) => Event::RoomPrivateMessage(
-                                message.id.clone(),
-                                full.to_bare(),
-                                full.resource_str().to_owned(),
-                                body.clone(),
-                            ),
-                        };
-
-                        found_special_message = true;
-                        events.push(event);
-                    }
-                }
-
-                if !found_special_message {
-                    let event =
-                        Event::ChatMessage(message.id.clone(), from.to_bare(), body.clone());
-                    events.push(event)
-                }
-            }
-            _ => (),
-        },
-        None => (),
-    }
     for child in message.payloads {
         if child.is("event", ns::PUBSUB_EVENT) {
             let new_events = pubsub::handle_event(&from, child, agent).await;