xasin-telegram 0.1.2.dev → 0.1.3.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8e24b94d5c11648a6b986c5c54f32851774019
-  data.tar.gz: 93a23b6c042aa90fdfa0c0db6cda284c6381630f
+  metadata.gz: 743b7681fa291a1401aa3b999eeb412d8bda857d
+  data.tar.gz: '099444ca11d5acc8419ed9c27886e3f1636bf49f'
 SHA512:
-  metadata.gz: 51568135c241d13a44e9ab1520322774f67e6b7ac7085f959a50efc2cc7fbb8ff77d1d6a5ba5c5f9b49eece675799fc2c590e712ccfb9262e9846a240838b925
-  data.tar.gz: 0f7c5b06f43cc7524034a24f000e2bd2b44bb8aebb58275d83d2c4bf57401be63f03ac62c3cf4d209b20e9878e5ee6bd86a61c5b01a1d32d0e0863caf17b4cd0
+  metadata.gz: 6e4fa00ac3f7d491ce64f83c3ccbba02d38a593b5e83dd132ceb0745b85585d9f867ada2041e5b3b2af50ee870f4158d8db9903cbfe5f406c50dc3773758e5c9
+  data.tar.gz: 85081d52cf64f6ff7654e317caa31b01623752a04e1cafa57276923d590dde2932cb371f4178b435a8d6aa77a3f9bf901a2f0669db0284a2646b9637b11f6408

data/lib/xasin/telegram/MQTT_Adapter.rb

@@ -28,6 +28,19 @@ module Telegram
 				setup_mqtt();
 			end
 
+			def _process_inline_keyboard(keyboardLayout, GID)
+				return nil unless (keyboardLayout.is_a? Array)
+				return nil unless GID
+
+				outData = Array.new();
+
+				keyboardLayout.each do |key|
+					outData << {text: key, callback_data: "#{GID}:#{key}"}
+				end
+
+				return {inline_keyboard: outData};
+			end
+
 			# Processes messages received through MQTT
 			# It takes care of setting a few good defaults (like parse_mode),
 			# deletes any old messages of the same GroupID (if requested),
@@ -38,7 +51,7 @@ module Telegram
 			def _handle_send(data, uID)
 				# Resolve a saved Username to a User-ID
 				uID = @usernameList[uID] if(@usernameList.key? uID)
-				uID = uID.to_i;
+				return if (uID = uID.to_i) == 0;
 
 				begin
 					data = JSON.parse(data, symbolize_names: true);
@@ -47,10 +60,17 @@ module Telegram
 					data = {text: data}
 				end
 
-				data[:parse_mode] ||= "Markdown";
-				data[:chat_id]		= uID;
+				outData = {
+					chat_id: 	uID,
+					parse_mode: (data[:parse_mode] or "Markdown"),
+					text:			data[:text]
+				}
+
+				if(ilk = data[:inline_keyboard])
+					outData[:reply_markup] = _process_inline_keyboard(ilk, data[:GID]);
+				end
 
-				reply = @httpCore.perform_post("sendMessage", data);
+				reply = @httpCore.perform_post("sendMessage", outData);
 
 				# Check if this message has a grouping ID
 				if(gID = data[:GID])
@@ -67,7 +87,7 @@ module Telegram
 			def _handle_edit(data, uID)
 				# Resolve a saved Username to a User-ID
 				uID = @usernameList[uID] if(@usernameList.key? uID)
-				uID = uID.to_i;
+				return if (uID = uID.to_i) == 0;
 
 				begin
 					data = JSON.parse(data, symbolize_names: true);
@@ -76,11 +96,22 @@ module Telegram
 					# Fetch the target Message ID
 					return unless mID = @groupIDList[uID][data[:GID]]
 
-					# Send the POST request editing the message text
-					@httpCore.perform_post("editMessageText",
-							{	text: data[:text],
-								chat_id: 	uID,
-								message_id:	mID});
+					outData = {
+						chat_id: uID,
+						message_id: mID,
+					};
+
+					if(data[:inline_keyboard])
+						outData[:reply_markup] = _process_inline_keyboard(data[:inline_keyboard]);
+					end
+
+					if(data[:text])
+						outData[:text] = data[:text];
+						# Send the POST request editing the message text
+						@httpCore.perform_post("editMessageText", outData);
+					else
+						@httpCore.perform_post("editMessageReplyMarkup", outData);
+					end
 				rescue
 				end
 			end
@@ -88,7 +119,7 @@ module Telegram
 			def _handle_delete(data, uID)
 				# Resolve a saved Username to a User-ID
 				uID = @usernameList[uID] if(@usernameList.key? uID)
-				uID = uID.to_i;
+				return if (uID = uID.to_i) == 0;
 
 				# Fetch the real message ID held by a grouping ID
 				return unless mID = @groupIDList[uID][data]
@@ -136,10 +167,22 @@ module Telegram
 					end
 
 					if(data[:reply_GID])
-						@mqtt.publish_to "Telegram/#{uID}/Reply", data;
+						@mqtt.publish_to "Telegram/#{uID}/Reply", data.to_json;
 					else
-						@mqtt.publish_to "Telegram/#{uID}/Received", data;
+						@mqtt.publish_to "Telegram/#{uID}/Received", data.to_json;
+					end
+				end
+
+				if(msg = packet[:callback_query])
+					@httpCore.perform_post("answerCallbackQuery", {callback_query_id: msg[:id]});
+
+					uID = msg[:message][:chat][:id];
+					if(newUID = @usernameList.key(uID))
+						uID = newUID
 					end
+
+					return unless /(\w+):(\w+)/ =~ msg[:data]
+					@mqtt.publish_to "Telegram/#{uID}/KeyboardPress", {GID: $1, key: $2}
 				end
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xasin-telegram
 version: !ruby/object:Gem::Version
-  version: 0.1.2.dev
+  version: 0.1.3.dev
 platform: ruby
 authors:
 - Xasin