diff options
| -rw-r--r-- | discord/pylon.lua | 48 | ||||
| -rw-r--r-- | irc/pylon.lua | 5 | ||||
| -rw-r--r-- | pylon.lua | 10 |
3 files changed, 49 insertions, 14 deletions
diff --git a/discord/pylon.lua b/discord/pylon.lua index f84db64..7f7549b 100644 --- a/discord/pylon.lua +++ b/discord/pylon.lua @@ -1,10 +1,13 @@ local consts = require'discord.consts' +local opcodes = consts.opcodes local websocket = require'http.websocket' local json = require 'dkjson' local Queue = require 'queue' local exec_webhook = require'discord.the' local cqueues = require 'cqueues' local pylon = require 'pylon' +local pprint = require 'pprint' +local Channel = require 'channel' local Discord = pylon.subclass "discord" @@ -15,7 +18,7 @@ end local function identify_payload(token) local I = consts.intents return json.encode{ - op = consts.opcodes.identify, + op = opcodes.identify, d = { properties = { os = "wilson", browser = "wilson", device = "wilson", @@ -31,14 +34,47 @@ function Discord._connect(self) self.ws = websocket.new_from_uri(uri) assert(self.ws:connect()) self.ws:send(identify_payload(self.token), 'text') - -- for a,b in self.ws:each() do - -- print('its',a,b) - -- end +end + +function Discord._heartbeat(self, interval_ms) + local interval = interval_ms / 1000 + cqueues.sleep(interval * math.random()) + while true do + self.ws:send(json.encode{ + op = opcodes.heartbeat, + d = self.sequence_number, + }) + cqueues.sleep(interval) + end end function Discord.recving(self) - for event in self.ws:each() do - print(event) + for packet in self.ws:each() do + local event = json.decode(packet) + print(event.s, event.op, event.t) + if event.op ~= opcodes.dispatch then + pprint(event.d) + end + + if event.s then self.sequence_number = event.s end + + if event.op == opcodes.hello then + self.cq:wrap(self._heartbeat, self, event.d.heartbeat_interval) + elseif event.op == opcodes.dispatch then + self:handle_dispatch(event) + end + end +end + +function Discord.handle_dispatch(self, event) + local d = event.d + if event.t == 'MESSAGE_CREATE' then + if d.author.id == '293066066605768714' then + self.wilson:deliver(Channel(self, d.channel_id), { + body = d.content, + sender = '[d]' .. d.author.username + }) + end end end diff --git a/irc/pylon.lua b/irc/pylon.lua index 8c43b13..0cee9aa 100644 --- a/irc/pylon.lua +++ b/irc/pylon.lua @@ -1,6 +1,5 @@ local cqueues = require'cqueues' local socket = require'cqueues.socket' -local pprint = require'pprint' local rirc = require'irc.rirc' local Queue = require'queue' local Channel = require'channel' @@ -11,7 +10,7 @@ local Irc = pylon.subclass 'irc' function Irc._send(self, args) args.source = args.source or self.nodename local sent = rirc.send(self.sock, args) - print('>', sent) + self:log('>', sent) end function Irc.init(self) @@ -26,7 +25,7 @@ end function Irc.recving(self) for line in self.sock:lines "*l" do - print('<', line) + self:log('<', line) local msg = rirc.parse(line) if msg.op == 'PING' then self:_send{'PONG', msg.args[1]} @@ -13,11 +13,11 @@ function BasePylon.check_config(self, vars) end function BasePylon.run(self) - local cq = cqueues.new() + self.cq = cqueues.new() self:_connect() - cq:wrap(self.recving, self) - cq:wrap(self.sending, self) - print(self.pylon_type, cq:loop()) + self.cq:wrap(self.recving, self) + self.cq:wrap(self.sending, self) + print(self.pylon_type, self.cq:loop()) end function BasePylon.post(self, dest_channel, message) @@ -26,7 +26,7 @@ end function BasePylon.log(self, ...) if self.debug then - print(self.pylon_type, self.name, ...) + print(self.name, ...) end end |