From 1938a9f1db1a50863a5809166fd3ec4302f4a6d0 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Thu, 18 Aug 2016 22:35:23 +0200
Subject: [PATCH] Added a lot of things

- Added "Add user to conversation"
-- Added a window to search for users to add
-- And made it all working
- Fixed the unread indicator
- Removed older TODOs
---
 pages/css/style.css                           | 44 ++++++++++--
 pages/index.html                              | 17 +++--
 pages/js/conversations.js                     | 27 +++++++-
 pages/js/index.js                             |  1 +
 pages/js/receivemessage.js                    | 20 ++++--
 pages/js/sendmessage.js                       |  2 -
 pages/js/users.js                             | 10 +++
 src/io/github/norbipeti/chat/server/Main.java |  8 +--
 .../norbipeti/chat/server/db/domain/User.java |  2 +
 .../server/page/ConversationsAjaxPage.java    | 47 ++++++++++++-
 .../norbipeti/chat/server/page/IndexPage.java | 17 ++---
 .../norbipeti/chat/server/page/Page.java      |  2 +-
 .../chat/server/page/UsersAjaxPage.java       | 68 +++++++++++++++++++
 13 files changed, 228 insertions(+), 37 deletions(-)
 create mode 100644 pages/js/users.js
 create mode 100644 src/io/github/norbipeti/chat/server/page/UsersAjaxPage.java
diff --git a/pages/css/style.css b/pages/css/style.css
index 12d3ad7..84cd14f 100644
--- a/pages/css/style.css
+++ b/pages/css/style.css
@@ -4,6 +4,8 @@ body {
 
 #errormsg, #successmsg {
     display: none;
+    box-shadow: 5px 5px 3px #888888;
+    z-index: 999;
 }
 
 #errormsg {
@@ -26,7 +28,7 @@ body {
     color: #00ff00;
 }
 
-#sidebar {
+#sidebarr {
     float: right;
     width: 20%;
 }
@@ -64,18 +66,48 @@ html, body {
     margin: 0;
 }
 
-#conversations
+#sidebarl
 {
     width: 20%;
     float: left;
 }
 
-#conversation
+.chmessage
 {
-
+    
 }
 
-#unreadmsg
+.unreadmsg
 {
     background-color: #DDD;
-}
\ No newline at end of file
+}
+
+#hoverdialogcont
+{
+    display: none;
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    height: 100%;
+    width: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+}
+
+#hoverdialogmid {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+#hoverdialog
+{
+    width: 30%;
+    background-color: #EEE;
+    margin-left: auto;
+    margin-right: auto;
+    box-shadow: 5px 5px 3px #888888;
+}
+
+.list
+{
+    width: 100%;
+}
diff --git a/pages/index.html b/pages/index.html
index 146d694..c1a8e26 100644
--- a/pages/index.html
+++ b/pages/index.html
@@ -13,23 +13,25 @@
     <link rel="stylesheet" href="css/style.css" />
     <script src="js/index.js"></script>
     <script src="js/conversations.js"></script>
+    <script src="js/users.js"></script>
 </head>
 
 <body>
     <div id="errormsg">
     </div>
-    <div id="conversations">
-        <div id="addconv">
-            <a href="#" onclick="return addConversation();">Add conversation</a>
+    <div id="sidebarl">
+        <div id="conversations">
         </div>
     </div>
-    <div id="sidebar">
+    <div id="sidebarr">
         <div id="userbox">
             <p>Logged in as
                 <username/>
             </p>
             <a href="/logout">Logout</a>
         </div>
+        <div id="usersinconv">
+        </div>
     </div>
     <div id="loginregisterbox">
         <div id="loginbox">
@@ -97,4 +99,11 @@
         <div id="channelmessages"></div>
         <textarea id="msginput" autofocus="autofocus"></textarea>
     </div>
+    <div id="hoverdialogcont">
+        <div id="hoverdialogmid">
+            <div id="hoverdialog">
+                <p>Loading...</p>
+            </div>
+        </div>
+    </div>
 </body>
