ruboty-slack_events 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2588ce42504b8c50d9db58ecca41e92c7b05d435ef0a75fb08dc458f7116fba3
-  data.tar.gz: b4f8b9c8c85abd03d37bbeb9b76121659f24b8c0453f94a5ddd5862125950834
+  metadata.gz: c779a46edaf630035527d72df0e40a57eb8104421f8151eeb8c3623202ce8537
+  data.tar.gz: bcbf6cb2c83dc15cea1c270404820dd6f9bdefa570de19478425c77265915626
 SHA512:
-  metadata.gz: e99fb912133d41ba3dd1d02a2ae9424b4f4ff89a65460678d3fc59a433797608373dca041903b5aa44a4f756110d2cea2b5c90829167f70701fb29c4798e3a63
-  data.tar.gz: 4b997f616c0d1c28e6e322077e94242d5088426d4c9cc8b73267f353e21ee5eac8b25162c8a3c2b91d051020951d29c5aec5c0fecac5985e5f76e77cdef82449
+  metadata.gz: c3c5e4fd09c22b7c52adcdcc556494d83cf559d88f548c71e2f050c939e004b8d3b793be1f81dbe03e95ce327aab65009d57001a1c2d9b48be7a8c0fa20dfdb1
+  data.tar.gz: 0f4192b9d52fb4c49ef47cdd7986ea50b86b5af077dfc392a4d62062867b5884094ea79b222e093dd7947bff122838c37b88e7a6146e63fce54fb8b813ba89b2

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 ## Unreleased
+## 0.3.0 - 2025-04-04
+
+- Rewrite text filter to parse links and unescape HTML entities
+
+## 0.2.0 - 2025-04-03
+
+- Support reply on threads
+- Ignore message events without text field
+
 ## 0.1.1 - 2025-04-02
 
 - Add ./bin/run-ruboty script to run ruboty locally with this gem

data/Rakefile

@@ -3,9 +3,11 @@
 require "bundler/gem_tasks"
 require "rubocop/rake_task"
 require "bump/tasks"
+require "rspec/core/rake_task"
 
 Bump.changelog = true
 
 RuboCop::RakeTask.new
+RSpec::Core::RakeTask.new(:spec)
 
-task default: :rubocop
+task default: %i[rubocop spec]

data/lib/ruboty/adapters/slack_events/slack_events_handler.rb

@@ -16,6 +16,13 @@ module Ruboty
         def handle_event(message) #: void
           Ruboty::SlackEvents::Logger.debug("handle_event") { message.to_json }
 
+          on_generic_event(message)
+        end
+
+        private
+
+        # @rbs message: Slack::Messages::Message -- a generic type event
+        def on_generic_event(message) #: void
           case message.type
           when "message"
             on_message(message)
@@ -34,12 +41,17 @@ module Ruboty
 
           return if message.subtype == "bot_message" && adapter.ignore_bot_message?
 
+          # Some event subtypes (e.g. message_changed) does not have `text` field.
+          # Consider that these events are not a new message.
+          return unless message.text
+
           message_for_robot = {
             body: adapter.rubotify.call(message.text),
             from: channel,
             from_name: user&.name,
-            to: channel
-          } #: RobotMessage
+            to: channel,
+            thread_ts: message.thread_ts
+          } #: receivedMessage
 
           Ruboty::SlackEvents::Logger.debug("robot.receive") { message_for_robot.to_json }
 
@@ -48,12 +60,12 @@ module Ruboty
 
         # @rbs message: Slack::Messages::Message -- `event_callback` type event
         def on_event_callback(message)
-          handle_event(message.event)
+          on_generic_event(message.event)
         end
 
         # @rbs message: Slack::Messages::Message -- `events_api` type event
         def on_events_api(message)
-          handle_event(message.payload)
+          on_generic_event(message.payload)
         end
       end
     end

data/lib/ruboty/adapters/slack_events.rb

@@ -14,8 +14,16 @@ module Ruboty
       #   type robotMessage = {
       #     body: String,
       #     from: String,
+      #     to: String,
+      #     original: receivedMessage?,
+      #     code: boolish?,
+      #   }
+      #   type receivedMessage = {
+      #     body: String,
+      #     from: String,
       #     from_name: String,
       #     to: String,
+      #     thread_ts: String?,
       #   }
 
       def run
@@ -41,7 +49,8 @@ module Ruboty
         slack_client.chat_postMessage(
           channel: message[:to],
           attachments: [],
-          markdown_text: text
+          markdown_text: text,
+          thread_ts: message.dig(:original, :thread_ts)
         )
       end
 
@@ -53,12 +62,12 @@ module Ruboty
         @resolvers ||= ::Ruboty::SlackEvents::Resolvers.new(slack_client:)
       end
 
-      def slackify #: ::Ruboty::SlackEvents::Mention::Slackify
-        @slackify ||= ::Ruboty::SlackEvents::Mention::Slackify.new(resolvers:)
+      def slackify #: ::Ruboty::SlackEvents::Filter::Slackify
+        @slackify ||= ::Ruboty::SlackEvents::Filter::Slackify.new(resolvers:)
       end
 
