From 9fdfa6a0629c4befc0225dce470b5c188fd67049 Mon Sep 17 00:00:00 2001 From: Akamaru Date: Mon, 8 Jun 2015 01:52:08 +0200 Subject: [PATCH] lala --- .gitignore | 4 ++-- .travis.yml | 2 +- bot/bot.lua | 9 ++++----- etc/telegram.conf | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 40ed5d0..ae343e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ res/ .luarocks *.db -plugins/alive.lua plugins/bitly.lua plugins/danbooru.lua plugins/deviantart.lua @@ -40,4 +39,5 @@ plugins/yandere.lua plugins/e621.lua plugins/random.lua plugins/ponyfaces.lua -plugins/rss_old.lua \ No newline at end of file +plugins/rss_old.lua +README - Kopie.md \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index ca50a26..5704265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ before_install: script: - luac -p bot/*.lua - - luac -p plugins/*.lua \ No newline at end of file + - luac -p plugins/*.lua diff --git a/bot/bot.lua b/bot/bot.lua index 5d79d91..8b4a3d2 100644 --- a/bot/bot.lua +++ b/bot/bot.lua @@ -1,6 +1,6 @@ -package.path = package.path .. ';.luarocks/share/lua/5.2/?.lua' - ..';.luarocks/share/lua/5.2/?/init.lua' -package.cpath = package.cpath .. ';.luarocks/lib/lua/5.2/?.so' +package.path = package.path .. ';.luarocks/share/lua/5.2/?.lua' + ..';.luarocks/share/lua/5.2/?/init.lua' +package.cpath = package.cpath .. ';.luarocks/lib/lua/5.2/?.so' require("./bot/utils") @@ -8,13 +8,12 @@ VERSION = '2.5-reloaded' -- This function is called when tg receive a msg function on_msg_receive (msg) - if not started then return end local receiver = get_receiver(msg) - + -- vardump(msg) msg = pre_process_service_msg(msg) if msg_valid(msg) then diff --git a/etc/telegram.conf b/etc/telegram.conf index 4619945..bdb4279 100644 --- a/etc/telegram.conf +++ b/etc/telegram.conf @@ -7,4 +7,4 @@ start on runlevel [2345] stop on shutdown setuid yourusername -exec /bin/sh telegrambotpath/launch.sh \ No newline at end of file +exec /bin/sh telegrambotpath/launch.sh