mojang 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 871ba643bb251bad85c2d2f9f1e8c0bc5a83ed6ba116db0bd43c9353b329b37e
-  data.tar.gz: 8a1ff13f8de818d4e3396ca193c2522ae9f3a5884e887fe52b5a7e05329ddb03
+  metadata.gz: 8eb306005063f2d6ab339d300aee099c0d495ede0a4496ba24e1a0cb14aa6e38
+  data.tar.gz: 9c85b85c208a471ea15ae4e557c5dcaf84e88a695ddc71f52551b70c1b022911
 SHA512:
-  metadata.gz: 22b93cc476c28a687326f85508161204ae14d4cc5ef8b52442bec5b38ecbdb8a5f399e7f1933ee0dceb2ec402cec65f044e92543c2ce332c40bba38233ee6359
-  data.tar.gz: 7a22815fe1b6ba43c90ea9affd7b874ed5251edefc96e2b24f1c670b393eac21cfc64c6c9fa2ed14f35c3a1ad39914062240a0f9e5e5e29e0efc5cc87fe6b9a0
+  metadata.gz: 2d7110ea93a6647e70d4e6cb66612b76977b2d934675205c3898f0f3d3aa63bfa73109fd207145f3da293590f0034497037137f8346c0b5114b6c9cc50b12e19
+  data.tar.gz: c67e8af66afa9d68e6b90b3bc3687c60aa5068d9c9493bb92bc93e50adcb5d68b4b89a842cf34d60841691d7001f995e5a9f465328272dd7f0f7589e8224d20e

data/lib/mojang.rb

@@ -28,24 +28,20 @@ module Mojang
   # @return [String] The username's user ID.
   def userid(username, date = nil)
     self.profile(username, date, 'id')
-  end
-
-  # Gets the username for the given UUID at the given time.
-  # @param uuid [String] The user's UUID (see #{userid})
-  # @param date [Date] The date to get the name at.
-  # @return [String] The user's username at the given time.
-  def username(uuid, date = nil)
-    self.profile(uuid, date, 'name')
-  end
-
-  # Gets whether the given username has paid for Minecraft.
-  # @param username [String] The username to check.
-  # @return [Boolean] Whether they have paid or not.
-  def has_paid?(username)
-    params = { user: username }
-    response = Curl.get('https://minecraft.net/haspaid.jsp', params).body_str
+    profile_str = "https://api.mojang.com/users/profiles/minecraft/#{username}"
+    # If the provided date (or 0, if not provided) does not return anything, try without any date provided at all.
+    # This is necessary because for users with name history's *have* you have to provide some date (and 0 is valid),
+    # while for users who do *not* have name history, giving a date (including 0) will return 204 No Content.
+    # If it is *still* empty after both tries, then error.
+    response = Curl.get(profile_str, { at: date.to_i }).body_str
+    response = Curl.get(profile_str).body_str if response.empty?
+    fail NoSuchUserError.new(query) if response.empty?
+    json = Oj.load(response)
+    if json.key?('error')
+      fail Mojang::Errors::MojangError.new(json['error'], json['errorMessage'])
+    end
 
-    response == 'true'
+    json['id']
   end
 
   # Gets a user's name history from their UUID.
@@ -66,22 +62,4 @@ module Mojang
 
     ret
   end
-
-  private
-
-  # Gets the profile data.
-  # @param query [String] Either a username or an ID; they are handled in the same way.
-  # @param date [Date] The date to get at.
-  # @param return_val [String] The key in the returned hash to return.
-  # @return [String] The returned value for the return_val key.
-  def self.profile(query, date, return_val)
-    params = { at: date.to_i }
-    response = Curl.get("https://api.mojang.com/users/profiles/minecraft/#{query}", params).body_str
-    fail NoSuchUserError.new(query) if response.empty?
-    json = Oj.load(response)
-    if json.key?('error')
-      fail MojangError.new(json['error'], json['errorMessage'])
-    end
-    return json[return_val]
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mojang
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Eli Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 description: A Ruby library accessing the Mojang and Minecraft web APIs
 email: elifosterwy@gmail.com
 executables: []