chat_sdk-gchat 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07828b323f52de29ac4f1fa5cd28a9ebc1991218919943ab098c282f12abf10
-  data.tar.gz: df8107d2939c79638eb19e72f556f3b418022edb3edf92fda051396d1f4ec6e6
+  metadata.gz: 3a9d22b76276f761a3436f508397dbef8b15fc177d03f390a1898e4f981bc9c1
+  data.tar.gz: 0f92f166374ea5b14dcc81e3ccd8742de0a3b244cf3e51bb71bc4c8b50ef276b
 SHA512:
-  metadata.gz: 827f9b4143159fd535cf282add46628591da26d2c1ba2cc83196622adf2f1ed76e8132e77291a13c7662673f7602be7fed0d02a9ac924472c6ec3d27426f81f5
-  data.tar.gz: 9ac83233af904d852c3706b73b6694ba0b78a03997782923def45689e8bb417e84eca20c166c28d6d4843c760647d360a7522b4a29dd74464582fcd6671f8df9
+  metadata.gz: f4aa6693d9ce80cec67766859a5aa95f28bf8db6dad55505cd404602db828231d47f08c57cf19881e9f008c7c8ca888ff73b857f4d779aae7c4135d9cfae7100
+  data.tar.gz: 869d867f863ac6201a63167e0dfa72f2f6e3e6b889a96454ecd54f7a733ca255006ebc3316314e1aa4f4efdbba18c8db1b21204cdc0a8d66d993296792a1e4e1

data/lib/chat_sdk/gchat/adapter.rb

@@ -81,11 +81,11 @@ module ChatSDK
         build_response_message(result, channel_id, msg)
       end
 
-      def edit_message(channel_id:, message_id:, message:)
+      def edit_message(channel_id:, message_id:, message:, **_options)
         require_capability!(:edit_messages)
         msg = ChatSDK::PostableMessage.from(message)
         request_body = build_message_body(msg)
-        request_body[:name] = "spaces/#{channel_id}/messages/#{message_id}"
+        request_body[:name] = message_resource_name(channel_id, message_id)
 
         @client.update_message(
           message: request_body,
@@ -93,9 +93,9 @@ module ChatSDK
         )
       end
 
-      def delete_message(channel_id:, message_id:)
+      def delete_message(channel_id:, message_id:, **_options)
         require_capability!(:delete_messages)
-        @client.delete_message(name: "spaces/#{channel_id}/messages/#{message_id}")
+        @client.delete_message(name: message_resource_name(channel_id, message_id))
       end
 
       def post_ephemeral(channel_id:, user_id:, message:, thread_id: nil)
@@ -120,22 +120,22 @@ module ChatSDK
         super
       end
 
-      def add_reaction(channel_id:, message_id:, emoji:)
+      def add_reaction(channel_id:, message_id:, emoji:, **_options)
         require_capability!(:reactions)
         @client.create_reaction(
-          parent: "spaces/#{channel_id}/messages/#{message_id}",
+          parent: message_resource_name(channel_id, message_id),
           reaction: {
             emoji: {unicode: emoji}
           }
         )
       end
 
-      def remove_reaction(channel_id:, message_id:, emoji:)
+      def remove_reaction(channel_id:, message_id:, emoji:, **_options)
         require_capability!(:reactions)
         # Google Chat requires the reaction resource name to delete
         # We construct it from the emoji unicode
         @client.delete_reaction(
-          name: "spaces/#{channel_id}/messages/#{message_id}/reactions/#{emoji}"
+          name: "#{message_resource_name(channel_id, message_id)}/reactions/#{emoji}"
         )
       end
 
@@ -164,7 +164,7 @@ module ChatSDK
         super
       end
 
-      def start_typing(channel_id:, thread_id: nil)
+      def start_typing(channel_id:, thread_id: nil, message_id: nil)
         super
       end
 

data/lib/chat_sdk/gchat/resource_name.rb

@@ -3,10 +3,40 @@
 module ChatSDK
   module GChat
     module ResourceName
+      MESSAGE_ID_PATTERN = /\A[A-Za-z0-9_.-]+\z/
+      SPACE_ID_PATTERN = /\A[A-Za-z0-9_-]+\z/
+
       def extract_id(resource_name)
         return resource_name unless resource_name.is_a?(String)
         resource_name.split("/").last || resource_name
       end
+
+      def message_resource_name(channel_id, message_id)
+        space_id = channel_id.to_s
+        unless channel_id.is_a?(String) && SPACE_ID_PATTERN.match?(space_id)
+          raise ChatSDK::Error, "Invalid Google Chat space ID: #{channel_id.inspect}"
+        end
+
+        unless message_id.is_a?(String)
+          raise ChatSDK::Error, "Invalid Google Chat message ID: #{message_id.inspect}"
+        end
+
+        space_name = "spaces/#{space_id}"
+        prefix = "#{space_name}/messages/"
+        message_name = message_id
+        message_name = "#{prefix}#{message_name}" if MESSAGE_ID_PATTERN.match?(message_name)
+
+        unless message_name.start_with?(prefix)
+          raise ChatSDK::Error, "Invalid Google Chat message ID: #{message_id.inspect}"
+        end
+
+        id = message_name.delete_prefix(prefix)
+        unless MESSAGE_ID_PATTERN.match?(id) && id != "." && id != ".."
+          raise ChatSDK::Error, "Invalid Google Chat message ID: #{message_id.inspect}"
+        end
+
+        "#{prefix}#{id}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-gchat
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Quentin Rousseau
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: google-apps-chat-v1
   requirement: !ruby/object:Gem::Requirement