\ No newline at end of file
diff --git a/pages/js/conversations.js b/pages/js/conversations.js
index 0830fcf..e9a0b5e 100644
--- a/pages/js/conversations.js
+++ b/pages/js/conversations.js
@@ -3,9 +3,34 @@ function addConversation() {
     $.ajax({
         url: "/conversations", data: json, method: "POST", success: function (result) {
             document.getElementById("conversations").innerHTML += result;
+            showAddUserToConv();
         }, error: function (result) {
             showError(result.responseText);
         }
     });
     return false;
-}
\ No newline at end of file
+}
+
+function showAddUserToConv() {
+    var json = JSON.stringify({ "action": "adduserdialog" });
+    $.ajax({
+        url: "/conversations", data: json, method: "POST", success: function (result) {
+            document.getElementById("hoverdialog").innerHTML = result;
+            document.getElementById("hoverdialogcont").style.display = "table";
+        }, error: function (result) {
+            showError(result.responseText);
+        }
+    });
+}
+
+function addUserToConv() {
+    var liste = document.getElementById("searchuserlist");
+    var json = JSON.stringify({ "action": "adduser", "userid": liste.options[liste.selectedIndex].value });
+    $.ajax({
+        url: "/conversations", data: json, method: "POST", success: function (result) {
+            document.getElementById("hoverdialogcont").style.display = "none";
+        }, error: function (result) {
+            showError(result.responseText);
+        }
+    });
+}
diff --git a/pages/js/index.js b/pages/js/index.js
index 7e80dff..d0276a5 100644
--- a/pages/js/index.js
+++ b/pages/js/index.js
@@ -41,3 +41,4 @@ function changeConversation(convid) {
     convidp.innerText = convid;
     conversationChanged();
 }
+
diff --git a/pages/js/receivemessage.js b/pages/js/receivemessage.js
index 4afb031..0c90054 100644
--- a/pages/js/receivemessage.js
+++ b/pages/js/receivemessage.js
@@ -31,6 +31,8 @@ var updateUnreadCount = function () {
 };
 
 var addUnread = function addUnread() {
+    if (shouldread || document.getElementById("msginput").disabled)
+        return;
     unreadCount++;
     updateUnreadCount();
 };
@@ -54,10 +56,7 @@ function poll() {
                 handlereceivedmessage(msgelement);
                 console.log("Can switch conversations now");
                 canswitchconversations = true;
-                if (justsentmsgread)
-                    justsentmsgread = false;
-                else
-                    addUnread();
+                addUnread();
 
             }, error: function (data) {
                 if (data.responseText) {
@@ -85,8 +84,17 @@ function stopPoll() {
 }
 
 var readTimer = null;
+var shouldread = false;
 $(document).ready(function () {
-    $('#msginput').on("focus", function () { readTimer == null ? readTimer = setTimeout(function () { resetUnread(); }, 3000) : readTimer; });
+    $('#msginput').on("focus", function () {
+        readTimer == null ? readTimer = setTimeout(function () {
+            resetUnread();
+        }, 3000) : readTimer;
+        shouldread = true;
+    });
     $('#msginput').on("keydown", resetUnread);
-    $('#msginput').on("blur", function () { readTimer != null ? clearTimeout(readTimer) : readTimer; });
+    $('#msginput').on("blur", function () {
+        readTimer != null ? clearTimeout(readTimer) : readTimer;
+        shouldread = false;
+    });
 });
diff --git a/pages/js/sendmessage.js b/pages/js/sendmessage.js
index a58ec6f..cf2bd8a 100644
--- a/pages/js/sendmessage.js
+++ b/pages/js/sendmessage.js
@@ -6,7 +6,6 @@ var sendmsg = function sendmsg(msginputta) {
     });
 };
 
