chat_sdk-discord 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c068b8a4ec22b48a3e677299e12b777dd836f60de1775a91c50b914c5fc574
-  data.tar.gz: 8201aba74defacec745d0096e46eede4dd9c5fd0efeb4fe595c2a2cd695b9913
+  metadata.gz: cd5ac190ac4b9ef0ac699a10d66ba147e5af7448cdfe271c571f3d2ba78c5ab8
+  data.tar.gz: 458821ec7c94570b34d587020318234b91505aa11a2dd81145e9f03704c986d8
 SHA512:
-  metadata.gz: a50e09acc0f29e76140e1019db6044b46864064360aaecab313fd9a3781df41ddfce5f8a21787327a4927329c32ba727d891f62758a96dcde62d8c30c9946d02
-  data.tar.gz: af622c3cf1dbfd417fa85ea7f0313721e7580d43e365914246c6ae15f4abad0ae5aae77615a114fca29269545a68e218f71c263d2f2964247c045559b21fb53d
+  metadata.gz: 1ef601e8b62acde8c447ef64dcc37516575a89108adc203a6443bd0374817b4c9809987c79e504546f904d9a44c1f6af15ee0d6b1d862eacaac292e26dab1a03
+  data.tar.gz: f4df9c079de22e5494236d3b2f19caa476ce9b94aa877a94aa3926c97afe3464b90596ae7bafaaa66be2116bfff5ea0fe3d3f16177beefd308092acb6cbddc22

data/lib/chat_sdk/discord/adapter.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "erb"
-
 module ChatSDK
   module Discord
     class Adapter < ChatSDK::Adapter::Base
@@ -19,6 +17,8 @@ module ChatSDK
 
         @client = ApiClient.new(bot_token: @bot_token)
         @renderer = EmbedRenderer.new
+        @verify_key = Ed25519::VerifyKey.new([@public_key].pack("H*")) if @public_key
+        @dm_channels = {}
       end
 
       def name
@@ -30,7 +30,7 @@ module ChatSDK
         body = rack_request.body.read
         rack_request.body.rewind
 
-        unless @public_key
+        unless @verify_key
           raise ChatSDK::ConfigurationError, "Discord public_key required for signature verification"
         end
 
@@ -41,7 +41,7 @@ module ChatSDK
           raise ChatSDK::SignatureVerificationError, "Missing Discord signature headers"
         end
 
-        Signature.verify!(@public_key, signature, timestamp, body)
+        Signature.verify!(@verify_key, signature, timestamp, body)
       end
 
       def ack_response(rack_request)
@@ -60,10 +60,7 @@ module ChatSDK
       end
 
       def parse_events(rack_request)
-        body = rack_request.body.read
-        rack_request.body.rewind
-
-        payload = JSON.parse(body)
+        payload = read_json_body(rack_request)
         EventParser.parse(payload)
       rescue JSON::ParserError
         []
@@ -71,17 +68,7 @@ module ChatSDK
 
       # Outbound
       def post_message(channel_id:, message:, thread_id: nil)
