discorb 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae7ec3df7c6da178e1ce924879cbda686fa17b1a3ad3858419ef2bf6f4bc9ada
-  data.tar.gz: f23eb8f8bc6acceacb33b555f38283297ff04140051c273a2ee26cf4c0fc50d4
+  metadata.gz: d38df4e18e2f0c0ab604723c2cd799b506863fc99a1bf48482b538174a65f2ae
+  data.tar.gz: 5a861ab96babd57d7be950c5e178bece1528d70a1bf39540a947a676a01d6d59
 SHA512:
-  metadata.gz: f43d25457a75adadc96f6d3d3304ea38956006888a03ef1159f6b1ce2e956167e283e540cf1e64dcb43c40774b6a8fcc63b0b1f76b2d2da1ebf574a16869153c
-  data.tar.gz: a6726842c6049171b02113947d430e96364021fbdcc5057d97feecb1d2a3f7866540c8327c2ad82e425a82cb8539ed7e2aa0a54ac4c1013593d2196630761fbb
+  metadata.gz: d7dcd629994dd0c52c8a7af393822913498072e358f33d0ee97e1a3f6627d26c5eb30b014908012ed7c109f0ed1c8d1463a94d72f3165abd47ef4e275900999c
+  data.tar.gz: d04c1c1212f5bb653c6b6221b255da8ee4b1f1b6ca0602424d552d3f8a5aeb60a443db99056155490af7d3f7d9408d03108802fda4606a1645e91a169b2e6379

data/Changelog.md

@@ -1,5 +1,17 @@
 # Changelog
 
-## v0.0.1 - Initial release
+## v0.0.1
 
-- Initial release
+- Initial release
+
+## v0.0.2
+
+- Fix: Fix rubygems description
+
+## v0.0.3
+
+- Fix: Fix no dependencies
+
+## v0.0.4
+
+- Fix: Fix NoMethodError by webhook message

data/Gemfile.lock

@@ -1,7 +1,11 @@
 PATH
   remote: .
   specs:
-    discorb (0.0.1)
+    discorb (0.0.5)
+      async
+      async-http
+      async-websocket
+      mime-types (~> 3.3)
 
 GEM
   remote: https://rubygems.org/
@@ -25,7 +29,6 @@ GEM
       async-http (~> 0.54)
       async-io (~> 1.23)
       protocol-websocket (~> 0.7.0)
-    colorize (0.8.1)
     console (1.13.1)
       fiber-local
     fiber-local (1.0.0)
@@ -45,7 +48,6 @@ GEM
       protocol-http1 (~> 0.2)
     rake (13.0.6)
     redcarpet (3.5.1)
-    ricecream (0.2.0)
     rufo (0.13.0)
     timers (4.3.3)
     yard (0.9.26)
@@ -57,12 +59,10 @@ DEPENDENCIES
   async
   async-http
   async-websocket
-  colorize (~> 0.8.1)
   discorb!
   mime-types (~> 3.3)
   rake (~> 13.0)
   redcarpet
-  ricecream (~> 0.2.0)
   rufo (~> 0.13.0)
   yard (~> 0.9.26)
 

data/README.md

@@ -46,7 +46,7 @@ client.run(ENV["DISCORD_BOT_TOKEN"])
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sevenc-nanashi/discorb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/discorb-lib/discorb.
 
 ## License
 

data/discorb.gemspec

@@ -9,16 +9,15 @@ Gem::Specification.new do |spec|
   spec.email = ["sevenc-nanashi@sevenbot.jp"]
 
   spec.summary = "discorb is a Discord API wrapper for Ruby."
-  spec.description = File.read(File.join(__dir__, "README.md"))
-  spec.homepage = "https://github.com/sevenc-nanashi/discorb"
+  spec.homepage = "https://github.com/discorb-lib/discorb"
   spec.license = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/sevenc-nanashi/discorb"
-  spec.metadata["changelog_uri"] = "https://github.com/sevenc-nanashi/discorb/blob/main/Changelog.md"
+  spec.metadata["source_code_uri"] = "https://github.com/discorb-lib/discorb"
+  spec.metadata["changelog_uri"] = "https://github.com/discorb-lib/discorb/blob/main/Changelog.md"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -30,8 +29,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "async"
+  spec.add_dependency "async-http"
+  spec.add_dependency "async-websocket"
 
