qwtf_discord_bot 5.5.4 → 5.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f9b7c8e269139913d517709124256e56fef428f17382c6c58d6e7e5f76887fb
-  data.tar.gz: 92d1b89d60184d7dfa68de5419db9c59dc338298ef4092819e4bc34a27f99021
+  metadata.gz: 1f51fa8d63ad6a2e6e0e08e3e83c851930694ba6208a70469d95f3322f3a5215
+  data.tar.gz: f0d9139fab06e85aae6fe4d563cff3a13acd7ae88e0ba680c2add202a7c541e7
 SHA512:
-  metadata.gz: 90aead5b21fa970eac664c9be433eabfa584e3c2335b2fa0508308c11ac83fb3e765ac353b10ed52896078f3f560c7cb9ac2aaa6b054d9c9d43f53615213d97f
-  data.tar.gz: '0589136e79e9f98db93c1b069d5551cef7f2588fb252e9ddb00c0b99fbe4e992442d7a192bc4129a7da584dcfd7d649f19d19b9a8df036058f610659be1bfcd7'
+  metadata.gz: 0ac22beba9007bc30f809e3ab82ad382e078ba8036c71f91474ccad8b301b0b850a0b04dfa0529bfc4755aaa84bf82769846c72706dca4dcd7ca1c301f271457
+  data.tar.gz: 341a554d68f4680b09d22dcdc08f16c711c6d86271811e66810d61f6660d628a1cac7a656ba23724e593d1ec638dd7512484cc5af2007ce6d1897b58cba30e64

data/VERSION

@@ -1 +1 @@
-5.5.4
+5.5.5

data/lib/pug.rb

@@ -11,8 +11,7 @@ class Pug
   end
 
   def join(player_id)
-    redis.setnx(pug_key, Time.now)
-
+    redis.setnx(pug_key, Time.now.to_i)
     redis.sadd(team_key(0), player_id)
   end
 
@@ -139,6 +138,14 @@ class Pug
     end
   end
 
+  def update_last_result_time
+    redis.set(last_result_time_key, Time.now.to_i)
+  end
+
+  def last_result_time
+    redis.get(last_result_time_key).to_i
+  end
+
   private
 
   def leave_teams(player_id)
@@ -155,6 +162,10 @@ class Pug
     [pug_key, 'teams', team_no].join(':')
   end
 
+  def last_result_time_key
+    [channel_key, 'last_result_time'].join(':')
+  end
+
   def pug_key
     [channel_key, 'pug'].join(':')
   end

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -8,6 +8,7 @@ class QwtfDiscordBotPug # :nodoc:
 
   MSG_SNIPPET_DELIMITER = ' · '
   TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
+  ONE_MINUTE = 60
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -334,6 +335,13 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :win do |event, *args|
       setup_pug(event) do |e, pug|
+        unless args.any?
+          return send_embedded_message(
+            description: "Specify winning team; e.g. `!win 1`",
+            channel: e.channel
+          )
+        end
+
         unless pug.active?
           return send_embedded_message(
             description: no_active_pug_message,
@@ -348,17 +356,19 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        unless args.any?
+        unless ["1", "2"].any?(args.first)
           return send_embedded_message(
-            description: "Specify winning team; e.g. `!win 1`",
+            description: "Invalid team number",
             channel: e.channel
           )
         end
 
-        unless ["1", "2"].any?(args.first)
+        if pug.last_result_time && pug.last_result_time > one_minute_ago
+          time_ago = Time.now.to_i - pug.last_result_time
+
           return send_embedded_message(
-            description: "Invalid team number",
-            channel: e.channel
+            description: "Please wait #{ONE_MINUTE - time_ago} more seconds before reporting",
+            channel: event.channel
           )
         end
 
@@ -380,7 +390,8 @@ class QwtfDiscordBotPug # :nodoc:
           teams.merge({ name => { players: players, result: result } })
         end
 
-        id = post_results(
+        id = report(
+          pug,
           {
             match: {
               map: pug.game_map,
@@ -425,6 +436,15 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
+        if pug.last_result_time && pug.last_result_time > one_minute_ago
+          time_ago = Time.now.to_i - pug.last_result_time
+
+          return send_embedded_message(
+            description: "Please wait #{ONE_MINUTE - time_ago} more seconds before reporting",
+            channel: event.channel
+          )
+        end
+
         team_results = pug.actual_teams.inject({}) do |teams, (name, player_ids)|
           players = player_ids.inject({}) do |memo, id|
             memo.merge({ id => e.display_name_for(id) })
@@ -433,7 +453,8 @@ class QwtfDiscordBotPug # :nodoc:
         teams.merge({ name => { players: players, result: 0 } })
         end
 
-        id = post_results(
+        id = report(
+          pug,
           {
             match: {
               map: pug.game_map,
@@ -767,6 +788,11 @@ class QwtfDiscordBotPug # :nodoc:
     end
   end
 
+  def report(pug, json)
+    pug.update_last_result_time
+    post_results(json)
+  end
+
   def post_results(json)
     uri = URI("#{ENV['RATINGS_API_URL']}matches/")
     req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
@@ -789,4 +815,8 @@ class QwtfDiscordBotPug # :nodoc:
 
     JSON.parse(res.body).map(&:to_h)
   end
+
+  def one_minute_ago
+    Time.now.to_i - ONE_MINUTE
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.4
+  version: 5.5.5
 platform: ruby
 authors:
 - Sheldon Johnson