mij-discord 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1bb367b3fa105f6f685bf536ffc5ed364c2bf1a
-  data.tar.gz: 69d324ed5ec538deec69e778e725053240bc6faf
+  metadata.gz: 48c0f016e36771e9039a514a7a7ffbd2395e0fd2
+  data.tar.gz: dbdc6fdff7a9aa2517ab6c52744d4c098e988309
 SHA512:
-  metadata.gz: cfae532e6dbad1759046637cc4049a8b2d000ac40c5d4ffc376455c5c000536d78f6d4168d288f8e80eaadfef01dbaacec391debbdd7cbeb4988f4751c3f7c75
-  data.tar.gz: 9bc6a5388a4f3d5961c1682b011043e3940fc5cc6d4a9a12d6e9f37c51cda80ea2589de5b67754bf642904c77bbf505099d1a7b9b34941c2c0dd23e2c417ae7b
+  metadata.gz: 274edf535044862a7ce570f94495f1eee69b2e136e3807068e12c441b58a3174545e824eac4d91245bf2a16b48129fbeedff74fb08a181103866eabad3509243
+  data.tar.gz: dd4ece4b29888a70aee6e58c54dfe9e21a344f1894b78f072a478303f76a40488672a54da9e4fff4b515f5b8d098c92520457ea27fb68ac5cfc751a81cebb085

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.idea/
+/.idea/
+/mij-discord-*.gem

data/README.md

@@ -2,6 +2,8 @@
 
 My Discord bot library that's partially based on Discordrb. Was made because I found Discordrb to be not satisfactory for my purposes.
 
+TODO: Write goddamn documentation because there's currently none.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/mij-discord/bot.rb

@@ -187,7 +187,7 @@ module MijDiscord
     end
 
     def application
-      raise RuntimeError, 'Cannot get OAuth application for non-bot user' if @type != :bot
+      raise 'Cannot get OAuth application for non-bot user' if @type != :bot
 
       response = MijDiscord::Core::API.oauth_application(@token)
       MijDiscord::Data::Application.new(JSON.parse(response), self)
@@ -563,7 +563,7 @@ module MijDiscord
     private
 
     def gateway_check
-      raise RuntimeError, 'A gateway connection is required for this action' unless connected?
+      raise 'A gateway connection is required for this action' unless connected?
     end
 
     def notify_ready

data/lib/mij-discord/core/api/channel.rb

@@ -16,7 +16,7 @@ module MijDiscord::Core::API::Channel
 
     # Update a channel's data
     # https://discordapp.com/developers/docs/resources/channel#modify-channel
