qwtf_discord_bot 5.5.1 → 5.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d76ac11d350eb38fbb60579e3ce26d561066f17e1bcda29029791afd98d36f
-  data.tar.gz: 1e75a7c3cecf17134bd41e2a9370bce29f82260319cd4d78bd9e9638e1c8e3af
+  metadata.gz: 3b23056513d2164179b74059da9679cad97749b7b541a72c3cfc5dd5f4cf7f8e
+  data.tar.gz: cdea90ab6a7539a83aa4cb80a8c3766d0931c78ece2d197905b351b53b0a3540
 SHA512:
-  metadata.gz: d13de4098fde37b346b4a668befed0c59ba73cae7a7640b69356064d1446c081af3b0552ef651896bd4c08b2548882a1386508992f12022717e9519eb5317dd2
-  data.tar.gz: c0868734a288588818370904904a407789857c74164d4b4ef42e27bafc68724238dcd4235bd7c625d79f72949109eef08ead1f03e2dea5a9ab39472132d2e1be
+  metadata.gz: 0ae5e3ab1a227bfe61805e53ffdcdb5ceeb90b541eb693a7bb17f45cf510185a0efc004f3f8b6aabc11192aaf413ed5e0510d1720992efcf62d456baeda00169
+  data.tar.gz: 9c012e37ca4c35697513e5ff082d7ab5d6060b05280f9daa01e8aa156848a8cebb3594130e86b1fc3bfcdf148096c3c39ea024b1f01461e6d034aa618a79fb3f

data/VERSION

@@ -1 +1 @@
-5.5.1
+5.5.6

data/lib/dashboard.rb

@@ -1,9 +1,18 @@
 class Dashboard
-  def initialize(channel, bot)
-    @channel_id = channel["id"]
-    @endpoints = channel["endpoints"]
-    @bot = bot
+  def initialize(dashboard_config, bot)
+    @server = bot.server(dashboard_config["server_id"])
+    @endpoints = dashboard_config["endpoints"]
     @messages = {}
+
+    old_dashboard_channel = @server.channels.find do |chan|
+      chan.name == "dashboard" && chan.topic = "QWTF Bot Dashboard"
+    end
+
+    old_dashboard_channel && old_dashboard_channel.delete
+
+    @channel = @server.create_channel("dashboard")
+    @channel.topic = "QWTF Bot Dashboard"
+    @channel.position = dashboard_config["position"]
   end
 
   def update
@@ -24,19 +33,8 @@ class Dashboard
       @messages[endpoint] = if @messages[endpoint]
                               @messages[endpoint].edit(nil, embed)
                             else
-                              channel.send_embed(nil, embed)
+                              @channel.send_embed(nil, embed)
                             end
     end
   end
-
-  private
-
-  def channel
-    data = Discordrb::API::Channel.resolve(
-      "Bot #{QwtfDiscordBot.config.token}",
-      @channel_id
-    )
-
-    Discordrb::Channel.new(JSON.parse(data), @bot)
-  end
 end

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
 
@@ -133,6 +132,20 @@ class Pug
     teams.tap { |team| team.delete(0) }
   end
 
+  def unteam_all_players
+    joined_players.each do |player_id|
+      join_team(team_no: 0, player_id: player_id)
+    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)
@@ -149,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_dashboard.rb

@@ -17,8 +17,10 @@ class QwtfDiscordBotDashboard
       end
     )
 
-    @dashboards ||= QwtfDiscordBot.config.dashboards.map do |channel|
-      Dashboard.new(channel, bot)
+    bot.run(true)
+
+    @dashboards ||= QwtfDiscordBot.config.dashboards.map do |dashboard_config|
+      Dashboard.new(dashboard_config, bot)
     end
 
     every(THIRTY_SECONDS) do

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,
@@ -393,8 +404,10 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         ).body
 
+        pug.unteam_all_players
+
         send_embedded_message(
-          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. [Ratings](http://ratings.fortressone.org)",
+          description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -423,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) })
@@ -431,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,
@@ -444,8 +467,10 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         ).body
 
+        pug.unteam_all_players
+
         send_embedded_message(
-          description: "Match ##{id} drawn. [Ratings](http://ratings.fortressone.org)",
+          description: "Match ##{id} drawn. `!choose` again. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
         )
       end
@@ -763,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')
@@ -785,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.6
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb