xasin-telegram 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca600743456b5d6b4114c81e9088714a8bada45d
-  data.tar.gz: ea9dcfbd3270f0f47e8665af6757680701268eb7
+  metadata.gz: 0f3ca644e1e5d77120315bfd33be84caca0c66ef
+  data.tar.gz: b88593045f6338ad204bfefcdade20fff9ec0cf9
 SHA512:
-  metadata.gz: b703ae37d7171d40fced2228c328f7040a6680081146609aaaa068e3d03199982a5224e5fe3d8535090db5008f3faa8641d03f1c6c530f7f13f788fce886f477
-  data.tar.gz: 1ed6375349b5c692049f19fcd9e38c9471d407f42a42574cde4d7d133a00a160bb4cc1a334aecf1a1fc002ae7c0fd672b992a6372d31acdfea45527518a9869b
+  metadata.gz: 82b65f87cb2d4b341a086bb748a48ee7a73ade189eee2e2ac21933f21352b149e0fef778ebb54ef1d932f0afdb2bdacd196ed3dc253fb625048b96c39eee26f8
+  data.tar.gz: 8b297c561c50a537a740a701bbb263adbffc2c596951ef7ae52d3680c8fff46e078dec39a794d51d53cef7a30d551ce932a1e4087b466fa13b4e34765c35a89c

data/lib/xasin/telegram/MQTT_Adapter.rb

@@ -32,20 +32,18 @@ module Telegram
 				return nil unless (keyboardLayout.is_a? Array)
 				return nil unless gID
 
+
+				keyboardLayout = [keyboardLayout] unless(keyboardLayout[0].is_a? Array);
 				outData = Array.new();
-				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
+
+				keyboardLayout.each do |row|
+					newRow = Array.new();
+
+					row.each do |key, val|
+						cbd = {i: gID, k: (val or key)};
+						newRow << {text: key, callback_data: cbd.to_json}
 					end
+					outData << newRow;
 				end
 
 				return {inline_keyboard: outData};
@@ -76,15 +74,15 @@ module Telegram
 					text:			data[:text]
 				}
 
-				if(ilk = data[:inline_keyboard] and data[:GID])
-					outData[:reply_markup] = _process_inline_keyboard(ilk, data[:GID]);
+				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])
+				if(gID = data[:gid])
 					# If the message has the :single flag, delete the last one
 					if(data[:single])
 						_handle_delete(gID, uID);
@@ -105,7 +103,7 @@ module Telegram
 
 					return unless data[:text];
 					# Fetch the target Message ID
-					return unless mID = @groupIDList[uID][data[:GID]]
+					return unless mID = @groupIDList[uID][data[:gid]]
 
 					outData = {
 						chat_id: uID,
@@ -174,10 +172,14 @@ module Telegram
 					return unless(data[:text] = msg[:text])
 
 					if(replyMSG = msg[:reply_to_message])
-						data[:reply_GID] = @groupIDList[uID].key(replyMSG[:message_id]);
+						data[:reply_gid] = @groupIDList[uID].key(replyMSG[:message_id]);
 					end
 
-					if(data[:reply_GID])
+					if(data[:text] =~ /^\//)
+						@mqtt.publish_to "Telegram/#{uID}/Command", data.to_json;
+					end
+
+					if(data[:reply_gid])
 						@mqtt.publish_to "Telegram/#{uID}/Reply", data.to_json;
 					else
 						@mqtt.publish_to "Telegram/#{uID}/Received", data.to_json;
@@ -193,7 +195,15 @@ module Telegram
 					end
 
 					return unless /(\S+):(\S+)/ =~ msg[:data]
-					@mqtt.publish_to "Telegram/#{uID}/KeyboardPress", {GID: $1, key: $2}
+					begin
+						data = JSON.parse(msg[:data], symbolize_names: true);
+
+						if(data[:k] =~ /^\//)
+							@mqtt.publish_to "Telegram/#{uID}/Command", {text: data[:k]}.to_json
+						end
+						@mqtt.publish_to "Telegram/#{uID}/KeyboardPress", data.to_json
+					rescue
+					end
 				end
 			end
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xasin-telegram
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Xasin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mqtt-sub_handler