-    def update(token, channel_id, name, topic, nsfw, parent_id, position, bitrate, user_limit, reason = nil)
+    def update(token, channel_id, name, topic, nsfw, parent_id, position, bitrate, user_limit, overwrites, reason = nil)
       MijDiscord::Core::API.request(
         :channels_cid,
         channel_id,
@@ -25,7 +25,8 @@ module MijDiscord::Core::API::Channel
         {
           name: name, topic: topic, nsfw: nsfw,
           parent_id: parent_id, position: position,
-          bitrate: bitrate, user_limit: user_limit
+          bitrate: bitrate, user_limit: user_limit,
+          permission_overwrites: overwrites
         }.delete_if {|_, v| v.nil? }.to_json,
         Authorization: token,
         content_type: :json,

data/lib/mij-discord/core/gateway.rb

@@ -414,7 +414,7 @@ module MijDiscord::Core
 
     def ws_send(data, type)
       unless @handshake_done && !@ws_closed
-        raise StandardError, 'Tried to send something to the websocket while not being connected!'
+        raise 'Tried to send something to the websocket while not being connected!'
       end
 
       frame = WebSocket::Frame::Outgoing::Client.new(data: data, type: type, version: @handshake.version)

data/lib/mij-discord/data/channel.rb

@@ -50,7 +50,7 @@ module MijDiscord::Data
         when :category
           ChannelCategory.new(data, bot, server)
         else
-          raise RuntimeError, 'Broken channel object!'
+          raise 'Broken channel object!'
       end
     end
 
@@ -114,6 +114,8 @@ module MijDiscord::Data
       @parent_id ? @server.cache.get_channel(@parent_id) : nil
     end
 
+    alias_method :category, :parent
+
     def member_overwrites
       @permission_overwrites.values.select {|v| v.type == :member }
     end
@@ -123,30 +125,47 @@ module MijDiscord::Data
     end
 
     def set_name(name, reason = nil)
-      return if private?
-
       set_options(reason, name: name)
+      nil
     end
 
     alias_method :name=, :set_name
 
     def set_position(position, reason = nil)
       set_options(reason, position: position)
+      nil
     end
 
     alias_method :position=, :set_position
 
     def set_parent(parent, reason = nil)
-      set_options(reason, parent: parent)
+      channel = @server.cache.get_channel(parent)
+      raise ArgumentError, 'Specified channel is not a category' unless channel&.category?
+
+      set_options(reason, parent: channel)
+      nil
     end
 
+    alias_method :parent=, :set_parent
+    alias_method :set_category, :set_parent
+    alias_method :category=, :set_parent
+
     def set_options(reason = nil, name: nil, topic: nil, nsfw: nil,
-    parent: nil, position: nil, bitrate: nil, user_limit: nil)
+    parent: nil, position: nil, bitrate: nil, user_limit: nil, overwrites: nil)
       response = MijDiscord::Core::API::Channel.update(@bot.token, @id,
-        name, topic, nsfw,parent&.to_id, position, bitrate, user_limit, reason)
+        name, topic, nsfw,parent&.to_id, position, bitrate, user_limit, overwrites, reason)
       @server.cache.put_channel(JSON.parse(response), update: true)
     end
 
+    def set_overwrites(overwrites, reason = nil)
+      set_options(reason, overwrites: overwrites)
+      nil
+    end
+
+    alias_method :overwrites=, :set_overwrites
+    alias_method :set_permission_overwrites, :set_overwrites
+    alias_method :permission_overwrites=, :set_overwrites
+
     def define_overwrite(object, reason = nil, allow: 0, deny: 0)
       unless object.is_a?(Overwrite)
         allow_bits = allow.respond_to?(:bits) ? allow.bits : allow
@@ -160,6 +179,10 @@ module MijDiscord::Data
       nil
     end
 
