xasin-telegram 0.1.3.dev → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 743b7681fa291a1401aa3b999eeb412d8bda857d
-  data.tar.gz: '099444ca11d5acc8419ed9c27886e3f1636bf49f'
+  metadata.gz: ca600743456b5d6b4114c81e9088714a8bada45d
+  data.tar.gz: ea9dcfbd3270f0f47e8665af6757680701268eb7
 SHA512:
-  metadata.gz: 6e4fa00ac3f7d491ce64f83c3ccbba02d38a593b5e83dd132ceb0745b85585d9f867ada2041e5b3b2af50ee870f4158d8db9903cbfe5f406c50dc3773758e5c9
-  data.tar.gz: 85081d52cf64f6ff7654e317caa31b01623752a04e1cafa57276923d590dde2932cb371f4178b435a8d6aa77a3f9bf901a2f0669db0284a2646b9637b11f6408
+  metadata.gz: b703ae37d7171d40fced2228c328f7040a6680081146609aaaa068e3d03199982a5224e5fe3d8535090db5008f3faa8641d03f1c6c530f7f13f788fce886f477
+  data.tar.gz: 1ed6375349b5c692049f19fcd9e38c9471d407f42a42574cde4d7d133a00a160bb4cc1a334aecf1a1fc002ae7c0fd672b992a6372d31acdfea45527518a9869b

data/lib/xasin/telegram/HTTPCore.rb

@@ -21,7 +21,16 @@ module Telegram
 
 			begin
 				if data
-					response = Net::HTTP.post_form(callAddress, data);
+					outData = Hash.new();
+					data.each do |key, val|
+						if(val.is_a? Hash or val.is_a? Array)
+							outData[key] = val.to_json
+						else
+							outData[key] = val;
+						end
+					end
+
+					response = Net::HTTP.post_form(callAddress, outData);
 				else
 					response = Net::HTTP.get callAddress
 				end

data/lib/xasin/telegram/MQTT_Adapter.rb

@@ -28,14 +28,24 @@ module Telegram
 				setup_mqtt();
 			end
 
-			def _process_inline_keyboard(keyboardLayout, GID)
+			def _process_inline_keyboard(keyboardLayout, gID)
 				return nil unless (keyboardLayout.is_a? Array)
-				return nil unless GID
+				return nil unless gID
 
 				outData = Array.new();
-
-				keyboardLayout.each do |key|
-					outData << {text: key, callback_data: "#{GID}:#{key}"}
+				if(keyboardLayout[0].is_a? String) then
+					keyboardLayout.each do |key|
+						outData << {text: key, callback_data: "#{gID}:#{key}"}
+					end
+					outData = [outData];
+				else
+					keyboardLayout.each do |row|
+						newRow = Array.new();
+						row.each do |key|
+							newRow << {text: key, callback_data: "#{gID}:#{key}"}
+						end
+						outData << newRow
+					end
 				end
 
 				return {inline_keyboard: outData};
@@ -66,11 +76,12 @@ module Telegram
 					text:			data[:text]
 				}
 
-				if(ilk = data[:inline_keyboard])
+				if(ilk = data[:inline_keyboard] and data[:GID])
 					outData[:reply_markup] = _process_inline_keyboard(ilk, data[:GID]);
 				end
 
 				reply = @httpCore.perform_post("sendMessage", outData);
+				return unless reply[:ok]
 
 				# Check if this message has a grouping ID
 				if(gID = data[:GID])
@@ -181,7 +192,7 @@ module Telegram
 						uID = newUID
 					end
 
-					return unless /(\w+):(\w+)/ =~ msg[:data]
+					return unless /(\S+):(\S+)/ =~ msg[:data]
 					@mqtt.publish_to "Telegram/#{uID}/KeyboardPress", {GID: $1, key: $2}
 				end
 			end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xasin-telegram
 version: !ruby/object:Gem::Version
-  version: 0.1.3.dev
+  version: '0.2'
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-sub_handler
@@ -51,9 +51,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14.1