Merge pull request #4 from taylorfinnell/fixes-for-new-messages

fixes for new message data

Author: taylorfinnell

shard.yml

@@ -1,10 +1,10 @@
 name: hqtrivia
-version: 0.2.0
+version: 0.2.2
 
 authors:
   - Taylor Finnell <[email protected]>
 
-crystal: 0.24.2
+crystal: 0.26.0
 
 license: MIT
 

spec/data/new_messages

@@ -21,14 +21,14 @@ end
 module HqTrivia
   describe Bot do
     it "works" do
-      messages = File.read("./spec/data/fullgame").each_line.to_a
+      messages = File.read("./spec/data/new_messages").each_line.to_a
       show = Model::Show.new(active: true, show_type: "hq-us", prize: 100, show_id: 666, start_time: Time.now)
       connection = Connection::Local.new(messages)
 
       bot = MyBot.new(show, LocalCoordinator.new("us"))
       bot.play(connection)
 
-      bot.words.values.max.should eq(328)
+      bot.words.values.max.should eq(70)
       bot.start_time.should eq(show.start_time)
       bot.show_id.should eq(show.show_id)
       bot.prize.should eq(show.prize)

spec/hqtrivia/bot_spec.cr

@@ -19,7 +19,7 @@ module HqTrivia
           user_id:     {key: "userId", type: Int32},
           message:     String,
           avatar_url:  {key: "avatarUrl", type: String?},
-          interaction: String,
+          interaction: String?,
           username:    String,
         })
       end

src/hqtrivia/model/interaction.cr

@@ -9,14 +9,19 @@ module HqTrivia
       })
 
       macro decode(json)
-        decoded = {{@type}}.from_json({{json}})
-        case decoded.type
-        {% for msg, index in Model::MessageTypes.constant("MESSAGE_LIST") %}
-        when {{msg}}
-          Model::{{msg.camelcase.id}}.from_json({{json}})
-        {% end %}
-        else
-          Model::UnknownMessage.new({{json}}, Time.utc_now)
+        begin
+          decoded = {{@type}}.from_json({{json}})
+          case decoded.type
+          {% for msg, index in Model::MessageTypes.constant("MESSAGE_LIST") %}
+          when {{msg}}
+            Model::{{msg.camelcase.id}}.from_json({{json}})
+          {% end %}
+          else
+            Model::UnknownMessage.new({{json}}, Time.utc_now)
+          end
+        rescue jme : JSON::MappingError
+          HqTrivia.logger.error("Failed to parse json: #{{{json}}}")
+          raise jme
         end
       end
     end

src/hqtrivia/model/raw_web_socket_message.cr

@@ -1,4 +1,4 @@
 module HqTrivia
   # Current HqTrivia version
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end