-var justsentmsgread = false;
 var respfunc = function respfunc(result) {
     var msginput = document.getElementById("msginput");
     if (result != "Success") { //on success result is string
@@ -26,7 +25,6 @@ var respfunc = function respfunc(result) {
         msginput.value = "";
         msginput.disabled = false;
         msginput.focus();
-        justsentmsgread = true;
     }
 };
 
diff --git a/pages/js/users.js b/pages/js/users.js
new file mode 100644
index 0000000..f2e4753
--- /dev/null
+++ b/pages/js/users.js
@@ -0,0 +1,10 @@
+function userSearch() {
+    var json = JSON.stringify({ "action": "search", "searchstr": document.getElementById("searchtext").value });
+    $.ajax({
+        url: "/users", data: json, method: "POST", success: function (result) {
+            document.getElementById("searchuserlist").innerHTML = result;
+        }, error: function (result) {
+            showError(result.responseText);
+        }
+    });
+}
diff --git a/src/io/github/norbipeti/chat/server/Main.java b/src/io/github/norbipeti/chat/server/Main.java
index 558a56e..d77f194 100644
--- a/src/io/github/norbipeti/chat/server/Main.java
+++ b/src/io/github/norbipeti/chat/server/Main.java
@@ -55,7 +55,7 @@ public class Main {
 			 * conversation.getUsers().add(loggedinuser); loggedinuser.getConversations().add(conversation); DataManager.save(user); DataManager.save(user2); DataManager.save(loggedinuser);
 			 * DataManager.save(conversation);
 			 */
-			LogManager.getLogger().log(Level.INFO, "Starting webserver..."); // TODO: Separate IDs for conversations and users
+			LogManager.getLogger().log(Level.INFO, "Starting webserver...");
 			HttpServer server = HttpServer.create(new InetSocketAddress(InetAddress.getLocalHost(), 8080), 10);
 			rf = new Reflections(
 					new ConfigurationBuilder().setUrls(ClasspathHelper.forClassLoader(Page.class.getClassLoader()))
@@ -75,16 +75,10 @@ public class Main {
 				}
 			}
 			server.start();
-			/*
-			 * LogManager.getLogger().info("Starting websocket server..."); Vertx vertx = Vertx.vertx(); io.vertx.core.http.HttpServer socketserver = vertx.createHttpServer();
-			 * socketserver.websocketHandler(websocket -> { websocket.writeFinalTextFrame("Hello"); // TODO }); socketserver.listen(8180);
-			 */
 			LogManager.getLogger().log(Level.INFO, "Ready... Press Enter to stop.");
 			System.in.read();
 			LogManager.getLogger().log(Level.INFO, "Stopping...");
 			server.stop(1);
-			// socketserver.close();
-			// vertx.close();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
diff --git a/src/io/github/norbipeti/chat/server/db/domain/User.java b/src/io/github/norbipeti/chat/server/db/domain/User.java
index b969cbb..b87fdba 100644
--- a/src/io/github/norbipeti/chat/server/db/domain/User.java
+++ b/src/io/github/norbipeti/chat/server/db/domain/User.java
@@ -6,6 +6,8 @@ import java.util.UUID;
 
 import javax.persistence.*;
 
+import org.jsoup.nodes.Element;
+
 import io.github.norbipeti.chat.server.data.LoaderCollection;
 import io.github.norbipeti.chat.server.data.LoaderRef;
 
diff --git a/src/io/github/norbipeti/chat/server/page/ConversationsAjaxPage.java b/src/io/github/norbipeti/chat/server/page/ConversationsAjaxPage.java
index 53b818a..4766382 100644
--- a/src/io/github/norbipeti/chat/server/page/ConversationsAjaxPage.java
+++ b/src/io/github/norbipeti/chat/server/page/ConversationsAjaxPage.java
@@ -3,10 +3,12 @@ package io.github.norbipeti.chat.server.page;
 import java.io.IOException;
 
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 
 import com.google.gson.JsonObject;
 import com.sun.net.httpserver.HttpExchange;
 
+import io.github.norbipeti.chat.server.data.DataManager;
 import io.github.norbipeti.chat.server.db.domain.Conversation;
 import io.github.norbipeti.chat.server.db.domain.ManagedData;
 import io.github.norbipeti.chat.server.db.domain.User;
@@ -39,13 +41,55 @@ public class ConversationsAjaxPage extends Page {
 		switch (post.get("action").getAsString()) {
 		case "add": {
 			Conversation conv = ManagedData.create(Conversation.class);
-			conv.getUsers().add(user); // TODO: Option to invite people
+			conv.getUsers().add(user);
 			user.getConversations().add(conv);
 			Document doc = new Document("");
 			conv.getAsHtml(doc);
 			IOHelper.SendResponse(200, doc.toString(), exchange);
 			break;
 		}
+		case "adduserdialog": {
+			Document doc = new Document("");
+			Element form = doc.appendElement("form");
+			form.attr("method", "POST");
+			form.appendElement("h3").text("Add user to conversation");
+			form.appendElement("input").attr("type", "text").attr("id", "searchtext");
+			form.appendElement("input").attr("type", "button").attr("value", "Search").attr("onclick", "userSearch()");
+			form.appendElement("br");
+			form.appendElement("select").addClass("list").attr("id", "searchuserlist").attr("size", "10");
+			form.appendElement("br");
+			form.appendElement("input").attr("type", "button").attr("value", "Add user").attr("onclick",
+					"addUserToConv()");
+			form.appendElement("input").attr("type", "button").attr("value", "Close").attr("onclick",
+					"document.getElementById(\"hoverdialogcont\").style.display = \"none\";");
+			IOHelper.SendResponse(200, doc.toString(), exchange);
+			break;
+		}
+		case "adduser": {
+			if (user.getCurrentConversation() == null) {
+				IOHelper.SendResponse(200, "<p>Not in a conversation!</p>", exchange);
+				return;
+			}
+			if (!post.has("userid")) {
+				IOHelper.SendResponse(200, "<p>User ID not found: " + post + "</p>", exchange);
+				return;
+			}
+			long userid = post.get("userid").getAsLong();
+			User adduser = DataManager.load(User.class, userid, false);
+			if (adduser == null) {
+				IOHelper.SendResponse(200, "<p>User not found: " + userid + "</p>", exchange);
+				return;
+			}
+			Conversation currentconversation = user.getCurrentConversation().get();
+			if (currentconversation.getUsers().contains(userid)) {
+				IOHelper.SendResponse(200, "<p>The user is already in the conversation</p>", exchange);
+				return;
+			}
+			currentconversation.getUsers().add(adduser);
+			adduser.getConversations().add(currentconversation);
+			IOHelper.SendResponse(200, doc -> currentconversation.getAsHtml(doc).ownerDocument(), exchange);
+			break;
+		}
 		default: {
 			IOHelper.SendResponse(400,
 					"<h1>400 Bad request</h1><p>Unknown action: " + post.get("action").getAsString() + "</p>",
@@ -54,5 +98,4 @@ public class ConversationsAjaxPage extends Page {
 		}
 		}
 	}
-
 }
diff --git a/src/io/github/norbipeti/chat/server/page/IndexPage.java b/src/io/github/norbipeti/chat/server/page/IndexPage.java
index 2be99f5..f9afb19 100644
--- a/src/io/github/norbipeti/chat/server/page/IndexPage.java
+++ b/src/io/github/norbipeti/chat/server/page/IndexPage.java
@@ -46,6 +46,12 @@ public class IndexPage extends Page {
 							message.getAsHTML(channelmessages);
 						}
 					}
+					for (int i = 0; i < conv.getUsers().size(); i++)
+						doc.getElementById("usersinconv").appendElement("div").attr("id", "convuser" + i)
+								.addClass("convuser").appendElement("p").text(conv.getUsers().get(i).getName());
+					doc.getElementById("sidebarr").appendElement("div").attr("id", "addconvuser").appendElement("a")
+							.text("Add user to conversation").attr("href", "javascript:showAddUserToConv()");
+					// TODO: Update users and conversations automatically on conv change
 				}
 				cide.attr("style", "display: none");
 				cide.attr("id", "convidp");
@@ -53,17 +59,12 @@ public class IndexPage extends Page {
 				Element conversations = doc.getElementById("conversations");
 				for (Conversation conv : user.getConversations())
 					conv.getAsHtml(conversations);
+				conversations.appendElement("div").attr("id", "addconv").appendElement("a").attr("href", "#")
+						.attr("onclick", "return addConversation();").text("Add conversation");
 				return doc;
 			}, exchange);
 
