prosody-modules
d8614cfe8fc9
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 @ 543:d8614cfe8fc9

mod_server_status: useless "space" removed
author Marco Cirillo <maranda@lightwitch.org>
date Tue, 10 Jan 2012 19:52:02 +0000
parent 538:de64963d8e7a
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
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
7
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
8 local _module = module
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
9 module = _G.module
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
10 local module = _module
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
11 local client_xmlns = "jabber:client"
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
12
483
f4ada087c743 mod_ircd: added listener port configuration, added utf8 checks to TOPIC, added check so that module wonn't get loaded if conference_server is unset.
Marco Cirillo <maranda@lightwitch.org>
parents: 482
diff changeset
13 local component_jid, component_secret, muc_server, port_number =
f4ada087c743 mod_ircd: added listener port configuration, added utf8 checks to TOPIC, added check so that module wonn't get loaded if conference_server is unset.
Marco Cirillo <maranda@lightwitch.org>
parents: 482
diff changeset
14 module.host, nil, module:get_option_string("conference_server"), module:get_option_number("listener_port", 7000);
f4ada087c743 mod_ircd: added listener port configuration, added utf8 checks to TOPIC, added check so that module wonn't get loaded if conference_server is unset.
Marco Cirillo <maranda@lightwitch.org>
parents: 482
diff changeset
15
f4ada087c743 mod_ircd: added listener port configuration, added utf8 checks to TOPIC, added check so that module wonn't get loaded if conference_server is unset.
Marco Cirillo <maranda@lightwitch.org>
parents: 482
diff changeset
16 if not muc_server then
538
de64963d8e7a mod_ircd: Made the requirement of setting the conference_server a bit more "aggressive", and the resulting error banner for not setting it also.
Marco Cirillo <maranda@lightwitch.org>
parents: 503
diff changeset
17 module:log ("error", "You need to set the MUC server in the configuration (conference_server)!")
de64963d8e7a mod_ircd: Made the requirement of setting the conference_server a bit more "aggressive", and the resulting error banner for not setting it also.
Marco Cirillo <maranda@lightwitch.org>
parents: 503
diff changeset
18 module:log ("error", "Be a good boy or girl and go read the wiki at: http://code.google.com/p/prosody-modules/wiki/mod_ircd")
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
19 return false;
483
f4ada087c743 mod_ircd: added listener port configuration, added utf8 checks to TOPIC, added check so that module wonn't get loaded if conference_server is unset.
Marco Cirillo <maranda@lightwitch.org>
parents: 482
diff changeset
20 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
21
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
22 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
23 local verse = require "verse"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
24 require "verse.component"
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
25 require "socket"
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
26 c = verse.new(); -- something interferes with prosody's console logging
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
27 c:add_plugin("groupchat");
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
28
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
29 local function verse2prosody(e)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
30 return c:event("stanza", e.stanza) or true;
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
31 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
32 module:hook("message/bare", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
33 module:hook("message/full", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
34 module:hook("presence/bare", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
35 module:hook("presence/full", verse2prosody);
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
36 c.type = "component";
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
37 c.send = core_post_stanza;
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
38
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
39 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
40 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
41
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
42 local function utf8_clean (s)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
43 local push, join = table.insert, table.concat;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
44 local r, i = {}, 1;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
45 if not(s and #s > 0) then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
46 return ""
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
47 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
48 while true do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
49 local c = s:sub(i,i)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
50 local b = c:byte();
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
51 local w = (
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
52 (b >= 9 and b <= 10 and 0) or
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
53 (b >= 32 and b <= 126 and 0) or
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
54 (b >= 192 and b <= 223 and 1) or
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
55 (b >= 224 and b <= 239 and 2) or
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
56 (b >= 240 and b <= 247 and 3) or
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
57 (b >= 248 and b <= 251 and 4) or
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
58 (b >= 251 and b <= 252 and 5) or nil
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
59 )
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
60 if not w then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
61 push(r, "?")
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
62 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
63 local n = i + w;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
64 if w == 0 then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
65 push(r, c);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
66 elseif n > #s then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
67 push(r, ("?"):format(b));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
68 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
69 local e = s:sub(i+1,n);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
70 if e:match('^[\128-\191]*$') then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
71 push(r, c);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
72 push(r, e);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
73 i = n;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
74 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
75 push(r, ("?"):format(b));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
76 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
77 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
78 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
79 i = i + 1;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
80 if i > #s then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
81 break
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
82 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
83 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
84 return join(r);
468
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
85 end
640e6c0b563d mod_ircd: Scrub invalid UTF-8 sequences, welcome message
Kim Alvefur <zash@zash.se>
parents: 466
diff changeset
86
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
87 local function parse_line(line)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
88 local ret = {};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
89 if line:sub(1,1) == ":" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
90 ret.from, line = line:match("^:(%w+)%s+(.*)$");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
91 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
92 for part in line:gmatch("%S+") do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
93 if part:sub(1,1) == ":" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
94 ret[#ret+1] = line:match(":(.*)$");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
95 break
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
96 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
97 ret[#ret+1]=part;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
98 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
99 return ret;
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
100 end
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
101
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
102 local function build_line(parts)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
103 if #parts > 1 then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
104 parts[#parts] = ":" .. parts[#parts];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
105 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
106 return (parts.from and ":"..parts.from.." " or "")..table.concat(parts, " ");
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
107 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
108
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
109 local function irc2muc(channel, nick)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
110 local room = channel and nodeprep(channel:match("^#(%w+)")) or nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
111 if not nick then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
112 return jid.join(room, muc_server);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
113 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
114 return jid.join(room, muc_server, nick);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
115 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
116 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
117 local function muc2irc(room)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
118 local channel, _, nick = jid.split(room);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
119 return "#"..channel, nick;
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
120 end
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
121 local role_map = {
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
122 moderator = "@",
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
123 participant = "",
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
124 visitor = "",
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
125 none = ""
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
126 }
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
127 local aff_map = {
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
128 owner = "~",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
129 administrator = "&",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
130 member = "+",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
131 none = ""
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 }
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
133 local role_modemap = {
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
134 moderator = "o",
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
135 participant = "",
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
136 visitor = "",
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
137 none = ""
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
138 }
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
139 local aff_modemap = {
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
140 owner = "q",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
141 administrator = "a",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
142 member = "v",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
143 none = ""
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
144 }
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
145
483
f4ada087c743 mod_ircd: added listener port configuration, added utf8 checks to TOPIC, added check so that module wonn't get loaded if conference_server is unset.
Marco Cirillo <maranda@lightwitch.org>
parents: 482
diff changeset
146 local irc_listener = { default_port = port_number, default_mode = "*l" };
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
147
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 local sessions = {};
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
149 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
150 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
151
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 local nicks = {};
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
153 local usernames = {};
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
154
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 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
156
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
157 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
158
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 local function irc_close_session(session)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
160 session.conn:close();
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 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
162
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 function irc_listener.onincoming(conn, data)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
164 local session = sessions[conn];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
165 if not session then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
166 session = { conn = conn, host = component_jid, reset_stream = function () end,
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
167 close = irc_close_session, log = logger.init("irc"..(conn.id or "1")),
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
168 rooms = {}, roster = {}, has_un = false };
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
169 sessions[conn] = session;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
170
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
171 function session.data(data)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
172 local parts = parse_line(data);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
173 module:log("debug", require"util.serialization".serialize(parts));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
174 local command = table.remove(parts, 1);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
175 if not command then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
176 return;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
177 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
178 command = command:upper();
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
179 if not session.username and not session.nick then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
180 if not (command == "USER" or command == "NICK") then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
181 module:log("debug", "Client tried to send command %s before registering", command);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
182 return session.send{from=muc_server, "451", command, "You have not completed the registration."}
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
183 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
184 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
185 if commands[command] then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
186 local ret = commands[command](session, parts);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
187 if ret then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
188 return session.send(ret);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
189 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
190 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
191 session.send{from=muc_server, "421", session.nick, command, "Unknown command"};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
192 return module:log("debug", "Unknown command: %s", command);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
193 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
194 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
195
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
196 function session.send(data)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
197 if type(data) == "string" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
198 return conn:write(data.."\r\n");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
199 elseif type(data) == "table" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
200 local line = build_line(data);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
201 module:log("debug", line);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
202 conn:write(line.."\r\n");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
203 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
204 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
205 end
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
206
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
207 if data then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
208 session.data(data);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
209 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
210 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
211
3de60860adca mod_ircd: Initial commit of a wonderfully hacky but working IRC->XMPP interface for Prosody
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
212 function irc_listener.ondisconnect(conn, error)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
213 local session = sessions[conn];
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
214
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
215 if session then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
216 for _, room in pairs(session.rooms) do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
217 room:leave("Disconnected");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
218 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
219 if session.nick then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
220 nicks[session.nick] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
221 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
222 if session.full_jid then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
223 jids[session.full_jid] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
224 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
225 if session.username then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
226 usernames[session.username] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
227 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
228 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
229 sessions[conn] = nil;
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 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
231
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
232 local function nick_inuse(nick)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
233 if nicks[nick] then return true else return false end
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
234 end
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
235 local function check_username(un)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
236 local count = 0;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
237 local result;
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
238
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
239 for name, given in pairs(usernames) do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
240 if un == given then count = count + 1; end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
241 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
242
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
243 result = count + 1;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
244
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
245 if count > 0 then return tostring(un)..tostring(result); else return tostring(un); end
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
246 end
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
247 local function set_t_data(session, full_jid)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
248 session.full_jid = full_jid;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
249 jids[full_jid] = session;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
250 jids[full_jid]["ar_last"] = {};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
251 jids[full_jid]["nicks_changing"] = {};
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
252
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
253 if session.nick then nicks[session.nick] = session; end
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
254 end
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
255 local function send_motd(session)
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
256 local nick = session.nick;
498
2865eaf43c74 mod_ircd: remove some duped code.
Marco Cirillo <maranda@lightwitch.org>
parents: 497
diff changeset
257
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
258 if session.username and session.nick then -- send MOTD only if username and nick are set
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
259 session.send{from = muc_server, "001", nick, "Welcome in the IRC to MUC XMPP Gateway, "..nick};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
260 session.send{from = muc_server, "002", nick, "Your host is "..muc_server.." running Prosody "..prosody.version};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
261 session.send{from = muc_server, "003", nick, "This server was created the "..os.date(nil, prosody.start_time)}
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
262 session.send{from = muc_server, "004", nick, table.concat({muc_server, "mod_ircd(alpha-0.8)", "i", "aoqv"}, " ")};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
263 session.send((":%s %s %s %s :%s"):format(muc_server, "005", nick, "CHANTYPES=# PREFIX=(qaov)~&@+", "are supported by this server"));
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
264 session.send((":%s %s %s %s :%s"):format(muc_server, "005", nick, "STATUSMSG=~&@+", "are supported by this server"));
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
265 session.send{from = muc_server, "375", nick, "- "..muc_server.." Message of the day -"};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
266 session.send{from = muc_server, "372", nick, "-"};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
267 session.send{from = muc_server, "372", nick, "- Please be warned that this is only a partial irc implementation,"};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
268 session.send{from = muc_server, "372", nick, "- it's made to facilitate users transiting away from irc to XMPP."};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
269 session.send{from = muc_server, "372", nick, "-"};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
270 session.send{from = muc_server, "372", nick, "- Prosody is _NOT_ an IRC Server and it never will."};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
271 session.send{from = muc_server, "372", nick, "- We also would like to remind you that this plugin is provided as is,"};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
272 session.send{from = muc_server, "372", nick, "- it's still an Alpha and it's still a work in progress, use it at your sole"};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
273 session.send{from = muc_server, "372", nick, "- risk as there's a not so little chance something will break."};
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
274 session.send{from = nick, "MODE", nick, "+i"}; -- why -> Invisible mode setting,
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
275 end -- enforce by default on most servers (since the source host doesn't show it's sensible to have it "set")
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
276 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
277
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
278 function commands.NICK(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
279 local nick = args[1];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
280 nick = nick:gsub("[^%w_]","");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
281
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
282 if session.nick and not nick_inuse(nick) then -- changing nick
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
283 local oldnick = session.nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
284
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
285 -- update and replace session data
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
286 session.nick = nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
287 nicks[oldnick] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
288 nicks[nick] = session;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
289
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
290 session.send{from=oldnick.."!"..nicks[nick].username, "NICK", nick};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
291
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
292 -- broadcast changes if required
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
293 if session.rooms then
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
294 session.nicks_changing[nick] = { oldnick, session.username };
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
295
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
296 for id, room in pairs(session.rooms) do room:change_nick(nick); end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
297
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
298 session.nicks_changing[nick] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
299 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
300
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
301 return;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
302 elseif nick_inuse(nick) then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
303 session.send{from=muc_server, "433", nick, "The nickname "..nick.." is already in use"}; return;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
304 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
305
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
306 session.nick = nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
307 session.type = "c2s";
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
308 nicks[nick] = session;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
309
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
310 -- Some choppy clients send in NICK before USER, that needs to be handled
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
311 if session.username then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
312 set_t_data(session, jid.join(session.username, component_jid, "ircd"));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
313 end
499
30e33292d738 mod_ircd: "finish" previous commit.
Marco Cirillo <maranda@lightwitch.org>
parents: 498
diff changeset
314
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
315 send_motd(session);
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
316 end
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
317
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
318 function commands.USER(session, params)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
319 local username = params[1];
488
4885ca74515c mod_ircd: corrected an issue within the nick change logic, and improved it by implementing the USER command.
Marco Cirillo <maranda@lightwitch.org>
parents: 487
diff changeset
320
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
321 if not session.has_un then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
322 local un_checked = check_username(username);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
323
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
324 usernames[un_checked] = username;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
325 session.username = un_checked;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
326 session.has_un = true;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
327
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
328 if not session.full_jid then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
329 set_t_data(session, jid.join(session.username, component_jid, "ircd"));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
330 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
331 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
332 return session.send{from=muc_server, "462", "USER", "You may not re-register."}
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
333 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
334
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
335 send_motd(session);
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
336 end
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
337
497
94756b0657b4 mod_ircd: added USERHOST command.
Marco Cirillo <maranda@lightwitch.org>
parents: 496
diff changeset
338 function commands.USERHOST(session, params) -- can show only users on the gateway. Needed for some clients to determinate self hostmask.
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
339 local nick = params[1];
497
94756b0657b4 mod_ircd: added USERHOST command.
Marco Cirillo <maranda@lightwitch.org>
parents: 496
diff changeset
340
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
341 if not nick then session.send{from=muc_server, "461", "USERHOST", "Not enough parameters"}; return; end
497
94756b0657b4 mod_ircd: added USERHOST command.
Marco Cirillo <maranda@lightwitch.org>
parents: 496
diff changeset
342
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
343 if nicks[nick] and nicks[nick].nick and nicks[nick].username then
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
344 session.send{from=muc_server, "302", session.nick, nick.."=+"..nicks[nick].username}; return;
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
345 else
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
346 return;
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
347 end
495
1a71e0e21a29 mod_ircd: added USERHOST placeholder.
Marco Cirillo <maranda@lightwitch.org>
parents: 491
diff changeset
348 end
1a71e0e21a29 mod_ircd: added USERHOST placeholder.
Marco Cirillo <maranda@lightwitch.org>
parents: 491
diff changeset
349
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
350 local function mode_map(am, rm, nicks)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
351 local rnick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
352 local c_modes;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
353 c_modes = aff_modemap[am]..role_modemap[rm]
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
354 rnick = string.rep(nicks.." ", c_modes:len())
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
355 if c_modes == "" then return nil, nil end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
356 return c_modes, rnick
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
357 end
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
358
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
359 function commands.JOIN(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
360 local channel = args[1];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
361 if not channel then return end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
362 local room_jid = irc2muc(channel);
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
363
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
364 if not jids[session.full_jid].ar_last[room_jid] then jids[session.full_jid].ar_last[room_jid] = {}; end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
365 local room, err = c:join_room(room_jid, session.nick, { source = session.full_jid } );
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
366 if not room then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
367 return ":"..muc_server.." ERR :Could not join room: "..err
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
368 end
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
369
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
370 session.rooms[channel] = room;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
371 room.session = session;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
372
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
373 if session.nicks_changing[session.nick] then -- my own nick is changing
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
374 commands.NAMES(session, channel);
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
375 else
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
376 session.send{from=session.nick.."!"..session.username, "JOIN", channel};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
377 if room.subject then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
378 session.send{from=muc_server, 332, session.nick, channel, room.subject};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
379 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
380 commands.NAMES(session, channel);
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
381 end
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
382
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
383 room:hook("subject-changed", function(changed)
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
384 session.send{from=changed.by.nick, "TOPIC", channel, changed.to or ""}
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
385 end);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
386
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
387 room:hook("message", function(event)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
388 if not event.body then return end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
389 local nick, body = event.nick, event.body;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
390 if nick ~= session.nick then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
391 if body:sub(1,4) == "/me " then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
392 body = "\1ACTION ".. body:sub(5) .. "\1"
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
393 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
394 local type = event.stanza.attr.type;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
395 session.send{from=nick, "PRIVMSG", type == "groupchat" and channel or nick, body};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
396 --FIXME PM's probably won't work
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
397 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
398 end);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
399
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
400 room:hook("presence", function(ar)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
401 local c_modes;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
402 local rnick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
403 if ar.nick and not jids[session.full_jid].ar_last[ar.room_jid][ar.nick] then jids[session.full_jid].ar_last[ar.room_jid][ar.nick] = {} end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
404 local x_ar = ar.stanza:get_child("x", "http://jabber.org/protocol/muc#user")
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
405 if x_ar then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
406 local xar_item = x_ar:get_child("item")
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
407 if xar_item and xar_item.attr and ar.stanza.attr.type ~= "unavailable" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
408 if xar_item.attr.affiliation and xar_item.attr.role then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
409 if not jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["affiliation"] and
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
410 not jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["role"] then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
411 jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["affiliation"] = xar_item.attr.affiliation
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
412 jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["role"] = xar_item.attr.role
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
413 n_self_changing = nicks[ar.nick] and nicks[ar.nick].nicks_changing and nicks[ar.nick].nicks_changing[ar.nick]
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
414 if n_self_changing then return; end
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
415 c_modes, rnick = mode_map(xar_item.attr.affiliation, xar_item.attr.role, ar.nick);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
416 if c_modes and rnick then session.send((":%s MODE %s +%s"):format(muc_server, channel, c_modes.." "..rnick)); end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
417 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
418 c_modes, rnick = mode_map(jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["affiliation"], jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["role"], ar.nick);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
419 if c_modes and rnick then session.send((":%s MODE %s -%s"):format(muc_server, channel, c_modes.." "..rnick)); end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
420 jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["affiliation"] = xar_item.attr.affiliation
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
421 jids[session.full_jid].ar_last[ar.room_jid][ar.nick]["role"] = xar_item.attr.role
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
422 n_self_changing = nicks[ar.nick] and nicks[ar.nick].nicks_changing and nicks[ar.nick].nicks_changing[ar.nick]
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
423 if n_self_changing then return; end
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
424 c_modes, rnick = mode_map(xar_item.attr.affiliation, xar_item.attr.role, ar.nick);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
425 if c_modes and rnick then session.send((":%s MODE %s +%s"):format(muc_server, channel, c_modes.." "..rnick)); end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
426 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
427 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
428 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
429 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
430 end, -1);
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
431 end
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
432
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
433 c:hook("groupchat/joined", function(room)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
434 local session = room.session or jids[room.opts.source];
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
435 local channel = "#"..room.jid:match("^(.*)@");
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
436
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
437 room:hook("occupant-joined", function(nick)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
438 if session.nicks_changing[nick.nick] then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
439 session.send{from=session.nicks_changing[nick.nick][1].."!"..(session.nicks_changing[nick.nick][2] or "xmpp"), "NICK", nick.nick};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
440 session.nicks_changing[nick.nick] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
441 else
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
442 session.send{from=nick.nick.."!"..(nicks[nick.nick] and nicks[nick.nick].username or "xmpp"), "JOIN", channel};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
443 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
444 end);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
445 room:hook("occupant-left", function(nick)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
446 if jids[session.full_jid] then jids[session.full_jid].ar_last[nick.jid:match("^(.*)/")][nick.nick] = nil; end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
447 local status_code =
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
448 nick.presence:get_child("x","http://jabber.org/protocol/muc#user") and
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
449 nick.presence:get_child("x","http://jabber.org/protocol/muc#user"):get_child("status") and
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
450 nick.presence:get_child("x","http://jabber.org/protocol/muc#user"):get_child("status").attr.code;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
451
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
452
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
453 if status_code == "303" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
454 local newnick =
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
455 nick.presence:get_child("x","http://jabber.org/protocol/muc#user") and
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
456 nick.presence:get_child("x","http://jabber.org/protocol/muc#user"):get_child("item") and
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
457 nick.presence:get_child("x","http://jabber.org/protocol/muc#user"):get_child("item").attr.nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
458
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
459 session.nicks_changing[newnick] = { nick.nick, (nicks[nick.nick] and nicks[nick.nick].username or "xmpp") }; return;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
460 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
461
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
462 for id, data in pairs(session.nicks_changing) do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
463 if data[1] == nick.nick then return; end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
464 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
465 session.send{from=nick.nick.."!"..(nicks[nick.nick] and nicks[nick.nick].username or "xmpp"), "PART", channel};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
466 end);
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
467 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
468
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
469 function commands.NAMES(session, channel)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
470 local nicks = { };
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
471 if type(channel) == "table" then channel = channel[1] end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
472
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
473 local room = session.rooms[channel];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
474
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
475 local symbols_map = {
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
476 owner = "~",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
477 administrator = "&",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
478 moderator = "@",
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
479 member = "+"
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
480 }
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
481
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
482 if not room then return end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
483 -- TODO Break this out into commands.NAMES
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
484 for nick, n in pairs(room.occupants) do
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
485 if n.affiliation == "owner" and n.role == "moderator" then
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
486 nick = symbols_map[n.affiliation]..nick;
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
487 elseif n.affiliation == "administrator" and n.role == "moderator" then
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
488 nick = symbols_map[n.affiliation]..nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
489 elseif n.affiliation == "member" and n.role == "moderator" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
490 nick = symbols_map[n.role]..nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
491 elseif n.affiliation == "member" and n.role == "partecipant" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
492 nick = symbols_map[n.affiliation]..nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
493 elseif n.affiliation == "none" and n.role == "moderator" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
494 nick = symbols_map[n.role]..nick;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
495 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
496 table.insert(nicks, nick);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
497 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
498 nicks = table.concat(nicks, " ");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
499 session.send((":%s 353 %s = %s :%s"):format(muc_server, session.nick, channel, nicks));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
500 session.send((":%s 366 %s %s :End of /NAMES list."):format(muc_server, session.nick, channel));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
501 session.send(":"..muc_server.." 353 "..session.nick.." = "..channel.." :"..nicks);
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
502 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
503
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
504 function commands.PART(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
505 local channel, part_message = unpack(args);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
506 local room = channel and nodeprep(channel:match("^#(%w+)")) or nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
507 if not room then return end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
508 channel = channel:match("^([%S]*)");
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
509 session.rooms[channel]:leave(part_message);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
510 jids[session.full_jid].ar_last[room.."@"..muc_server] = nil;
503
db32236d7682 mod_ircd: some cleanup.
Marco Cirillo <maranda@lightwitch.org>
parents: 499
diff changeset
511 session.send{from=session.nick.."!"..session.username, "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
512 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
513
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
514 function commands.PRIVMSG(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
515 local channel, message = unpack(args);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
516 if message and #message > 0 then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
517 if message:sub(1,8) == "\1ACTION " then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
518 message = "/me ".. message:sub(9,-2)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
519 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
520 message = utf8_clean(message);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
521 if channel:sub(1,1) == "#" then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
522 if session.rooms[channel] then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
523 module:log("debug", "%s sending PRIVMSG \"%s\" to %s", session.nick, message, channel);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
524 session.rooms[channel]:send_message(message);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
525 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
526 else -- private message
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
527 local nick = channel;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
528 module:log("debug", "PM to %s", nick);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
529 for channel, room in pairs(session.rooms) do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
530 module:log("debug", "looking for %s in %s", nick, channel);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
531 if room.occupants[nick] then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
532 module:log("debug", "found %s in %s", nick, channel);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
533 local who = room.occupants[nick];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
534 -- FIXME PMs in verse
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
535 --room:send_private_message(nick, message);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
536 local pm = st.message({type="chat",to=who.jid}, message);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
537 module:log("debug", "sending PM to %s: %s", nick, tostring(pm));
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
538 room:send(pm)
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
539 break
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
540 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
541 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
542 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
543 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
544 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
545
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
546 function commands.PING(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
547 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
548 end
d4ff1cd414e5 mod_ircd: Add PING command / Echo PART back
Florian Zeitz <florob@babelmonkeys.de>
parents: 111
diff changeset
549
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
550 function commands.TOPIC(session, message)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
551 if not message then return end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
552 local channel, topic = message[1], message[2];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
553 channel = utf8_clean(channel);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
554 topic = utf8_clean(topic);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
555 if not channel then return end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
556 local room = session.rooms[channel];
482
9d62586e7aae mod_ircd: hacked around it to make it "work" again, topics should be operational once again.
Marco Cirillo <maranda@lightwitch.org>
parents: 473
diff changeset
557
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
558 if topic then room:set_subject(topic); end
470
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
559 end
4f9224369e69 mod_ircd: merged in various changes including -- code to propagate aff/role changes as modes, topic hooks/command, scarecrow motd banner, default port.
Marco Cirillo <maranda@lightwitch.org>
parents: 469
diff changeset
560
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
561 function commands.WHO(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
562 local channel = args[1];
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
563 if session.rooms[channel] then
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
564 local room = session.rooms[channel]
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
565 for nick in pairs(room.occupants) do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
566 session.send{from=muc_server, 352, session.nick, channel, nick, nick, muc_server, nick, "H", "0 "..nick}
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
567 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
568 session.send{from=muc_server, 315, session.nick, channel, "End of /WHO list"};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
569 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
570 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
571
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
572 function commands.MODE(session, args) -- Empty 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
573 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
574
466
0fcd34ee7301 mod_ircd: Proper line parsing and generating. Fix PMs
Kim Alvefur <zash@zash.se>
parents: 465
diff changeset
575 function commands.QUIT(session, args)
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
576 session.send{"ERROR", "Closing Link: "..session.nick};
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
577 for _, room in pairs(session.rooms) do
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
578 room:leave(args[1]);
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
579 end
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
580 jids[session.full_jid] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
581 nicks[session.nick] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
582 usernames[session.username] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
583 sessions[session.conn] = nil;
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
584 session:close();
329
febfb59502fc mod_ircd: Add QUIT command.
Kim Alvefur <zash@zash.se>
parents: 326
diff changeset
585 end
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
586
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
587 function commands.RAW(session, data) -- Empty 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
588 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
589
465
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
590 local function desetup()
491
5b3db688213d mod_ircd: Fixed nick change logic (thanks mva), so that the self nick-change "flag" is removed properly, improved the logic to use verse's room_mt:change_nick (thanks Zash) yet to be pushed into main, added squished verse with the meta method included.
Marco Cirillo <maranda@lightwitch.org>
parents: 490
diff changeset
591 require "net.connlisteners".deregister("irc");
465
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
592 end
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
593
487
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
594 require "net.connlisteners".register("irc", irc_listener);
8bdab5489653 mod_ircd: code cleanup, added full logic for changing nicks (locally it works no traces), removed many comment lines (there was an over abundance of 'em they're in the .old_annotate file)
Marco Cirillo <maranda@lightwitch.org>
parents: 485
diff changeset
595 require "net.connlisteners".start("irc");
326
282abba844e8 mod_ircd: Partial rewrite, use verse for MUC
Kim Alvefur <zash@zash.se>
parents: 282
diff changeset
596
465
030404dd7609 mod_ircd: Better nameing, squishy.
Kim Alvefur <zash@zash.se>
parents: 461
diff changeset
597 module:hook("module-unloaded", desetup)