From 76b37397cb3466166c56d677cb7116bdb162b249 Mon Sep 17 00:00:00 2001 From: doruq Date: Tue, 3 Feb 2015 00:20:34 -0500 Subject: [PATCH 1/3] Typo fix in the description --- plugins/stats.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/stats.lua b/plugins/stats.lua index e9fcf7e..b062873 100644 --- a/plugins/stats.lua +++ b/plugins/stats.lua @@ -86,7 +86,7 @@ end _stats = read_file_stats() return { - description = "Numer of messages by user", + description = "Number of messages by user", usage = "!stats", patterns = { ".*", @@ -95,4 +95,4 @@ return { run = run } -end \ No newline at end of file +end From 522bfc9d141eaf1be39682833fd94b28af57b30a Mon Sep 17 00:00:00 2001 From: yago Date: Wed, 11 Feb 2015 22:00:00 +0100 Subject: [PATCH 2/3] F*cking tabs --- plugins/stats.lua | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/plugins/stats.lua b/plugins/stats.lua index 3a3f46c..ccdd2c3 100644 --- a/plugins/stats.lua +++ b/plugins/stats.lua @@ -54,49 +54,49 @@ end local function save_stats() - -- Save stats to file - serialize_to_file(_stats, _file_stats) + -- Save stats to file + serialize_to_file(_stats, _file_stats) end local function get_stats_status( msg ) - -- vardump(stats) - local text = "" + -- vardump(stats) + local text = "" local to_id = tostring(msg.to.id) - local rank = {} + local rank = {} - for id, user in pairs(_stats[to_id]) do - table.insert(rank, user) - end + for id, user in pairs(_stats[to_id]) do + table.insert(rank, user) + end - table.sort(rank, function(a, b) - if a.msg_num and b.msg_num then - return a.msg_num > b.msg_num - end - end - ) + table.sort(rank, function(a, b) + if a.msg_num and b.msg_num then + return a.msg_num > b.msg_num + end + end + ) - for id, user in pairs(rank) do + for id, user in pairs(rank) do -- Previous versions didn't save that user_id = user.user_id or '' - print(">> ", id, user.name) - if user.last_name == nil then - text = text..user.name.." ["..user_id.."]: "..user.msg_num.."\n" - else - text = text..user.name.." "..user.last_name.." ["..user_id.."]: "..user.msg_num.."\n" - end - end - print("usuarios: "..text) - return text + print(">> ", id, user.name) + if user.last_name == nil then + text = text..user.name.." ["..user_id.."]: "..user.msg_num.."\n" + else + text = text..user.name.." "..user.last_name.." ["..user_id.."]: "..user.msg_num.."\n" + end + end + print("usuarios: "..text) + return text end local function run(msg, matches) - if matches[1] == "stats" then -- Hack - return get_stats_status(msg) - else - print ("update stats") - update_user_stats(msg) + if matches[1] == "stats" then -- Hack + return get_stats_status(msg) + else + print ("update stats") + update_user_stats(msg) save_stats() - end + end end _stats = read_file_stats() From b61051109597c405824d46b3b00df33f678a6bba Mon Sep 17 00:00:00 2001 From: yago Date: Wed, 11 Feb 2015 22:01:31 +0100 Subject: [PATCH 3/3] updated version --- bot/bot.lua | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bot/bot.lua b/bot/bot.lua index 3f4fb11..7ed6756 100644 --- a/bot/bot.lua +++ b/bot/bot.lua @@ -5,7 +5,7 @@ json = (loadfile "./libs/JSON.lua")() serpent = (loadfile "./libs/serpent.lua")() require("./bot/utils") -VERSION = '0.8.5' +VERSION = '0.8.6' function on_msg_receive (msg) vardump(msg) @@ -63,12 +63,18 @@ end function do_action(msg) local receiver = get_receiver(msg) local text = msg.text + if msg.text == nil then - -- Not a text message, make text the same as what tg shows so - -- we can match on it. The plugin is resposible for handling - text = '['..msg.media.type..']' + -- Not a text message, make text the same as what tg shows so + -- we can match on it. The plugin is resposible for handling + if msg.media ~= nil then + text = '['..msg.media.type..']' + end end + -- We can't do anything + if msg.text == nil return false end + msg.text = do_lex(msg, text) for name, desc in pairs(plugins) do