From 8fee7ce9ccee18b8edb77c4f4003c627462136c9 Mon Sep 17 00:00:00 2001
From: Horhik <horhik@tuta.io>
Date: Thu, 22 Apr 2021 05:02:20 +0300
Subject: [PATCH] fix issue with adding new messages into DB

---
 src/api/handlers.rs   |  9 ++++++++-
 src/chat/serv_conn.rs | 11 ++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/api/handlers.rs b/src/api/handlers.rs
index 546dbdd..5eeca90 100644
--- a/src/api/handlers.rs
+++ b/src/api/handlers.rs
@@ -85,6 +85,13 @@ pub fn send_message(
     conn: &Connection,
     server_sender: SP,
 ) -> Result<()> {
+    log::debug!("CUM CUM");
+    log::debug!("CUM CUM");
+    log::debug!("CUM CUM");
+    log::debug!("CUM CUM");
+    log::debug!("CUM CUM");
+    log::debug!("CUM CUM");
+    log::debug!("CUM CUM");
     if let Ok(user_data) = db::users::get_user_by_id(user_id, conn) {
         // Add message to DB
         let key = user_data.insert_key;
@@ -95,7 +102,7 @@ pub fn send_message(
             date: chrono::offset::Local::now(),
             user_id: Id(uuid::Uuid::parse_str(identifier).expect("failed to parse user ID")),
             message: message.clone(),
-            from_me: false,
+            from_me: true,
         };
         let _ = db::messages::add_my_message(db_message, conn).unwrap();
         let fcp_req: String =
diff --git a/src/chat/serv_conn.rs b/src/chat/serv_conn.rs
index 30b929d..8622e3a 100644
--- a/src/chat/serv_conn.rs
+++ b/src/chat/serv_conn.rs
@@ -2,6 +2,7 @@ use super::serv_handler::to_server_sender;
 use crate::chat::types::{PackedMessage, RP, SP};
 use async_std::task;
 use fcpv2::types::traits::FcpParser;
+use regex::Regex;
 use serde_derive::Deserialize;
 use std::env;
 use tokio::{
@@ -50,6 +51,12 @@ async fn server_responce_getter(mut receiver: OwnedReadHalf, client_sender: SP)
                     "SSKKeypair" => {
                         log::debug!("parsing keypair: {:?}", &req);
                         let keypair = fcpv2::types::SSKKeypair::parse(&received).unwrap();
+                        /*
+                        let id_regex = Regex::new(r"^(\w*-\w*)").unwrap();
+                        let identifier_type: String = id_regex
+                            .captures(&keypair.identifier[..])
+                            .expect("wrong type identifier")[0].to_string();
+                        */
                         match &keypair.identifier[..] {
                             "config-SSK" => {
                                 log::debug!("got SSKKeypair: {:?}", &keypair);
@@ -83,7 +90,9 @@ async fn server_responce_getter(mut receiver: OwnedReadHalf, client_sender: SP)
                             }
                             _ => {}
                         }
-                    }
+                    },
+                    "DataFound" => {
+                    },
                     _ => {
                         log::debug!("unhandled: {}", &req);
                         client_sender