+  spec.add_dependency "mime-types", "~> 3.3"
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

data/lib/discorb/channel.rb

@@ -175,7 +175,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete(base_url.wait.to_s, audit_log_reason: reason).wait
+        @client.http.delete(base_url.wait.to_s, audit_log_reason: reason).wait
         @deleted = true
         self
       end
@@ -203,7 +203,7 @@ module Discorb
         }
         payload[:lock_permissions] = lock_permissions
         payload[:parent_id] = parent&.id if parent != :unset
-        @client.internet.patch("/guilds/#{@guild_id}/channels", payload, audit_log_reason: reason).wait
+        @client.http.patch("/guilds/#{@guild_id}/channels", payload, audit_log_reason: reason).wait
       end
     end
 
@@ -295,7 +295,7 @@ module Discorb
         default_auto_archive_duration ||= archive_in
         payload[:default_auto_archive_duration] = default_auto_archive_duration if default_auto_archive_duration != :unset
 
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -317,7 +317,7 @@ module Discorb
         payload = {}
         payload[:name] = name
         payload[:avatar] = avatar.to_s if avatar
-        _resp, data = @client.internet.post("/channels/#{@id}/webhooks", payload).wait
+        _resp, data = @client.http.post("/channels/#{@id}/webhooks", payload).wait
         Webhook.new([@client, data])
       end
     end
@@ -331,7 +331,7 @@ module Discorb
     #
     def fetch_webhooks
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/webhooks").wait
+        _resp, data = @client.http.get("/channels/#{@id}/webhooks").wait
         data.map { |webhook| Webhook.new([@client, webhook]) }
       end
     end
@@ -358,7 +358,7 @@ module Discorb
 
         message_ids = messages.map { |m| Discorb::Utils.try(m, :id).to_s }
 
-        @client.internet.post("/channels/#{@id}/messages/bulk-delete", { messages: message_ids }).wait
+        @client.http.post("/channels/#{@id}/messages/bulk-delete", { messages: message_ids }).wait
       end
     end
 
@@ -387,7 +387,7 @@ module Discorb
           deny: deny_value,
           type: target.is_a?(Member) ? 1 : 0,
         }
-        @client.internet.put("/channels/#{@id}/permissions/#{target.id}", payload, audit_log_reason: reason).wait
+        @client.http.put("/channels/#{@id}/permissions/#{target.id}", payload, audit_log_reason: reason).wait
       end
     end
 
@@ -406,7 +406,7 @@ module Discorb
     #
     def delete_permissions(target, reason: nil)
       Async do
-        @client.internet.delete("/channels/#{@id}/permissions/#{target.id}", audit_log_reason: reason).wait
+        @client.http.delete("/channels/#{@id}/permissions/#{target.id}", audit_log_reason: reason).wait
       end
     end
 
@@ -423,7 +423,7 @@ module Discorb
     #
     def fetch_invites
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/invites").wait
+        _resp, data = @client.http.get("/channels/#{@id}/invites").wait
         data.map { |invite| Invite.new(@client, invite) }
       end
     end
@@ -444,7 +444,7 @@ module Discorb
     #
     def create_invite(max_age: nil, max_uses: nil, temporary: false, unique: false, reason: nil)
       Async do
