disrb 0.1.0 → 0.1.1.2

data/lib/disrb/logger.rb

@@ -7,16 +7,24 @@ class Logger2
     @verbosity_level = verbosity_level
   end
 
-  def error(message)
+  def fatal_error(message)
     return unless @verbosity_level >= 1
 
-    puts("\033[1;38;2;255;255;255;48;2;192;57;43m | ERROR          \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
+    puts("\033[1;38;2;255;255;255;48;2;192;57;43m | FATAL ERROR    \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
          " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;192;57;43m  \033[0m " \
          "\e[38;2;192;57;43m#{message}\e[0m")
   end
 
+  def error(message)
+    return unless @verbosity_level >= 2
+
+    puts("\033[1;38;2;255;255;255;48;2;243;156;18m | ERROR          \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
+         " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;243;156;18m  \033[0m " \
+         "\e[38;2;243;156;18m#{message}\e[0m")
+  end
+
   def debug(message)
-    return unless @verbosity_level == 4
+    return unless @verbosity_level == 5
 
     puts("\033[1;38;2;255;255;255;48;2;155;89;182m | DEBUG          \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
          " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;155;89;182m  \033[0m " \
@@ -24,27 +32,33 @@ class Logger2
   end
 
   def warn(message)
-    return unless @verbosity_level >= 2
+    return unless @verbosity_level >= 3
 
-    puts("\033[1;38;2;255;255;255;48;2;243;156;18m | WARNING        \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
-         " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;243;156;18m  \033[0m " \
-         "\e[38;2;243;156;18m#{message}\e[0m")
+    puts("\033[1;38;2;255;255;255;48;2;241;196;15m | WARNING        \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
+         " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;241;196;15m  \033[0m " \
+         "\e[38;2;241;196;15m#{message}\e[0m")
   end
 
   def info(message)
-    return unless @verbosity_level >= 3
+    return unless @verbosity_level >= 4
 
     puts("\033[1;38;2;255;255;255;48;2;76;175;80m | INFORMATION    \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
          " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;76;175;80m  \033[0m " \
          "\e[38;2;76;175;80m#{message}\e[0m")
   end
 
-  def self.s_error(message)
-    puts("\033[1;38;2;255;255;255;48;2;192;57;43m | ERROR          \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
+  def self.s_fatal_error(message)
+    puts("\033[1;38;2;255;255;255;48;2;192;57;43m | FATAL ERROR    \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
            " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;192;57;43m  \033[0m " \
            "\e[38;2;192;57;43m#{message}\e[0m")
   end
 
+  def self.s_error(message)
+    puts("\033[1;38;2;255;255;255;48;2;243;156;18m | ERROR          \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
+           " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;243;156;18m  \033[0m " \
+           "\e[38;2;243;156;18m#{message}\e[0m")
+  end
+
   def self.s_debug(message)
     puts("\033[1;38;2;255;255;255;48;2;155;89;182m | DEBUG          \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
            " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;155;89;182m  \033[0m " \
@@ -52,9 +66,9 @@ class Logger2
   end
 
   def self.s_warn(message)
-    puts("\033[1;38;2;255;255;255;48;2;243;156;18m | WARNING        \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
-           " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;243;156;18m  \033[0m " \
-           "\e[38;2;243;156;18m#{message}\e[0m")
+    puts("\033[1;38;2;255;255;255;48;2;241;196;15m | WARNING        \033[0m\033[38;2;255;255;255;48;2;44;62;80m" \
+           " #{Time.now.strftime('%Y-%m-%d %H:%M:%S')} \033[0m\033[1;38;2;255;255;255;48;2;241;196;15m  \033[0m " \
+           "\e[38;2;241;196;15m#{message}\e[0m")
   end
 
   def self.s_info(message)

data/lib/disrb/message.rb

@@ -11,24 +11,24 @@ 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
-    url = URI("#{@base_url}/channels/#{channel_id}/messages")
+    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' }
-    response = Net::HTTP.post(url, data, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.post(url, data, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to create message in channel #{channel_id}. Response: #{response.body}")
     response

data/lib/disrb/user.rb

@@ -6,41 +6,43 @@
 # The class that contains everything that interacts with the Discord API.
 class DiscordApi
   def get_current_user
-    url = URI("#{@base_url}/users/@me")
+    url = "#{@base_url}/users/@me"
     headers = { 'Authorization': @authorization_header }
-    response = Net::HTTP.get(url, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.get(url, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to get current user. Response: #{response.body}")
     response
   end
 
-  # TODO: I should consistenly check that the variables are set correctly
   def get_user(user_id)
-    url = URI("#{@base_url}/users/#{user_id}")
+    url = "#{@base_url}/users/#{user_id}"
     headers = { 'Authorization': @authorization_header }
-    response = Net::HTTP.get(url, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.get(url, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to get user with ID #{user_id}. Response: #{response.body}")
     response
   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 if username
-    output[:avatar] = avatar if avatar
-    output[:banner] = banner if banner
-    # TODO: where all parameters are optional, i should consistently check if the parameters are empty, then skip if yes
+    output[:username] = username unless username.nil?
+    output[:avatar] = avatar unless avatar.nil?
+    output[:banner] = banner unless banner.nil?
     if output.empty?
       @logger.warn('No current user modifications provided. Skipping function.')
       return
     end
-    url = URI("#{@base_url}/users/@me")
+    url = "#{@base_url}/users/@me"
     data = JSON.generate(output)
     headers = { 'Authorization': @authorization_header, 'Content-Type': 'application/json' }
-    response = Net::HTTP.patch(url, data, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.patch(url, data, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to modify current user. Response: #{response.body}")
     response
@@ -48,41 +50,41 @@ class DiscordApi
 
   def get_current_user_guilds(before: nil, after: nil, limit: nil, with_counts: nil)
     query_string_hash = {}
-    query_string_hash[:before] = before
-    query_string_hash[:after] = after
-    query_string_hash[:limit] = limit
-    query_string_hash[:with_counts] = with_counts
+    query_string_hash[:before] = before unless before.nil?
+    query_string_hash[:after] = after unless after.nil?
+    query_string_hash[:limit] = limit unless limit.nil?
+    query_string_hash[:with_counts] = with_counts unless with_counts.nil?
     query_string = DiscordApi.handle_query_strings(query_string_hash)
-    url = URI("#{@base_url}/users/@me/guilds#{query_string}")
+    url = "#{@base_url}/users/@me/guilds#{query_string}"
     headers = { 'Authorization': @authorization_header }
-    response = Net::HTTP.get(url, headers)
+    response = DiscordApi.get(url, headers)
     if @authorization_token_type == 'Bot' && response.body.count == 200
       @logger.warn('A bot can be in more than 200 guilds, however 200 guilds were returned.' \
                     'Discord API doesn\'t allow you to fetch more than 200 guilds. Some guilds might not be listed.')
       return response
     end
-    return response unless response.code != '200'
+    return response unless response.status != 200
 
     @logger.error("Failed to get current user's guilds. Response: #{response.body}")
     response
   end
 
   def leave_guild(guild_id)
-    url = URI("#{@base_url}/users/@me/guilds/#{guild_id}")
+    url = "#{@base_url}/users/@me/guilds/#{guild_id}"
     headers = { 'Authorization': @authorization_header }
-    response = Net::HTTP.delete(url, headers)
-    return response unless response.code != '204'
+    response = DiscordApi.delete(url, headers)
+    return response unless response.status != 204
 
     @logger.error("Failed to leave guild with ID #{guild_id}. Response: #{response.body}")
     response
   end
 
   def create_dm(recipient_id)
-    url = URI("#{@base_url}/users/@me/channels")
+    url = "#{@base_url}/users/@me/channels"
     data = JSON.generate({ recipient_id: recipient_id })
     headers = { 'Authorization': @authorization_header, 'Content-Type': 'application/json' }
-    response = Net::HTTP.post(url, data, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.post(url, data, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to create DM with recipient ID #{recipient_id}. Response: #{response.body}")
     response
@@ -92,31 +94,31 @@ class DiscordApi
     output = {}
     output[:access_tokens] = access_tokens
     output[:nicks] = nicks
-    url = URI("#{@base_url}/users/@me/channels")
+    url = "#{@base_url}/users/@me/channels"
     data = JSON.generate(output)
     headers = { 'Authorization': @authorization_header, 'Content-Type': 'application/json' }
-    response = Net::HTTP.post(url, data, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.post(url, data, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to create group DM. Response: #{response.body}")
     response
   end
 
   def get_current_user_connections
-    url = URI("#{@base_url}/users/@me/connections")
+    url = "#{@base_url}/users/@me/connections"
     headers = { 'Authorization': @authorization_header }
-    response = Net::HTTP.get(url, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.get(url, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to get current user's connections. Response: #{response.body}")
     response
   end
 
   def get_current_user_application_role_connection(application_id)
-    url = URI("#{@base_url}/users/@me/applications/#{application_id}/role-connection")
+    url = "#{@base_url}/users/@me/applications/#{application_id}/role-connection"
     headers = { 'Authorization': @authorization_header }
-    response = Net::HTTP.get(url, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.get(url, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to get current user's application role connection for application ID #{application_id}. " \
                   "Response: #{response.body}")
@@ -133,11 +135,11 @@ class DiscordApi
       @logger.warn('No current user application role connection modifications provided. Skipping function.')
       return
     end
-    url = URI("#{@base_url}/users/@me/applications/#{application_id}/role-connection")
+    url = "#{@base_url}/users/@me/applications/#{application_id}/role-connection"
     data = JSON.generate(output)
     headers = { 'Authorization': @authorization_header, 'Content-Type': 'application/json' }
-    response = Net::HTTP.put(url, data, headers)
-    return response unless response.code != '200'
+    response = DiscordApi.put(url, data, headers)
+    return response unless response.status != 200
 
     @logger.error("Failed to update current user's application role connection for application ID #{application_id}. " \
                     "Response: #{response.body}")