Updated description and added installation instructions, fixed a few typos and bugs.

.gitignore

@@ -0,0 +1 @@
+*~

README.md

@@ -1,4 +1,108 @@
 #bashbot
 A Telegram bot written in bash.
 
-Uses [json.sh](https://github.com/dominictarr/JSON.sh).
+Uses [json.sh](https://github.com/dominictarr/JSON.sh) and tmux (for interactive chats).
+
+
+## Instructions
+### Create your first bot
+
+1. Message @botfather https://telegram.me/botfather with the following
+text: `/newbot`
+   If you don't know how to message by username, click the search
+field on your Telegram app and type `@botfather`, you should be able
+to initiate a conversation. Be careful not to send it to the wrong
+contact, because some users has similar usernames to `botfather`.
+
+   ![botfather initial conversation](http://i.imgur.com/aI26ixR.png)
+
+2. @botfather replies with `Alright, a new bot. How are we going to
+call it? Please choose a name for your bot.`
+
+3. Type whatever name you want for your bot.
+
+4. @botfather replies with `Good. Now let's choose a username for your
+bot. It must end in `bot`. Like this, for example: TetrisBot or
+tetris_bot.`
+
+5. Type whatever username you want for your bot, minimum 5 characters,
+and must end with `bot`. For example: `telesample_bot`
+
+6. @botfather replies with:
+
+    Done! Congratulations on your new bot. You will find it at
+telegram.me/telesample_bot. You can now add a description, about
+section and profile picture for your bot, see /help for a list of
+commands.
+
+    Use this token to access the HTTP API:
+    <b>123456789:AAG90e14-0f8-40183D-18491dDE</b>
+
+    For a description of the Bot API, see this page:
+https://core.telegram.org/bots/api
+
+7. Note down the 'token' mentioned above.
+
+8. Type `/setprivacy` to @botfather.
+
+   ![botfather later conversation](http://i.imgur.com/tWDVvh4.png)
+
+9. @botfather replies with `Choose a bot to change group messages settings.`
+
+10. Type `@telesample_bot` (change to the username you set at step 5
+above, but start it with `@`)
+
+11. @botfather replies with
+
+    'Enable' - your bot will only receive messages that either start
+with the '/' symbol or mention the bot by username.
+    'Disable' - your bot will receive all messages that people send to groups.
+    Current status is: ENABLED
+
+12. Type `Disable` to let your bot receive all messages sent to a
+group. This step is up to you actually.
+
+13. @botfather replies with `Success! The new status is: DISABLED. /help`
+
+### Install bashbot  
+Clone the repository:  
+```
+git clone https://github.com/topkecleon/telegram-bot-bash
+```
+
+Paste the token on line 12 (instead of tokenhere).  
+Then start editing the commands.  
+
+
+### Usage  
+To send messages use the ```send_message``` function:  
+```
+send_message "$TARGET" "lol" 
+```   
+To send images use the ```send_photo``` function:  
+```
+send_photo "$TARGET" "/home/user/doge.jpg"  
+```
+To send custom keyboards use the ```send_keyboard``` function or the ```send_message``` function:  
+```
+send_keyboard "$TARGET" "Text that will appear in chat?" "Yep" "No"
+```  
+
+To create interactive chats, write (or edit the question script) a normal bash (or C or python) script, chmod +x it and then substitute ./question @ line 49 with the command you usually use to start the script.  
+The text that the script will output will be sent in real time to the user, and all user input will be sent to the script (as long as it's running or until the user kills it with /cancel).   
+To open up a keyboard in an interactive script, print out the keyboard layout in the following way:  
+```
+echo "Text that will appear in chat? mykeyboardstartshere Yep No"
+```  
+Same goes for images:
+```
+echo "Text that will appear in chat? myimagelocationstartshere /home/user/doge.jpg"
+```  
+Or both:
+```
+echo "Text that will appear in chat? mykeyboardstartshere Yep No myimagelocationstartshere /home/user/doge.jpg"
+```  
+
+That's it!
+
+If you feel that there's something missing or if you found a bug, feel free to submit a pull request!

bashbot.sh

@@ -1,15 +1,18 @@
 #!/bin/bash
 # bashbot, the Telegram bot written in bash.
 # Written by @topkecleon, Juan Potato (@awkward_potato), Lorenzo Santina (BigNerd95) and Daniil Gentili (danog)
-# http://github.com/topkecleon/bashbot
+# https://github.com/topkecleon/telegram-bot-bash
+
+# Depends on ./JSON.sh (http://github.com/dominictarr/./JSON.sh),
+# which is MIT/Apache-licensed
+# And on tmux (https://github.com/tmux/tmux),
+# which is BSD-licensed
 
-# Depends on JSON.sh (http://github.com/dominictarr/JSON.sh),
-# which is MIT/Apache-licensed.
 
 # This file is public domain in the USA and all free countries.
 # If you're in Europe, and public domain does not exist, then haha.
 
-TOKEN=''
+TOKEN='tokenhere'
 URL='https://api.telegram.org/bot'$TOKEN
 MSG_URL=$URL'/sendMessage'
 PHO_URL=$URL'/sendPhoto'
@@ -18,12 +21,19 @@ OFFSET=0
 
 send_message() {
 	local chat="$1"
-	local text="$(echo "$2" | sed 's/ mykeyboardstartshere.*//g')"
+	local text="$(echo "$2" | sed 's/ mykeyboardstartshere.*//g;s/ myimagelocationstartshere.*//g')"
-	local keyboard="$(echo "$2" | sed '/mykeyboardstartshere /!d;s/.*mykeyboardstartshere //g')"
+	local keyboard="$(echo "$2" | sed '/mykeyboardstartshere /!d;s/.*mykeyboardstartshere //g;s/ myimagelocationstartshere.*//g')"
-	if [ "$keyboard" = "" ]; then
+	local image="$(echo "$2" | sed '/myimagelocationstartshere /!d;s/.*myimagelocationstartshere //g;s/ mykeyboardstartshere.*//g;')"
-		res=$(curl -s "$MSG_URL" -F "chat_id=$chat" -F "text=$text")
+	if [ "$keyboard" != "" ]; then
-	else
 		send_keyboard "$chat" "$text" "$keyboard"
+		local sent=y
+	fi
+	if [ "$image" != "" ]; then
+		send_photo "$chat" "$image"
+		local sent=y
+	fi
+	if [ "$sent" != "y" ];then
+		res=$(curl -s "$MSG_URL" -F "chat_id=$chat" -F "text=$text")
 	fi
 }
 
@@ -31,9 +41,9 @@ send_keyboard() {
 	local chat="$1"
 	local text="$2"
 	shift 2
-	keyboard=init
+	local keyboard=init
-	for f in $*;do keyboard="$keyboard, [\"$f\"]";done
+	for f in $*;do local keyboard="$keyboard, [\"$f\"]";done
-	keyboard=${keyboard/init, /}
+	local keyboard=${keyboard/init, /}
 	res=$(curl -s "$MSG_URL" --header "content-type: multipart/form-data" -F "chat_id=$chat" -F "text=$text" -F "reply_markup={\"keyboard\": [$keyboard],\"one_time_keyboard\": true}")
 }
 
@@ -46,7 +56,7 @@ startproc() {
 	local TARGET="$2"
 	mkdir -p "$copname"
 	mkfifo $copname/out
-	tmux new-session -d -n $copname "./question $TARGET 2>&1>$copname/out"
+	tmux new-session -d -n $copname "./question 2>&1>$copname/out"
 	local pid=$(ps aux | sed '/tmux/!d;/'$copname'/!d;/sed/d;s/'$USER'\s*//g;s/\s.*//g')
 	echo $pid>$copname/pid
 	while ps aux | grep -v grep | grep -q $pid;do
@@ -92,7 +102,7 @@ Available commands:
 /cancel: Cancel any currently running interactive chats.
 
 Written by @topkecleon, Juan Potato (@awkward_potato), Lorenzo Santina (BigNerd95) and Daniil Gentili (danog)
-http://github.com/topkecleon/bashbot
+https://github.com/topkecleon/telegram-bot-bash
 "
 				;;
 			*)
@@ -114,9 +124,9 @@ while true; do {
 
 	res=$(curl -s $UPD_URL$OFFSET)
 
-	TARGET=$(echo $res | JSON.sh | egrep '\["result",0,"message","chat","id"\]' | cut -f 2)
+	TARGET=$(echo $res | ./JSON.sh | egrep '\["result",0,"message","chat","id"\]' | cut -f 2)
-	OFFSET=$(echo $res | JSON.sh | egrep '\["result",0,"update_id"\]' | cut -f 2)
+	OFFSET=$(echo $res | ./JSON.sh | egrep '\["result",0,"update_id"\]' | cut -f 2)
-	MESSAGE=$(echo $res | JSON.sh -s | egrep '\["result",0,"message","text"\]' | cut -f 2 | cut -d '"' -f 2)
+	MESSAGE=$(echo $res | ./JSON.sh -s | egrep '\["result",0,"message","text"\]' | cut -f 2 | cut -d '"' -f 2)
 
 	OFFSET=$((OFFSET+1))
 

question

@@ -9,7 +9,7 @@ until [ "$SUCCESS" = "y" ] ;do
 	read answer
 	case $answer in
 		'Yass!') echo "Goody!";SUCCESS=y;;
-		'No') echo "Well that's weird";SUCCESS=y;;
+		'No') echo "Well that's weird.";SUCCESS=y;;
 		*) SUCCESS=n;;
 	esac
 done