disrb 0.1.1 → 0.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a6f8406c32616a61973380e5c5c27ba3bf216ac8de6f254b2ab9a2f3b0ccbb
-  data.tar.gz: bf346d61334a6a343bb62797b36179139f72cd28f93fe8901042db87bff5d0c7
+  metadata.gz: ecf60885f01f0ba754ad0a67f675413d09c33870ee4ec5e46bbb9ff84fb80d9d
+  data.tar.gz: 2744718f229ff9b5a789a94d50292a2113b988afb5d47f46edb71429753cea44
 SHA512:
-  metadata.gz: 31d3bd127e740e64460828e335f94f9ad918af0ca4d06fbedc12a7ce20d911e693c624ac95374e0ddd6622d253ab0c58119cd87f4d3ff8197f6170d7349c1eb9
-  data.tar.gz: fee46629e39d8b0f1d6b48a4e828650290eb9c99b2934db308d8bc4395ebdd3fed31a0baae04043e9c02744538da977a31d037dbb99eefa5989a77708e38ed73
+  metadata.gz: fd9a84148138aa689686aa061bdf0e0343b285ed8012a89ca5b282178e05a681b064eed32bf6ea5409d66ca506a4be975729602a0e2a201597d699202a6df1ca
+  data.tar.gz: 44e7a2d3a1c4e978d31d14f58891f4802a73f74a94d8f455a15f5a829ee8215c9ec22e33251f1b811a8ddbf0aff9bfc25115e991a56a174fbd5999d2f7f15a27

data/README.md

@@ -1,5 +1,7 @@
 # discord.rb indev
 
+[Changelog](CHANGELOG.md) | [Licensed under the MIT License](LICENSE)
+
 ![CI Pipeline](https://ci.codeberg.org/api/badges/14824/status.svg)
 
 W.I.P. Discord API wrapper written in Ruby for fun.
@@ -22,8 +24,8 @@ The test.rb file creates two commands "test" and "test2", that return "Hi" and "
   - [ ] Add support for all Discord Gateway events and properly handle the connection
   - [ ] Documentation (v0.1.2)
   - [x] Transition to Faraday for HTTP requests (v0.1.1)
-  - [ ] Functions where all options are optional, check if atleast one is provided
-  - [ ] Prefer to use keyword arguments over positional arguments if there are more than 1 optional arguments
+  - [x] Functions where all options are optional, check if atleast one is provided (v0.1.1.1)
+  - [x] Prefer to use keyword arguments over positional arguments if there are more than 1 optional arguments (v0.1.1.1)
 - [ ] Beta release (v0.3.0)
   - [ ] Component support and builder
   - [ ] Sharding support

data/lib/disrb/guild.rb

@@ -33,11 +33,10 @@ class DiscordApi
   end
 
   def get_guild(guild_id, with_counts = nil)
-    url = if !with_counts.nil?
-            "#{@base_url}/guilds/#{guild_id}?with_counts=#{with_counts}"
-          else
-            "#{@base_url}/guilds/#{guild_id}"
-          end
+    query_string_hash = {}
+    query_string_hash[:with_counts] = with_counts unless with_counts.nil?
+    query_string = DiscordApi.handle_query_strings(query_string_hash)
+    url = "#{@base_url}/guilds/#{guild_id}#{query_string}"
     headers = { 'Authorization' => @authorization_header }
     response = DiscordApi.get(url, headers)
     return response unless response.status != 200
@@ -62,6 +61,10 @@ class DiscordApi
                    system_channel_flags: nil, rules_channel_id: nil, public_updates_channel_id: nil,
                    preferred_locale: nil, features: nil, description: nil, premium_progress_bar_enabled: nil,
                    safety_alerts_channel_id: nil, audit_reason: nil)
+    if args[1..-2].all?(&:nil?)
+      @logger.warn("No modifications for guild with ID #{guild_id} provided. Skipping.")
+      return nil
+    end
     output = {}
     output[:name] = name unless name.nil?
     unless region.nil?
@@ -156,6 +159,11 @@ class DiscordApi
   end
 
   def modify_guild_channel_positions(guild_id, channel_id, position: nil, lock_permissions: nil, parent_id: nil)
+    if args[2..].all?(&:nil?)
+      @logger.warn("No modifications for guild channel positions with guild ID #{guild_id} and channel ID " \
+                     "#{channel_id} provided. Skipping.")
+      return nil
+    end
     output = {}
     output[:id] = channel_id
     output[:position] = position unless position.nil?
@@ -243,6 +251,11 @@ class DiscordApi
 
   def modify_guild_member(guild_id, user_id, nick: nil, roles: nil, mute: nil, deaf: nil, channel_id: nil,
                           communication_disabled_until: nil, flags: nil, audit_reason: nil)
+    if args[2..-2].all?(&:nil?)
+      @logger.warn("No modifications for guild member with guild ID #{guild_id} and user ID #{user_id} provided. " \
+                     'Skipping.')
+      return nil
+    end
     output = {}
     output[:nick] = nick unless nick.nil?
     output[:roles] = roles unless roles.nil?
@@ -264,6 +277,10 @@ class DiscordApi
   end
 
   def modify_current_member(guild_id, nick: nil, audit_reason: nil)
+    if nick.nil?
+      @logger.warn("No modifications for current member in guild ID #{guild_id} provided. Skipping.")
+      return nil
+    end
     output = {}
     output[:nick] = nick unless nick.nil?
     url = "#{@base_url}/guilds/#{guild_id}/members/@me"
@@ -279,6 +296,10 @@ class DiscordApi
 
   def modify_current_user_nick(guild_id, nick: nil, audit_reason: nil)
     @logger.warn('The "Modify Current User Nick" endpoint has been deprecated and should not be used!')
+    if nick.nil?
+      @logger.warn("No modifications for current user nick in guild ID #{guild_id} provided. Skipping.")
+      return nil
+    end
     output = {}
     output[:nick] = nick unless nick.nil?
     url = "#{@base_url}/guilds/#{guild_id}/users/@me/nick"
@@ -453,6 +474,10 @@ class DiscordApi
   end
 
   def modify_guild_role_positions(guild_id, id, position: nil, audit_reason: nil)
+    if position.nil?
+      @logger.warn("No role positions provided for guild with ID #{guild_id}. Skipping function.")
+      return nil
+    end
     output = {}
     output[:id] = id
     output[:position] = position unless position.nil?
@@ -469,6 +494,11 @@ class DiscordApi
 
   def modify_guild_role(guild_id, role_id, name: nil, permissions: nil, color: nil, hoist: nil, icon: nil,
                         unicode_emoji: nil, mentionable: nil, audit_reason: nil)
+    if args[2..-2].all?(&:nil?)
+      @logger.warn("No modifications for guild role with ID #{role_id} in guild with ID #{guild_id} provided. " \
+                     'Skipping.')
+      return nil
+    end
     output = {}
     output[:name] = name unless name.nil?
     output[:permissions] = permissions unless permissions.nil?
@@ -677,6 +707,11 @@ class DiscordApi
 
   def modify_guild_welcome_screen(guild_id, enabled: nil, welcome_channels: nil, description: nil,
                                   audit_reason: nil)
+    if args[1..-2].all?(&:nil?)
+      @logger.warn("No modifications for guild welcome screen with guild ID #{guild_id} provided. " \
+                     'Skipping.')
+      return nil
+    end
     output = {}
     output[:enabled] = enabled unless enabled.nil?
     output[:welcome_channels] = welcome_channels unless welcome_channels.nil?
@@ -704,6 +739,11 @@ class DiscordApi
 
   def modify_guild_onboarding(guild_id, prompts: nil, default_channel_ids: nil, enabled: nil, mode: nil,
                               audit_reason: nil)
+    if args[1..-2].all?(&:nil?)
+      @logger.warn("No modifications for guild onboarding with guild ID #{guild_id} provided. " \
+                     'Skipping.')
+      return nil
+    end
     output = {}
     output[:prompts] = prompts unless prompts.nil?
     output[:default_channel_ids] = default_channel_ids unless default_channel_ids.nil?
@@ -721,6 +761,11 @@ class DiscordApi
   end
 
   def modify_guild_incident_actions(guild_id, invites_disabled_until: nil, dms_disabled_until: nil)
