minestat 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6006984abccf0461b0cfaccbc5e40f875f833f9996eb99e4d0a1bd6c636359
-  data.tar.gz: 49f04e6d471f3f4f0494d2c47da13e4562f9653a5cf98d9906508648dff3e562
+  metadata.gz: 91e281cebc7b0ed35188df906f0a93ffb216952b9f524f2aeb2a435120978273
+  data.tar.gz: 226896ef611cc2cc1d9bbc5122dddbf9a8a40b5089d5a956fd52af5bf13837a6
 SHA512:
-  metadata.gz: 2a267e36c53d565b313742dc5e48b25bc46fb0e19dca0d26a3410a74f224c323590f1be51e88bd356d150cc5f2c1580fcb7984f9e1e5af2bcba0376e61c27e91
-  data.tar.gz: 40c34e11de59a7c10cb018b32a216ea4dae9e3aad267168a82205dce541d634b544a452ec500b841c79a0c931bdbe47ad80b53e85bc1d3722f9c32c9ef47d480
+  metadata.gz: 9c61f0e76903e24e94c669bc6963212775de447b6c898b57898737ac486a0182bbf22d93447b72e399207bf167c746c5441e3091f5b24478f09e0a9600c9dee1
+  data.tar.gz: 5d34a0b1282e6097bebdd4099398a99eac414b9ad59ced7a538ec632da838ecae7386da71a2ea708b17e60a794e9c4c7294704b26187ed92010bff1472740336

data/ChangeLog.md

@@ -1,3 +1,9 @@
+## 3.0.5 (March 30, 2024)
+- Fixed nested JSON MotD issue
+
+## 3.0.4 (March 25, 2024)
+- Fixed typo
+
 ## 3.0.3 (November 2, 2023)
 - Fixed empty MotD issue
 

data/lib/minestat.rb

@@ -27,7 +27,7 @@ require 'timeout'
 # Provides a Ruby interface for polling the status of Minecraft servers
 class MineStat
   # MineStat version
-  VERSION = "3.0.3"
+  VERSION = "3.0.5"
 
   # Number of values expected from server
   NUM_FIELDS = 6
@@ -170,7 +170,7 @@ class MineStat
     @srv_succeeded = false     # SRV resolution successful?
 
     @try_all = true if request_type == Request::NONE
-    @srv_suceeded = resolve_srv() if @srv_enabled
+    @srv_succeeded = resolve_srv() if @srv_enabled
     set_connection_status(attempt_protocols(request_type))
   end
 
@@ -253,21 +253,19 @@ class MineStat
   private :set_connection_status
 
   # Strips message of the day formatting characters
-  def strip_motd()
-    unless @motd['text'] == nil
-      @motd = @motd['text']
-      @stripped_motd = @motd
-    else
-      @stripped_motd = @motd
-    end
-    unless @motd['extra'] == nil
-      json_data = @motd['extra']
-      unless json_data.nil? || json_data.empty?
-        json_data.each do |nested_hash|
-          @stripped_motd += nested_hash['text']
+  def strip_motd(raw_motd)
+    @stripped_motd = raw_motd if raw_motd.is_a?(String)
+
+    if raw_motd.is_a?(Hash)
+      @stripped_motd = raw_motd['text'] unless raw_motd['text'].nil?
+
+      unless raw_motd['extra'].nil?
+        raw_motd['extra'].each do |nested_hash|
+          @stripped_motd += strip_motd(nested_hash)
         end
       end
     end
+
     @stripped_motd = @stripped_motd.force_encoding('UTF-8')
     @stripped_motd = @stripped_motd.gsub(/§./, "")
   end
@@ -360,7 +358,7 @@ class MineStat
       if server_info != nil && server_info.length >= NUM_FIELDS_BETA
         @version = ">=1.8b/1.3" # since server does not return version, set it
         @motd = server_info[0]
-        strip_motd()
+        strip_motd(@motd)
         @current_players = server_info[1].to_i
         @max_players = server_info[2].to_i
         @online = true
@@ -373,7 +371,7 @@ class MineStat
         @version = "#{server_info[3]} #{server_info[7]} (#{server_info[0]})"
         @mode = server_info[8]
         @motd = server_info[1]
-        strip_motd()
+        strip_motd(@motd)
         @current_players = server_info[4].to_i
         @max_players = server_info[5].to_i
         @online = true
@@ -386,7 +384,7 @@ class MineStat
         server_info = Hash[*server_info[0].split(delimiter).flatten(1)]
         @version = server_info["version"]
         @motd = server_info["hostname"]
-        strip_motd()
+        strip_motd(@motd)
         @current_players = server_info["numplayers"].to_i
         @max_players = server_info["maxplayers"].to_i
         unless server_info["plugins"].nil? || server_info["plugins"].empty?
@@ -405,7 +403,7 @@ class MineStat
         @protocol = server_info[1].to_i # contains the protocol version (51 for 1.9 or 78 for 1.6.4 for example)
         @version = server_info[2]
         @motd = server_info[3]
-        strip_motd()
+        strip_motd(@motd)
         @current_players = server_info[4].to_i
         @max_players = server_info[5].to_i
         @online = true
@@ -612,7 +610,7 @@ class MineStat
         @protocol = json_data['version']['protocol'].to_i
         @version = json_data['version']['name']
         @motd = json_data['description']
-        strip_motd()
+        strip_motd(@motd)
         @current_players = json_data['players']['online'].to_i
         @max_players = json_data['players']['max'].to_i
         @favicon_b64 = json_data['favicon']
@@ -785,7 +783,7 @@ class MineStat
           challenge_token = @server.recv(QUERY_HANDSHAKE_SIZE)[QUERY_HANDSHAKE_OFFSET..-1]
           payload = "\xFE\xFD\x00\x0B\x03\x03\x0F".force_encoding('ASCII-8BIT')
           # Use the full stat below by stripping the null terminator from the challenge token and padding the end
-          # of the payload  with "\x00\x00\x00\x00". The basic stat response does not include the server version.
+          # of the payload with "\x00\x00\x00\x00". The basic stat response does not include the server version.
           payload += [challenge_token.rstrip.to_i].pack('l>').force_encoding('ASCII-8BIT')
           payload += "\x00\x00\x00\x00".force_encoding('ASCII-8BIT')
           @server.write(payload)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minestat
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Lloyd Dilley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies: []
 description: MineStat polls Minecraft server data such as version, motd, current players,
   and max players.