ruboty-slack_events 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d8044e2af28b28bfb9b43de3fd70cf2bd98136a47e16be26ce97f8cc94d01d9
-  data.tar.gz: 364780ecafa68c98e4b7e7e34a6b15e974a21eb1e8ed4c86ae5447a88f57e30c
+  metadata.gz: cdf0c6b6732081933efdc52213d1a9388e1e0ef809e6057da1adb68ef4032d54
+  data.tar.gz: 4d23791111c4f38d0811d17ea0adac7a52da52096423155a8baec62d4ce00e66
 SHA512:
-  metadata.gz: 8c58744c0accd0247d52ae38c38374baf6584b8a357924db43bcf51e03d14610431314cc4db256f40a6aa225aad96f1f9487292f8a7503a7d2880ae1fe8f4aac
-  data.tar.gz: fb2137b623fbadb5da6ee60a73f4c0e5f5c190c2be252b4a66c7e20e57c1b2f4bd7db20108b828254e650238420c1feb00b6db611dc152f49e87659dee01cc2a
+  metadata.gz: dffe1198d352f9d065f3aff234f78f3f13dfb0627afe4d2120d5e087f4302b32f7ad56aca4af0e3f1f32250bde4f0e0659567d2d0793343f1175be198a773b7e
+  data.tar.gz: 0bbaf0b61b5a585cf4989ff014be85a5acc12fbcc1839d2dbc37683503531f6a02edf5ccf47cfdc327731ec722c4d2a77e08b2a4ba8212b5c851f835dbd2ba20

data/.rspec

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

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 ## Unreleased
+## 0.3.1 - 2025-04-07
+
+- Let UserResolver#user_info_by_id return nil on user_not_found error (https://github.com/tomoasleep/ruboty-slack_events/pull/2)
+
+## 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

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

@@ -62,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/resolvers/user_resolver.rb

@@ -34,6 +34,9 @@ module Ruboty
             Logger.debug { "Slack API: users.info(#{user_id})" }
             res = slack_client.users_info(user: user_id)
             res.user
+          rescue Slack::Web::Api::Errors::UserNotFound => e
+            Logger.debug { "Slack API Error: users.info(#{user_id}) => #{e.message}" }
+            nil
           end
         end
 

data/lib/ruboty/slack_events/version.rb

@@ -2,6 +2,6 @@
 
 module Ruboty
   module SlackEvents
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   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.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tomoya Chiba
 bindir: exe
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-07 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

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