Mercurial Hosting > chat

changeset 12:9f45d32670ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server push
author Franklin Schmidt <fschmidt@gmail.com>
date Thu, 31 Oct 2024 21:40:57 -0600
parents 563a5358f2ee
children 22534fc3aadd
files src/add_post.js.luan src/chat.js src/delete_chat.js.luan src/get_chat.js.luan src/lib/Chat.luan src/lib/Shared.luan src/login.js.luan
diffstat 7 files changed, 59 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/src/add_post.js.luan	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/add_post.js.luan	Thu Oct 31 21:40:57 2024 -0600
@@ -2,6 +2,8 @@
 local error = Luan.error
 local Time = require "luan:Time.luan"
 local time_now = Time.now or error()
+local Parsers = require "luan:Parsers.luan"
+local json_string = Parsers.json_string or error()
 local Io = require "luan:Io.luan"
 local Http = require "luan:http/Http.luan"
 local User = require "site:/lib/User.luan"
@@ -12,16 +14,19 @@
 local get_chat_by_id = Chat.get_by_id or error()
 local Post = require "site:/lib/Post.luan"
 local new_post = Post.new or error()
+local Shared = require "site:/lib/Shared.luan"
+local post_html = Shared.post_html or error()
 
 
 return function()
 	local user = current_user() or error()
 	local chat = Http.request.parameters.chat or error()
 	local content = Http.request.parameters.content or error()
