This commit is contained in:
Akamaru 2016-06-15 19:18:36 +02:00
parent 5c75429586
commit e5157a6815
3 changed files with 71 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
config.lua config.lua
*.db *.db
tg tg
otouto-dev-1.rockspec

56
otouto/plugins/dice.lua Normal file
View File

@ -0,0 +1,56 @@
local dice = {}
local utilities = require('otouto.utilities')
dice.command = 'roll <nDr>'
function dice:init(config)
dice.triggers = utilities.triggers(self.info.username, config.cmd_pat):t('roll', true).table
dice.doc = [[```
]]..config.cmd_pat..[[roll <nDr>
Returns a set of dice rolls, where n is the number of rolls and r is the range. If only a range is given, returns only one roll.
```]]
end
function dice:action(msg)
local input = utilities.input(msg.text_lower)
if not input then
utilities.send_message(self, msg.chat.id, dice.doc, true, msg.message_id, true)
return
end
local count, range
if input:match('^[%d]+d[%d]+$') then
count, range = input:match('([%d]+)d([%d]+)')
elseif input:match('^d?[%d]+$') then
count = 1
range = input:match('^d?([%d]+)$')
else
utilities.send_message(self, msg.chat.id, dice.doc, true, msg.message_id, true)
return
end
count = tonumber(count)
range = tonumber(range)
if range < 2 then
utilities.send_reply(self, msg, 'The minimum range is 2.')
return
end
if range > 1000 or count > 1000 then
utilities.send_reply(self, msg, 'The maximum range and count are 1000.')
return
end
local output = '*' .. count .. 'd' .. range .. '*\n`'
for _ = 1, count do
output = output .. math.random(range) .. '\t'
end
output = output .. '`'
utilities.send_message(self, msg.chat.id, output, true, msg.message_id, true)
end
return dice

View File

@ -1,11 +1,14 @@
local Redis = require 'redis' local Redis = require 'redis'
local FakeRedis = require 'fakeredis' local FakeRedis = require 'fakeredis'
local params = { local params = {
'unix:///home/anditest/.redis/sock' host = os.getenv('REDIS_HOST') or '127.0.0.1',
port = tonumber(os.getenv('REDIS_PORT') or 6379)
} }
local database = os.getenv('REDIS_DB')
local password = os.getenv('REDIS_PASSWORD')
-- Overwrite HGETALL -- Overwrite HGETALL
Redis.commands.hgetall = Redis.command('hgetall', { Redis.commands.hgetall = Redis.command('hgetall', {
response = function(reply, command, ...) response = function(reply, command, ...)
@ -19,7 +22,7 @@ local redis = nil
-- Won't launch an error if fails -- Won't launch an error if fails
local ok = pcall(function() local ok = pcall(function()
redis = Redis.connect('unix:///home/anditest/.redis/sock') -- FUCKING FUCK REDIS LUA FUCK Y U NO WORK WITH PARAMS redis = Redis.connect(params)
end) end)
if not ok then if not ok then
@ -41,6 +44,13 @@ if not ok then
return fake[b] or fake_func return fake[b] or fake_func
end }) end })
else
if password then
redis:auth(password)
end
if database then
redis:select(database)
end
end end