discordrb 1.2.0 → 1.3.0

data/lib/discordrb/events/voice-state-update.rb

@@ -1,89 +1,89 @@
-require 'discordrb/events/generic'
-require 'discordrb/data'
-
-module Discordrb::Events
-  class VoiceStateUpdateEvent
-    attr_reader :user
-    attr_reader :token
-    attr_reader :suppress
-    attr_reader :session_id
-    attr_reader :self_mute
-    attr_reader :self_deaf
-    attr_reader :mute
-    attr_reader :deaf
-    attr_reader :server
-    attr_reader :channel
-
-    def initialize(data, bot)
-      @token = data['token']
-      @suppress = data['suppress']
-      @session_id = data['session_id']
-      @self_mute = data['self_mute']
-      @self_deaf = data['self_deaf']
-      @mute = data['mute']
-      @deaf = data['deaf']
-      @server = bot.server(data['guild_id'].to_i)
-      return if !@server
-      if data['channel_id']
-        @channel = bot.channel(data['channel_id'].to_i)
-      end
-      @user = bot.user(data['user_id'].to_i)
-    end
-  end
-
-  class VoiceStateUpdateEventHandler < EventHandler
-    def matches?(event)
-      # Check for the proper event type
-      return false unless event.is_a? VoiceStateUpdateEvent
-
-      return [
-        matches_all(@attributes[:from], event.user) do |a,e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
-        end,
-        matches_all(@attributes[:mute], event.mute) do |a,e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end
-        end,
-        matches_all(@attributes[:deaf], event.deaf) do |a,e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end          
-        end,
-        matches_all(@attributes[:self_mute], event.self_mute) do |a,e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end
-        end,
-        matches_all(@attributes[:self_deaf], event.self_deaf) do |a,e|
-          if a.is_a? Boolean
-            a == e.to_s
-          else
-            a == e
-          end          
-        end,
-        matches_all(@attributes[:channel], event.channel) do |a,e|
-          if a.is_a? String
-            a == e.name
-          elsif a.is_a? Fixnum
-            a == e.id
-          else
-            a == e
-          end
-        end
-      ].reduce(true, &:&)
-    end
-  end
-end
+require 'discordrb/events/generic'
+require 'discordrb/data'
+
+module Discordrb::Events
+  class VoiceStateUpdateEvent
+    attr_reader :user
+    attr_reader :token
+    attr_reader :suppress
+    attr_reader :session_id
+    attr_reader :self_mute
+    attr_reader :self_deaf
+    attr_reader :mute
+    attr_reader :deaf
+    attr_reader :server
+    attr_reader :channel
+
+    def initialize(data, bot)
+      @token = data['token']
+      @suppress = data['suppress']
+      @session_id = data['session_id']
+      @self_mute = data['self_mute']
+      @self_deaf = data['self_deaf']
+      @mute = data['mute']
+      @deaf = data['deaf']
+      @server = bot.server(data['guild_id'].to_i)
+      return if !@server
+      if data['channel_id']
+        @channel = bot.channel(data['channel_id'].to_i)
+      end
+      @user = bot.user(data['user_id'].to_i)
+    end
+  end
+
+  class VoiceStateUpdateEventHandler < EventHandler
+    def matches?(event)
+      # Check for the proper event type
+      return false unless event.is_a? VoiceStateUpdateEvent
+
+      return [
+        matches_all(@attributes[:from], event.user) do |a,e|
+          if a.is_a? String
+            a == e.name
+          elsif a.is_a? Fixnum
+            a == e.id
+          else
+            a == e
+          end
+        end,
+        matches_all(@attributes[:mute], event.mute) do |a,e|
+          if a.is_a? Boolean
+            a == e.to_s
+          else
+            a == e
+          end
+        end,
+        matches_all(@attributes[:deaf], event.deaf) do |a,e|
+          if a.is_a? Boolean
+            a == e.to_s
+          else
+            a == e
+          end          
+        end,
+        matches_all(@attributes[:self_mute], event.self_mute) do |a,e|
+          if a.is_a? Boolean
+            a == e.to_s
+          else
+            a == e
+          end
+        end,
+        matches_all(@attributes[:self_deaf], event.self_deaf) do |a,e|
+          if a.is_a? Boolean
+            a == e.to_s
+          else
+            a == e
+          end          
+        end,
+        matches_all(@attributes[:channel], event.channel) do |a,e|
+          if a.is_a? String
+            a == e.name
+          elsif a.is_a? Fixnum
+            a == e.id
+          else
+            a == e
+          end
+        end
+      ].reduce(true, &:&)
+    end
+  end
+end

