Thu, 14 Oct 2010 13:21:55 +0100
plugins.version, plugins.command: Remove obsolete require 'util.xstanza'
0 | 1 | local verse = require "verse"; |
2 | local st = require "util.stanza"; | |
3 | ||
4 | module("riddim", package.seeall); | |
5 | plugins = {}; | |
6 | ||
7 | local riddim_mt = {}; | |
8 | riddim_mt.__index = riddim_mt; | |
9 | ||
10 | function new(stream, config) | |
11 | if not stream then | |
12 | error("riddim.new(): Verse stream required as first parameter", 2); | |
13 | end | |
3
d1a9fb6495c6
Don't allow loading the same plugin more than once
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
14 | return setmetatable({ stream = stream, config = config or {}, plugins = {} }, riddim_mt); |
0 | 15 | end |
16 | ||
17 | -- self.conn is ready for stanzas | |
18 | function riddim_mt:start() | |
19 | self.stream:hook("stanza", function (stanza) | |
16
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
20 | local body = stanza:get_child("body"); |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
21 | local event = { |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
22 | sender = { jid = stanza.attr.from }; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
23 | body = (body and body:get_text()) or nil; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
24 | stanza = stanza; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
25 | }; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
26 | if stanza.name == "message" then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
27 | local replied; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
28 | local bot = self; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
29 | function event:reply(reply) |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
30 | if replied then return false; end |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
31 | replied = true; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
32 | return bot:send_message(stanza.attr.from, stanza.attr.type, reply); |
0 | 33 | end |
16
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
34 | end |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
35 | local ret; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
36 | if stanza.name == "iq" and (stanza.attr.type == "get" or stanza.attr.type == "set") then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
37 | local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
38 | if xmlns then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
39 | event.xmlns = xmlns; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
40 | ret = self:event("iq/"..xmlns, event); |
0 | 41 | end |
16
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
42 | end |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
43 | if not ret then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
44 | ret = self:event(stanza.name, event); |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
45 | end |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
46 | if ret and type(ret) == "table" and ret.name then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
47 | self:send(ret); |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
48 | end |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
49 | return ret; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
50 | end, 1); |
17
9fe723988f3c
Fire started event at the end of startup routine
Chris <jugg@hotmail.com>
parents:
16
diff
changeset
|
51 | self:event("started"); |
0 | 52 | end |
53 | ||
54 | function riddim_mt:send(s) | |
28
d0d1d88ec0ef
init.lua: Don't tostring() stanzas before passing to Verse, in case we ever support filters. Also add send_iq() to bot object.
Matthew Wild <mwild1@gmail.com>
parents:
24
diff
changeset
|
55 | return self.stream:send(s); |
d0d1d88ec0ef
init.lua: Don't tostring() stanzas before passing to Verse, in case we ever support filters. Also add send_iq() to bot object.
Matthew Wild <mwild1@gmail.com>
parents:
24
diff
changeset
|
56 | end |
d0d1d88ec0ef
init.lua: Don't tostring() stanzas before passing to Verse, in case we ever support filters. Also add send_iq() to bot object.
Matthew Wild <mwild1@gmail.com>
parents:
24
diff
changeset
|
57 | |
d0d1d88ec0ef
init.lua: Don't tostring() stanzas before passing to Verse, in case we ever support filters. Also add send_iq() to bot object.
Matthew Wild <mwild1@gmail.com>
parents:
24
diff
changeset
|
58 | function riddim_mt:send_iq(s, callback, errback) |
d0d1d88ec0ef
init.lua: Don't tostring() stanzas before passing to Verse, in case we ever support filters. Also add send_iq() to bot object.
Matthew Wild <mwild1@gmail.com>
parents:
24
diff
changeset
|
59 | return self.stream:send_iq(s, callback, errback); |
0 | 60 | end |
61 | ||
62 | function riddim_mt:event(name, ...) | |
63 | return self.stream:event("bot/"..name, ...); | |
64 | end | |
65 | ||
66 | function riddim_mt:hook(name, ...) | |
67 | return self.stream:hook("bot/"..name, ...); | |
68 | end | |
69 | ||
15
22e6c003a83a
Reply to messages with the same (the incoming) message type
Chris <jugg@hotmail.com>
parents:
14
diff
changeset
|
70 | function riddim_mt:send_message(to, type, text) |
22e6c003a83a
Reply to messages with the same (the incoming) message type
Chris <jugg@hotmail.com>
parents:
14
diff
changeset
|
71 | self:send(st.message({ to = to, type = type }):tag("body"):text(text)); |
0 | 72 | end |
73 | ||
18
d7cd7ce93132
Rudimentary presence plugin to auto-accept subscription requests
Chris <jugg@hotmail.com>
parents:
17
diff
changeset
|
74 | function riddim_mt:send_presence(to, type) |
d7cd7ce93132
Rudimentary presence plugin to auto-accept subscription requests
Chris <jugg@hotmail.com>
parents:
17
diff
changeset
|
75 | self:send(st.presence({ to = to, type = type })); |
d7cd7ce93132
Rudimentary presence plugin to auto-accept subscription requests
Chris <jugg@hotmail.com>
parents:
17
diff
changeset
|
76 | end |
d7cd7ce93132
Rudimentary presence plugin to auto-accept subscription requests
Chris <jugg@hotmail.com>
parents:
17
diff
changeset
|
77 | |
0 | 78 | function riddim_mt:add_plugin(name) |
3
d1a9fb6495c6
Don't allow loading the same plugin more than once
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
79 | if not self.plugins[name] then |
d1a9fb6495c6
Don't allow loading the same plugin more than once
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
80 | self.plugins[name] = require("riddim.plugins."..name); |
d1a9fb6495c6
Don't allow loading the same plugin more than once
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
81 | return riddim.plugins[name](self); |
d1a9fb6495c6
Don't allow loading the same plugin more than once
Matthew Wild <mwild1@gmail.com>
parents:
2
diff
changeset
|
82 | end |
0 | 83 | end |
84 | ||
85 | -- Built-in bot starter | |
86 | if not (... and package.loaded[...] ~= nil) then | |
87 | require "verse.client"; | |
88 | ||
89 | -- Config loading | |
90 | local chunk, err = loadfile("config.lua"); | |
91 | if not chunk then | |
92 | print("File or syntax error:", err); | |
93 | return 1; | |
94 | end | |
95 | ||
96 | local config = {}; | |
97 | setfenv(chunk, setmetatable(config, {__index = _G})); | |
98 | local ok, err = pcall(chunk); | |
99 | if not ok then | |
100 | print("Error while processing config:", err); | |
101 | return 1; | |
102 | end | |
103 | setmetatable(config, nil); | |
104 | ||
105 | if not config.jid then | |
106 | io.write("Enter the bot's JID: "); | |
107 | config.jid = io.read("*l"); | |
108 | end | |
109 | ||
110 | if not config.password then | |
111 | io.write("Enter the password for "..config.jid..": "); | |
112 | config.password = io.read("*l"); | |
113 | end | |
114 | ||
115 | -- Create the stream object and bot object | |
116 | local c = verse.new(); | |
117 | local b = riddim.new(c, config); | |
118 | ||
119 | if config.debug then | |
120 | c:hook("incoming-raw", print); | |
121 | end | |
122 | ||
14
3df63aaba9e3
Decouple plugins from base implementation (in particular no plugins are now loaded by default)
Chris <jugg@hotmail.com>
parents:
11
diff
changeset
|
123 | for _, plugin in ipairs(config.plugins or {}) do |
2
6b31cc678fd7
Add configured plugins to the bot instead of the stream
Matthew Wild <mwild1@gmail.com>
parents:
1
diff
changeset
|
124 | b:add_plugin(plugin); |
0 | 125 | end |
126 | ||
127 | b:hook("started", function () | |
6
b0fec41e695b
initial implementation of disco responses (XEP-0030) and entity caps sending (XEP-0115)
Hubert Chathi <hubert@uhoreg.ca>
parents:
5
diff
changeset
|
128 | local presence = verse.presence() |
b0fec41e695b
initial implementation of disco responses (XEP-0030) and entity caps sending (XEP-0115)
Hubert Chathi <hubert@uhoreg.ca>
parents:
5
diff
changeset
|
129 | if b.caps then |
b0fec41e695b
initial implementation of disco responses (XEP-0030) and entity caps sending (XEP-0115)
Hubert Chathi <hubert@uhoreg.ca>
parents:
5
diff
changeset
|
130 | presence:add_child(b:caps()) |
b0fec41e695b
initial implementation of disco responses (XEP-0030) and entity caps sending (XEP-0115)
Hubert Chathi <hubert@uhoreg.ca>
parents:
5
diff
changeset
|
131 | end |
11
7bb53dcf93d4
Fix to send initial presence again
Hubert Chathi <hubert@uhoreg.ca>
parents:
8
diff
changeset
|
132 | b:send(presence); |
0 | 133 | end); |
134 | ||
24
330643a82a1d
riddim: Hook Verse's new 'ready' event instead of 'binding-success'
Matthew Wild <mwild1@gmail.com>
parents:
18
diff
changeset
|
135 | c:hook("ready", function () b:start(); end); |
5
d9ed6e7d9936
allow specifying connect host and port in config file
Hubert Chathi <hubert@uhoreg.ca>
parents:
3
diff
changeset
|
136 | |
16
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
137 | if config.connect_host then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
138 | c.connect_host = config.connect_host; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
139 | end |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
140 | if config.connect_port then |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
141 | c.connect_port = config.connect_port; |
ae69cea97598
Formatting, indentation and cleanup
Chris <jugg@hotmail.com>
parents:
15
diff
changeset
|
142 | end |
0 | 143 | |
144 | c:connect_client(config.jid, config.password); | |
145 | ||
146 | verse.loop(); | |
147 | end | |
148 | ||
149 | return _M; |