-	} // TODO:
-		// Validation
-		// at
-		// registration
-		// (no
-		// special
-		// chars,
-		// etc.)
+	} // TODO: Validation at registration (no special chars, etc.)
 
 	@Override
 	public String GetName() {
diff --git a/src/io/github/norbipeti/chat/server/page/Page.java b/src/io/github/norbipeti/chat/server/page/Page.java
index f720f95..871f4b5 100644
--- a/src/io/github/norbipeti/chat/server/page/Page.java
+++ b/src/io/github/norbipeti/chat/server/page/Page.java
@@ -41,7 +41,7 @@ public abstract class Page implements HttpHandler {
 				str.print("</pre>");
 				IOHelper.SendResponse(500, baos.toString(StandardCharsets.ISO_8859_1), exchange);
 			} catch (Exception e1) {
-				e1.printStackTrace(); // TODO: Message listener JS
+				e1.printStackTrace();
 			}
 		}
 	}
diff --git a/src/io/github/norbipeti/chat/server/page/UsersAjaxPage.java b/src/io/github/norbipeti/chat/server/page/UsersAjaxPage.java
new file mode 100644
index 0000000..1fd7c08
--- /dev/null
+++ b/src/io/github/norbipeti/chat/server/page/UsersAjaxPage.java
@@ -0,0 +1,68 @@
+package io.github.norbipeti.chat.server.page;
+
+import java.io.IOException;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+
+import com.google.gson.JsonObject;
+import com.sun.net.httpserver.HttpExchange;
+
+import io.github.norbipeti.chat.server.data.DataManager;
+import io.github.norbipeti.chat.server.db.domain.Conversation;
+import io.github.norbipeti.chat.server.db.domain.ManagedData;
+import io.github.norbipeti.chat.server.db.domain.User;
+import io.github.norbipeti.chat.server.io.IOHelper;
+
+public class UsersAjaxPage extends Page {
+
+	@Override
+	public String GetName() {
+		return "users";
+	}
+
+	@Override
+	public void handlePage(HttpExchange exchange) throws IOException {
+		JsonObject post = IOHelper.GetPOSTJSON(exchange);
+		User user = IOHelper.GetLoggedInUser(exchange);
+		if (user == null) {
+			IOHelper.SendResponse(403, "<h1>403 Login required</h1>", exchange);
+			return;
+		}
+		if (post == null) {
+			IOHelper.SendResponse(400,
+					"<h1>400 Bad request</h1><p>Not a JSON string: " + IOHelper.GetPOST(exchange) + "</p>", exchange);
+			return;
+		}
+		if (!post.has("action")) {
+			IOHelper.SendResponse(400, "<h1>400 Bad request</h1><p>Action missing: " + post + "</p>", exchange);
+			return;
+		}
+		switch (post.get("action").getAsString()) {
+		case "search": {
+			if (!post.has("searchstr")) {
+				IOHelper.SendResponse(400, "<h1>400 Bad request</h1><p>Search string missing: " + post + "</p>",
+						exchange);
+				return;
+			}
+			String searchstr = post.get("searchstr").getAsString().toLowerCase();
+			Document doc = new Document("");
+			if (searchstr.length() != 0)
+				for (User suser : DataManager.getAll(User.class))
+					if (suser.getEmail().toLowerCase().contains(searchstr)
+							|| suser.getName().toLowerCase().contains(searchstr))
+						doc.appendElement("option").addClass("resuser").attr("value", suser.getId() + "")
+								.text(suser.getName());
+			IOHelper.SendResponse(200, doc.toString(), exchange);
+			break;
+		}
+		default: {
+			IOHelper.SendResponse(400,
+					"<h1>400 Bad request</h1><p>Unknown action: " + post.get("action").getAsString() + "</p>",
+					exchange);
+			break;
+		}
+		}
+	}
+
+}