+	local post
 	run_in_transaction( function()
 		chat = get_chat_by_id(chat) or error()
 		local now = time_now()
-		local post = new_post{
+		post = new_post{
 			chat_id = chat.id
 			author_id = user.id
 			date = now
@@ -31,4 +36,7 @@
 		chat.updated = now
 		chat.save()
 	end )
+	local html = `post_html(post)`
+	local js = "added("..json_string(html)..")"
+	chat.http_push(js)
 end
--- a/src/chat.js	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/chat.js	Thu Oct 31 21:40:57 2024 -0600
@@ -1,6 +1,7 @@
 'use strict';
 
 let currentChatId = null;
+let eventSource;
 
 function selectChat(div) {
 	let chatId = div.getAttribute('chat');
@@ -11,6 +12,19 @@
 	div.setAttribute('selected','');
 	ajax(`get_chat.js?chat=${chatId}`);
 	currentChatId = chatId;
+
+	if(eventSource)  eventSource.close();
+	eventSource = new EventSource(`${location.origin}/chat/${chatId}`);
+	eventSource.onmessage = function(event) {
+		eval(event.data);
+	};
+}
+
+function gotChat(html) {
+	document.querySelector('div[posts]').innerHTML = html;
+	fixDates();
+	document.querySelector('div[input] textarea').focus();
+	document.querySelector('div[input]').scrollIntoView({block: 'end'});
 }
 
 function fixTextarea(event) {
@@ -29,7 +43,6 @@
 		return;
 	ajax(`add_post.js?chat=${currentChatId}&content=${encodeURIComponent(text)}`);
 	textarea.value = '';
-	console.log('addPost');
 }
 
 function textareaKey(event) {
@@ -50,3 +63,9 @@
 function deleteChat() {
 	ajax(`delete_chat.js?chat=${currentChatId}`);
 }
+
+function added(html) {
+	let input = document.querySelector('div[input]');
+	input.insertAdjacentHTML('beforebegin',html);
+	input.scrollIntoView({block: 'end'});
+}
--- a/src/delete_chat.js.luan	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/delete_chat.js.luan	Thu Oct 31 21:40:57 2024 -0600
@@ -1,6 +1,5 @@
 local Luan = require "luan:Luan.luan"
 local error = Luan.error
-local Io = require "luan:Io.luan"
 local Http = require "luan:http/Http.luan"
 local User = require "site:/lib/User.luan"
 local current_user = User.current or error()
@@ -13,8 +12,5 @@
 	chat = get_chat_by_id(chat) or error()
 	local user = current_user() or error()
 	chat.delete()
-	Io.stdout = Http.response.text_writer()
-%>
-	location = '/chat.html';
-<%
+	chat.http_push("location = '/chat.html'")
 end
--- a/src/get_chat.js.luan	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/get_chat.js.luan	Thu Oct 31 21:40:57 2024 -0600
@@ -3,32 +3,17 @@
 local ipairs = Luan.ipairs or error()
 local Parsers = require "luan:Parsers.luan"
 local json_string = Parsers.json_string or error()
-local Html = require "luan:Html.luan"
-local html_encode = Html.encode or error()
 local Io = require "luan:Io.luan"
 local Http = require "luan:http/Http.luan"
 local User = require "site:/lib/User.luan"
-local get_user_by_id = User.get_by_id or error()
 local current_user = User.current or error()
 local Chat = require "site:/lib/Chat.luan"
 local get_chat_by_id = Chat.get_by_id or error()
 local Post = require "site:/lib/Post.luan"
 local post_search = Post.search or error()
-
+local Shared = require "site:/lib/Shared.luan"
+local post_html = Shared.post_html or error()
 
-local function post_html(post)
-	local author = get_user_by_id(post.author_id)
-	local id = post.id
-%>
-		<div post="<%=id%>">
-			<div who>
-				<span author><%=author.email%></span>
-				<span when fix><%=post.date%></span>
-			</div>
-			<div text><%= html_encode(post.content) %></div>
-		</div>
-<%
-end
 
 local function html()
 	local user = current_user() or error()
@@ -57,8 +42,6 @@
 return function()
 	Io.stdout = Http.response.text_writer()
 %>
-	document.querySelector('div[posts]').innerHTML = <%=json_string(`html()`)%>;
-	fixDates();
-	document.querySelector('div[input] textarea').focus();
+	gotChat(<%=json_string(`html()`)%>);
 <%
 end
--- a/src/lib/Chat.luan	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/lib/Chat.luan	Thu Oct 31 21:40:57 2024 -0600
@@ -6,8 +6,11 @@
 local is_empty = Table.is_empty or error()
 local Time = require "luan:Time.luan"
 local time_now = Time.now or error()
+local Http = require "luan:http/Http.luan"
 local Db = require "site:/lib/Db.luan"
 local run_in_transaction = Db.run_in_transaction or error()
+local Utils = require "site:/lib/Utils.luan"
+local base_url = Utils.base_url or error()
 
 
 local Chat = {}
@@ -62,6 +65,11 @@
 		return concat( t, ", " )
 	end
 
+	function chat.http_push(message)
+		local url = base_url().."/chat/"..chat.id
+		Http.push(url,message)
+	end
+
 	return chat
 end
 
--- a/src/lib/Shared.luan	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/lib/Shared.luan	Thu Oct 31 21:40:57 2024 -0600
@@ -7,9 +7,12 @@
 local Time = require "luan:Time.luan"
 local Thread = require "luan:Thread.luan"
 local thread_run = Thread.run or error()
+local Html = require "luan:Html.luan"
+local html_encode = Html.encode or error()
 local Mail = require "luan:mail/Mail.luan"
 local User = require "site:/lib/User.luan"
 local current_user = User.current or error()
+local get_user_by_id = User.get_by_id or error()
 
 
 local Shared = {}
@@ -83,4 +86,18 @@
 	end )
 end
 
+function Shared.post_html(post)
+	local author = get_user_by_id(post.author_id)
+	local id = post.id
+%>
+		<div post="<%=id%>">
+			<div who>
+				<span author><%=author.email%></span>
+				<span when fix><%=post.date%></span>
+			</div>
+			<div text><%= html_encode(post.content) %></div>
+		</div>
+<%
+end
+
 return Shared
--- a/src/login.js.luan	Thu Oct 31 19:17:53 2024 -0600
+++ b/src/login.js.luan	Thu Oct 31 21:40:57 2024 -0600
@@ -7,9 +7,8 @@
 local send_mail_async = Shared.send_mail_async or error()
 local Utils = require "site:/lib/Utils.luan"
 local base_url = Utils.base_url or error()
+local to_list = Utils.to_list or error()
 local User = require "site:/lib/User.luan"
-local Utils = require "site:/lib/Utils.luan"
-local to_list = Utils.to_list or error()
 
 
 return function()