qwtf_discord_bot 5.5.13 → 5.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f3e7db0dcde510ced3d8854582e00e5cb38dc231495dc70d9b5b70f7f9627a
-  data.tar.gz: d159cfc3dae171fe78eaf7c0cece4d7ae38d6e1927a05bb67e2aa37eb2cc334d
+  metadata.gz: edf725dbe10cf8dd1f3a44adb214ccd9ebca849a86c898dc5012b180301da3eb
+  data.tar.gz: 3c2dff10129f4f73b4b16337ed7413207d5aa2695457fa046158b5a8bf4a5240
 SHA512:
-  metadata.gz: 949ad6ac34383e8b284705f80c79e59b4aed603755a901e47744de5c9dac0e9407cfe3fdfffef158631c4bb762ac693d4f2455a90fb7fda42af592635260f4bd
-  data.tar.gz: 8beb3374d086b15923a0d443c08b970a3a0e60fd2c63aa825cb66a0cde3261ae569e18d8d9792add082b365285becb2eaee898ad8651a59c4f70eb00e4d052bc
+  metadata.gz: f9a5f0e994c6ffd34c93af96d8b5b7ac9bcf80005532a6fa9e1918da72a05c42c74ab079cc7ab34bd03f5f0bf6a51d12c5a7510f10a692146dcb96dc6d35da47
+  data.tar.gz: a6d3460b139e0386de4c5685ea978c8e98fafcd1fcdb9988ff620628e37df0ef5854d5adc5d72403cff072168c138e4fc8120f62f82f90f24a9cc7f822ec3a43

data/Dockerfile

@@ -1,5 +1,6 @@
-FROM ruby:2.6
+FROM ruby:3.0
 WORKDIR /discord-bot/
+RUN gem install bundler
 RUN git clone https://github.com/multiplay/qstat.git \
  && cd /discord-bot/qstat \
  && ./autogen.sh \

data/Gemfile.lock

@@ -1,90 +1,86 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (5.3.5)
-      discordrb (~> 3.3)
-      redis (~> 4.1)
-      thor (~> 0.20)
+    qwtf_discord_bot (5.5.18)
+      discordrb
+      redis
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    discordrb (3.3.0)
-      discordrb-webhooks (~> 3.3.0)
+    discordrb (3.4.2)
+      discordrb-webhooks (~> 3.4.2)
       ffi (>= 1.9.24)
       opus-ruby
-      rbnacl (~> 3.4.0)
-      rest-client (>= 2.1.0.rc1)
+      rest-client (>= 2.0.0)
       websocket-client-simple (>= 0.3.0)
