From b2951061b717f48dd36274f94f3f5e38cf573141 Mon Sep 17 00:00:00 2001 From: Javier Honduvilla Coto Date: Sat, 11 Oct 2014 12:34:51 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ed5fca6..e8c4543 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,22 @@ telegram-bot ============ -Bot for telegram with [tg](https://github.com/vysheng/tg). +A telegram bot using https://github.com/vysheng/tg. + +Installation +------------ + +* Requirements ```bash # Tested on Ubuntu 14.04 -sudo apt-get install lua-socket libreadline-dev libconfig-dev libssl-dev lua5.2 liblua5.2-dev libevent-dev fortune curl -git clone https://github.com/yagop/telegram-bot.git && cd telegram-bot -git submodule update --init --recursive -cd tg -./configure && make -../launch.sh +$ sudo apt-get install libreadline-dev libconfig-dev libssl-dev lua5.2 liblua5.2-dev libevent-dev fortune curl luarocks +``` + +* Clone the repo & compile the telegram library +```bash +$ git clone https://github.com/yagop/telegram-bot --recursive && cd telegram-bot/tg +$ ./configure && make +$ cd .. && ./launch.sh # Will ask you for a telegram enabled number phone & confirmation code. ``` Command list From 5d80cfa156466e7d9fa60abbe4daeae1ddc85852 Mon Sep 17 00:00:00 2001 From: Javier Honduvilla Coto Date: Sat, 11 Oct 2014 12:38:13 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e8c4543..fea2230 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Installation * Requirements ```bash -# Tested on Ubuntu 14.04 +# Tested on Ubuntu 14.04, for other OSs check out https://github.com/vysheng/tg#installation $ sudo apt-get install libreadline-dev libconfig-dev libssl-dev lua5.2 liblua5.2-dev libevent-dev fortune curl luarocks ``` From 89c25cc4266f790acdfb56aaef524a1b47efba5a Mon Sep 17 00:00:00 2001 From: Javier Date: Sat, 11 Oct 2014 13:54:43 +0200 Subject: [PATCH 3/3] Added yt thumbnails --- bot/bot.lua | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/bot/bot.lua b/bot/bot.lua index be07b71..be2b0c0 100644 --- a/bot/bot.lua +++ b/bot/bot.lua @@ -16,9 +16,11 @@ function on_msg_receive (msg) else if is_image_url(msg.text) then send_image_from_url (msg) + elseif is_youtube_url(msg.text) then + send_youtube_thumbnail(msg.text) else if is_file_url(msg.text) then - send_file_from_url (msg) + send_file_from_url(msg) end end end @@ -67,6 +69,20 @@ function is_image_url(text) return false end +function is_youtube_url(text) + -- http://stackoverflow.com/questions/19377262/regex-for-youtube-url + not_full_yt_url = string.match(text, "youtube.com/watch%?v=([A-Za-z0-9-]*)") == nil + not_short_yt_url = string.match(text, "youtu.be/([A-Za-z0-9-]*)") == nil + yt = full_yt_url or short_yt_url + return yt +end + +function send_youtube_thumbnail(msg) + yt_thumbnail = "http://img.youtube.com/vi/".. string.match(msg.text, "([A-Za-z0-9-]*)").."/hqdefault.jpg" + file = download_to_file(yt_thumbnail) + send_photo(get_receiver(msg), file, ok_cb, false) +end + function is_file_url(text) last = string.get_last_word(text) extension = string.get_extension_from_filename(last) @@ -106,14 +122,14 @@ function do_action(msg) meaning = getDulcinea(text) send_msg(receiver, meaning, ok_cb, false) end - - if string.starts(msg.text, '!9gag') then - url, title = get_9GAG() - file_path = download_to_file(url) - send_photo(receiver, file_path, ok_cb, false) - send_msg(receiver, title, ok_cb, false) - return - end + + if string.starts(msg.text, '!9gag') then + url, title = get_9GAG() + file_path = download_to_file(url) + send_photo(receiver, file_path, ok_cb, false) + send_msg(receiver, title, ok_cb, false) + return + end if string.starts(msg.text, '!fortune') then text = run_bash('fortune') @@ -512,4 +528,4 @@ end function on_binlog_replay_end () started = 1 -end \ No newline at end of file +end