Commit Graph

69 Commits

Author SHA1 Message Date
topkecleon 62c3d5eb84 Added a license for the unfortunate souls whose governments don't allow public domain.
Removed JSON.sh and added the project as a submodule. Modified code referencing it accordingly.

Added "attach" argument to attach to the tmux session and a default message if no argument is given.

Other minor changes.
2016-04-19 05:49:35 -04:00
Daniil Gentili 55bf7e35a9 Fix perms 2016-04-18 12:05:59 +02:00
Daniil Gentili dfd4bc6fa6 Moved customizable settings into commands.sh 2016-04-18 12:05:31 +02:00
Drew aebbff855c Merge pull request #14 from iicc1/patch-4
Updated readme with inline
2016-04-18 02:27:52 -04:00
Ignacio Iglesias bd14114971 updated readme with inline 2016-04-18 00:50:50 +02:00
Daniil Gentili c09ae5036e Merge pull request #13 from TiagoDanin/patch-1
Whoops :). Merged.
2016-04-17 21:31:15 +02:00
Tiago Danin e053481a41 FIX README 2016-04-17 20:16:14 +02:00
Daniil Gentili 867180363c Fix perms 2016-04-17 20:01:05 +02:00
Daniil Gentili fd1358b209 Added sendvenue method and moved command parsing section to commands.sh to ease upgrades. 2016-04-17 20:00:37 +02:00
Daniil Gentili 7f1d8cb8bf Added easy way to source script 2016-04-17 14:15:30 +02:00
Daniil Gentili c13d45b37b Added easy way to start bot. 2016-04-17 14:13:28 +02:00
Daniil Gentili d13b6e25eb Fixed smore bugs, tried to speed up bot. 2016-04-17 14:00:45 +02:00
Daniil Gentili c33082e585 Fixed bugs (now you can run multiple background session in multiple bots), added option to count users, added option to parse markdown and html using send_message, updated documentation and decided to put the sending loop for interactive chats in the background using tmux so that if I have to update the bot interactive sessions will continue to send out messages. Also changed the file name and the location (/tmp/ of the fifos for interactive chats) and added option to broadcast messages to all users. 2016-04-16 20:50:05 +02:00
Drew d95470e8a9 Merge pull request #11 from iicc1/patch-3
Added inline support and examples.
2016-04-16 05:48:19 -04:00
Ignacio Iglesias 9ffc3bf3c4 Added inline support and examples.
I have adapted inline mode to the bot:  InlineQuery, answerInlineQuery, the 19 types of InlineQueryResult and InputTextMessageContent from InputMessageContent. I also have added some examples.
2016-04-16 03:43:15 +02:00
Daniil Gentili 219bcd25d2 Added killproc function. 2016-04-15 19:37:44 +02:00
Daniil Gentili c96cc8a4a7 Reduced interactive command timeout, added command to print last newline and made startproc call command in args 2016-04-15 19:32:21 +02:00
Daniil Gentili 495c23def4 Fixed bug when script prints content right before exiting 2016-04-15 19:25:43 +02:00
Drew decd11ee0a Merge pull request #10 from iicc1/patch-2
Updated nested tmux and fixed username in groups
2016-03-26 18:57:22 -04:00
Ignacio Iglesias 6ad35f34d7 Updated nested tmux and fixed username in chats
With the: ''TMUX= tmux new-session -d -s ....'' addition,  now interactive chats work when you are running the bot inside a tmux session.

Before, USER[USERNAME] was not getting the username of the user in groups, now it is solved.
2016-03-26 23:31:47 +01:00
Drew 64f3cb5fc7 Merge pull request #9 from danog/patch-3
Fixed security issues
2016-03-23 13:59:40 -04:00
Daniil Gentili 86c11e9397 Fixed typo 2016-03-23 16:04:28 +01:00
Daniil Gentili 66b36cc62a Added description of new parameter. 2016-03-23 16:02:28 +01:00
Daniil Gentili a7a495561e Fixed security issues
Added check in send_file function to prevent user from requesting any file on the server and added a third parameter check to send_message.
If send_message is called with text as third param it will send the message given as is, without checking for keyboards, files etc...
One could simply do a myfilelocationstartshere $PWD/bashbot.sh and get the whole bot with the token.
2016-03-23 15:56:22 +01:00
Drew 652be0893f Merge pull request #8 from danog/patch-2
Fixed bugs and added option to source functions from other script
2016-03-22 09:00:55 -04:00
Drew 7b38ed5389 Merge pull request #7 from iicc1/patch-1
Added Markdown support for telegram-bot-bash
2016-03-22 09:00:22 -04:00
Daniil Gentili 994bfa3100 Update README.md 2016-03-20 23:40:00 +01:00
Daniil Gentili a7801823ce Fixed last bugs 2016-03-20 22:34:55 +01:00
Ignacio Iglesias 4d2a6a6de2 Separated markdown sendmessage 2016-03-19 02:08:25 +01:00
Ignacio Iglesias 76e96c05a1 Added Markdown support for telegram-bot-bash 2016-03-18 01:34:05 +01:00
Daniil Gentili 79a7a7ee4a Update question 2016-03-06 21:30:25 +01:00
Daniil Gentili 6e3e156f42 Fixed other bugs 2016-01-25 13:37:05 +01:00
Daniil Gentili 931cf51a7c Update bashbot.sh 2016-01-22 19:03:12 +01:00
Daniil Gentili c1456a3119 Update bashbot.sh 2016-01-22 19:01:24 +01:00
Daniil Gentili 471819f934 Update README.md 2016-01-22 18:54:08 +01:00
Daniil Gentili 905d68a9f3 FIxing bugs 2016-01-22 18:52:37 +01:00
Daniil Gentili 43c468e336 Fix loop 2016-01-22 16:47:58 +01:00
Daniil Gentili 6eca34758f fixed some more bugs 2016-01-22 16:06:41 +01:00
Drew fce86d0884 Merge pull request #5 from danog/patch-1
Added documentation
2016-01-19 15:01:09 -05:00
Daniil Gentili 2036217f74 Let script read urls 2016-01-19 20:59:15 +01:00
Daniil Gentili d3c59da613 Added documentation 2016-01-19 20:53:45 +01:00
Drew bd86cece58 Merge pull request #4 from danog/patch-1
Added remaining api methods (video, audio, location, contact) and fixed tmux
2016-01-19 14:37:32 -05:00
Daniil Gentili 89fdfdf14b Removed token and added checks 2016-01-19 20:32:29 +01:00
Daniil Gentili 329b248987 Finished! 2016-01-19 20:27:09 +01:00
Daniil Gentili 54c7186848 Update bashbot.sh 2016-01-19 14:17:06 +01:00
danogentili 501b757ac2 Nearly done 2016-01-17 17:46:24 +01:00
danogentili bd4a9cdae4 Adding missing telegram methods... 2016-01-06 17:11:56 +01:00
Daniil Gentili 03be1530cb Fixed newline 2016-01-06 14:05:39 +01:00
Daniil Gentili 2ee0b52af3 Added smore instructions 2016-01-06 14:04:24 +01:00
Drew d5331eb4eb Merge pull request #3 from danog/interactive
Interactive chat support, bugs fixed, added installation instructions to readme, added support for custom keyboards, made curl quiet
2016-01-05 18:34:31 -05:00