Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Andreas Bielawski 2016-08-19 14:07:00 +02:00
commit 15b75fbc70
2 changed files with 7 additions and 1 deletions

View File

@ -35,6 +35,12 @@ function echo:action(msg)
output = '*Echo:*\n"' .. utilities.md_escape(input) .. '"'
utilities.send_message(self, msg.chat.id, output, true, nil, true)
return
elseif msg.chat.type == 'group' then
local b = 1
while b ~= 0 do
input = utilities.trim(input)
input,b = input:gsub('^/+','')
end
end
utilities.send_message(self, msg.chat.id, input, true, nil, true)
end

View File

@ -730,7 +730,7 @@ function cache_data(plugin, query, data, timeout, typ, hash_field)
redis:sadd(hash, str)
end
else
redis:hset(hash, hash_field, data)
redis:hmset(hash, data)
end
if timeout then
redis:expire(hash, timeout)