xasin-telegram 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f3ca644e1e5d77120315bfd33be84caca0c66ef
-  data.tar.gz: b88593045f6338ad204bfefcdade20fff9ec0cf9
+  metadata.gz: 9b586489f2bb15aa638d85a6409bbfd937ee10d8
+  data.tar.gz: 3b184fa20bf6fa785ce51796b00af78ca75bc83f
 SHA512:
-  metadata.gz: 82b65f87cb2d4b341a086bb748a48ee7a73ade189eee2e2ac21933f21352b149e0fef778ebb54ef1d932f0afdb2bdacd196ed3dc253fb625048b96c39eee26f8
-  data.tar.gz: 8b297c561c50a537a740a701bbb263adbffc2c596951ef7ae52d3680c8fff46e078dec39a794d51d53cef7a30d551ce932a1e4087b466fa13b4e34765c35a89c
+  metadata.gz: c8241173e2b8911d30dcbef771aa1c03848bc6d289160401a518d6b8248fa93281852ab34ccf192afc1a0e770a0dfa232900e528d5cf04fe7c5aa90e43b163b9
+  data.tar.gz: ee57382ce4b7649d32e7c01752ddf3d965241815b7e13413486014e5326644caa361b7567decd5f0467baef7d7ec5764fa2627db0c4ac01ad416b5795c4d87f9

data/lib/xasin/telegram/MQTT_Adapter.rb

@@ -62,12 +62,21 @@ module Telegram
 				return if (uID = uID.to_i) == 0;
 
 				begin
-					data = JSON.parse(data, symbolize_names: true);
+					data = JSON.parse(data, symbolize_names: true) if data.is_a? String
 				rescue
 					# Allow for pure-text to be sent (easier on the ESPs)
 					data = {text: data}
 				end
 
+				if(gID = data[:gid])
+					if(data[:replace])
+						_handle_delete(gID, uID)
+					elsif(data[:overwrite] and @groupIDList[uID][gID])
+						_handle_edit(data, uID);
+						return;
+					end
+				end
+
 				outData = {
 					chat_id: 	uID,
 					parse_mode: (data[:parse_mode] or "Markdown"),
@@ -83,11 +92,6 @@ module Telegram
 
 				# Check if this message has a grouping ID
 				if(gID = data[:gid])
-					# If the message has the :single flag, delete the last one
-					if(data[:single])
-						_handle_delete(gID, uID);
-					end
-
 					# Save this grouping ID
 					@groupIDList[uID][gID] = reply[:result][:message_id];
 				end
@@ -99,9 +103,8 @@ module Telegram
 				return if (uID = uID.to_i) == 0;
 
 				begin
-					data = JSON.parse(data, symbolize_names: true);
+					data = JSON.parse(data, symbolize_names: true) if data.is_a? String
 
-					return unless data[:text];
 					# Fetch the target Message ID
 					return unless mID = @groupIDList[uID][data[:gid]]
 
@@ -177,9 +180,7 @@ module Telegram
 
 					if(data[:text] =~ /^\//)
 						@mqtt.publish_to "Telegram/#{uID}/Command", data.to_json;
-					end
-
-					if(data[:reply_gid])
+					elsif(data[:reply_gid])
 						@mqtt.publish_to "Telegram/#{uID}/Reply", data.to_json;
 					else
 						@mqtt.publish_to "Telegram/#{uID}/Received", data.to_json;
@@ -198,8 +199,13 @@ module Telegram
 					begin
 						data = JSON.parse(msg[:data], symbolize_names: true);
 
-						if(data[:k] =~ /^\//)
-							@mqtt.publish_to "Telegram/#{uID}/Command", {text: data[:k]}.to_json
+						data = {
+							gid:  data[:g],
+							key: data[:k],
+						}
+
+						if(data[:key] =~ /^\//)
+							@mqtt.publish_to "Telegram/#{uID}/Command", {text: data[:key]}.to_json
 						end
 						@mqtt.publish_to "Telegram/#{uID}/KeyboardPress", data.to_json
 					rescue

metadata

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