discordrb 1.3.12 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8344efadd31dd87ad79b62b72a82d6be04de185b
-  data.tar.gz: 9b7794426e79e82d8a86ccc24a394ea7747cb3bb
+  metadata.gz: 1318b8f7407048d6ba422c2d3732ed9536fdb56d
+  data.tar.gz: d7f68a7d482a60a961c61c96c23c3a34592014e6
 SHA512:
-  metadata.gz: 7809cfda57d26b2ef71751162356f35a31b908c392fce6c556466c4bf779df17b22aba0bacd2702f7bf209650a88f3e7fb7232d3505322f5cb78bf81fd099c9d
-  data.tar.gz: 98a4c66c5882c5b651d9a044edeaa0b6f18713200b7332be26c26662e3268ee58253a2cefe802f5bf652ac30e7ed9b4d0a5d62689aeb0996af392d9e6340d557
+  metadata.gz: 8063043dce37200550f85b17d8a521e5da6f9f16c31d2663d5d7d0a2b64ac918644d7124e00a19e5acc50fc6a6fe00b537adae056a0e3b2b72b40395a26c6eb5
+  data.tar.gz: 5b2719cfb5f73cffe7b34957d9ca957766d7c277f57d951ffe2ad9af8ec1fc95af54c193032a4f7a4c0c832475f2227a1410e6351b37ddf22ac4d53f63e993dc

data/Rakefile

@@ -2,6 +2,10 @@ require 'bundler/gem_tasks'
 
 # Make "build" the default task
 task default: :build
+
+# Make build depend on update_lists
+task build: :update_lists
+
 task :update_lists do
   ruby 'util/update_lists.rb'
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "discordrb"
+require 'bundler/setup'
+require 'discordrb'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "discordrb"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/discordrb.gemspec

@@ -4,25 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'discordrb/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "discordrb"
+  spec.name          = 'discordrb'
   spec.version       = Discordrb::VERSION
-  spec.authors       = ["meew0"]
-  spec.email         = [""]
+  spec.authors       = ['meew0']
+  spec.email         = ['']
 
-  spec.summary       = "Discord API for Ruby"
-  spec.description   = "A Ruby implementation of the Discord (https://discordapp.com) API."
-  spec.homepage      = "https://github.com/meew0/discordrb"
-  spec.license       = "MIT"
+  spec.summary       = 'Discord API for Ruby'
+  spec.description   = 'A Ruby implementation of the Discord (https://discordapp.com) API.'
+  spec.homepage      = 'https://github.com/meew0/discordrb'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "faye-websocket"
-  spec.add_dependency "rest-client"
-  spec.add_dependency "activesupport"
+  spec.add_dependency 'faye-websocket'
+  spec.add_dependency 'rest-client'
+  spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

data/examples/commands.rb

@@ -2,17 +2,17 @@
 
 require 'discordrb'
 
-bot = Discordrb::Commands::CommandBot.new "email@example.com", "hunter2", "!"
+bot = Discordrb::Commands::CommandBot.new 'email@example.com', 'hunter2', '!'
 
 bot.command :user do |event|
   event.user.name
 end
 
-bot.command :bold do |event, *args|
+bot.command :bold do |_event, *args|
   "**#{args.join(' ')}**"
 end
 
-bot.command :italic do |event, *args|
+bot.command :italic do |_event, *args|
   "**#{args.join(' ')}**"
 end
 
@@ -20,7 +20,7 @@ bot.command(:join, permission_level: 1, chain_usable: false) do |event, invite|
   event.bot.join invite
 end
 
-bot.command(:random, min_args: 0, max_args: 2, description: "Generates a random number between 0 and 1, 0 and max or min and max.", usage: "random [min/max] [max]") do |event, min, max|
+bot.command(:random, min_args: 0, max_args: 2, description: 'Generates a random number between 0 and 1, 0 and max or min and max.', usage: 'random [min/max] [max]') do |_event, min, max|
   if max
     rand(min..max)
   elsif min
