From fbe933f5ecadc2c1ac20ea1858b587a10df6bdda Mon Sep 17 00:00:00 2001 From: Brayden Banks Date: Mon, 11 Apr 2016 20:55:46 -0700 Subject: [PATCH] Final(?) fixes. --- plugins/administration.lua | 2 +- plugins/cats.lua | 6 +++--- plugins/dice.lua | 2 +- plugins/dilbert.lua | 2 +- plugins/floodcontrol.lua | 2 +- plugins/gImages.lua | 4 ++-- plugins/hackernews.lua | 4 +++- plugins/help.lua | 2 +- plugins/pokedex.lua | 2 +- plugins/shout.lua | 2 +- plugins/youtube.lua | 6 ++---- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/administration.lua b/plugins/administration.lua index 3d56316..9e61c76 100644 --- a/plugins/administration.lua +++ b/plugins/administration.lua @@ -1132,7 +1132,7 @@ function administration:action(msg) end function administration:cron() - self.temp.flood = {} + self.admin_temp.flood = {} end administration.command = 'groups' diff --git a/plugins/cats.lua b/plugins/cats.lua index 9e05146..a43b97c 100755 --- a/plugins/cats.lua +++ b/plugins/cats.lua @@ -4,18 +4,18 @@ local HTTP = require('socket.http') local bindings = require('bindings') local utilities = require('utilities') -function bindings:init() +function cats:init() if not self.config.thecatapi_key then print('Missing config value: thecatapi_key.') print('cats.lua will be enabled, but there are more features with a key.') end + + cats.triggers = utilities.triggers(self.info.username):t('cat').table end cats.command = 'cat' cats.doc = '`Returns a cat!`' -cats.triggers = utilities.triggers():t('cat').table - function cats:action(msg) local url = 'http://thecatapi.com/api/images/get?format=html&type=jpg' diff --git a/plugins/dice.lua b/plugins/dice.lua index 296743f..2e5689b 100755 --- a/plugins/dice.lua +++ b/plugins/dice.lua @@ -17,7 +17,7 @@ function dice:action(msg) local input = utilities.input(msg.text_lower) if not input then - bindings.sendMessage(msg.chat.id, dice.doc, true, msg.message_id, true) + bindings.sendMessage(self, msg.chat.id, dice.doc, true, msg.message_id, true) return end diff --git a/plugins/dilbert.lua b/plugins/dilbert.lua index ea227e5..e3b9fac 100644 --- a/plugins/dilbert.lua +++ b/plugins/dilbert.lua @@ -19,7 +19,7 @@ end function dilbert:action(msg) - bindings.sendChatAction(msg.chat.id, 'upload_photo') + bindings.sendChatAction(self, msg.chat.id, 'upload_photo') local input = utilities.input(msg.text) if not input then input = os.date('%F') end diff --git a/plugins/floodcontrol.lua b/plugins/floodcontrol.lua index 7b03b14..1af204d 100755 --- a/plugins/floodcontrol.lua +++ b/plugins/floodcontrol.lua @@ -7,7 +7,7 @@ local JSON = require('cjson') local utilities = require('utilities') function floodcontrol:init() - self.floodcontrol = floodcontrol or {} + self.floodcontrol = self.floodcontrol or {} end floodcontrol.triggers = { diff --git a/plugins/gImages.lua b/plugins/gImages.lua index 777385f..ab36742 100755 --- a/plugins/gImages.lua +++ b/plugins/gImages.lua @@ -1,5 +1,5 @@ -- You need a Google API key and a Google Custom Search Engine set up to use this, in config.google_api_key and config.google_cse_key, respectively. - -- You must also sign up for the CSE in the Google Developer Concsole, and enable image results. + -- You must also sign up for the CSE in the Google Developer Console, and enable image results. local gImages = {} @@ -20,7 +20,7 @@ function gImages:init() return end - gImages.triggers = utilities.triggers():t('image', true):t('i', true):t('insfw', true).table + gImages.triggers = utilities.triggers(self.info.username):t('image', true):t('i', true):t('insfw', true).table end gImages.command = 'image ' diff --git a/plugins/hackernews.lua b/plugins/hackernews.lua index f68a458..1029094 100755 --- a/plugins/hackernews.lua +++ b/plugins/hackernews.lua @@ -11,7 +11,9 @@ Returns four (if group) or eight (if private message) top stories from Hacker Ne Alias: /hn ```]] -hackernews.triggers = utilities.triggers():t('hackernews', true):t('hn', true).table +function hackernews:init() + hackernews.triggers = utilities.triggers(self.info.username):t('hackernews', true):t('hn', true).table +end function hackernews:action(msg) diff --git a/plugins/help.lua b/plugins/help.lua index bb923fc..a84bf78 100755 --- a/plugins/help.lua +++ b/plugins/help.lua @@ -15,7 +15,7 @@ function help:init() end end - help.triggers = utilities.triggers():t('help', true):t('h', true).table + help.triggers = utilities.triggers(self.info.username):t('help', true):t('h', true).table end help_text = help_text .. [[ diff --git a/plugins/pokedex.lua b/plugins/pokedex.lua index 054fc6c..9e9f128 100755 --- a/plugins/pokedex.lua +++ b/plugins/pokedex.lua @@ -62,7 +62,7 @@ function pokedex:action(msg) local output = '*' .. dex_jdat.name .. '*\n#' .. dex_jdat.national_id .. ' | ' .. poke_type .. '\n_' .. desc_jdat.description:gsub('POKMON', 'Pokémon'):gsub('Pokmon', 'Pokémon') .. '_' - bindings.sendMessage(msg.chat.id, output, true, nil, true) + bindings.sendMessage(self, msg.chat.id, output, true, nil, true) end diff --git a/plugins/shout.lua b/plugins/shout.lua index ca9b887..eb08293 100644 --- a/plugins/shout.lua +++ b/plugins/shout.lua @@ -10,7 +10,7 @@ Shouts something. ```]] function shout:init() - shout.triggers = utilities.triggers(self.info.username):t('shout', true) + shout.triggers = utilities.triggers(self.info.username):t('shout', true).table end function shout:action(msg) diff --git a/plugins/youtube.lua b/plugins/youtube.lua index 63a7e49..ee7a41f 100755 --- a/plugins/youtube.lua +++ b/plugins/youtube.lua @@ -14,6 +14,8 @@ function youtube:init() print('youtube.lua will not be enabled.') return end + + youtube.triggers = utilities.triggers(self.info.username):t('youtube', true):t('yt', true).table end youtube.command = 'youtube ' @@ -23,10 +25,6 @@ Returns the top result from YouTube. Alias: /yt ```]] -function youtube:init() - youtube.triggers = utilities.triggers(self.info.username):t('youtube', true):t('yt', true).table -end - function youtube:action(msg) local input = utilities.input(msg.text)