From 446e3e885a04f9a03626a8212303bd158627513e Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Tue, 5 Jul 2022 09:50:44 +0200
Subject: [PATCH] Move chat to ui module

---
 src/main.rs                      | 1 -
 src/ui.rs                        | 3 ++-
 src/{ => ui}/chat.rs             | 0
 src/{ => ui}/chat/tree.rs        | 0
 src/{ => ui}/chat/tree/action.rs | 3 +--
 src/{ => ui}/chat/tree/blocks.rs | 4 +---
 src/{ => ui}/chat/tree/cursor.rs | 3 +--
 src/{ => ui}/chat/tree/layout.rs | 3 +--
 src/{ => ui}/chat/tree/render.rs | 0
 src/{ => ui}/chat/tree/util.rs   | 0
 src/ui/room.rs                   | 2 +-
 11 files changed, 7 insertions(+), 12 deletions(-)
 rename src/{ => ui}/chat.rs (100%)
 rename src/{ => ui}/chat/tree.rs (100%)
 rename src/{ => ui}/chat/tree/action.rs (98%)
 rename src/{ => ui}/chat/tree/blocks.rs (99%)
 rename src/{ => ui}/chat/tree/cursor.rs (99%)
 rename src/{ => ui}/chat/tree/layout.rs (99%)
 rename src/{ => ui}/chat/tree/render.rs (100%)
 rename src/{ => ui}/chat/tree/util.rs (100%)

diff --git a/src/main.rs b/src/main.rs
index 9aa259e..fbf35c3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,6 @@
 
 // TODO Clean up use and manipulation of toss Pos and Size
 
-mod chat;
 mod euph;
 mod logger;
 mod replies;
diff --git a/src/ui.rs b/src/ui.rs
index 2ed32c2..2dfaca8 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,3 +1,4 @@
+mod chat;
 mod room;
 mod rooms;
 mod util;
@@ -14,10 +15,10 @@ use tokio::task;
 use toss::frame::{Frame, Pos, Size};
 use toss::terminal::Terminal;
 
-use crate::chat::Chat;
 use crate::logger::{LogMsg, Logger};
 use crate::vault::Vault;
 
+use self::chat::Chat;
 use self::rooms::Rooms;
 
 #[derive(Debug)]
diff --git a/src/chat.rs b/src/ui/chat.rs
similarity index 100%
rename from src/chat.rs
rename to src/ui/chat.rs
diff --git a/src/chat/tree.rs b/src/ui/chat/tree.rs
similarity index 100%
rename from src/chat/tree.rs
rename to src/ui/chat/tree.rs
diff --git a/src/chat/tree/action.rs b/src/ui/chat/tree/action.rs
similarity index 98%
rename from src/chat/tree/action.rs
rename to src/ui/chat/tree/action.rs
index b43cec4..2bb2911 100644
--- a/src/chat/tree/action.rs
+++ b/src/ui/chat/tree/action.rs
@@ -3,10 +3,9 @@ use std::sync::Arc;
 use parking_lot::FairMutex;
 use toss::terminal::Terminal;
 
-use crate::chat::Cursor;
 use crate::store::{Msg, MsgStore};
 
-use super::TreeView;
+use super::{Cursor, TreeView};
 
 impl<M: Msg> TreeView<M> {
     fn prompt_msg(crossterm_lock: &Arc<FairMutex<()>>, terminal: &mut Terminal) -> Option<String> {
diff --git a/src/chat/tree/blocks.rs b/src/ui/chat/tree/blocks.rs
similarity index 99%
rename from src/chat/tree/blocks.rs
rename to src/ui/chat/tree/blocks.rs
index 64eca2d..8be0adb 100644
--- a/src/chat/tree/blocks.rs
+++ b/src/ui/chat/tree/blocks.rs
@@ -5,9 +5,7 @@ use std::collections::VecDeque;
 use chrono::{DateTime, Utc};
 use toss::styled::Styled;
 
-use crate::chat::Cursor;
-
-use super::util;
+use super::{util, Cursor};
 
 pub struct Block<I> {
     pub id: I,
diff --git a/src/chat/tree/cursor.rs b/src/ui/chat/tree/cursor.rs
similarity index 99%
rename from src/chat/tree/cursor.rs
rename to src/ui/chat/tree/cursor.rs
index bf0eb8f..e0fe81d 100644
--- a/src/chat/tree/cursor.rs
+++ b/src/ui/chat/tree/cursor.rs
@@ -2,11 +2,10 @@
 
 use toss::frame::{Frame, Size};
 
-use crate::chat::Cursor;
 use crate::store::{Msg, MsgStore, Tree};
 
 use super::blocks::Blocks;
-use super::{util, TreeView};
+use super::{util, Cursor, TreeView};
 
 impl<M: Msg> TreeView<M> {
     #[allow(clippy::too_many_arguments)]
diff --git a/src/chat/tree/layout.rs b/src/ui/chat/tree/layout.rs
similarity index 99%
rename from src/chat/tree/layout.rs
rename to src/ui/chat/tree/layout.rs
index 5760676..e8f951b 100644
--- a/src/chat/tree/layout.rs
+++ b/src/ui/chat/tree/layout.rs
@@ -2,12 +2,11 @@
 
 use toss::frame::{Frame, Size};
 
-use crate::chat::Cursor;
 use crate::store::{Msg, MsgStore, Tree};
 
 use super::blocks::{Block, Blocks};
 use super::util::{self, MIN_CONTENT_WIDTH};
-use super::TreeView;
+use super::{Cursor, TreeView};
 
 fn msg_to_block<M: Msg>(frame: &mut Frame, size: Size, msg: &M, indent: usize) -> Block<M::Id> {
     let nick = msg.nick();
diff --git a/src/chat/tree/render.rs b/src/ui/chat/tree/render.rs
similarity index 100%
rename from src/chat/tree/render.rs
rename to src/ui/chat/tree/render.rs
diff --git a/src/chat/tree/util.rs b/src/ui/chat/tree/util.rs
similarity index 100%
rename from src/chat/tree/util.rs
rename to src/ui/chat/tree/util.rs
diff --git a/src/ui/room.rs b/src/ui/room.rs
index bad7070..b432a0d 100644
--- a/src/ui/room.rs
+++ b/src/ui/room.rs
@@ -6,10 +6,10 @@ use tokio::sync::mpsc;
 use toss::frame::{Frame, Pos, Size};
 use toss::terminal::Terminal;
 
-use crate::chat::Chat;
 use crate::euph::{self, Status};
 use crate::vault::{EuphMsg, EuphVault};
 
+use super::chat::Chat;
 use super::{util, UiEvent};
 
 pub struct EuphRoom {