@@ -31,10 +31,10 @@ bot.command(:random, min_args: 0, max_args: 2, description: "Generates a random
 end
 
 bot.command :long do |event|
-  event << "This is a long message."
-  event << "It has multiple lines that are each sent by doing `event << line`."
-  event << "This is an easy way to do such long messages, or to create lines that should only be sent conditionally."
-  event << "Anyway, have a nice day."
+  event << 'This is a long message.'
+  event << 'It has multiple lines that are each sent by doing `event << line`.'
+  event << 'This is an easy way to do such long messages, or to create lines that should only be sent conditionally.'
+  event << 'Anyway, have a nice day.'
 end
 
 bot.run

data/examples/ping.rb

@@ -2,10 +2,10 @@
 
 require 'discordrb'
 
-bot = Discordrb::Bot.new "email@example.com", "hunter2"
+bot = Discordrb::Bot.new 'email@example.com', 'hunter2'
 
-bot.message(with_text: "Ping!") do |event|
-  event.respond "Pong!"
+bot.message(with_text: 'Ping!') do |event|
+  event.respond 'Pong!'
 end
 
 bot.run

data/examples/pm_send.rb

@@ -2,10 +2,10 @@
 
 require 'discordrb'
 
-bot = Discordrb::Bot.new "email@example.com", "hunter2"
+bot = Discordrb::Bot.new 'email@example.com', 'hunter2'
 
 bot.mention do |event|
-  event.user.pm("You have mentioned me!")
+  event.user.pm('You have mentioned me!')
 end
 
 bot.run

data/lib/discordrb.rb

@@ -4,4 +4,5 @@ require 'discordrb/commands/command_bot'
 
 # All discordrb functionality, to be extended by other files
 module Discordrb
+  Thread.current[:discordrb_name] = 'main'
 end

data/lib/discordrb/api.rb

@@ -58,15 +58,33 @@ module Discordrb::API
   end
 
   # Create a server
-  def create_server(token, name, region)
+  def create_server(token, name, region = :london)
     RestClient.post(
       "#{APIBASE}/guilds",
-      { 'name' => name, 'region' => region }.to_json,
+      { 'name' => name, 'region' => region.to_s }.to_json,
       Authorization: token,
       content_type: :json
     )
   end
 
+  # Update a server
+  def update_server(token, server_id, name, region, icon, afk_channel_id, afk_timeout)
+    RestClient.patch(
+      "#{APIBASE}/guilds/#{server_id}",
+      { 'name' => name, 'region' => region, 'icon' => icon, 'afk_channel_id' => afk_channel_id, 'afk_timeout' => afk_timeout }.to_json,
+      Authorization: token,
+      content_type: :json
+    )
+  end
+
+  # Delete a server
+  def delete_server(token, server_id)
+    RestClient.delete(
+      "#{APIBASE}/guilds/#{server_id}",
+      Authorization: token
+    )
+  end
+
   # Leave a server
   def leave_server(server_id)
     RestClient.delete(
@@ -112,18 +130,18 @@ module Discordrb::API
   end
 
   # Join a server using an invite
-  def join_server(token, invite_id)
+  def join_server(token, invite_code)
     RestClient.post(
-      "#{APIBASE}/invite/#{invite_id}",
+      "#{APIBASE}/invite/#{invite_code}",
       nil,
       Authorization: token
     )
   end
 
   # Resolve an invite
-  def resolve_invite(token, code)
+  def resolve_invite(token, invite_code)
     RestClient.get(
-      "#{APIBASE}/invite/#{code}",
+      "#{APIBASE}/invite/#{invite_code}",
       Authorization: token
     )
   end
@@ -139,15 +157,23 @@ module Discordrb::API
   end
 
   # Create an instant invite from a server or a channel id
-  def create_invite(token, id, max_age = 0, max_uses = 0, temporary = false, xkcd = false)
+  def create_invite(token, channel_id, max_age = 0, max_uses = 0, temporary = false, xkcd = false)
     RestClient.post(
-      "#{APIBASE}/channels/#{id}/invites",
+      "#{APIBASE}/channels/#{channel_id}/invites",
       { 'max_age' => max_age, 'max_uses' => max_uses, 'temporary' => temporary, 'xkcdpass' => xkcd }.to_json,
       Authorization: token,
       content_type: :json
     )
   end
 
+  # Delete an invite by code
+  def delete_invite(token, code)
+    RestClient.delete(
+      "#{APIBASE}/invites/#{code}",
+      Authorization: token
+    )
+  end
+
   # Send a message to a channel
   def send_message(token, channel_id, message, mentions = [], tts = false)
     RestClient.post(

data/lib/discordrb/bot.rb

@@ -14,6 +14,7 @@ require 'discordrb/events/members'
 require 'discordrb/events/guild_role_create'
 require 'discordrb/events/guild_role_delete'
 require 'discordrb/events/guild_role_update'
+require 'discordrb/events/guilds'
 require 'discordrb/events/await'
 
 require 'discordrb/api'
@@ -27,7 +28,7 @@ module Discordrb
   class Bot
     include Discordrb::Events
 
-    attr_reader :bot_user, :token, :users, :servers
+    attr_reader :bot_user, :token, :users, :servers, :event_threads, :profile
     attr_accessor :should_parse_self
 
     def initialize(email, password, debug = false)
@@ -51,6 +52,9 @@ module Discordrb
       @users = {}
 
       @awaits = {}
+
+      @event_threads = []
+      @current_thread = 0
     end
 
     def run(async = false)
@@ -66,6 +70,7 @@ module Discordrb
       @heartbeat_interval = 1
       @heartbeat_active = false
       @heartbeat_thread = Thread.new do
+        Thread.current[:discordrb_name] = 'heartbeat'
         loop do
           sleep @heartbeat_interval
           send_heartbeat if @heartbeat_active
@@ -73,6 +78,7 @@ module Discordrb
       end
 
       @ws_thread = Thread.new do
+        Thread.current[:discordrb_name] = 'websocket'
         loop do
           websocket_connect
           debug('Disconnected! Attempting to reconnect in 5 seconds.')
@@ -113,12 +119,23 @@ module Discordrb
       @private_channels[id] = channel
     end
 
-    def join(invite)
+    def resolve_invite_code(invite)
+      invite = invite.code if invite.is_a? Discordrb::Invite
       invite = invite[invite.rindex('/') + 1..-1] if invite.start_with?('http') || invite.start_with?('discord.gg')
+      invite
+    end
+
+    def join(invite)
+      invite = resolve_invite_code(invite)
       resolved = JSON.parse(API.resolve_invite(@token, invite))['code']
       API.join_server(@token, resolved)
     end
 
+    def delete_invite(code)
+      invite = resolve_invite_code(code)
+      API.delete_invite(@token, invite)
+    end
+
     def user(id)
       @users[id]
     end
@@ -164,6 +181,16 @@ module Discordrb
       @awaits[key] = await
     end
 
+    # Regions: :london, :amsterdam, :frankfurt, :us-east, :us-west, :singapore, :sydney
+    def create_server(name, region = :london)
+      response = API.create_server(@token, name, region)
+      id = JSON.parse(response)['id'].to_i
+      sleep 0.1 until @servers[id]
+      server = @servers[id]
+      debug "Successfully created server #{server.id} with name #{server.name}"
+      server
+    end
+
     def parse_mention(mention)
       # Mention format: <@id>
       return nil unless /\<@(?<id>\d+)\>?/ =~ mention
@@ -269,6 +296,18 @@ module Discordrb
       register_event(GuildMemberDeleteEvent, attributes, block)
     end
 
+    def server_create(attributes = {}, &block)
+      register_event(GuildCreateEvent, attributes, block)
+    end
+
+    def server_update(attributes = {}, &block)
+      register_event(GuildUpdateEvent, attributes, block)
+    end
+
+    def server_delete(attributes = {}, &block)
+      register_event(GuildDeleteEvent, attributes, block)
+    end
+
     def await(attributes = {}, &block)
       register_event(AwaitEvent, attributes, block)
     end
@@ -290,7 +329,12 @@ module Discordrb
     end
 
     def debug(message, important = false)
-      puts "[DEBUG @ #{Time.now}] #{message}" if @debug || important
+      puts "[DEBUG : #{Thread.current[:discordrb_name]} @ #{Time.now}] #{message}" if @debug || important
+    end
+
+    def log_exception(e)
+      debug("Exception: #{e.inspect}", true)
+      e.backtrace.each { |line| debug(line, true) }
     end
 
     def handler_class(event_class)
@@ -301,6 +345,31 @@ module Discordrb
 
     private
 
+    #######     ###     ######  ##     ## ########
+    ##    ##   ## ##   ##    ## ##     ## ##
+    ##        ##   ##  ##       ##     ## ##
+    ##       ##     ## ##       ######### ######
+    ##       ######### ##       ##     ## ##
+    ##    ## ##     ## ##    ## ##     ## ##
+    #######  ##     ##  ######  ##     ## ########
+
+    def add_server(data)
+      server = Server.new(data, self)
+      @servers[server.id] = server
+
+      # Initialize users
+      server.members.each do |member|
+        if @users[member.id]
+          # If the user is already cached, just add the new roles
+          @users[member.id].merge_roles(server, member.roles[server.id])
+        else
+          @users[member.id] = member
+        end
+      end
+
+      server
+    end
+
     ### ##    ## ######## ######## ########  ##    ##    ###    ##        ######
     ##  ###   ##    ##    ##       ##     ## ###   ##   ## ##   ##       ##    ##
     ##  ####  ##    ##    ##       ##     ## ####  ##  ##   ##  ##       ##
@@ -427,6 +496,27 @@ module Discordrb
       server.delete_user(user_id)
     end
 
+    # Internal handler for GUILD_CREATE
+    def create_guild(data)
+      add_server(data)
+    end
+
+    # Internal handler for GUILD_UPDATE
+    def update_guild(data)
+      @servers[data['id'].to_i].update_data(data)
+    end
+
+    # Internal handler for GUILD_DELETE
+    def delete_guild(data)
+      id = data['id']
+
+      @users.each do |_, user|
+        user.delete_roles(id)
+      end
+
+      @servers.delete(id)
+    end
+
     # Internal handler for GUILD_ROLE_UPDATE
     def update_guild_role(data)
       role_data = data['role']
@@ -551,22 +641,12 @@ module Discordrb
         debug("Desired heartbeat_interval: #{@heartbeat_interval}")
 
         bot_user_id = data['user']['id'].to_i
+        @profile = Profile.new(data['user'], self, @email, @password)
 
         # Initialize servers
         @servers = {}
         data['guilds'].each do |element|
-          server = Server.new(element, self)
-          @servers[server.id] = server
-
-          # Initialize users
-          server.members.each do |member|
-            if @users[member.id]
-              # If the user is already cached, just add the new roles
-              @users[member.id].merge_roles(server, member.roles[server.id])
-            else
-              @users[member.id] = member
-            end
-          end
+          add_server(element)
 
           # Save the bot user
           @bot_user = @users[bot_user_id]
@@ -664,10 +744,24 @@ module Discordrb
 
         event = GuildRoleDeleteEvent.new(data, self)
         raise_event(event)
+      when 'GUILD_CREATE'
+        create_guild(data)
+
+        event = GuildCreateEvent.new(data, self)
+        raise_event(event)
+      when 'GUILD_UPDATE'
+        update_guild(data)
+
+        event = GuildUpdateEvent.new(data, self)
+        raise_event(event)
+      when 'GUILD_DELETE'
+        delete_guild(data)
+
+        event = GuildDeleteEvent.new(data, self)
+        raise_event(event)
       end
     rescue Exception => e
-      debug("Exception: #{e.inspect}", true)
-      e.backtrace.each { |line| debug(line) }
+      log_exception(e)
     end
 
     def websocket_close(event)
@@ -704,7 +798,21 @@ module Discordrb
 
       handlers = @event_handlers[event.class]
       (handlers || []).each do |handler|
-        handler.match(event)
+        call_event(handler, event) if handler.matches?(event)
+      end
+    end
+
+    def call_event(handler, event)
+      t = Thread.new do
+        @event_threads << t
+        Thread.current[:discordrb_name] = "et-#{@current_thread += 1}"
+        begin
+          handler.call(event)
+        rescue => e
+          log_exception(e)
+        ensure
+          @event_threads.delete(t)
+        end
       end
     end