diff --git a/otouto/bot.lua b/otouto/bot.lua index 7093bd1..4fe8937 100755 --- a/otouto/bot.lua +++ b/otouto/bot.lua @@ -8,8 +8,8 @@ bot.version = '3.9' function bot:init(config) -- The function run when the bot is started or reloaded. - bindings = require('bindings') - utilities = require('utilities') + bindings = require('otouto.bindings') + utilities = require('otouto.utilities') assert( config.bot_api_key and config.bot_api_key ~= '', @@ -34,7 +34,7 @@ function bot:init(config) -- The function run when the bot is started or reloade self.plugins = {} -- Load plugins. for _,v in ipairs(config.plugins) do - local p = require('plugins.'..v) + local p = require('otouto.plugins.'..v) table.insert(self.plugins, p) if p.init then p.init(self, config) end end diff --git a/otouto/plugins/about.lua b/otouto/plugins/about.lua index 22d04fd..e212dce 100755 --- a/otouto/plugins/about.lua +++ b/otouto/plugins/about.lua @@ -1,7 +1,7 @@ local about = {} -local bot = require('bot') -local utilities = require('utilities') +local bot = require('otouto.bot') +local utilities = require('otouto.utilities') about.command = 'about' about.doc = '`Returns information about the bot.`' diff --git a/otouto/plugins/administration.lua b/otouto/plugins/administration.lua index 941b209..c4936fb 100644 --- a/otouto/plugins/administration.lua +++ b/otouto/plugins/administration.lua @@ -43,8 +43,8 @@ local JSON = require('dkjson') local drua = dofile('drua-tg.lua') -local bindings = require('bindings') -local utilities = require('utilities') +local bindings = require('otouto.bindings') +local utilities = require('otouto.utilities') local administration = {} diff --git a/otouto/plugins/apod.lua b/otouto/plugins/apod.lua index e936104..d0d187f 100755 --- a/otouto/plugins/apod.lua +++ b/otouto/plugins/apod.lua @@ -5,7 +5,7 @@ local apod = {} local HTTPS = require('ssl.https') local JSON = require('dkjson') local URL = require('socket.url') -local utilities = require('utilities') +local utilities = require('otouto.utilities') apod.command = 'apod [date]' diff --git a/otouto/plugins/bandersnatch.lua b/otouto/plugins/bandersnatch.lua index 2ddcb2c..1cdcc50 100755 --- a/otouto/plugins/bandersnatch.lua +++ b/otouto/plugins/bandersnatch.lua @@ -1,6 +1,6 @@ local bandersnatch = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') bandersnatch.command = 'bandersnatch' diff --git a/otouto/plugins/bible.lua b/otouto/plugins/bible.lua index 9ba50c3..1daddc2 100755 --- a/otouto/plugins/bible.lua +++ b/otouto/plugins/bible.lua @@ -2,7 +2,7 @@ local bible = {} local HTTP = require('socket.http') local URL = require('socket.url') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function bible:init(config) if not config.biblia_api_key then diff --git a/otouto/plugins/bing.lua b/otouto/plugins/bing.lua index b2413a5..b4c24ff 100644 --- a/otouto/plugins/bing.lua +++ b/otouto/plugins/bing.lua @@ -8,7 +8,7 @@ local JSON = require('dkjson') local mime = require('mime') local https = require('ssl.https') local ltn12 = require('ltn12') -local utilities = require('utilities') +local utilities = require('otouto.utilities') bing.command = 'bing ' bing.doc = [[``` diff --git a/otouto/plugins/blacklist.lua b/otouto/plugins/blacklist.lua index 19fb43d..ac83e74 100755 --- a/otouto/plugins/blacklist.lua +++ b/otouto/plugins/blacklist.lua @@ -3,7 +3,7 @@ local blacklist = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function blacklist:init() if not self.database.blacklist then diff --git a/otouto/plugins/calc.lua b/otouto/plugins/calc.lua index f9bb84f..e9cfd99 100755 --- a/otouto/plugins/calc.lua +++ b/otouto/plugins/calc.lua @@ -2,7 +2,7 @@ local calc = {} local URL = require('socket.url') local HTTPS = require('ssl.https') -local utilities = require('utilities') +local utilities = require('otouto.utilities') calc.command = 'calc ' diff --git a/otouto/plugins/cats.lua b/otouto/plugins/cats.lua index 1011122..7daa660 100755 --- a/otouto/plugins/cats.lua +++ b/otouto/plugins/cats.lua @@ -1,7 +1,7 @@ local cats = {} local HTTP = require('socket.http') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function cats:init(config) if not config.thecatapi_key then diff --git a/otouto/plugins/channel.lua b/otouto/plugins/channel.lua index 4dca032..d70be2d 100644 --- a/otouto/plugins/channel.lua +++ b/otouto/plugins/channel.lua @@ -1,7 +1,7 @@ local channel = {} -local bindings = require('bindings') -local utilities = require('utilities') +local bindings = require('otouto.bindings') +local utilities = require('otouto.utilities') --channel.command = 'ch \\n ' channel.doc = [[``` diff --git a/otouto/plugins/chatter.lua b/otouto/plugins/chatter.lua index 53a41fe..2dcde3e 100755 --- a/otouto/plugins/chatter.lua +++ b/otouto/plugins/chatter.lua @@ -5,7 +5,7 @@ local chatter = {} local HTTP = require('socket.http') local URL = require('socket.url') local JSON = require('dkjson') -local bindings = require('bindings') +local bindings = require('otouto.bindings') function chatter:init(config) if not config.simsimi_key then diff --git a/otouto/plugins/commit.lua b/otouto/plugins/commit.lua index 74980ae..0701385 100755 --- a/otouto/plugins/commit.lua +++ b/otouto/plugins/commit.lua @@ -2,7 +2,7 @@ local commit = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') commit.command = 'commit' commit.doc = '`Returns a commit message from whatthecommit.com.`' diff --git a/otouto/plugins/control.lua b/otouto/plugins/control.lua index 1e4e0bb..7681c21 100644 --- a/otouto/plugins/control.lua +++ b/otouto/plugins/control.lua @@ -1,7 +1,7 @@ local control = {} -local bot = require('bot') -local utilities = require('utilities') +local bot = require('otouto.bot') +local utilities = require('otouto.utilities') local cmd_pat -- Prevents the command from being uncallable. diff --git a/otouto/plugins/currency.lua b/otouto/plugins/currency.lua index 1c83cdc..16160d2 100755 --- a/otouto/plugins/currency.lua +++ b/otouto/plugins/currency.lua @@ -1,7 +1,7 @@ local currency = {} local HTTPS = require('ssl.https') -local utilities = require('utilities') +local utilities = require('otouto.utilities') currency.command = 'cash [amount] to ' diff --git a/otouto/plugins/dice.lua b/otouto/plugins/dice.lua index 7206f3b..032d3bf 100755 --- a/otouto/plugins/dice.lua +++ b/otouto/plugins/dice.lua @@ -1,6 +1,6 @@ local dice = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') dice.command = 'roll ' diff --git a/otouto/plugins/dilbert.lua b/otouto/plugins/dilbert.lua index 894c967..63416a6 100644 --- a/otouto/plugins/dilbert.lua +++ b/otouto/plugins/dilbert.lua @@ -2,8 +2,8 @@ local dilbert = {} local HTTP = require('socket.http') local URL = require('socket.url') -local bindings = require('bindings') -local utilities = require('utilities') +local bindings = require('otouto.bindings') +local utilities = require('otouto.utilities') dilbert.command = 'dilbert [date]' diff --git a/otouto/plugins/echo.lua b/otouto/plugins/echo.lua index 43c8da0..10228b4 100755 --- a/otouto/plugins/echo.lua +++ b/otouto/plugins/echo.lua @@ -1,6 +1,6 @@ local echo = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') echo.command = 'echo ' diff --git a/otouto/plugins/eightball.lua b/otouto/plugins/eightball.lua index d02895e..5db3972 100755 --- a/otouto/plugins/eightball.lua +++ b/otouto/plugins/eightball.lua @@ -1,6 +1,6 @@ local eightball = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') eightball.command = '8ball' eightball.doc = '`Returns an answer from a magic 8-ball!`' diff --git a/otouto/plugins/fortune.lua b/otouto/plugins/fortune.lua index 64cc2c3..c47871e 100755 --- a/otouto/plugins/fortune.lua +++ b/otouto/plugins/fortune.lua @@ -2,7 +2,7 @@ local fortune = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function fortune:init(config) local s = io.popen('fortune'):read('*all') diff --git a/otouto/plugins/gImages.lua b/otouto/plugins/gImages.lua index a01985f..9730a1a 100755 --- a/otouto/plugins/gImages.lua +++ b/otouto/plugins/gImages.lua @@ -6,7 +6,7 @@ local gImages = {} local HTTPS = require('ssl.https') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function gImages:init(config) if not config.google_api_key then diff --git a/otouto/plugins/gMaps.lua b/otouto/plugins/gMaps.lua index d09411f..d3719e9 100755 --- a/otouto/plugins/gMaps.lua +++ b/otouto/plugins/gMaps.lua @@ -1,7 +1,7 @@ local gMaps = {} -local bindings = require('bindings') -local utilities = require('utilities') +local bindings = require('otouto.bindings') +local utilities = require('otouto.utilities') gMaps.command = 'location ' diff --git a/otouto/plugins/gSearch.lua b/otouto/plugins/gSearch.lua index c4fa9e4..d38fb97 100755 --- a/otouto/plugins/gSearch.lua +++ b/otouto/plugins/gSearch.lua @@ -3,7 +3,7 @@ local gSearch = {} local HTTPS = require('ssl.https') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') gSearch.command = 'google ' diff --git a/otouto/plugins/greetings.lua b/otouto/plugins/greetings.lua index 9cf762e..f254f5d 100755 --- a/otouto/plugins/greetings.lua +++ b/otouto/plugins/greetings.lua @@ -4,7 +4,7 @@ local greetings = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function greetings:init(config) config.greetings = config.greetings or { diff --git a/otouto/plugins/hackernews.lua b/otouto/plugins/hackernews.lua index 23b83fc..b0a9f69 100755 --- a/otouto/plugins/hackernews.lua +++ b/otouto/plugins/hackernews.lua @@ -2,8 +2,8 @@ local hackernews = {} local HTTPS = require('ssl.https') local JSON = require('dkjson') -local bindings = require('bindings') -local utilities = require('utilities') +local bindings = require('otouto.bindings') +local utilities = require('otouto.utilities') hackernews.command = 'hackernews' diff --git a/otouto/plugins/hearthstone.lua b/otouto/plugins/hearthstone.lua index dd7ceeb..6f8d075 100755 --- a/otouto/plugins/hearthstone.lua +++ b/otouto/plugins/hearthstone.lua @@ -4,7 +4,7 @@ local hearthstone = {} --local HTTPS = require('ssl.https') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function hearthstone:init(config) if not self.database.hearthstone or os.time() > self.database.hearthstone.expiration then diff --git a/otouto/plugins/help.lua b/otouto/plugins/help.lua index d1ce390..9d9ffd4 100755 --- a/otouto/plugins/help.lua +++ b/otouto/plugins/help.lua @@ -3,7 +3,7 @@ local help = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') local help_text diff --git a/otouto/plugins/imdb.lua b/otouto/plugins/imdb.lua index 30bea2c..2e05eb8 100755 --- a/otouto/plugins/imdb.lua +++ b/otouto/plugins/imdb.lua @@ -3,7 +3,7 @@ local imdb = {} local HTTP = require('socket.http') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') imdb.command = 'imdb ' diff --git a/otouto/plugins/lastfm.lua b/otouto/plugins/lastfm.lua index 94958e0..316b3e0 100755 --- a/otouto/plugins/lastfm.lua +++ b/otouto/plugins/lastfm.lua @@ -6,7 +6,7 @@ local lastfm = {} local HTTP = require('socket.http') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function lastfm:init(config) if not config.lastfm_api_key then diff --git a/otouto/plugins/luarun.lua b/otouto/plugins/luarun.lua index ee3f812..1e9e095 100644 --- a/otouto/plugins/luarun.lua +++ b/otouto/plugins/luarun.lua @@ -1,6 +1,6 @@ local luarun = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') local URL = require('socket.url') local JSON = require('dkjson') @@ -25,9 +25,9 @@ function luarun:action(msg, config) end local output = loadstring( [[ - local bot = require('bot') - local bindings = require('bindings') - local utilities = require('utilities') + local bot = require('otouto.bot') + local bindings = require('otouto.bindings') + local utilities = require('otouto.utilities') local JSON = require('dkjson') local URL = require('socket.url') local HTTP = require('socket.http') diff --git a/otouto/plugins/me.lua b/otouto/plugins/me.lua index 2d5cb9a..f11769c 100644 --- a/otouto/plugins/me.lua +++ b/otouto/plugins/me.lua @@ -1,6 +1,6 @@ local me = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function me:init(config) me.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('me', true).table diff --git a/otouto/plugins/nick.lua b/otouto/plugins/nick.lua index 32f8bdd..50a60b8 100755 --- a/otouto/plugins/nick.lua +++ b/otouto/plugins/nick.lua @@ -1,6 +1,6 @@ local nick = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') nick.command = 'nick ' diff --git a/otouto/plugins/patterns.lua b/otouto/plugins/patterns.lua index cc475c4..bfffcd4 100644 --- a/otouto/plugins/patterns.lua +++ b/otouto/plugins/patterns.lua @@ -1,6 +1,6 @@ local patterns = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') patterns.triggers = { '^/?s/.-/.-$' diff --git a/otouto/plugins/ping.lua b/otouto/plugins/ping.lua index b6d769c..c368c33 100755 --- a/otouto/plugins/ping.lua +++ b/otouto/plugins/ping.lua @@ -2,7 +2,7 @@ local ping = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function ping:init(config) ping.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('ping'):t('annyong').table diff --git a/otouto/plugins/pokedex.lua b/otouto/plugins/pokedex.lua index 00c3b37..a38de1a 100755 --- a/otouto/plugins/pokedex.lua +++ b/otouto/plugins/pokedex.lua @@ -2,8 +2,8 @@ local pokedex = {} local HTTP = require('socket.http') local JSON = require('dkjson') -local bindings = require('bindings') -local utilities = require('utilities') +local bindings = require('otouto.bindings') +local utilities = require('otouto.utilities') pokedex.command = 'pokedex ' diff --git a/otouto/plugins/preview.lua b/otouto/plugins/preview.lua index 1cdd54a..7b535d6 100644 --- a/otouto/plugins/preview.lua +++ b/otouto/plugins/preview.lua @@ -1,7 +1,7 @@ local preview = {} local HTTP = require('socket.http') -local utilities = require('utilities') +local utilities = require('otouto.utilities') preview.command = 'preview ' diff --git a/otouto/plugins/pun.lua b/otouto/plugins/pun.lua index c26c34f..fc84689 100755 --- a/otouto/plugins/pun.lua +++ b/otouto/plugins/pun.lua @@ -1,6 +1,6 @@ local pun = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') pun.command = 'pun' pun.doc = '`Returns a pun.`' diff --git a/otouto/plugins/reactions.lua b/otouto/plugins/reactions.lua index 6daee9c..e594d50 100755 --- a/otouto/plugins/reactions.lua +++ b/otouto/plugins/reactions.lua @@ -8,7 +8,7 @@ local reactions = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') reactions.command = 'reactions' reactions.doc = '`Returns a list of "reaction" emoticon commands.`' diff --git a/otouto/plugins/reddit.lua b/otouto/plugins/reddit.lua index c68551e..21bfb00 100755 --- a/otouto/plugins/reddit.lua +++ b/otouto/plugins/reddit.lua @@ -3,7 +3,7 @@ local reddit = {} local HTTP = require('socket.http') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') reddit.command = 'reddit [r/subreddit | query]' diff --git a/otouto/plugins/remind.lua b/otouto/plugins/remind.lua index 6a1af88..ed982c0 100644 --- a/otouto/plugins/remind.lua +++ b/otouto/plugins/remind.lua @@ -1,6 +1,6 @@ local remind = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') remind.command = 'remind ' diff --git a/otouto/plugins/setandget.lua b/otouto/plugins/setandget.lua index 37fd11f..11f4e82 100644 --- a/otouto/plugins/setandget.lua +++ b/otouto/plugins/setandget.lua @@ -1,6 +1,6 @@ local setandget = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function setandget:init(config) self.database.setandget = self.database.setandget or {} diff --git a/otouto/plugins/shell.lua b/otouto/plugins/shell.lua index 3c34570..47b6adb 100644 --- a/otouto/plugins/shell.lua +++ b/otouto/plugins/shell.lua @@ -1,6 +1,6 @@ local shell = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') function shell:init(config) shell.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('run', true).table diff --git a/otouto/plugins/shout.lua b/otouto/plugins/shout.lua index 77d1a9b..9f68327 100644 --- a/otouto/plugins/shout.lua +++ b/otouto/plugins/shout.lua @@ -1,6 +1,6 @@ local shout = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') shout.command = 'shout ' diff --git a/otouto/plugins/slap.lua b/otouto/plugins/slap.lua index 5a3e905..5128434 100755 --- a/otouto/plugins/slap.lua +++ b/otouto/plugins/slap.lua @@ -1,6 +1,6 @@ local slap = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') slap.command = 'slap [target]' diff --git a/otouto/plugins/time.lua b/otouto/plugins/time.lua index 0a9ba0d..90aa68c 100755 --- a/otouto/plugins/time.lua +++ b/otouto/plugins/time.lua @@ -2,7 +2,7 @@ local time = {} local HTTPS = require('ssl.https') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') time.command = 'time ' diff --git a/otouto/plugins/translate.lua b/otouto/plugins/translate.lua index b5431bb..bcff57e 100755 --- a/otouto/plugins/translate.lua +++ b/otouto/plugins/translate.lua @@ -3,7 +3,7 @@ local translate = {} local HTTPS = require('ssl.https') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') translate.command = 'translate [text]' diff --git a/otouto/plugins/urbandictionary.lua b/otouto/plugins/urbandictionary.lua index 47aed09..c206057 100755 --- a/otouto/plugins/urbandictionary.lua +++ b/otouto/plugins/urbandictionary.lua @@ -3,7 +3,7 @@ local urbandictionary = {} local HTTP = require('socket.http') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') urbandictionary.command = 'urbandictionary ' diff --git a/otouto/plugins/weather.lua b/otouto/plugins/weather.lua index 392477e..d437c46 100755 --- a/otouto/plugins/weather.lua +++ b/otouto/plugins/weather.lua @@ -2,7 +2,7 @@ local weather = {} local HTTP = require('socket.http') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function weather:init(config) if not config.owm_api_key then diff --git a/otouto/plugins/whoami.lua b/otouto/plugins/whoami.lua index de07618..52b8ae5 100755 --- a/otouto/plugins/whoami.lua +++ b/otouto/plugins/whoami.lua @@ -1,6 +1,6 @@ local whoami = {} -local utilities = require('utilities') +local utilities = require('otouto.utilities') whoami.command = 'whoami' diff --git a/otouto/plugins/wikipedia.lua b/otouto/plugins/wikipedia.lua index d61884a..5f9fcae 100755 --- a/otouto/plugins/wikipedia.lua +++ b/otouto/plugins/wikipedia.lua @@ -3,7 +3,7 @@ local wikipedia = {} local HTTPS = require('ssl.https') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') wikipedia.command = 'wikipedia ' diff --git a/otouto/plugins/xkcd.lua b/otouto/plugins/xkcd.lua index df04686..bd16ef8 100755 --- a/otouto/plugins/xkcd.lua +++ b/otouto/plugins/xkcd.lua @@ -2,7 +2,7 @@ local xkcd = {} local HTTP = require('socket.http') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') xkcd.command = 'xkcd [i]' diff --git a/otouto/plugins/youtube.lua b/otouto/plugins/youtube.lua index e1e2e9c..1c75537 100755 --- a/otouto/plugins/youtube.lua +++ b/otouto/plugins/youtube.lua @@ -5,7 +5,7 @@ local youtube = {} local HTTPS = require('ssl.https') local URL = require('socket.url') local JSON = require('dkjson') -local utilities = require('utilities') +local utilities = require('otouto.utilities') function youtube:init(config) if not config.google_api_key then diff --git a/otouto/utilities.lua b/otouto/utilities.lua index 74f7a36..c4578cd 100755 --- a/otouto/utilities.lua +++ b/otouto/utilities.lua @@ -8,7 +8,7 @@ local ltn12 = require('ltn12') local HTTPS = require('ssl.https') local URL = require('socket.url') local JSON = require('dkjson') -local bindings = require('bindings') +local bindings = require('otouto.bindings') -- For the sake of ease to new contributors and familiarity to old contributors, -- we'll provide a couple of aliases to real bindings here.