Mercurial Hosting > chat

changeset 21:5a56297713a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move chat to home
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 05 Nov 2024 12:57:41 -0700
parents dade6a560494
children 949914955bfe
files src/about.html.luan src/account.html.luan src/chat.html.luan src/do_login.html.luan src/index.html.luan src/login.html.luan
diffstat 6 files changed, 142 insertions(+), 141 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/about.html.luan	Tue Nov 05 12:57:41 2024 -0700
@@ -0,0 +1,36 @@
+local Luan = require "luan:Luan.luan"
+local error = Luan.error
+local Io = require "luan:Io.luan"
+local Http = require "luan:http/Http.luan"
+local Shared = require "site:/lib/Shared.luan"
+local head = Shared.head or error()
+local header = Shared.header or error()
+
+
+return function()
+	Io.stdout = Http.response.text_writer()
+%>
+<!doctype html>
+<html>
+	<head>
+<%		head() %>
+		<style>
+			h1 {
+				margin-bottom: 0;
+			}
+			h3 {
+				margin-top: 8px;
+			}
+		</style>
+	</head>
+	<body>
+<%		header() %>
+		<div content>
+			<h1>Web Chat</h1>
+			<h3>A free web-based instant messaging service</h3>
+			<p><a href="https://hg.reactionary.software/repo/chat/">source code</a></p>
+		</div>
+	</body>
+</html>
+<%
+end
--- a/src/account.html.luan	Mon Nov 04 21:37:58 2024 -0700
+++ b/src/account.html.luan	Tue Nov 05 12:57:41 2024 -0700
@@ -38,8 +38,8 @@
 <%		header() %>
 		<div content>
 			<h1>Your Account</h1>
-			<p><a href="chat.html">Your Chats</a></p>
-			<p>Your URL: <%= base_url() %>/chat.html?with=<%=user.email%></p>
+			<p><a href="about.html">About Web Chat</a></p>
+			<p>Your URL: <%= base_url() %>/?with=<%=user.email%></p>
 			<p><a href="javascript:deleteUser()">Delete account</a></p>
 			<p><a href="javascript:logout()">Logout</a></p>
 		</div>
