1 files changed, 7 insertions, 3 deletions
diff --git a/lib/irc/connection.ex b/lib/irc/connection.ex
index fcb6c5e..1e94003 100644
--- a/lib/irc/connection.ex
+++ b/lib/irc/connection.ex
@@ -294,7 +294,9 @@ defmodule IRC.Connection do
       if !Map.get(user.options, :puppet) do
         reply_fun = fn(text) -> irc_reply(state, {chan, sender}, text) end
         account = IRC.Account.lookup(sender)
-        message = %IRC.Message{at: NaiveDateTime.utc_now(), text: text, network: state.network, account: account, sender: sender, channel: chan, replyfun: reply_fun, trigger: extract_trigger(text)}
+        message = %IRC.Message{id: FlakeId.get(), transport: :irc, at: NaiveDateTime.utc_now(), text: text, network: state.network,
+                               account: account, sender: sender, channel: chan, replyfun: reply_fun,
+                               trigger: extract_trigger(text)}
         message = case IRC.UserTrack.messaged(message) do
           :ok -> message
           {:ok, message} -> message
@@ -309,7 +311,8 @@ defmodule IRC.Connection do
   def handle_info({:received, text, sender}, state) do
     reply_fun = fn(text) -> irc_reply(state, {sender.nick, sender}, text) end
     account = IRC.Account.lookup(sender)
-    message = %IRC.Message{text: text, network: state.network, account: account, sender: sender, replyfun: reply_fun, trigger: extract_trigger(text)}
+    message = %IRC.Message{id: FlakeId.get(), transport: irc, text: text, network: state.network, at: NaiveDateTime.utc_now(),
+                           account: account, sender: sender, replyfun: reply_fun, trigger: extract_trigger(text)}
     message = case IRC.UserTrack.messaged(message) do
       :ok -> message
       {:ok, message} -> message
@@ -460,7 +463,8 @@ defmodule IRC.Connection do
             |> List.flatten()
     outputs = for line <- lines do
       ExIRC.Client.msg(client, :privmsg, target, line)
-      {:irc, :out, %IRC.Message{network: network, channel: target, text: line, sender: %ExIRC.SenderInfo{nick: state.conn.nick}, at: NaiveDateTime.utc_now(), meta: %{self: true}}}
+      {:irc, :out, %IRC.Message{id: FlakeId.get(), transport: :irc, network: network,
+              channel: target, text: line, sender: %ExIRC.SenderInfo{nick: state.conn.nick}, at: NaiveDateTime.utc_now(), meta: %{self: true}}}
     end
     for f <- outputs, do: dispatch(["irc:outputs", "#{network}/#{target}:outputs"], f)
   end