+    alias_method :add_overwrite, :define_overwrite
+    alias_method :define_permission_overwrite, :define_overwrite
+    alias_method :add_permission_overwrite, :define_overwrite
+
     def delete_overwrite(object, reason = nil)
       raise ArgumentError, 'Invalid overwrite target' unless object.respond_to?(:to_id)
       MijDiscord::Core::API::Channel.delete_permission(@bot.token, @id,
@@ -167,6 +190,16 @@ module MijDiscord::Data
       nil
     end
 
+    alias_method :delete_permission_overwrite, :delete_overwrite
+
+    def sync_overwrites(reason = nil)
+      raise 'Cannot sync overwrites on a channel with no category set' unless @parent_id
+      set_overwrites(parent.overwrites, reason)
+      nil
+    end
+
+    alias_method :sync_permission_overwrites, :sync_overwrites
+
     def delete(reason = nil)
       MijDiscord::Core::API::Channel.delete(@bot.token, @id, reason)
       @server.cache.remove_channel(@id)
@@ -239,6 +272,7 @@ module MijDiscord::Data
       return unless text?
 
       set_options(reason, topic: topic)
+      nil
     end
 
     alias_method :topic=, :set_topic
@@ -247,6 +281,7 @@ module MijDiscord::Data
       return unless text?
 
       set_options(reason, nsfw: nsfw)
+      nil
     end
 
     alias_method :nsfw=, :set_nsfw
@@ -297,6 +332,7 @@ module MijDiscord::Data
 
       MijDiscord::Core::API::Channel.bulk_delete_messages(@bot.token, @id, ids)
       ids.each {|m| @cache.remove_message(m) }
+      nil
     end
 
     def invites
@@ -362,8 +398,6 @@ module MijDiscord::Data
 
     def initialize(data, bot, server)
       super(data, bot, server)
-
-
     end
 
     def update_data(data)
@@ -375,12 +409,14 @@ module MijDiscord::Data
 
     def set_bitrate(rate, reason = nil)
       set_options(reason, bitrate: rate)
+      nil
     end
 
     alias_method :bitrate=, :set_bitrate
 
     def set_user_limit(limit, reason = nil)
       set_options(reason, user_limit: limit)
+      nil
     end
 
     alias_method :user_limit=, :set_user_limit
@@ -400,5 +436,7 @@ module MijDiscord::Data
     def channels
       @server.channels.select! {|x| x.parent_id == @id }
     end
+
+    alias_method :children, :channels
   end
 end

data/lib/mij-discord/data/role.rb

@@ -58,24 +58,28 @@ module MijDiscord::Data
 
     def set_name(name)
       set_options(name: name)
+      nil
     end
 
     alias_method :name=, :set_name
 
     def set_hoist(flag)
       set_options(hoist: flag)
+      nil
     end
     
     alias_method :hoist=, :set_hoist
 
     def set_mentionable(flag)
       set_options(mentionable: flag)
+      nil
     end
 
     alias_method :mentionable=, :set_mentionable
 
     def set_color(color)
       set_options(color: color)
+      nil
     end
 
     alias_method :color=, :set_color

data/lib/mij-discord/data/server.rb

@@ -21,6 +21,12 @@ module MijDiscord::Data
       1 => :mentions,
     }.freeze
 
+    CHANNEL_TYPES = {
+      :text     => 0,
+      :voice    => 2,
+      :category => 4,
+    }.freeze
+
     include IDObject
 
     attr_reader :bot
@@ -237,10 +243,12 @@ module MijDiscord::Data
       channels.select!(&:voice?)
     end
 
-    def create_channel(name, reason = nil, voice: false, bitrate: nil, user_limit: nil, permissions: [], nsfw: false)
+    def create_channel(name, reason = nil, type: :text, bitrate: nil, user_limit: nil, permissions: [], nsfw: false)
+      raise ArgumentError, 'Invalid channel type specified' unless CHANNEL_TYPES.has_key?(type)
+
       permissions = permissions.map {|x| x.is_a(Overwrite) ? x.to_hash : x }
       response = MijDiscord::Core::API::Server.create_channel(@bot.token, @id,
-        name, voice ? 2 : 0, bitrate, user_limit, permissions, nsfw, reason)
+        name, CHANNEL_TYPES[type], bitrate, user_limit, permissions, nsfw, reason)
       @cache.put_channel(JSON.parse(response))
     end
 
@@ -294,6 +302,7 @@ module MijDiscord::Data
 
     def set_name(name, reason = nil)
       set_options(reason, name: name)
+      nil
     end
 
     alias_method :name=, :set_name
@@ -314,6 +323,7 @@ module MijDiscord::Data
       raise ArgumentError, 'Invalid region' unless available_regions.find {|x| x.id == region }
 
       set_options(reason, region: region)
+      nil
     end
 
     alias_method :region=, :set_region
@@ -326,18 +336,21 @@ module MijDiscord::Data
       else
         set_options(reason, icon: icon.to_s)
       end
+      nil
     end
 
     alias_method :icon=, :set_icon
 
     def set_afk_channel(channel, reason = nil)
       set_options(reason, afk_channel: channel.to_id)
+      nil
     end
 
     alias_method :afk_channel=, :set_afk_channel
 
     def set_afk_timeout(timeout, reason = nil)
       set_options(reason, afk_timeout: timeout)
+      nil
     end
 
     alias_method :afk_timeout=, :set_afk_timeout

data/lib/mij-discord/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MijDiscord
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mij-discord
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Mijyuoon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client