diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/offlinemessage.lua | 2 | ||||
-rw-r--r-- | core/rostermanager.lua | 14 | ||||
-rw-r--r-- | core/stanza_router.lua | 1 |
3 files changed, 4 insertions, 13 deletions
diff --git a/core/offlinemessage.lua b/core/offlinemessage.lua index dda9b7d8..ebb357ba 100644 --- a/core/offlinemessage.lua +++ b/core/offlinemessage.lua @@ -11,3 +11,5 @@ function new(user, host, stanza) t_insert(offlinedata, stanza); return datamanager.store(user, host, "offlinemsg", offlinedata); end + +return _M;
\ No newline at end of file diff --git a/core/rostermanager.lua b/core/rostermanager.lua index 26a14256..c39d28ed 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -18,17 +18,6 @@ local st = require "util.stanza"; module "rostermanager" ---[[function getroster(username, host) - return { - ["mattj@localhost"] = true, - ["tobias@getjabber.ath.cx"] = true, - ["waqas@getjabber.ath.cx"] = true, - ["thorns@getjabber.ath.cx"] = true, - ["idw@getjabber.ath.cx"] = true, - } - --return datamanager.load(username, host, "roster") or {}; -end]] - function add_to_roster(session, jid, item) if session.roster then local old_item = session.roster[jid]; @@ -65,7 +54,7 @@ function roster_push(username, host, jid) local stanza = st.iq({type="set"}); stanza:tag("query", {xmlns = "jabber:iq:roster"}); if item then - stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name}); + stanza:tag("item", {jid = jid, subscription = item.subscription, name = item.name, ask = item.ask}); for group in pairs(item.groups) do stanza:tag("group"):text(group):up(); end @@ -94,6 +83,7 @@ function load_roster(username, host) return roster; end -- Attempt to load roster for non-loaded user + -- TODO also support loading for offline user end function save_roster(username, host) diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 905de6e3..5062bc23 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -151,7 +151,6 @@ function core_handle_stanza(origin, stanza) end end --- TODO: Does this function belong here? function is_authorized_to_see_presence(origin, username, host) local roster = datamanager.load(username, host, "roster") or {}; local item = roster[origin.username.."@"..origin.host]; |