minestat 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c241df5d1adebf63bf3fa8ff85a4066cf788b64ac160afddf99906f6d0ea1a3
-  data.tar.gz: c257c9b9640bb4bf961bdc80dfbebbcad829cfe5a56f90951bc724859ab389c7
+  metadata.gz: 2bb7df47ea2b1dbc9593527397307a00e553ca5f67e7569d9c3d92bf26c971ef
+  data.tar.gz: 6dd403da69ee5878a58e7b1c973b937f57f04f607d86774fb87febd46514db54
 SHA512:
-  metadata.gz: afb6c96adcac8c9bcea0bb88e1466ef9354d116345707c1f9fa901322996d412c8244a59c5facd724909d7f16375f5c3dcc098f40aef484ca8a9d18dff4936c4
-  data.tar.gz: c08c4a7f1099ed57094bedf7c4f3eed374eff7fa824be55a1962b3fa3831f6f2f088284ee0b58acc09c7285b33fea8892ed8abfbe5b757264876497c3ff637d0
+  metadata.gz: 54c7a4cfd1fb9c07e83529f513dcb800dbd2464044389a18c08f22c8bb7435f963fdfc5acacdd174774f9b65a3dec22391f76f1e856499ca48a64f4f5e03cd9e
+  data.tar.gz: ce1ae19de3e86ded84a5205ec38c50218181add5eaf5965e8578102299c7cd51e316a37bd58437abb2aa6f154d6b067644a0a6485fb9c823972572d3ded02a69

data/lib/minestat.rb

@@ -21,7 +21,7 @@ require 'socket'
 require 'timeout'
 
 class MineStat
-  VERSION = "2.0.0"    # MineStat version
+  VERSION = "2.1.0"    # MineStat version
   NUM_FIELDS = 6       # number of values expected from server
   NUM_FIELDS_BETA = 3  # number of values expected from a 1.8b/1.3 server
   MAX_VARINT_SIZE = 5  # maximum number of bytes a varint can be
@@ -49,6 +49,7 @@ class MineStat
     @online            # online or offline?
     @version           # server version
     @motd              # message of the day
+    @stripped_motd     # message of the day without formatting
     @current_players   # current number of players online
     @max_players       # maximum player capacity
     @protocol          # protocol level
@@ -81,17 +82,33 @@ class MineStat
           retval = beta_request()
         end
         # SLP 1.6
-        unless retval == Retval::SUCCESS || retval == Retval::CONNFAIL
+        unless retval == Retval::CONNFAIL
           retval = extended_legacy_request()
         end
         # SLP 1.7
-        unless retval == Retval::SUCCESS || retval == Retval::CONNFAIL
+        unless retval == Retval::CONNFAIL
           retval = json_request()
         end
     end
     @online = false unless retval == Retval::SUCCESS
   end
 
+  # Strips message of the day formatting characters
+  def strip_motd(is_json = false)
+    unless is_json
+      @stripped_motd = @motd.gsub(/§./, "")
+    else
+      @stripped_motd = @motd['text']
+      json_data = @motd['extra']
+      unless json_data.nil? || json_data.empty?
+        json_data.each do |nested_hash|
+          @stripped_motd += nested_hash['text']
+        end
+      end
+      @stripped_motd = @stripped_motd.gsub(/§./, "")
+    end
+  end
+
   # Connects to remote server
   def connect()
     begin
@@ -133,6 +150,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
         @current_players = server_info[1].to_i
         @max_players = server_info[2].to_i
         @online = true
@@ -145,6 +163,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
         @current_players = server_info[4].to_i
         @max_players = server_info[5].to_i
         @online = true
@@ -309,7 +328,8 @@ class MineStat
         @json_data = json_data
         @protocol = json_data['version']['protocol'].to_i
         @version = json_data['version']['name']
-        @motd = json_data['description']['text']
+        @motd = json_data['description']
+        strip_motd(true)
         @current_players = json_data['players']['online'].to_i
         @max_players = json_data['players']['max'].to_i
         if !@version.empty? && !@motd.empty? && !@current_players.nil? && !@max_players.nil?
@@ -361,5 +381,5 @@ class MineStat
     return vint
   end
 
-  attr_reader :address, :port, :online, :version, :motd, :current_players, :max_players, :protocol, :json_data, :latency, :request_type
+  attr_reader :address, :port, :online, :version, :motd, :stripped_motd, :current_players, :max_players, :protocol, :json_data, :latency, :request_type
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: minestat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lloyd Dilley
 - Stepan Melnikov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies: []
 description: MineStat polls Minecraft server data such as version, motd, current players,
   and max players.
@@ -24,7 +24,7 @@ homepage: https://github.com/FragLand/minestat
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -39,9 +39,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.6.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Minecraft server status checker
 test_files: []