--- a/src/chat.html.luan	Mon Nov 04 21:37:58 2024 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-local Luan = require "luan:Luan.luan"
-local error = Luan.error
-local ipairs = Luan.ipairs or error()
-local pairs = Luan.pairs or error()
-local range = Luan.range or error()
-local Table = require "luan:Table.luan"
-local concat = Table.concat or error()
-local is_empty = Table.is_empty or error()
-local size = Table.size or error()
-local Io = require "luan:Io.luan"
-local Http = require "luan:http/Http.luan"
-local Shared = require "site:/lib/Shared.luan"
-local head = Shared.head or error()
-local header = Shared.header or error()
-local started = Shared.started or error()
-local chats_html = Shared.chats_html or error()
-local http_push_to_users = Shared.http_push_to_users or error()
-local User = require "site:/lib/User.luan"
-local current_user = User.current or error()
-local get_user_by_email = User.get_by_email or error()
-local Utils = require "site:/lib/Utils.luan"
-local to_set = Utils.to_set or error()
-local Db = require "site:/lib/Db.luan"
-local run_in_transaction = Db.run_in_transaction or error()
-local Chat = require "site:/lib/Chat.luan"
-local chat_search = Chat.search or error()
-local Logging = require "luan:logging/Logging.luan"
-local logger = Logging.logger "chat.html"
-
-
-local function get_chat(with)
-	local t = {}
-	local ids = {}
-	for email in pairs(with) do
-		local with_user = get_user_by_email(email) or error()
-		local id = with_user.id
-		t[#t+1] = "+chat_user_ids:"..id
-		ids[#ids+1] = id
-	end
-	local query = concat(t," ")
-	local need_push = false
-	local chat = run_in_transaction( function()
-		local chats = chat_search(query)
-		local n = #chats
-		if n == 0 then
-			local chat = Chat.new{
-				user_ids = ids
-			}
-			chat.save()
-			need_push = true
-			return chat
-		elseif n == 1 then
-			return chats[1]
-		else
-			error("multiple chats for: "..query)
-		end
-	end )
-	if need_push then
-		local js = "getChats('"..chat.id.."')"
-		http_push_to_users( chat.user_ids, js )
-	end
-	return chat
-end
-
-return function()
-	local with = Http.request.parameters.with
-	with = to_set(with)
-	local user = current_user()
-	if user == nil then
-		local url = "/login.html"
-		if not is_empty(with) then
-			local t = {}
-			for email in pairs(with) do
-				t[#t+1] = "with="..email
-			end
-			url = url.."?"..concat(t,"&")
-		end
-		Http.response.send_redirect(url)
-		return
-	end
-	local selected = nil
-	if not is_empty(with) then
-		with[user.email] = true
-		if size(with) > 1 then
-			selected = get_chat(with)
-		end
-	end
-	Io.stdout = Http.response.text_writer()
-%>
-<!doctype html>
-<html>
-	<head>
-<%		head() %>
-		<style>
-			@import "chat.css?s=<%=started%>";
-		</style>
-		<script src="chat.js?s=<%=started%>"></script>
-	</head>
-	<body>
-<%		header() %>
-		<div content>
-			<div chats>
-<%				chats_html() %>
-			</div>
-			<div posts></div>
-		</div>
-		<dialog delete_chat>
-			<h2>Delete Chat</h2>
-			<p>Are you sure that you want to delete this chat?</p>
-			<div buttons>
-				<button cancel onclick="closeModal(this)">Cancel</button>
-				<button go onclick="doDeleteChat(this)">Delete</button>
-			</div>
-		</dialog>
-		<script>
-<%
-	if selected ~= nil then
-%>
-			let div = document.querySelector('div[chat="<%=selected.id%>"]');
-			selectChat(div);
-<%
-	end
-%>
-			setUserEventSource(<%=user.id%>);
-		</script>
-	</body>
-</html>
-<%
-end
--- a/src/do_login.html.luan	Mon Nov 04 21:37:58 2024 -0700
+++ b/src/do_login.html.luan	Tue Nov 05 12:57:41 2024 -0700
@@ -43,7 +43,7 @@
 			for _, email in ipairs(with) do
 				t[#t+1] = "with="..email
 			end
-			location = "/chat.html?"..concat(t,"&")
+			location = "/?"..concat(t,"&")
 		end
 %>
 			<script> location = '<%=location%>'; </script>
--- a/src/index.html.luan	Mon Nov 04 21:37:58 2024 -0700
+++ b/src/index.html.luan	Tue Nov 05 12:57:41 2024 -0700
@@ -1,13 +1,90 @@
 local Luan = require "luan:Luan.luan"
 local error = Luan.error
+local ipairs = Luan.ipairs or error()
+local pairs = Luan.pairs or error()
+local range = Luan.range or error()
+local Table = require "luan:Table.luan"
+local concat = Table.concat or error()
+local is_empty = Table.is_empty or error()
+local size = Table.size or error()
 local Io = require "luan:Io.luan"
 local Http = require "luan:http/Http.luan"
 local Shared = require "site:/lib/Shared.luan"
 local head = Shared.head or error()
 local header = Shared.header or error()
+local started = Shared.started or error()
+local chats_html = Shared.chats_html or error()
+local http_push_to_users = Shared.http_push_to_users or error()
+local User = require "site:/lib/User.luan"
+local current_user = User.current or error()
+local get_user_by_email = User.get_by_email or error()
+local Utils = require "site:/lib/Utils.luan"
+local to_set = Utils.to_set or error()
+local Db = require "site:/lib/Db.luan"
+local run_in_transaction = Db.run_in_transaction or error()
+local Chat = require "site:/lib/Chat.luan"
+local chat_search = Chat.search or error()
+local Logging = require "luan:logging/Logging.luan"
+local logger = Logging.logger "index.html"
 
 
+local function get_chat(with)
+	local t = {}
+	local ids = {}
+	for email in pairs(with) do
+		local with_user = get_user_by_email(email) or error()
+		local id = with_user.id
+		t[#t+1] = "+chat_user_ids:"..id
+		ids[#ids+1] = id
+	end
+	local query = concat(t," ")
+	local need_push = false
+	local chat = run_in_transaction( function()
+		local chats = chat_search(query)
+		local n = #chats
+		if n == 0 then
+			local chat = Chat.new{
+				user_ids = ids
+			}
+			chat.save()
+			need_push = true
+			return chat
+		elseif n == 1 then
+			return chats[1]
+		else
+			error("multiple chats for: "..query)
+		end
+	end )
+	if need_push then
+		local js = "getChats('"..chat.id.."')"
+		http_push_to_users( chat.user_ids, js )
+	end
+	return chat
+end
+
 return function()
+	local with = Http.request.parameters.with
+	with = to_set(with)
+	local user = current_user()
+	if user == nil then
+		local url = "/login.html"
+		if not is_empty(with) then
+			local t = {}
+			for email in pairs(with) do
+				t[#t+1] = "with="..email
+			end
+			url = url.."?"..concat(t,"&")
+		end
+		Http.response.send_redirect(url)
+		return
+	end
+	local selected = nil
+	if not is_empty(with) then
+		with[user.email] = true
+		if size(with) > 1 then
+			selected = get_chat(with)
+		end
+	end
 	Io.stdout = Http.response.text_writer()
 %>
 <!doctype html>
@@ -15,21 +92,37 @@
 	<head>
 <%		head() %>
 		<style>
-			h1 {
-				margin-bottom: 0;
-			}
-			h3 {
-				margin-top: 8px;
-			}
+			@import "chat.css?s=<%=started%>";
 		</style>
+		<script src="chat.js?s=<%=started%>"></script>
 	</head>
 	<body>
 <%		header() %>
 		<div content>
-			<h1>Web Chat</h1>
-			<h3>A free web-based instant messaging service</h3>
-			<p><a href="https://hg.reactionary.software/repo/chat/">source code</a></p>
+			<div chats>
+<%				chats_html() %>
+			</div>
+			<div posts></div>
 		</div>
+		<dialog delete_chat>
+			<h2>Delete Chat</h2>
+			<p>Are you sure that you want to delete this chat?</p>
+			<div buttons>
+				<button cancel onclick="closeModal(this)">Cancel</button>
+				<button go onclick="doDeleteChat(this)">Delete</button>
+			</div>
+		</dialog>
+		<script>
+<%
+	if selected ~= nil then
+%>
+			let div = document.querySelector('div[chat="<%=selected.id%>"]');
+			selectChat(div);
+<%
+	end
+%>
+			setUserEventSource(<%=user.id%>);
+		</script>
 	</body>
 </html>
 <%
--- a/src/login.html.luan	Mon Nov 04 21:37:58 2024 -0700
+++ b/src/login.html.luan	Tue Nov 05 12:57:41 2024 -0700
@@ -39,6 +39,7 @@
 					<input type=submit>
 				</p>
 			</form>
+			<p><a href="about.html">About Web Chat</a></p>
 		</div>
 	</body>
 </html>