Working presence!

3 files changed, 43 insertions, 16 deletions

diff --git a/core/stanza_dispatch.lua b/core/stanza_dispatch.lua
index e392b5ba..5f61f5fb 100644
--- a/core/stanza_dispatch.lua
+++ b/core/stanza_dispatch.lua
@@ -39,6 +39,7 @@ function init_stanza_dispatcher(session)
 					-- Authentication successful!
 					session.username = username;
 					session.resource = resource;
+					session.full_jid = username.."@"..session.host.."/"..session.resource;
 					if not hosts[session.host].sessions[username] then
 						hosts[session.host].sessions[username] = { sessions = {} };
 					end
@@ -97,25 +98,40 @@ function init_stanza_dispatcher(session)
 					end
 				elseif stanza.name == "presence" then
 					if session.roster then
+						local initial_presence = not session.last_presence;
+						session.last_presence = stanza;
+						
 						-- Broadcast presence and probes
-						local broadcast = st.presence({ from = session.username.."@"..session.host.."/"..session.resource });
-						local probe = st.presence { from = broadcast.attr.from, type = "probe" };
+						local broadcast = st.presence({ from = session.full_jid, type = stanza.attr.type });
+						--local probe = st.presence { from = broadcast.attr.from, type = "probe" };
 
-						for child in stanza:children() do
-							broadcast:tag(child.name, child.attr);
+						for child in stanza:childtags() do
+							broadcast:text(tostring(child));
 						end
-						for contact in pairs(session.roster) do
-							broadcast.attr.to = contact;
-							send_to(contact, broadcast);
-							--local host = jid.host(contact);
-							--if hosts[host] and hosts[host].type == "local" then
-								--local node, host = jid.split(contact);
-								--if host[host].sessions[node]
-								--local pres = st.presence { from = con
-							--else
-							--	probe.attr.to = contact;
-							--	send_to(contact, probe);
-							--end
+						for contact_jid in pairs(session.roster) do
+							broadcast.attr.to = contact_jid;
+							send_to(contact_jid, broadcast);
+							if initial_presence then
+								print("Initital presence");
+								local node, host = jid.split(contact_jid);
+								if hosts[host] and hosts[host].type == "local" then
+									local contact = hosts[host].sessions[node]
+									if contact then
+										local pres = st.presence { to = session.full_jid };
+										for resource, contact_session in pairs(contact.sessions) do
+											if contact_session.last_presence then
+												pres.tags = contact_session.last_presence.tags;
+												pres.attr.from = contact_session.full_jid;
+												send(pres);
+											end
+										end
+									end
+									--FIXME: Do we send unavailable if they are offline?
+								else
+									probe.attr.to = contact;
+									send_to(contact, probe);
+								end
+							end
 						end
 						
 						-- Probe for our contacts' presence
diff --git a/main.lua b/main.lua
index 41d812bc..0df6bbd1 100644
--- a/main.lua
+++ b/main.lua
@@ -132,6 +132,8 @@ function handler(conn, data, err)
 			session.parser = lxp.new(session.xml_handlers, ":");
 			
 			function session.disconnect(err)
+				hosts[session.host].sessions[session.username] = nil;
+				session = nil;
 				print("Disconnected: "..err);
 			end
 		end
diff --git a/util/stanza.lua b/util/stanza.lua
index f41ba699..b4deda39 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -68,6 +68,15 @@ function stanza_mt:children()
 		end, self, i;
 	                                    
 end
+function stanza_mt:childtags()
+	local i = 0;
+	return function (a)
+			i = i + 1
+			local v = self.tags[i]
+			if v then return v; end
+		end, self.tags[1], i;
+	                                    
+end
 
 function stanza_mt.__tostring(t)
 	local children_text = "";