prosody-modules
640e6c0b563d
mod_ircd/mod_ircd.in.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody-modules

Annotate

mod_ircd/mod_ircd.in.lua @ 468:640e6c0b563d

mod_ircd: Scrub invalid UTF-8 sequences, welcome message
author Kim Alvefur <zash@zash.se>
date Tue, 01 Nov 2011 19:18:30 +0100
parent 466:0fcd34ee7301
child 469:ff03a325aa41
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
1 -- README
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
2 -- Squish verse into this dir, then squish them into one, which you move
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
3 -- and rename to mod_ircd.lua in your prosody modules/plugins dir.
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
4 --
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
5 -- IRC spec:
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
6 -- http://tools.ietf.org/html/rfc2812
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
7 local _module = module
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
8 module = _G.module
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
9 local module = _module
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
10 --
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
11 local component_jid, component_secret, muc_server =
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
12 module.host, nil, module:get_option("conference_server");
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
13
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
14 package.loaded["util.sha1"] = require "util.encodings";
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
15 local verse = require "verse"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
16 require "verse.component"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
17 require "socket"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
18 c = verse.new();--verse.logger())
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
19 c:add_plugin("groupchat");
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
20
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
21 local function verse2prosody(e)
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
22 return c:event("stanza", e.stanza) or true;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
23 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
24 module:hook("message/bare", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
25 module:hook("message/full", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
26 module:hook("presence/bare", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
27 module:hook("presence/full", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
28 c.type = "component";
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
29 c.send = core_post_stanza;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
30
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
31 -- This plugin is actually a verse based component, but that mode is currently commented out
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
32
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
33 -- Add some hooks for debugging
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
34 --c:hook("opened", function () print("Stream opened!") end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
35 --c:hook("closed", function () print("Stream closed!") end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
36 --c:hook("stanza", function (stanza) print("Stanza:", stanza) end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
37
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
38 -- This one prints all received data
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
39 --c:hook("incoming-raw", print, 1000);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
40 --c:hook("stanza", print, 1000);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
41 --c:hook("outgoing-raw", print, 1000);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
42
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
43 -- Print a message after authentication
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
44 --c:hook("authentication-success", function () print("Logged in!"); end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
45 --c:hook("authentication-failure", function (err) print("Failed to log in! Error: "..tostring(err.condition)); end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
46
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
47 -- Print a message and exit when disconnected
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
48 --c:hook("disconnected", function () print("Disconnected!"); os.exit(); end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
49
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
50 -- Now, actually start the connection:
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
51 --c.connect_host = "127.0.0.1"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
52 --c:connect_component(component_jid, component_secret);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
53
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
54 local jid = require "util.jid";
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
55 local nodeprep = require "util.encodings".stringprep.nodeprep;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
56
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
57 local function utf8_clean (s)
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
58 local push, join = table.insert, table.concat;
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
59 local r, i = {}, 1;
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
60 if not(s and #s > 0) then
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
61 return ""
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
62 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
63 while true do
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
64 local c = s:sub(i,i)
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
65 local b = c:byte();
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
66 local w = (
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
67 (b >= 9 and b <= 10 and 0) or
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
68 (b >= 32 and b <= 126 and 0) or
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
69 (b >= 192 and b <= 223 and 1) or
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
70 (b >= 224 and b <= 239 and 2) or
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
71 (b >= 240 and b <= 247 and 3) or
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
72 (b >= 248 and b <= 251 and 4) or
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
73 (b >= 251 and b <= 252 and 5) or nil
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
74 )
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
75 if not w then
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
76 push(r, "?")
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
77 else
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
78 local n = i + w;
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
79 if w == 0 then
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
80 push(r, c);
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
81 elseif n > #s then
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
82 push(r, ("?"):format(b));
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
83 else
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
84 local e = s:sub(i+1,n);
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
85 if e:match('^[\128-\191]*$') then
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
86 push(r, c);
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
87 push(r, e);
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
88 i = n;
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
89 else
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
90 push(r, ("?"):format(b));
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
91 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
92 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
93 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
94 i = i + 1;
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
95 if i > #s then
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
96 break
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
97 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
98 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
99 return join(r);
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
100 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
101
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
102 local function parse_line(line)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
103 local ret = {};
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
104 if line:sub(1,1) == ":" then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
105 ret.from, line = line:match("^:(%w+)%s+(.*)$");
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
106 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
107 for part in line:gmatch("%S+") do
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
108 if part:sub(1,1) == ":" then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
109 ret[#ret+1] = line:match(":(.*)$");
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
110 break
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
111 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
112 ret[#ret+1]=part;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
113 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
114 return ret;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
115 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
116
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
117 local function build_line(parts)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
118 if #parts > 1 then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
119 parts[#parts] = ":" .. parts[#parts];
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
120 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
121 return (parts.from and ":"..parts.from.." " or "")..table.concat(parts, " ");
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
122 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
123
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
124 local function irc2muc(channel, nick)
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
125 local room = channel and nodeprep(channel:match("^#(%w+)")) or nil;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
126 return jid.join(room, muc_server, nick)
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
127 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
128 local function muc2irc(room)
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
129 local channel, _, nick = jid.split(room);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
130 return "#"..channel, nick;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
131 end
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
132 local rolemap = {
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
133 moderator = "@",
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
134 participant = "+",
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
135 }
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
136 local modemap = {
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
137 moderator = "o",
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
138 participant = "v",
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
139 }
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
140
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
141 local irc_listener = { default_port = 6667, default_mode = "*l" };
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
142
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
143 local sessions = {};
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
144 local jids = {};
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
145 local commands = {};
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
146
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
147 local nicks = {};
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
148
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
149 local st = require "util.stanza";
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
150
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
151 local conference_server = muc_server;
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
152
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
153 local function irc_close_session(session)
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
154 session.conn:close();
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
155 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
156
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
157 function irc_listener.onincoming(conn, data)
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
158 local session = sessions[conn];
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
159 if not session then
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
160 session = { conn = conn, host = component_jid, reset_stream = function () end,
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
161 close = irc_close_session, log = logger.init("irc"..(conn.id or "1")),
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
162 rooms = {},
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
163 roster = {} };
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
164 sessions[conn] = session;
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
165 function session.data(data)
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
166 local parts = parse_line(data);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
167 module:log("debug", require"util.serialization".serialize(parts));
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
168 local command = table.remove(parts, 1);
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
169 if not command then
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
170 return;
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
171 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
172 command = command:upper();
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
173 if not session.nick then
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
174 if not (command == "USER" or command == "NICK") then
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
175 module:log("debug", "Client tried to send command %s before registering", command);
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
176 return session.send{from=muc_server, "451", command, "You have not registered"}
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
177 end
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
178 end
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
179 if commands[command] then
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
180 local ret = commands[command](session, parts);
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
181 if ret then
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
182 return session.send(ret);
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
183 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
184 else
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
185 session.send{from=muc_server, "421", session.nick, command, "Unknown command"};
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
186 return module:log("debug", "Unknown command: %s", command);
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
187 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
188 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
189 function session.send(data)
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
190 if type(data) == "string" then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
191 return conn:write(data.."\r\n");
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
192 elseif type(data) == "table" then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
193 local line = build_line(data);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
194 module:log("debug", line);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
195 conn:write(line.."\r\n");
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
196 end
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
197 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
198 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
199 if data then
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
200 session.data(data);
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
201 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
202 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
203
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
204 function irc_listener.ondisconnect(conn, error)
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
205 local session = sessions[conn];
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
206 if session then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
207 for _, room in pairs(session.rooms) do
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
208 room:leave("Disconnected");
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
209 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
210 if session.nick then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
211 nicks[session.nick] = nil;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
212 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
213 if session.full_jid then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
214 jids[session.full_jid] = nil;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
215 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
216 end
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
217 sessions[conn] = nil;
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
218 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
219
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
220 function commands.NICK(session, args)
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
221 if session.nick then
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
222 session.send{from = muc_server, "484", "*", nick, "I'm afraid I can't let you do that"};
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
223 --TODO Loop throug all rooms and change nick, with help from Verse.
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
224 return;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
225 end
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
226 local nick = args[1];
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
227 nick = nick:gsub("[^%w_]","");
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
228 if nicks[nick] then
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
229 session.send{from=muc_server, "433", nick, "The nickname "..nick.." is already in use"};
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
230 return;
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
231 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
232 local full_jid = jid.join(nick, component_jid, "ircd");
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
233 jids[full_jid] = session;
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
234 nicks[nick] = session;
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
235 session.nick = nick;
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
236 session.full_jid = full_jid;
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
237 session.type = "c2s";
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
238 session.send{from = muc_server, "001", nick, "Welcome to IRC gateway to XMPP!"};
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
239 session.send{from = muc_server, "002", nick, module.host.." running Prosody "..prosody.version};
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
240 session.send{from = muc_server, "003", nick, os.date(nil, prosody.start_time)}
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
241 session.send{from = muc_server, "004", table.concat({muc_server, "alpha", "i", "ov"}, " ")};
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
242 session.send{from = nick, "MODE", nick, "+i"}; -- why
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
243 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
244
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
245 function commands.USER(session, params)
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
246 -- FIXME
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
247 -- Empty command for now
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
248 end
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
249
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
250 function commands.JOIN(session, args)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
251 local channel = args[1];
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
252 local room_jid = irc2muc(channel);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
253 print(session.full_jid);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
254 local room, err = c:join_room(room_jid, session.nick, { source = session.full_jid } );
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
255 if not room then
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
256 return ":"..session.host.." ERR :Could not join room: "..err
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
257 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
258 session.rooms[channel] = room;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
259 room.channel = channel;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
260 room.session = session;
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
261 session.send{from=session.nick, "JOIN", channel};
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
262 session.send{from=muc_server, 332, session.nick, channel ,"Connection in progress..."};
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
263
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
264 room:hook("message", function(event)
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
265 if not event.body then return end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
266 local nick, body = event.nick, event.body;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
267 if nick ~= session.nick then
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
268 if body:sub(1,4) == "/me " then
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
269 body = "\1ACTION ".. body:sub(5) .. "\1"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
270 end
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
271 local type = event.stanza.attr.type;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
272 session.send{from=nick, "PRIVMSG", type == "groupchat" and channel or nick, body};
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
273 --FIXME PM's probably won't work
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
274 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
275 end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
276 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
277
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
278 c:hook("groupchat/joined", function(room)
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
279 local session = room.session or jids[room.opts.source];
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
280 local channel = room.channel;
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
281 session.send{from=session.nick.."!"..session.nick, "JOIN", channel};
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
282 session.send((":%s!%s JOIN %s :"):format(session.nick, session.nick, channel));
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
283 if room.topic then
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
284 session.send{from=muc_server, 332, room.topic};
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
285 end
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
286 commands.NAMES(session, channel)
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
287 if session.nick.role then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
288 session.send{from=muc_server, "MODE", channel, session.nick, modemap[session.nick.role], session.nick}
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
289 end
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
290 room:hook("occupant-joined", function(nick)
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
291 session.send{from=nick.nick.."!"..nick.nick, "JOIN", channel};
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
292 if nick.role and modemap[nick.role] then
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
293 session.send{from=nick.nick.."!"..nick.nick, "MODE", channel, modemap[nick.role], nick.nick};
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
294 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
295 end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
296 room:hook("occupant-left", function(nick)
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
297 session.send{from=nick.nick.."!"..nick.nick, "PART", room.channel};
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
298 end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
299 end);
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
300
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
301 function commands.NAMES(session, channel)
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
302 local nicks = { };
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
303 local room = session.rooms[channel];
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
304 if not room then return end
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
305 -- TODO Break this out into commands.NAMES
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
306 for nick, n in pairs(room.occupants) do
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
307 if n.role and rolemap[n.role] then
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
308 nick = rolemap[n.role] .. nick;
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
309 end
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
310 table.insert(nicks, nick);
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
311 end
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
312 nicks = table.concat(nicks, " ");
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
313 session.send((":%s 353 %s = %s :%s"):format(session.host, session.nick, channel, nicks));
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
314 session.send((":%s 366 %s %s :End of /NAMES list."):format(session.host, session.nick, channel));
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
315 session.send(":"..session.host.." 353 "..session.nick.." = "..channel.." :"..nicks);
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
316 end
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
317
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
318 function commands.PART(session, args)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
319 local channel, part_message = unpack(args);
132
d4ff1cd414e5 mod_ircd: Add PING command / Echo PART back
Florian Zeitz <florob@babelmonkeys.de>
parents: 111
diff changeset
320 channel = channel:match("^([%S]*)");
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
321 session.rooms[channel]:leave(part_message);
132
d4ff1cd414e5 mod_ircd: Add PING command / Echo PART back
Florian Zeitz <florob@babelmonkeys.de>
parents: 111
diff changeset
322 session.send(":"..session.nick.." PART :"..channel);
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
323 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
324
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
325 function commands.PRIVMSG(session, args)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
326 local channel, message = unpack(args);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
327 if message and #message > 0 then
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
328 if message:sub(1,8) == "\1ACTION " then
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
329 message = "/me ".. message:sub(9,-2)
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
330 end
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
331 message = utf8_clean(message);
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
332 if channel:sub(1,1) == "#" then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
333 if session.rooms[channel] then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
334 module:log("debug", "%s sending PRIVMSG \"%s\" to %s", session.nick, message, channel);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
335 session.rooms[channel]:send_message(message);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
336 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
337 else -- private message
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
338 local nick = channel;
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
339 module:log("debug", "PM to %s", nick);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
340 for channel, room in pairs(session.rooms) do
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
341 module:log("debug", "looking for %s in %s", nick, channel);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
342 if room.occupants[nick] then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
343 module:log("debug", "found %s in %s", nick, channel);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
344 local who = room.occupants[nick];
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
345 -- FIXME PMs in verse
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
346 --room:send_private_message(nick, message);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
347 local pm = st.message({type="chat",to=who.jid}, message);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
348 module:log("debug", "sending PM to %s: %s", nick, tostring(pm));
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
349 room:send(pm)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
350 break
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
351 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
352 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
353 end
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
354 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
355 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
356
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
357 function commands.PING(session, args)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
358 session.send{from=muc_server, "PONG", args[1]};
132
d4ff1cd414e5 mod_ircd: Add PING command / Echo PART back
Florian Zeitz <florob@babelmonkeys.de>
parents: 111
diff changeset
359 end
d4ff1cd414e5 mod_ircd: Add PING command / Echo PART back
Florian Zeitz <florob@babelmonkeys.de>
parents: 111
diff changeset
360
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
361 function commands.WHO(session, args)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
362 local channel = args[1];
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
363 if session.rooms[channel] then
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
364 local room = session.rooms[channel]
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
365 for nick in pairs(room.occupants) do
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
366 --n=MattJ 91.85.191.50 irc.freenode.net MattJ H :0 Matthew Wild
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
367 session.send{from=muc_server, 352, session.nick, channel, nick, nick, muc_server, nick, "H", "0 "..nick}
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
368 end
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
369 session.send{from=muc_server, 315, session.nick, channel, "End of /WHO list"};
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
370 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
371 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
372
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
373 function commands.MODE(session, args) -- FIXME
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
374 local channel, target = unpack(args);
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
375 if target then
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
376 -- do stuff?
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
377 --room:set_affiliation(...)
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
378 session.send{from=muc_server, "324", session.nick, channel, "+i"}
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
379 else
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
380 -- What's 324? And +J ?
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
381 session.send{from=muc_server, "324", session.nick, channel, "+J"}
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
382 end
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
383 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
384
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
385 function commands.QUIT(session, args)
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
386 session.send{"ERROR", "Closing Link: "..session.nick};
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
387 for _, room in pairs(session.rooms) do
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
388 room:leave(args[1]);
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
389 end
335
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
390 jids[session.full_jid] = nil;
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
391 nicks[session.nick] = nil;
8b81257c9dc5 mod_ircd: Don't allow any command until nick has been set. Split out NAMES into a command.
Kim Alvefur <zash@zash.se>
parents: 329
diff changeset
392 sessions[session.conn] = nil;
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
393 session:close();
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
394 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
395
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
396 function commands.RAW(session, data)
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
397 --c:send(data)
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
398 end
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
399
465
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
400 local function desetup()
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
401 require "net.connlisteners".deregister("irc");
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
402 end
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
403
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
404 --c:hook("ready", function ()
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
405 require "net.connlisteners".register("irc", irc_listener);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
406 require "net.connlisteners".start("irc");
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
407 --end);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
408
465
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
409 module:hook("module-unloaded", desetup)
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
410
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
411
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
412 --print("Starting loop...")
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
413 --verse.loop()
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
414
111
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
415