-        _resp, data = @client.internet.post("/channels/#{@id}/invites", {
+        _resp, data = @client.http.post("/channels/#{@id}/invites", {
           max_age: max_age,
           max_uses: max_uses,
           temporary: temporary,
@@ -464,7 +464,7 @@ module Discorb
     #
     def follow_from(target, reason: nil)
       Async do
-        @client.internet.post("/channels/#{target.id}/followers", { webhook_channel_id: @id }, audit_log_reason: reason).wait
+        @client.http.post("/channels/#{target.id}/followers", { webhook_channel_id: @id }, audit_log_reason: reason).wait
       end
     end
 
@@ -478,7 +478,7 @@ module Discorb
     #
     def follow_to(target, reason: nil)
       Async do
-        @client.internet.post("/channels/#{@id}/followers", { webhook_channel_id: target.id }, audit_log_reason: reason).wait
+        @client.http.post("/channels/#{@id}/followers", { webhook_channel_id: target.id }, audit_log_reason: reason).wait
       end
     end
 
@@ -491,7 +491,7 @@ module Discorb
     #
     def fetch_pins
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/pins").wait
+        _resp, data = @client.http.get("/channels/#{@id}/pins").wait
         data.map { |pin| Message.new(@client, pin) }
       end
     end
@@ -506,7 +506,7 @@ module Discorb
     #
     def pin_message(message, reason: nil)
       Async do
-        @client.internet.put("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
+        @client.http.put("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
       end
     end
 
@@ -520,7 +520,7 @@ module Discorb
     #
     def unpin_message(message, reason: nil)
       Async do
-        @client.internet.delete("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
+        @client.http.delete("/channels/#{@id}/pins/#{message.id}", {}, audit_log_reason: reason).wait
       end
     end
 
@@ -540,12 +540,12 @@ module Discorb
     def start_thread(name, message: nil, auto_archive_duration: 1440, public: true, reason: nil)
       Async do
         _resp, data = if message.nil?
-            @client.internet.post("/channels/#{@id}/threads", {
+            @client.http.post("/channels/#{@id}/threads", {
               name: name, auto_archive_duration: auto_archive_duration, type: public ? 11 : 10,
             },
-                                  audit_log_reason: reason).wait
+                              audit_log_reason: reason).wait
           else
-            @client.internet.post("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", {
+            @client.http.post("/channels/#{@id}/messages/#{Utils.try(message, :id)}/threads", {
               name: name, auto_archive_duration: auto_archive_duration,
             }, audit_log_reason: reason).wait
           end
@@ -564,7 +564,7 @@ module Discorb
     #
     def fetch_archived_public_threads
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/threads/archived/public").wait
+        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/public").wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
@@ -578,7 +578,7 @@ module Discorb
     #
     def fetch_archived_private_threads
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/threads/archived/private").wait
+        _resp, data = @client.http.get("/channels/#{@id}/threads/archived/private").wait
         data.map { |thread| Channel.make_channel(@client, thread) }
       end
     end
@@ -599,7 +599,7 @@ module Discorb
           before = 0
           threads = []
           loop do
-            _resp, data = @client.internet.get("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}").wait
+            _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?before=#{before}").wait
             threads += data[:threads].map { |thread| Channel.make_channel(@client, thread) }
             before = data[:threads][-1][:id]
 
@@ -607,7 +607,7 @@ module Discorb
           end
           threads
         else
-          _resp, data = @client.internet.get("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}").wait
+          _resp, data = @client.http.get("/channels/#{@id}/users/@me/threads/archived/private?limit=#{limit}&before=#{before}").wait
           data.map { |thread| Channel.make_channel(@client, thread) }
         end
       end
@@ -670,7 +670,7 @@ module Discorb
         payload[:user_limit] = user_limit if user_limit != :unset
         payload[:rtc_region] = rtc_region if rtc_region != :unset
 
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -734,7 +734,7 @@ module Discorb
         payload[:position] = position if position != :unset
         payload[:bitrate] = bitrate if bitrate != :unset
         payload[:rtc_region] = rtc_region if rtc_region != :unset
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -754,7 +754,7 @@ module Discorb
     #
     def start(topic, public: false, reason: nil)
       Async do
-        _resp, data = @client.internet.post("/stage-instances", { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
+        _resp, data = @client.http.post("/stage-instances", { channel_id: @id, topic: topic, public: public ? 2 : 1 }, audit_log_reason: reason).wait
         StageInstance.new(@client, data)
       end
     end
@@ -769,7 +769,7 @@ module Discorb
     #
     def fetch_stage_instance
       Async do
-        _resp, data = @client.internet.get("/stage-instances/#{@id}").wait
+        _resp, data = @client.http.get("/stage-instances/#{@id}").wait
       rescue Discorb::NotFoundError
         nil
       else
@@ -865,7 +865,7 @@ module Discorb
         auto_archive_duration ||= archive_in
         payload[:auto_archive_duration] = auto_archive_duration if auto_archive_duration != :unset
         payload[:locked] = locked if locked != :unset
-        @client.internet.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
+        @client.http.patch("/channels/#{@id}", payload, audit_log_reason: reason).wait
         self
       end
     end
@@ -947,9 +947,9 @@ module Discorb
     def add_member(member = :me)
       Async do
         if member == :me
-          @client.internet.post("/channels/#{@id}/thread-members/@me").wait
+          @client.http.post("/channels/#{@id}/thread-members/@me").wait
         else
-          @client.internet.post("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.post("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
         end
       end
     end
@@ -959,9 +959,9 @@ module Discorb
     def remove_member(member = :me)
       Async do
         if member == :me
-          @client.internet.delete("/channels/#{@id}/thread-members/@me").wait
+          @client.http.delete("/channels/#{@id}/thread-members/@me").wait
         else
-          @client.internet.delete("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
+          @client.http.delete("/channels/#{@id}/thread-members/#{Utils.try(member, :id)}").wait
         end
       end
     end
@@ -970,7 +970,7 @@ module Discorb
 
     def fetch_members
       Async do
-        _resp, data = @client.internet.get("/channels/#{@id}/thread-members").wait
+        _resp, data = @client.http.get("/channels/#{@id}/thread-members").wait
         data.map { |d| @members[d[:id]] = Member.new(@client, d) }
       end
     end

data/lib/discorb/client.rb

@@ -16,8 +16,8 @@ module Discorb
     # @return [Discorb::Application] The application that the client is using.
     # @return [nil] If never fetched application by {#fetch_application}.
     attr_reader :application
-    # @return [Discorb::Internet] The internet client.
-    attr_reader :internet
+    # @return [Discorb::HTTP] The http client.
+    attr_reader :http
     # @return [Integer] The heartbeat interval.
     attr_reader :heartbeat_interval
     # @return [Integer] The API version of the Discord gateway.
@@ -187,7 +187,7 @@ module Discorb
     #
     def fetch_user(id)
       Async do
-        _resp, data = internet.get("/users/#{id}").wait
+        _resp, data = http.get("/users/#{id}").wait
         User.new(self, data)
       end
     end
@@ -205,7 +205,7 @@ module Discorb
     #
     def fetch_channel(id)
       Async do
-        _resp, data = internet.get("/channels/#{id}").wait
+        _resp, data = http.get("/channels/#{id}").wait
         Channel.make_channel(self, data)
       end
     end
@@ -223,7 +223,7 @@ module Discorb
     #
     def fetch_guild(id)
       Async do
-        _resp, data = internet.get("/guilds/#{id}").wait
+        _resp, data = http.get("/guilds/#{id}").wait
         Guild.new(self, data, false)
       end
     end
@@ -241,7 +241,7 @@ module Discorb
     #
     def fetch_invite(code, with_count: false, with_expiration: false)
       Async do
-        _resp, data = internet.get("/invites/#{code}?with_count=#{with_count}&with_expiration=#{with_expiration}").wait
+        _resp, data = http.get("/invites/#{code}?with_count=#{with_count}&with_expiration=#{with_expiration}").wait
         Invite.new(self, data, false)
       end
     end
@@ -260,7 +260,7 @@ module Discorb
       Async do
         next @application if @application && !force
 
-        _resp, data = internet.get("/oauth2/applications/@me").wait
+        _resp, data = http.get("/oauth2/applications/@me").wait
         @application = Application.new(self, data)
         @application
       end
@@ -275,7 +275,7 @@ module Discorb
     #
     def fetch_nitro_sticker_packs
       Async do
-        _resp, data = internet.get("/stickers-packs").wait
+        _resp, data = http.get("/stickers-packs").wait
         data.map { |pack| Sticker::Pack.new(self, pack) }
       end
     end

data/lib/discorb/common.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 module Discorb
+  # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
-  VERSION = "0.0.1"
+  # @return [String] The version of discorb.
+  VERSION = "0.0.5"
+  # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 
   #

data/lib/discorb/emoji.rb

@@ -86,7 +86,7 @@ module Discorb
         payload = {}
         payload[:name] = name if name != :unset
         payload[:roles] = roles.map { |r| Discorb::Utils.try(r, :id) } if roles != :unset
-        @client.internet.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
+        @client.http.patch("/guilds/#{@guild.id}/emojis/#{@id}", payload, audit_log_reason: reason)
         self
       end
     end
@@ -104,7 +104,7 @@ module Discorb
     #
     def delete!(reason: nil)
       Async do
-        @client.internet.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
+        @client.http.delete("/guilds/#{@guild.id}/emojis/#{@id}", audit_log_reason: reason).wait
         @available = false
         self
       end