+    if args[1..].all?(&:nil?)
+      @logger.warn("No modifications for guild incident actions with guild ID #{guild_id} provided. " \
+                     'Skipping.')
+      return nil
+    end
     output = {}
     if invites_disabled_until == false
       output[:invites_disabled_until] = nil

data/lib/disrb/message.rb

@@ -11,19 +11,19 @@ class DiscordApi
       return
     end
     output = {}
-    output[:content] = content if content
-    output[:nonce] = nonce if nonce
-    output[:tts] = tts if tts
-    output[:embeds] = embeds if embeds
-    output[:allowed_mentions] = allowed_mentions if allowed_mentions
-    output[:message_reference] = message_reference if message_reference
-    output[:components] = components if components
-    output[:sticker_ids] = sticker_ids if sticker_ids
-    output[:files] = files if files
-    output[:attachments] = attachments if attachments
-    output[:flags] = flags if flags
-    output[:enforce_nonce] = enforce_nonce if enforce_nonce
-    output[:poll] = poll if poll
+    output[:content] = content unless content.nil?
+    output[:nonce] = nonce unless nonce.nil?
+    output[:tts] = tts unless tts.nil?
+    output[:embeds] = embeds unless embeds.nil?
+    output[:allowed_mentions] = allowed_mentions unless allowed_mentions.nil?
+    output[:message_reference] = message_reference unless message_reference.nil?
+    output[:components] = components unless components.nil?
+    output[:sticker_ids] = sticker_ids unless sticker_ids.nil?
+    output[:files] = files unless files.nil?
+    output[:attachments] = attachments unless attachments.nil?
+    output[:flags] = flags unless flags.nil?
+    output[:enforce_nonce] = enforce_nonce unless enforce_nonce.nil?
+    output[:poll] = poll unless poll.nil?
     url = "#{@base_url}/channels/#{channel_id}/messages"
     data = JSON.generate(output)
     headers = { 'Authorization': @authorization_header, 'Content-Type': 'application/json' }

data/lib/disrb/user.rb

@@ -26,6 +26,10 @@ class DiscordApi
   end
 
   def modify_current_user(username: nil, avatar: nil, banner: nil)
+    if args.all?(&:nil?)
+      @logger.warn('No modifications provided for current user. Skipping function.')
+      return nil
+    end
     output = {}
     output[:username] = username unless username.nil?
     output[:avatar] = avatar unless avatar.nil?

data/lib/disrb.rb

@@ -103,7 +103,7 @@ class DiscordApi
     output[:description_localizations] = description_localizations unless description_localizations.nil?
     output[:options] = options unless options.nil?
     output[:default_permission] = default_permission unless default_permission.nil?
-    output[:type] = type unless default_permission.nil?
+    output[:type] = type unless type.nil?
     output[:nsfw] = nsfw unless nsfw.nil?
     output[:default_member_permissions] = default_member_permissions unless default_member_permissions.nil?
     url = "#{@base_url}/applications/#{@application_id}/guilds/#{guild_id}/commands"
@@ -173,6 +173,10 @@ class DiscordApi
   def edit_global_application_command(command_id, name: nil, name_localizations: nil, description: nil,
                                       description_localizations: nil, options: nil, default_member_permissions: nil,
                                       default_permission: nil, integration_types: nil, contexts: nil, nsfw: nil)
+    if args[1..].all?(&:nil?)
+      @logger.warn("No modifications provided for global application command with ID #{command_id}. Skipping.")
+      return nil
+    end
     output = {}
     output[:name] = name
     output[:name_localizations] = name_localizations unless name_localizations.nil?
@@ -197,6 +201,10 @@ class DiscordApi
   def edit_guild_application_command(guild_id, command_id, name: nil, name_localizations: nil, description: nil,
                                      description_localizations: nil, options: nil, default_member_permissions: nil,
                                      default_permission: nil, nsfw: nil)
+    if args[2..].all?(&:nil?)
+      @logger.warn("No modifications provided for guild application command with command ID #{command_id}. Skipping.")
+      return nil
+    end
     output = {}
     output[:name] = name
     output[:name_localizations] = name_localizations unless name_localizations.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disrb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.1.2
 platform: ruby
 authors:
 - hoovad