chat_sdk-gchat 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07828b323f52de29ac4f1fa5cd28a9ebc1991218919943ab098c282f12abf10
-  data.tar.gz: df8107d2939c79638eb19e72f556f3b418022edb3edf92fda051396d1f4ec6e6
+  metadata.gz: '08f7bf3bc0128b23b9e9bb9d68431f7ce573179c6e40e6f61d942cf1c4770dea'
+  data.tar.gz: e13b88766dfe5be010298320aa8406d818068dfd7709298e3c2da958a6c2993a
 SHA512:
-  metadata.gz: 827f9b4143159fd535cf282add46628591da26d2c1ba2cc83196622adf2f1ed76e8132e77291a13c7662673f7602be7fed0d02a9ac924472c6ec3d27426f81f5
-  data.tar.gz: 9ac83233af904d852c3706b73b6694ba0b78a03997782923def45689e8bb417e84eca20c166c28d6d4843c760647d360a7522b4a29dd74464582fcd6671f8df9
+  metadata.gz: 9498945602865b18d40f6389afe9673a46460b0fc25fe56318d7b621901d2aa586fa189eb2159adde02358eb95c6ed67e04c1e713450bf981d71c7a2e56268ba
+  data.tar.gz: 87693f0e0e19e74e753ee79df79f20708a35e63182df5bd370cd970556e811e93ce273a10a61243f65fd843b4dcb0b73f8000077809487e7eec4d25e6e7b58fe

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/card_v2_renderer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "cgi"
+
 module ChatSDK
   module GChat
     class CardV2Renderer
@@ -24,10 +26,16 @@ module ChatSDK
       end
 
       def build_header(node)
-        return nil unless node.attributes[:title]
+        image_url = node.attributes[:image_url]
+        has_image_url = image_url && !image_url.empty?
+        return nil unless node.attributes[:title] || has_image_url
 
-        header = {title: node.attributes[:title]}
+        header = {title: node.attributes[:title] || ""}
         header[:subtitle] = node.attributes[:subtitle] if node.attributes[:subtitle]
+        if has_image_url
+          header[:imageUrl] = image_url
+          header[:imageType] = "SQUARE"
+        end
         header
       end
 
@@ -60,11 +68,13 @@ module ChatSDK
       def render_widget(node)
         case node.type
         when :text then render_text(node)
+        when :link then render_link(node)
         when :fields then render_fields(node)
         when :image then render_image(node)
         when :actions then render_actions(node)
         when :divider then {divider: {}}
         when :select then render_select(node)
+        when :radio_select then render_radio_select(node)
         end
       end
 
@@ -78,7 +88,15 @@ module ChatSDK
       end
 
       def render_text(node)
-        {textParagraph: {text: node.attributes[:content]}}
+        text = node.attributes[:content]
+        text = "*#{text}*" if node.attributes[:style] == :bold
+        {textParagraph: {text: text}}
+      end
+
+      def render_link(node)
+        url = CGI.escapeHTML(node.attributes[:url].to_s)
+        label = CGI.escapeHTML(node.attributes[:label].to_s)
+        {textParagraph: {text: %(<a href="#{url}">#{label}</a>)}}
       end
 
       def render_fields(node)
@@ -106,10 +124,15 @@ module ChatSDK
         widgets = []
         buttons = []
         node.children.each do |child|
-          if child.type == :select
+          if %i[select radio_select].include?(child.type)
             widgets << render_button_list(buttons) unless buttons.empty?
             buttons = []
-            widgets << render_select(child)
+            widget = if child.type == :radio_select
+              render_radio_select(child)
+            else
+              render_select(child)
+            end
+            widgets << widget
           else
             btn = render_action_element(child)
             buttons << btn if btn
@@ -152,36 +175,56 @@ module ChatSDK
         elsif node.attributes[:style] == :danger
           btn[:color] = {red: 0.87, green: 0.17, blue: 0.17, alpha: 1.0}
         end
+        btn[:disabled] = true if node.attributes[:disabled]
 
         btn
       end
 
       def render_link_button(node)
-        {
+        button = {
           text: node.attributes[:text],
           onClick: {
             openLink: {url: node.attributes[:url]}
           }
         }
+        if node.attributes[:style] == :primary
+          button[:color] = {red: 0.0, green: 0.53, blue: 0.87, alpha: 1.0}
+        elsif node.attributes[:style] == :danger
+          button[:color] = {red: 0.87, green: 0.17, blue: 0.17, alpha: 1.0}
+        end
+        button
       end
 
       def render_select(node)
+        render_selection_input(node, type: "DROPDOWN")
+      end
+
+      def render_radio_select(node)
+        render_selection_input(node, type: "RADIO_BUTTON")
+      end
+
+      def render_selection_input(node, type:)
         {
           selectionInput: {
             name: node.attributes[:id],
-            label: node.attributes[:placeholder] || "Select",
-            type: "DROPDOWN",
-            items: node.children.map { |opt| render_select_option(opt) }
+            label: node.attributes[:label] || node.attributes[:placeholder] || "Select",
+            type: type,
+            items: node.children.map { |option| render_select_option(option, node.attributes[:initial_option]) }
           }
         }
       end
 
-      def render_select_option(node)
-        {
+      def render_select_option(node, initial_option)
+        option = {
           text: node.attributes[:text],
-          value: node.attributes[:value],
-          selected: false
+          value: node.attributes[:value]
         }
+        if initial_option.nil?
+          option[:selected] = false
+        elsif node.attributes[:value] == initial_option
+          option[:selected] = true
+        end
+        option
       end
     end
   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.3.0
 platform: ruby
 authors:
 - Quentin Rousseau
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: google-apps-chat-v1
   requirement: !ruby/object:Gem::Requirement