mij-discord 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449da084c2286a702480a67f637280e78d730503
-  data.tar.gz: c63653fb126dd72671f1d80194896b2f8b5714dc
+  metadata.gz: b5fcf947865936bee821151da5e83bef481fd163
+  data.tar.gz: 97545b505d78aae0d38a65efe7d6608d41f2cb30
 SHA512:
-  metadata.gz: 0ebd2ca1f55781f917f14c95f3acd3cb16939d6add73cfe6dbc0939f64c7b7c3db3f8a8f5a68bf27195f2858b244e5216df5487c14164d51956e5a0da1b6ba29
-  data.tar.gz: 9b1322411c9080ff065a342e2bf3d274ef73da71fb3225ccb3a975fcf5020dc28ebd7b40d9907776f177f4dfb203d80cacd2768afba2b5a1f8d7715d0bae13cd
+  metadata.gz: 684a85c5f4d1aea724672abe6d343eea34cc67dfca1e8cbaaa65ee6c4debb2fd9a83febfe5c98cc6586480070aed222ae9d08ce1b9ba1e287a46fd4ca07e3c2f
+  data.tar.gz: cda5fe4edf5ee6021610c4cf637b1ca598ebe8710dd3b88c3cce9b1ea2de7783e386642b6d81ba597b4bbe741f03500d2de117f2cd35bd94d6ca83827f353d75

data/lib/mij-discord.rb

@@ -12,40 +12,40 @@ require 'zlib'
 require 'websocket-client-simple'
 require 'rest-client'
 
-require 'mij-discord/version'
-require 'mij-discord/logger'
-require 'mij-discord/cache'
-require 'mij-discord/events'
-
-require 'mij-discord/core/gateway'
-require 'mij-discord/core/errors'
-require 'mij-discord/core/api'
-require 'mij-discord/core/api/channel'
-require 'mij-discord/core/api/invite'
-require 'mij-discord/core/api/server'
-require 'mij-discord/core/api/user'
-
-require 'mij-discord/data'
-require 'mij-discord/data/invite'
-require 'mij-discord/data/voice'
-require 'mij-discord/data/permissions'
-require 'mij-discord/data/application'
-require 'mij-discord/data/user'
-require 'mij-discord/data/member'
-require 'mij-discord/data/role'
-require 'mij-discord/data/channel'
-require 'mij-discord/data/server'
-require 'mij-discord/data/embed'
-require 'mij-discord/data/emoji'
-require 'mij-discord/data/message'
-
-require 'mij-discord/events/basic'
-require 'mij-discord/events/server'
-require 'mij-discord/events/member'
-require 'mij-discord/events/channel'
-require 'mij-discord/events/message'
-
-require 'mij-discord/bot'
+require_relative 'mij-discord/version'
+require_relative 'mij-discord/logger'
+require_relative 'mij-discord/cache'
+require_relative 'mij-discord/events'
+
+require_relative 'mij-discord/core/gateway'
+require_relative 'mij-discord/core/errors'
+require_relative 'mij-discord/core/api'
+require_relative 'mij-discord/core/api/channel'
+require_relative 'mij-discord/core/api/invite'
+require_relative 'mij-discord/core/api/server'
+require_relative 'mij-discord/core/api/user'
+
+require_relative 'mij-discord/data'
+require_relative 'mij-discord/data/invite'
+require_relative 'mij-discord/data/voice'
+require_relative 'mij-discord/data/permissions'
+require_relative 'mij-discord/data/application'
+require_relative 'mij-discord/data/user'
+require_relative 'mij-discord/data/member'
+require_relative 'mij-discord/data/role'
+require_relative 'mij-discord/data/channel'
+require_relative 'mij-discord/data/server'
+require_relative 'mij-discord/data/embed'
+require_relative 'mij-discord/data/emoji'
+require_relative 'mij-discord/data/message'
+
+require_relative 'mij-discord/events/basic'
+require_relative 'mij-discord/events/server'
+require_relative 'mij-discord/events/member'
+require_relative 'mij-discord/events/channel'
+require_relative 'mij-discord/events/message'
+
+require_relative 'mij-discord/bot'
 
 class Integer
   alias_method :to_id, :itself

data/lib/mij-discord/bot.rb

@@ -195,13 +195,13 @@ module MijDiscord
 
     def invite(invite)
       code = parse_invite_code(invite)
-      response = MijDiscord::Core::API::Invite.resolve(token, code)
+      response = MijDiscord::Core::API::Invite.resolve(@token, code)
       MijDiscord::Data::Invite.new(JSON.parse(response), self)
     end
 
     def accept_invite(invite)
       code = parse_invite_code(invite)