-        msg = ChatSDK::PostableMessage.from(message)
-
-        content = msg.text || msg.card&.fallback_text || ""
-        embeds = nil
-        components = nil
-
-        if msg.card?
-          rendered = @renderer.render(msg.card)
-          embeds = rendered["embeds"]
-          components = rendered["components"]
-        end
+        content, embeds, components = prepare_message_payload(message)
 
         result = @client.create_message(
           channel_id,
@@ -102,18 +89,7 @@ module ChatSDK
       end
 
       def edit_message(channel_id:, message_id:, message:)
-        require_capability!(:edit_messages)
-        msg = ChatSDK::PostableMessage.from(message)
-
-        content = msg.text || msg.card&.fallback_text || ""
-        embeds = nil
-        components = nil
-
-        if msg.card?
-          rendered = @renderer.render(msg.card)
-          embeds = rendered["embeds"]
-          components = rendered["components"]
-        end
+        content, embeds, components = prepare_message_payload(message)
 
         @client.edit_message(
           channel_id,
@@ -125,80 +101,78 @@ module ChatSDK
       end
 
       def delete_message(channel_id:, message_id:)
-        require_capability!(:delete_messages)
         @client.delete_message(channel_id, message_id)
       end
 
-      def post_ephemeral(channel_id:, user_id:, message:, thread_id: nil)
-        super # raises NotSupportedError
-      end
-
       def upload_file(channel_id:, io:, filename:, thread_id: nil, comment: nil)
-        require_capability!(:file_uploads)
         @client.upload_file(channel_id, io, filename)
       end
 
       def add_reaction(channel_id:, message_id:, emoji:)
-        require_capability!(:reactions)
         @client.add_reaction(channel_id, message_id, emoji)
       end
 
       def remove_reaction(channel_id:, message_id:, emoji:)
-        require_capability!(:reactions)
         @client.remove_reaction(channel_id, message_id, emoji)
       end
 
       def open_dm(user_id)
-        require_capability!(:direct_messages)
-        result = @client.create_dm(user_id)
-        result["id"]
+        @dm_channels[user_id] ||= @client.create_dm(user_id)["id"]
       end
 
       def fetch_messages(channel_id:, thread_id: nil, cursor: nil, limit: 50)
-        require_capability!(:message_history)
-
         messages_data = @client.get_messages(channel_id, limit: limit, before: cursor)
         messages_data = [] unless messages_data.is_a?(Array)
 
-        messages = messages_data.map do |msg|
-          ChatSDK::Message.new(
-            id: msg["id"],
-            text: msg["content"] || "",
-            author: ChatSDK::Author.new(
-              id: msg.dig("author", "id") || "unknown",
-              name: msg.dig("author", "username") || "unknown",
-              platform: :discord
-            ),
-            thread_id: msg["id"],
-            channel_id: channel_id,
-            platform: :discord,
-            raw: msg
-          )
+        messages = messages_data.map do |data|
+          parse_discord_message(data, channel_id)
         end
 
         next_cursor = messages_data.any? ? messages_data.last["id"] : nil
         [messages, next_cursor]
       end
 
-      def open_modal(trigger_id:, modal:)
-        super # raises NotSupportedError
-      end
-
-      def start_typing(channel_id:, thread_id: nil)
-        super # raises NotSupportedError
-      end
-
       def mention(user_id)
         "<@#{user_id}>"
       end
 
       def render(postable_message)
-        msg = ChatSDK::PostableMessage.from(postable_message)
-        if msg.card?
-          @renderer.render(msg.card)
+        if postable_message.card?
+          @renderer.render(postable_message.card)
         else
-          msg.text
+          postable_message.text
+        end
+      end
+
+      private
+
+      def prepare_message_payload(message)
+        msg = ChatSDK::PostableMessage.from(message)
+        content = msg.text || msg.card&.fallback_text || ""
+        embeds = nil
+        components = nil
+        if msg.card?
+          rendered = @renderer.render(msg.card)
+          embeds = rendered["embeds"]
+          components = rendered["components"]
         end
+        [content, embeds, components]
+      end
+
+      def parse_discord_message(data, channel_id)
+        ChatSDK::Message.new(
+          id: data["id"],
+          text: data["content"] || "",
+          author: ChatSDK::Author.new(
+            id: data.dig("author", "id") || "unknown",
+            name: data.dig("author", "username") || "unknown",
+            platform: :discord
+          ),
+          thread_id: data["id"],
+          channel_id: channel_id,
+          platform: :discord,
+          raw: data
+        )
       end
     end
   end

data/lib/chat_sdk/discord/api_client.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require "erb"
+
 module ChatSDK
   module Discord
-    class ApiClient
+    class ApiClient < ChatSDK::ApiClient::Base
       BASE_URL = "https://discord.com"
       API_PREFIX = "/api/v10"
 
@@ -54,69 +56,41 @@ module ChatSDK
         request(:get, path)
       end
 
-      # Typing
-      def trigger_typing(channel_id)
-        request(:post, "#{API_PREFIX}/channels/#{channel_id}/typing")
-      end
-
       # File upload
       def upload_file(channel_id, io, filename)
-        conn = Faraday.new(url: BASE_URL) do |f|
-          f.request :multipart
-          f.response :json
-          f.adapter :net_http
-        end
-
         payload = {
           "file[0]" => Faraday::Multipart::FilePart.new(io, "application/octet-stream", filename)
         }
 
-        response = conn.post("#{API_PREFIX}/channels/#{channel_id}/messages", payload) do |req|
-          req.headers["Authorization"] = "Bot #{@bot_token}"
-        end
-
+        response = upload_connection.post("#{API_PREFIX}/channels/#{channel_id}/messages", payload)
         handle_response(response)
       end
 
       private
 
-      def connection
-        @connection ||= Faraday.new(url: BASE_URL) do |f|
-          f.request :json
-          f.response :json
-          f.adapter :net_http
-        end
+      def base_url
+        BASE_URL
       end
 
-      def request(method, path, body = nil)
-        response = connection.public_send(method, path) do |req|
-          req.headers["Authorization"] = "Bot #{@bot_token}"
-          req.body = body if body && method != :get
-        end
+      def adapter_name
+        :discord
+      end
 
-        handle_response(response)
+      def configure_auth(faraday)
+        faraday.headers["Authorization"] = "Bot #{@bot_token}"
+      end
+
+      def extract_success_body(response)
+        response.body
+      end
+
+      def extract_retry_after(response)
+        body = response.body
+        body.is_a?(Hash) ? body["retry_after"]&.to_i : nil
       end
 
-      def handle_response(response)
-        return response.body if response.success?
-
-        if response.status == 429
-          retry_after = response.body.is_a?(Hash) ? response.body["retry_after"]&.to_i : nil
-          raise ChatSDK::RateLimitedError.new(
-            "Discord API rate limited",
-            retry_after: retry_after,
-            status: response.status,
-            body: response.body,
-            adapter_name: :discord
-          )
-        end
-
-        raise ChatSDK::PlatformError.new(
-          "Discord API error: #{response.status}",
-          status: response.status,
-          body: response.body,
-          adapter_name: :discord
-        )
+      def extract_error_message(response)
+        response.status.to_s
       end
     end
   end

data/lib/chat_sdk/discord/event_parser.rb

@@ -58,7 +58,8 @@ module ChatSDK
             id: user_info[:id],
             name: user_info[:name],
             platform: :discord,
-            bot: false
+            bot: false,
+            locale: user_info[:locale]
           )
 
           [ChatSDK::Events::Action.new(
@@ -77,7 +78,8 @@ module ChatSDK
           user = payload.dig("member", "user") || payload["user"] || {}
           {
             id: user["id"] || "unknown",
-            name: user["username"] || user["id"] || "unknown"
+            name: user["username"] || user["id"] || "unknown",
+            locale: payload["locale"]
           }
         end
 

data/lib/chat_sdk/discord/signature.rb

@@ -3,8 +3,7 @@
 module ChatSDK
   module Discord
     module Signature
-      def self.verify!(public_key_hex, signature_hex, timestamp, body)
-        verify_key = Ed25519::VerifyKey.new([public_key_hex].pack("H*"))
+      def self.verify!(verify_key, signature_hex, timestamp, body)
         signature = [signature_hex].pack("H*")
         message = "#{timestamp}#{body}"
         verify_key.verify(signature, message)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: chat_sdk-discord
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
-- Rootly
+- Quentin Rousseau
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -53,7 +53,7 @@ dependencies:
         version: '1.3'
 description: Discord bot adapter for the ChatSDK framework
 email:
-- eng@rootly.com
+- quentin@rootly.com
 executables: []
 extensions: []
 extra_rdoc_files: []