make brayden's stuff work

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

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.`'

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 = {}
 

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]'
 

otouto/plugins/bandersnatch.lua

@@ -1,6 +1,6 @@
 local bandersnatch = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 bandersnatch.command = 'bandersnatch'
 

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

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 <query>'
 bing.doc = [[```

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

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 <expression>'
 

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

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 <channel> \\n <message>'
 channel.doc = [[```

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

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.`'

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.
 

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] <from> to <to>'
 

otouto/plugins/dice.lua

@@ -1,6 +1,6 @@
 local dice = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 dice.command = 'roll <nDr>'
 

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]'
 

otouto/plugins/echo.lua

@@ -1,6 +1,6 @@
 local echo = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 echo.command = 'echo <text>'
 

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!`'

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')

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

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 <query>'
 

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 <query>'
 

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 {

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'
 

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

otouto/plugins/help.lua

@@ -3,7 +3,7 @@
 
 local help = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 local help_text
 

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 <query>'
 

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

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')

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

otouto/plugins/nick.lua

@@ -1,6 +1,6 @@
 local nick = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 nick.command = 'nick <nickname>'
 

otouto/plugins/patterns.lua

@@ -1,6 +1,6 @@
 local patterns = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 patterns.triggers = {
 	'^/?s/.-/.-$'

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

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 <query>'
 

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 <link>'
 

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.`'

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.`'

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]'
 

otouto/plugins/remind.lua

@@ -1,6 +1,6 @@
 local remind = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 remind.command = 'remind <duration> <message>'
 

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 {}

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

otouto/plugins/shout.lua

@@ -1,6 +1,6 @@
 local shout = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 shout.command = 'shout <text>'
 

otouto/plugins/slap.lua

@@ -1,6 +1,6 @@
 local slap = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 slap.command = 'slap [target]'
 

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 <location>'
 

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]'
 

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 <query>'
 

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

otouto/plugins/whoami.lua

@@ -1,6 +1,6 @@
 local whoami = {}
 
-local utilities = require('utilities')
+local utilities = require('otouto.utilities')
 
 whoami.command = 'whoami'
 

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 <query>'
 

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]'
 

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

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.