discordrb 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef7f70f8f9ba4e684a19ddd8545909f1e81b609
-  data.tar.gz: 6d8691f3e57f0bff79958ae09cf61aa1b23d6eca
+  metadata.gz: e7a553fc163491c4a828dfb1b0ae8eceea31002b
+  data.tar.gz: f03090190ede187097ab7c6522e4c46bcab7a76b
 SHA512:
-  metadata.gz: e18a5a8ccd4f31162d5407e69061dace62500b5a620140c7354f325978c61d9a2298d2e9312f855f7ea468f967a93919f55f9c72477357460d17f40932640da4
-  data.tar.gz: 0579638f1f91114752bdaca6afdc2465add207ad7bca65d13c90a38f7da6681ce9a08ece963298304180f4a6dcf05ddb6af512285eb5045571348be31c578139
+  metadata.gz: 23c01ad25109395e1d09ff9ca80d7fc84136ddc265d76f3c74cd6e7cf038ceacfffb61eb30ff856ed8abcac6df60eea5d9de07fb85387bd7304a1b174b24c149
+  data.tar.gz: aa0d36cc705bab5ac583a3f9a2317e20189e862832e49b76838e81c0106d39c24fba15e70ecda3ef4185ce998ff7232654451e392a3ded38178b95d3edd9a201

data/examples/commands.rb

@@ -0,0 +1,40 @@
+# This bot has various commands that show off CommandBot.
+
+require 'discordrb'
+
+bot = Discordrb::Commands::CommandBot.new "email@example.com", "hunter2", "!"
+
+bot.command :user do |event|
+  event.user.name
+end
+
+bot.command :bold do |event, *args|
+  "**#{args.join(' ')}**"
+end
+
+bot.command :italic do |event, *args|
+  "**#{args.join(' ')}**"
+end
+
+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|
+  if max
+    rand(min..max)
+  elsif min
+    rand(0..min)
+  else
+    rand
+  end
+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."
+end
+
+bot.run

data/lib/discordrb/api.rb

@@ -100,6 +100,14 @@ module Discordrb::API
     )
   end
 
+  # Resolve an invite
+  def resolve_invite(token, code)
+    RestClient.get(
+      "#{APIBASE}/invite/#{code}",
+      Authorization: token
+    )
+  end
+
   # Create a private channel
   def create_private(token, bot_user_id, user_id)
     RestClient.post(
@@ -159,10 +167,10 @@ module Discordrb::API
   end
 
   # Send a file as a message to a channel
-  def send_file(token, channel_id, file, filename = 'filename')
+  def send_file(token, channel_id, file)
     RestClient.post(
       "#{APIBASE}/channels/#{channel_id}/messages",
-      (filename.to_sym) => file,
+      {:file => file},
       Authorization: token
     )
   end

data/lib/discordrb/bot.rb

@@ -91,7 +91,8 @@ module Discordrb
 
     def join(invite)
       invite = invite[invite.rindex('/')+1..-1] if invite.start_with?('http') || invite.start_with?('discord.gg')
-      API.join_server(@token, invite)
+      resolved = JSON.parse(API.resolve_invite(@token, invite))['code']
+      API.join_server(@token, resolved)
     end
 
     def user(id)
@@ -111,6 +112,10 @@ module Discordrb
       API.send_message(@token, channel_id, content)
     end
 
+    def send_file(channel_id, file)
+      API.send_file(@token, channel_id, file)
+    end
+
     def debug=(debug)
       @debug = debug
     end

data/lib/discordrb/data.rb

@@ -177,6 +177,10 @@ module Discordrb
       @bot.send_message(@id, content)
     end
 
+    def send_file(file)
+      @bot.send_file(@id, file)
+    end
+
     def update_from(other)
       @topic = other.topic
       @name = other.name

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
 module Discordrb
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-31 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -96,6 +96,7 @@ files:
 - bin/console
 - bin/setup
 - discordrb.gemspec
+- examples/commands.rb
 - examples/ping.rb
 - examples/pm.rb
 - lib/discordrb.rb