-    discordrb-webhooks (3.3.0)
-      rest-client (>= 2.1.0.rc1)
+    discordrb-webhooks (3.4.2)
+      rest-client (>= 2.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     event_emitter (0.2.6)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    ffi (1.13.1)
+    ffi (1.14.2)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    minitest (5.14.1)
+    mime-types-data (3.2021.0212)
+    minitest (5.14.3)
     netrc (0.11.0)
     opus-ruby (1.0.1)
       ffi
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rbnacl (3.4.0)
-      ffi
-    redis (4.2.1)
+    redis (4.2.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    websocket (1.2.8)
+    websocket (1.2.9)
     websocket-client-simple (0.3.0)
       event_emitter
       websocket
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -97,4 +93,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.17.2
+   2.2.8

data/README.md

@@ -126,7 +126,7 @@ they haven't been connected for more than ten minutes.
 
 Build:
 
-    gem build qwtf_discrd_bot.gemspec
+    gem build qwtf_discord_bot.gemspec
 
 
 Install:

data/VERSION

@@ -1 +1 @@
-5.5.13
+5.5.18

data/lib/dashboard.rb

@@ -2,7 +2,6 @@ class Dashboard
   def initialize(dashboard_config, bot)
     @server = bot.server(dashboard_config["server_id"])
     @endpoints = dashboard_config["endpoints"]
-    @messages = {}
 
     channel_name = dashboard_config["name"]
 
@@ -11,31 +10,37 @@ class Dashboard
     end
 
     @channel = if old_dashboard_channel
-      position = old_dashboard_channel.position
-      topic = old_dashboard_channel.topic
-      category = old_dashboard_channel.category
-      old_dashboard_channel.delete
-
-      @server.create_channel(channel_name).tap do |channel|
-        channel.position = position
-        channel.topic = topic if topic
-        channel.category = category if category
-      end
-    else
-      @server.create_channel(channel_name).tap do |channel|
-        channel.topic = "QWTF Bot Dashboard"
-      end
-    end
+                 old_messages = JSON.parse(
+                   Discordrb::API::Channel.messages(
+                     "Bot #{QwtfDiscordBot.config.token}",
+                     old_dashboard_channel.id,
+                     100
+                   )
+                 )
+
+                 old_messages.each do |old_message|
+                   sleep 2
+                   old_dashboard_channel.message(old_message['id']).delete
+                 end
+
+                 old_dashboard_channel
+               else
+                 @server.create_channel(channel_name).tap do |channel|
+                   channel.topic = "QWTF Bot Dashboard"
+                 end
+               end
   end
 
   def update
+    messages = {}
+
     @endpoints.each do |endpoint|
       qstat_request = QstatRequest.new(endpoint)
 
       if qstat_request.is_empty?
-        if @messages[endpoint]
-          @messages[endpoint].delete
-          @messages.delete(endpoint)
+        if messages[endpoint]
+          messages[endpoint].delete
+          messages.delete(endpoint)
         end
 
         next
@@ -43,8 +48,8 @@ class Dashboard
 
       embed = qstat_request.to_full_embed
 
-      @messages[endpoint] = if @messages[endpoint]
-                              @messages[endpoint].edit(nil, embed)
+      messages[endpoint] = if messages[endpoint]
+                              messages[endpoint].edit(nil, embed)
                             else
                               @channel.send_embed(nil, embed)
                             end

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -8,7 +8,7 @@ class QwtfDiscordBotPug # :nodoc:
 
   MSG_SNIPPET_DELIMITER = ' · '
   TEAM_NAMES = { 1 => "Blue", 2 => "Red" }
-  ONE_MINUTE = 60
+  TEN_MINUTES = 10 * 60
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -46,6 +46,13 @@ class QwtfDiscordBotPug # :nodoc:
 
     bot.command :choose do |event, *args|
       setup_pug(event) do |e, pug|
+        if pug.joined_players.count > pug.maxplayers
+          return send_embedded_message(
+            description: "Too many players, increase `!teamsize` or `!kick` extras",
+            channel: event.channel
+          )
+        end
+
         if pug.joined_players.count.odd?
           return send_embedded_message(
             description: "Can't choose teams with odd number of players",
@@ -240,7 +247,13 @@ class QwtfDiscordBotPug # :nodoc:
             )
           end
 
-          join_pug(e, pug) unless pug.joined?(user_id)
+          if pug.team(team_no).size >= pug.teamsize
+            return send_embedded_message(
+              description: "Team is full",
+              channel: e.channel
+            )
+          end
+
           pug.join_team(team_no: team_no, player_id: user_id)
 
           send_embedded_message(
@@ -252,6 +265,13 @@ class QwtfDiscordBotPug # :nodoc:
           )
         else
           args[1..-1].each do |mention|
+            if pug.team(team_no).size >= pug.teamsize
+              return send_embedded_message(
+                description: "Team is full",
+                channel: e.channel
+              )
+            end
+
             unless mention.match(/<@!\d+>/)
               send_embedded_message(
                 description: "#{arg} isn't a valid mention",
@@ -356,7 +376,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.equal_number_of_players_on_each_team?
+        if !pug.equal_number_of_players_on_each_team?
           return send_embedded_message(
             description: "Can't report unless teams have same number of players",
             channel: event.channel
@@ -370,11 +390,9 @@ 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
-
+        if pug.last_result_time && pug.last_result_time > ten_minutes_ago
           return send_embedded_message(
-            description: "Please wait #{ONE_MINUTE - time_ago} more seconds before reporting",
+            description: "A match was reported less than 10 minutes ago",
             channel: event.channel
           )
         end
@@ -411,8 +429,6 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         ).body
 
-        pug.unteam_all_players
-
         send_embedded_message(
           description: "#{TEAM_NAMES[winning_team_no]} wins game ##{id}. `!choose` again. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
@@ -436,7 +452,7 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.equal_number_of_players_on_each_team?
+        if !pug.equal_number_of_players_on_each_team?
           return send_embedded_message(
             description: "Can't report unless teams have same number of players",
             channel: event.channel
@@ -450,11 +466,11 @@ class QwtfDiscordBotPug # :nodoc:
           )
         end
 
-        if pug.last_result_time && pug.last_result_time > one_minute_ago
+        if pug.last_result_time && pug.last_result_time > ten_minutes_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",
+            description: "A match was reported less than 10 minutes ago",
             channel: event.channel
           )
         end
@@ -481,8 +497,6 @@ class QwtfDiscordBotPug # :nodoc:
           }.to_json
         ).body
 
-        pug.unteam_all_players
-
         send_embedded_message(
           description: "Match ##{id} drawn. `!choose` again. [Ratings](http://ratings.fortressone.org)",
           channel: e.channel
@@ -633,7 +647,7 @@ class QwtfDiscordBotPug # :nodoc:
   private
 
   def team_name(team_no)
-    return "No team" if team_no == 0
+    return "Queue" if team_no == 0
 
     [team_no, TEAM_NAMES[team_no]].join(" ")
   end
@@ -830,7 +844,7 @@ class QwtfDiscordBotPug # :nodoc:
     JSON.parse(res.body).map(&:to_h)
   end
 
-  def one_minute_ago
-    Time.now.to_i - ONE_MINUTE
+  def ten_minutes_ago
+    Time.now.to_i - TEN_MINUTES
   end
 end

data/qwtf_discord_bot.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'discordrb', '~> 3.3'
-  spec.add_runtime_dependency 'redis', '~> 4.1'
-  spec.add_runtime_dependency 'thor', '~> 0.20'
+  spec.add_runtime_dependency 'discordrb', '~> 3.4'
+  spec.add_runtime_dependency 'redis', '~> 4.2'
+  spec.add_runtime_dependency 'thor', '~>1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.5.13
+  version: 5.5.18
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.1'
 description: A Discord bot for reporting on QuakeWorld Team Fortress game servers
 email:
 - shayolden@hotmail.com
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Works by wrapping the excellent CLI server query tool qstat. Accepts !server,