aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shard/lib/app/chat.ex8
-rw-r--r--shardweb/lib/templates/chat/chat.html.eex2
2 files changed, 8 insertions, 2 deletions
diff --git a/shard/lib/app/chat.ex b/shard/lib/app/chat.ex
index be3b848..2e5e076 100644
--- a/shard/lib/app/chat.ex
+++ b/shard/lib/app/chat.ex
@@ -163,7 +163,13 @@ defmodule SApp.Chat do
with all connected peers.
"""
def handle_cast({:chat_send, pk, msg}, state) do
- msgbin = SData.term_bin {(System.os_time :seconds), msg}
+ next_ts = case MST.last(state.mst, nil, 1) do
+ [] -> System.os_time :seconds
+ [{{_, msgbin, _}, true}] ->
+ {ts, _msg} = SData.term_unbin msgbin
+ max(ts + 1, System.os_time :seconds)
+ end
+ msgbin = SData.term_bin {next_ts, msg}
{:ok, sign} = Shard.Keys.sign_detached(pk, msgbin)
msgitem = {pk, msgbin, sign}
diff --git a/shardweb/lib/templates/chat/chat.html.eex b/shardweb/lib/templates/chat/chat.html.eex
index 28cc9e6..499e14d 100644
--- a/shardweb/lib/templates/chat/chat.html.eex
+++ b/shardweb/lib/templates/chat/chat.html.eex
@@ -6,7 +6,7 @@
#<%= @chan %>
<small>public chat room</small>
<% else %>
- #<%= @nicks %>
+ <%= @nicks %>
<small>private chat</small>
<% end %>