-      API::Invite.accept(token, code)
+      MijDiscord::Core::API::Invite.accept(@token, code)
       nil
     end
 
@@ -226,9 +226,9 @@ module MijDiscord
 
     def parse_invite_code(invite)
       case invite
-        when %r[(\w+)] then $1
-        when %r[(?:https?://)?discord\.gg/(\w+)]i then $1
-        when %r[https?://discordapp\.com/invite/(\w+)]i then $1
+        when %r[^(?:https?://)?discord\.gg/(\w+)$]i then $1
+        when %r[^https?://discordapp\.com/invite/(\w+)$]i then $1
+        when %r[^([a-zA-Z0-9]+)$] then $1
         when MijDiscord::Data::Invite then invite.code
         else raise ArgumentError, 'Invalid invite format'
       end
@@ -238,9 +238,9 @@ module MijDiscord
       gateway_check
 
       case mention
-        when /<@!?(\d+)>/
+        when /^<@!?(\d+)>$/
           server_id ? member(server_id, $1) : user($1)
-        when /<@&(\d+)>/
+        when /^<@&(\d+)>$/
           role = role(server_id, $1)
           return role if role
 
@@ -248,7 +248,7 @@ module MijDiscord
             role = sv.role($1)
             return role if role
           end
-        when /<:\w+:(\d+)>/
+        when /^<:\w+:(\d+)>$/
           emoji = emoji(server_id, $1)
           return emoji if emoji
 
@@ -446,7 +446,7 @@ module MijDiscord
 
         when :GUILD_ROLE_DELETE
           server = @cache.get_server(data['guild_id'])
-          role = server.cache.remove_role(data['role']['id'])
+          role = server.cache.remove_role(data['role_id'])
           trigger_event(:delete_role, self, server, role)
 
         when :GUILD_EMOJIS_UPDATE

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

@@ -8,11 +8,24 @@ module MijDiscord::Core::API
   class << self
     attr_accessor :bot_name
 
-    def user_agent
-      bot_name = @bot_name || 'generic'
-      ua_base = "DiscordBot (https://github.com/Mijyuoon/mij-discord, v#{MijDiscord::VERSION})"
+    def user_agent(kind)
+      case kind
+        when :bot
+          bot_name = @bot_name || 'generic'
+          ua_base = "DiscordBot (https://github.com/Mijyuoon/mij-discord, v#{MijDiscord::VERSION})"
+          "#{ua_base} mij-discord/#{MijDiscord::VERSION} #{bot_name}"
+
+        when :user
+          'Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:54.0) Gecko/20100101 Firefox/54.0'
+      end
+    end
 
-      "#{ua_base} mij-discord/#{MijDiscord::VERSION} #{bot_name}"
+    def token_type(token)
+      case token
+        when /^Bot (.+)$/ then :bot
+        when /^mfa\.(.+)$/ then :user
+        else :user
+      end
     end
 
     # Make an icon URL from server and icon IDs
@@ -164,7 +177,8 @@ module MijDiscord::Core::API
       ratelimit_delta, response = nil, nil
 
       if (params = attributes.last).is_a?(Hash)
-        params[:user_agent] = user_agent
+        ua_type = token_type(params[:Authorization])
+        params[:user_agent] = user_agent(ua_type)
         ratelimit_delta = params.delete(:header_bypass_delay)
       end
 

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

@@ -9,7 +9,7 @@ module MijDiscord::Core::API::Invite
         :invite_code,
         nil,
         :get,
-        "#{MijDiscord::Core::API::APIBASE_URL}/invite/#{invite_code}",
+        "#{MijDiscord::Core::API::APIBASE_URL}/invites/#{invite_code}",
         Authorization: token
       )
     end
@@ -34,7 +34,7 @@ module MijDiscord::Core::API::Invite
         :invite_code,
         nil,
         :post,
-        "#{MijDiscord::Core::API::APIBASE_URL}/invite/#{invite_code}",
+        "#{MijDiscord::Core::API::APIBASE_URL}/invites/#{invite_code}",
         nil,
         Authorization: token
       )

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

@@ -220,9 +220,13 @@ module MijDiscord::Data
 
     attr_reader :recipients
 
+    attr_reader :last_message_id
+
     def initialize(data, bot, server)
       super(data, bot, server)
 
+      @last_message_id = data['last_message_id']
+
       if private?
         @recipients = []
         if data['recipients']
@@ -272,6 +276,10 @@ module MijDiscord::Data
       @owner_id ? @bot.cache.get_user(@owner_id) : nil
     end
 
+    def last_message
+      @last_message_id ? @cache.get_message(@last_message_id) : nil
+    end
+
     def set_topic(topic, reason = nil)
       return unless text?
 

data/lib/mij-discord/version.rb

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

metadata

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