Akamaru/Mikubot-2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upps

Browse Source
This commit is contained in:
Akamaru 2016-08-26 18:09:43 +02:00
parent f4cf9c6d96
commit 21b2494bb6
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
miku/plugins/quotes.lua
View File

@ -88,13 +88,8 @@ function quotes:action(msg, config, matches)
utilities.send_reply(msg, quotes:save_quote(msg), true) utilities.send_reply(msg, quotes:save_quote(msg), true)
return return
elseif matches[1] == "delquote" and matches[2] then elseif matches[1] == "delquote" and matches[2] then
<<<<<<< HEAD:miku/plugins/quotes.lua
if msg.from.id ~= config.admin then
utilities.send_reply(msg, config.errors.sudo, true)
=======
if not is_sudo(msg, config) then if not is_sudo(msg, config) then
utilities.send_reply(msg, config.errors.sudo) utilities.send_reply(msg, config.errors.sudo, true)
>>>>>>> upstream/master:otouto/plugins/quotes.lua
return return
end end
utilities.send_reply(msg, quotes:delete_quote(msg), true) utilities.send_reply(msg, quotes:delete_quote(msg), true)