-      def rubotify #: ::Ruboty::SlackEvents::Mention::Rubotify
-        @rubotify ||= ::Ruboty::SlackEvents::Mention::Rubotify.new(resolvers:)
+      def rubotify #: ::Ruboty::SlackEvents::Filter::Rubotify
+        @rubotify ||= ::Ruboty::SlackEvents::Filter::Rubotify.new(resolvers:)
       end
 
       def ignore_bot_message?

data/lib/ruboty/slack_events/filter/rubotify.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module Ruboty
+  module SlackEvents
+    module Filter
+      # Convert Slack text format to Ruboty format
+      # For more details of Slack text format, see: https://api.slack.com/reference/surfaces/formatting
+      class Rubotify
+        attr_reader :resolvers #: Resolvers
+
+        # @rbs resolvers: Resolvers
+        def initialize(resolvers:)
+          @resolvers = resolvers
+        end
+
+        # @rbs text: String
+        def call(text) #: String
+          text
+            .then { replace_user_mentions(_1) }
+            .then { replace_link(_1) }
+            .then { unescape(_1) }
+        end
+
+        private
+
+        # @rbs text: String
+        def replace_user_mentions(text) #: String
+          text.gsub(/<@(?<user_id>\w+)>/) do |user_mention|
+            user_id = Regexp.last_match[:user_id]
+
+            user_info = resolvers.user_resolver.user_info_by_id(user_id)
+
+            next user_mention unless user_info
+
+            "@#{user_info.name}"
+          end
+        end
+
+        # @rbs text: String
+        def replace_link(text) #: String
+          text.gsub(/<(?<url>[^\>|]+)(?:\|(?<text>[^\>]+))?>/) do |link|
+            url = Regexp.last_match[:url]
+            text = Regexp.last_match[:text]
+
+            begin
+              next link unless URI.parse(url).scheme
+            rescue URI::InvalidURIError, URI::InvalidComponentError
+              next link
+            end
+
+            text || url
+          end
+        end
+
+        # Unescape HTML entities in the text.
+        # See: https://api.slack.com/reference/surfaces/formatting#escaping
+        # @rbs text: String
+        def unescape(text) #: String
+          CGI.unescapeHTML(text)
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/slack_events/{mention → filter}/slackify.rb

@@ -2,7 +2,8 @@
 
 module Ruboty
   module SlackEvents
-    module Mention
+    module Filter
+      # Convert Ruboty text format to Slack text format
       class Slackify
         attr_reader :resolvers #: Resolvers
 

data/lib/ruboty/slack_events/version.rb

@@ -2,6 +2,6 @@
 
 module Ruboty
   module SlackEvents
-    VERSION = "0.1.1"
+    VERSION = "0.3.0"
   end
 end

data/lib/ruboty/slack_events.rb

@@ -9,8 +9,8 @@ end
 require_relative "slack_events/version"
 
 require_relative "slack_events/api/socket_client"
-require_relative "slack_events/mention/slackify"
-require_relative "slack_events/mention/rubotify"
+require_relative "slack_events/filter/slackify"
+require_relative "slack_events/filter/rubotify"
 require_relative "slack_events/resolvers"
 require_relative "slack_events/logger"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_events
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomoya Chiba
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -58,6 +58,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -69,9 +70,9 @@ files:
 - lib/ruboty/slack_events.rb
 - lib/ruboty/slack_events/api/socket_client.rb
 - lib/ruboty/slack_events/app_info.rb
+- lib/ruboty/slack_events/filter/rubotify.rb
+- lib/ruboty/slack_events/filter/slackify.rb
 - lib/ruboty/slack_events/logger.rb
-- lib/ruboty/slack_events/mention/rubotify.rb
-- lib/ruboty/slack_events/mention/slackify.rb
 - lib/ruboty/slack_events/resolvers.rb
 - lib/ruboty/slack_events/resolvers/user_resolver.rb
 - lib/ruboty/slack_events/version.rb
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Ruboty adapter with Slack Events API
 test_files: []

data/lib/ruboty/slack_events/mention/rubotify.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Ruboty
-  module SlackEvents
-    module Mention
-      class Rubotify
-        attr_reader :resolvers #: Resolvers
-
-        # @rbs resolvers: Resolvers
-        def initialize(resolvers:)
-          @resolvers = resolvers
-        end
-
-        # @rbs text: String
-        def call(text) #: String
-          replace_user_mentions(text)
-        end
-
-        # @rbs text: String
-        def replace_user_mentions(text) #: String
-          text.gsub(/<@(?<user_id>\w+)>/) do |user_mention|
-            user_id = Regexp.last_match[:user_id]
-
-            user_info = resolvers.user_resolver.user_info_by_id(user_id)
-
-            next user_mention unless user_info
-
-            "@#{user_info.name}"
-          end
-        end
-      end
-    end
-  end
-end