data/lib/discordrb/exceptions.rb

@@ -1,10 +1,10 @@
-module Discordrb
-  # Raised when authentication data is invalid or incorrect.
-  class InvalidAuthenticationException < RuntimeError; end
-
-  # Raised when a HTTP status code indicates a failure
-  class HTTPStatusException < RuntimeError
-    attr :status
-    def initialize(status); @status = status; end
-  end
-end
+module Discordrb
+  # Raised when authentication data is invalid or incorrect.
+  class InvalidAuthenticationException < RuntimeError; end
+
+  # Raised when a HTTP status code indicates a failure
+  class HTTPStatusException < RuntimeError
+    attr :status
+    def initialize(status); @status = status; end
+  end
+end

data/lib/discordrb/permissions.rb

@@ -0,0 +1,46 @@
+module Discordrb
+  class Permissions
+    # This hash maps bit positions to logical permissions.
+    # I'm not sure what the unlabeled bits are reserved for.
+    Flags = {
+      # Bit => Permission # Value
+      0 => :create_instant_invite, # 1
+      1 => :kick_members,          # 2
+      2 => :ban_members,           # 4
+      3 => :manage_roles ,         # 8
+      4 => :manage_channels,       # 16
+      5 => :manage_server,         # 32
+      #6                           # 64
+      #7                           # 128
+      #8                           # 256
+      #9                           # 512
+      10 => :read_messages,        # 1024
+      11 => :send_messages,        # 2048
+      12 => :send_tts_messages,    # 4096
+      13 => :manage_messages,      # 8192
+      14 => :embed_links,          # 16384
+      15 => :attach_files,         # 32768
+      16 => :read_message_history, # 65536
+      17 => :mention_everyone,     # 131072
+      #18                          # 262144
+      #19                          # 524288
+      20 => :connect,              # 1048576
+      21 => :speak,                # 2097152
+      22 => :mute_members,         # 4194304
+      23 => :deafen_members,       # 8388608
+      24 => :move_members,         # 16777216
+      25 => :use_voice_activity    # 33554432
+    }
+             
+    Flags.each_value do |flag|
+      attr_reader flag
+    end
+  
+    def initialize(bits)
+      Flags.each do |position, flag|
+        flag_set = ((bits >> position) & 0x1) == 1
+        instance_variable_set "@#{flag}", flag_set
+      end
+    end
+  end
+end

data/lib/discordrb/version.rb

@@ -1,3 +1,3 @@
-module Discordrb
-  VERSION = "1.2.0"
-end
+module Discordrb
+  VERSION = "1.3.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discordrb
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - meew0
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -100,6 +100,8 @@ files:
 - examples/pm.rb
 - lib/discordrb.rb
 - lib/discordrb/bot.rb
+- lib/discordrb/commands/command-bot.rb
+- lib/discordrb/commands/parser.rb
 - lib/discordrb/data.rb
 - lib/discordrb/endpoints/endpoints.rb
 - lib/discordrb/events/channel-create.rb
@@ -116,6 +118,7 @@ files:
 - lib/discordrb/events/typing.rb
 - lib/discordrb/events/voice-state-update.rb
 - lib/discordrb/exceptions.rb
+- lib/discordrb/permissions.rb
 - lib/discordrb/version.rb
 homepage: https://github.com/meew0/discordrb
 licenses: