qwtf_discord_bot 5.1.11 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f929cda85f6a53ffc63d04e3a85b6ca4bcbcadf72b2c0ab70eab8a1a549843a
-  data.tar.gz: 45b0e4b9bba67fdfb8139d3904176ce3443d43ea7cb74c750588f4eb6ea1fb8d
+  metadata.gz: 27e4374d157a5f3cad0f5c1cc58ffb1e9fc0b9f6ca9b89391509635260bc460a
+  data.tar.gz: 2775f0952e46afb2af7dbff0a72b388e34f343ed896b3d909ca0b9d069f76ab4
 SHA512:
-  metadata.gz: cca2b1392fbbdca102e22ea27e79774da07478e5cfa2a9a2ee14c4b6ae48ae1ea3c8e4c8906461d123a1f32f3e2e0cef519f107a3b7abf42d1853a5e870bf342
-  data.tar.gz: d29bd7a09c9ffed879429965497118d0f63332bac8084c83ea498601d924d11227adad67694de73f97658b73ed9c7c90236fc855bb8c82a809a522fe0ecb78f6
+  metadata.gz: 6cf2acfe24299674b69051e0d28ce628cea334840910b5bbd083d73e10d91cdf2d7c96312371ffed448424b769abb86c77a63de05b4a23136d05e92398bf2ff1
+  data.tar.gz: 1a5830ef4f29e3c331d5534a84837e8d3e29bccf016e478e439aa8727836fe957d20f4865265264aa69116110f9e7ba7cf322869f6738aff5ef365f4d860137d

data/Gemfile

@@ -12,6 +12,6 @@ group :development do
 end
 
 group :test do
-  gem 'rspec'
   gem 'factory_bot'
+  gem 'rspec'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qwtf_discord_bot (5.0.4)
+    qwtf_discord_bot (5.1.12)
       discordrb (~> 3.3)
       redis (~> 4.1)
       thor (~> 0.20)

data/README.md

@@ -91,6 +91,9 @@ This responds to discord messages:
   - `!status`
   - `!kick <@player>`
   - `!teamsize <no_of_players>`
+  - `!team <team_no>`
+  - `!unteam`
+  - `!win <team_no>`
   - `!notify <@role @role2>`
   - `!end`
 

data/VERSION

@@ -1 +1 @@
-5.1.11
+5.2.5

data/bin/bundle

@@ -8,46 +8,46 @@
 # this file is here to facilitate running it.
 #
 
-require "rubygems"
+require 'rubygems'
 
 m = Module.new do
-    module_function
+  module_function
 
   def invoked_as_script?
     File.expand_path($0) == File.expand_path(__FILE__)
   end
 
   def env_var_version
-    ENV["BUNDLER_VERSION"]
+    ENV['BUNDLER_VERSION']
   end
 
   def cli_arg_version
     return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    return unless 'update'.start_with?(ARGV.first || ' ') # must be running `bundle update`
+
     bundler_version = nil
     update_index = nil
     ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
+      bundler_version = a if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
+
+      bundler_version = Regexp.last_match(1) || '>= 0.a'
       update_index = i
     end
     bundler_version
   end
 
   def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
+    gemfile = ENV['BUNDLE_GEMFILE']
     return gemfile if gemfile && !gemfile.empty?
 
-    File.expand_path("../../Gemfile", __FILE__)
+    File.expand_path('../Gemfile', __dir__)
   end
 
   def lockfile
     lockfile =
       case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      when 'gems.rb' then gemfile.sub(/\.rb$/, gemfile)
       else "#{gemfile}.lock"
       end
     File.expand_path(lockfile)
@@ -55,8 +55,10 @@ m = Module.new do
 
   def lockfile_version
     return unless File.file?(lockfile)
+
     lockfile_contents = File.read(lockfile)
     return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+
     Regexp.last_match(1)
   end
 
@@ -68,24 +70,28 @@ m = Module.new do
   end
 
   def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
+    ENV['BUNDLE_GEMFILE'] ||= gemfile
 
     # must dup string for RG < 1.8 compatibility
     activate_bundler(bundler_version.dup)
   end
 
   def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
+    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new('2.0')
+      bundler_version = '< 2'
     end
     gem_error = activation_error_handling do
-      gem "bundler", bundler_version
+      gem 'bundler', bundler_version
     end
     return if gem_error.nil?
+
     require_error = activation_error_handling do
-      require "bundler/version"
+      require 'bundler/version'
+    end
+    if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+      return
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+
     warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
     exit 42
   end
@@ -100,6 +106,4 @@ end
 
 m.load_bundler!
 
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end
+load Gem.bin_path('bundler', 'bundle') if m.invoked_as_script?

data/bin/coderay

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("coderay", "coderay")
+load Gem.bin_path('coderay', 'coderay')

data/bin/htmldiff

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("diff-lcs", "htmldiff")
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("diff-lcs", "ldiff")
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/pry

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("pry", "pry")
+load Gem.bin_path('pry', 'pry')

data/bin/qwtf_discord_bot

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("qwtf_discord_bot", "qwtf_discord_bot")
+load Gem.bin_path('qwtf_discord_bot', 'qwtf_discord_bot')

data/bin/restclient

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("rest-client", "restclient")
+load Gem.bin_path('rest-client', 'restclient')

data/bin/rspec

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("rspec-core", "rspec")
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/thor

@@ -8,11 +8,11 @@
 # this file is here to facilitate running it.
 #
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
+bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
   if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
@@ -23,7 +23,7 @@ Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this
   end
 end
 
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-load Gem.bin_path("thor", "thor")
+load Gem.bin_path('thor', 'thor')

data/lib/endpoint.rb

@@ -12,7 +12,7 @@ class Endpoint
 
     @config.values.each do |settings|
       settings.each do |setting|
-        setting["channel_ids"].each do |channel_id|
+        setting['channel_ids'].each do |channel_id|
           channel_ids << channel_id
         end
       end

data/lib/event_decorator.rb

@@ -23,18 +23,20 @@ class EventDecorator
     server.users
   end
 
-  def mentions_for(user_ids)
-    find_users(user_ids).map do |user|
-      user&.mention
-    end
+  def mention_for(user_id)
+    find_user(user_id)&.mention
   end
 
-  def display_names_for(user_ids)
-    find_users(user_ids).map(&:display_name)
+  def mentions_for(user_ids)
+    find_users(user_ids).map(&:mention)
   end
 
   def display_name_for(user_id)
-    find_user(user_id) && find_user(user_id).display_name
+    find_user(user_id)&.display_name
+  end
+
+  def display_names_for(user_ids)
+    find_users(user_ids).map(&:display_name)
   end
 
   private
@@ -57,4 +59,3 @@ class EventDecorator
     @event.user
   end
 end
-

data/lib/player.rb

@@ -28,7 +28,8 @@ class Player
   end
 
   def team
-    return 'spec' if !valid_score? || @data['team'].empty? || @data['team'] == "observe"
+    return 'spec' if !valid_score? || @data['team'].empty? || @data['team'] == 'observe'
+
     @data['team']
   end
 

data/lib/pug.rb

@@ -1,6 +1,6 @@
 class Pug
-  DEFAULT_teamsize = 4
-  NO_OF_TEAMS = 2
+  DEFAULT_TEAMSIZE = 4
+  MIN_NO_OF_TEAMS = 2
 
   def self.for(channel_id)
     new(channel_id)
@@ -10,18 +10,25 @@ class Pug
     @channel_id = channel_id
   end
 
-  def join(user_id)
+  def join(player_id)
     redis.setnx(pug_key, Time.now)
-    redis.sadd(players_key, user_id)
+
+    redis.sadd(team_key(0), player_id)
+  end
+
+  def join_team(team_no:, player_id:)
+    leave_teams(player_id)
+    redis.sadd(team_key(team_no), player_id)
   end
 
   def joined_players
-    redis.smembers(players_key).map(&:to_i)
+    teams_keys.inject([]) do |players, team|
+      players + redis.smembers(team).map(&:to_i)
+    end
   end
 
-  def team(no)
-    index = no - 1
-    joined_players.each_slice(teamsize).to_a[index]
+  def team(number)
+    redis.smembers(team_key(number)).map(&:to_i)
   end
 
   def teamsize=(teamsize)
@@ -33,7 +40,11 @@ class Pug
   end
 
   def joined_player_count
-    redis.scard(players_key).to_i
+    joined_players.count
+  end
+
+  def team_player_count(team_no)
+    redis.scard(team_key(team_no)).to_i
   end
 
   def player_slots
@@ -49,15 +60,11 @@ class Pug
   end
 
   def notify_roles
-    redis.get(notify_roles_key) || "@here"
-  end
-
-  def teamsize=(teamsize)
-    redis.set(teamsize_key, teamsize)
+    redis.get(notify_roles_key) || '@here'
   end
 
   def teamsize
-    (redis.get(teamsize_key) || DEFAULT_teamsize).to_i
+    (redis.get(teamsize_key) || DEFAULT_TEAMSIZE).to_i
   end
 
   def active?
@@ -65,13 +72,14 @@ class Pug
   end
 
   def leave(player_id)
-    redis.srem(players_key, player_id)
+    leave_teams(player_id)
     end_pug if empty?
   end
 
   def end_pug
-    redis.del(pug_key)
-    redis.del(players_key)
+    redis.keys([pug_key, "*"].join).each do |key|
+      redis.del(key)
+    end
   end
 
   def joined?(player_id)
@@ -79,36 +87,64 @@ class Pug
   end
 
   def maxplayers
-    teamsize * NO_OF_TEAMS
+    teamsize * no_of_teams
+  end
+
+  def won_by(team_no)
+    { teams: teams, winner: team_no }
+  end
+
+  def teams
+    teams_keys.inject({}) do |teams, team|
+      teams.merge({ team.split(':').last => redis.smembers(team).map(&:to_i) })
+    end
+  end
+
+  def actual_teams
+    teams.tap { |team| team.delete("0") }
   end
 
   private
 
+  def leave_teams(player_id)
+    teams_keys.each do |team|
+      redis.srem(team, player_id)
+    end
+  end
+
+  def teams_keys
+    redis.keys([pug_key, 'teams:*'].join(':'))
+  end
+
   def empty?
     joined_player_count.zero?
   end
 
-  def teamsize_key
-    [pug_key, "teamsize"].join(":")
+  def team_key(team_no)
+    [pug_key, 'teams', team_no].join(':')
   end
 
-  def players_key
-    [pug_key, "players"].join(":")
+  def pug_key
+    [channel_key, 'pug'].join(':')
   end
 
-  def pug_key
-    ["pug", "channel", @channel_id].join(":")
+  def channel_key
+    ['channel', @channel_id].join(':')
   end
 
   def notify_roles_key
-    [pug_key, "role"].join(":")
+    [channel_key, 'role'].join(':')
   end
 
   def teamsize_key
-    [pug_key, "teamsize"].join(":")
+    [pug_key, 'teamsize'].join(':')
   end
 
   def redis
     Redis.current
   end
+
+  def no_of_teams
+    [actual_teams.count, MIN_NO_OF_TEAMS].max
+  end
 end

data/lib/qstat_request.rb

@@ -23,12 +23,14 @@ class QstatRequest
 
   def to_message
     return server_summary if is_empty?
+
     [server_summary, player_table].join("\n")
   end
 
   def server_summary
     return "#{@endpoint} isn't responding" unless game_map
     return "#{name} | #{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers}" unless has_spectators?
+
     "#{name} | #{@endpoint} | #{game_map} | #{numplayers}/#{maxplayers} players | #{numspectators}/#{maxspectators} spectators"
   end
 
@@ -46,70 +48,70 @@ class QstatRequest
 
   private
 
-    def has_spectators?
-      numspectators && numspectators > 0
-    end
-
-    def teams
-      @teams ||= build_roster
-    end
+  def has_spectators?
+    numspectators && numspectators > 0
+  end
 
-    def data
-      @data ||= JSON.parse(result).first
-    end
+  def teams
+    @teams ||= build_roster
+  end
 
-    def execute
-      %x[qstat -json -P -qws #{@endpoint}]
-    end
+  def data
+    @data ||= JSON.parse(result).first
+  end
 
-    def player_table
-      players.sort_by { |player| player.team.number }.map(&:to_row).join("\n")
-    end
+  def execute
+    `qstat -json -P -qws #{@endpoint}`
+  end
 
-    def name
-      data["name"]
-    end
+  def player_table
+    players.sort_by { |player| player.team.number }.map(&:to_row).join("\n")
+  end
 
-    def address
-      data["address"]
-    end
+  def name
+    data['name']
+  end
 
-    def game_map
-      data["map"]
-    end
+  def address
+    data['address']
+  end
 
-    def numplayers
-      data["numplayers"]
-    end
+  def game_map
+    data['map']
+  end
 
-    def maxplayers
-      data["maxplayers"]
-    end
+  def numplayers
+    data['numplayers']
+  end
 
-    def numspectators
-      data["numspectators"]
-    end
+  def maxplayers
+    data['maxplayers']
+  end
 
-    def maxspectators
-      data["maxspectators"]
-    end
+  def numspectators
+    data['numspectators']
+  end
 
-    def build_roster
-      return nil if is_empty?
+  def maxspectators
+    data['maxspectators']
+  end
 
-      roster = Roster.new
+  def build_roster
+    return nil if is_empty?
 
-      data["players"].map do |player_data|
-        player = Player.new(player_data)
-        roster.enroll(player)
-      end
+    roster = Roster.new
 
-      roster.teams.sort_by { |team| team.number }
+    data['players'].map do |player_data|
+      player = Player.new(player_data)
+      roster.enroll(player)
     end
 
-    def players
-      data["players"].map do |player_data|
-        Player.new(player_data)
-      end
+    roster.teams.sort_by { |team| team.number }
+  end
+
+  def players
+    data['players'].map do |player_data|
+      Player.new(player_data)
     end
+  end
 end

data/lib/qwtf_discord_bot.rb

@@ -21,6 +21,7 @@ module QwtfDiscordBot # :nodoc:
   def self.config_file
     return ENV['QWTF_DISCORD_BOT_CONFIG_FILE'] if ENV['QWTF_DISCORD_BOT_CONFIG_FILE']
     return "#{Dir.pwd}/config.yaml" if FileTest.exist?("#{Dir.pwd}/config.yaml")
+
     "#{Dir.home}/.config/qwtf_discord_bot/config.yaml"
   end
 

data/lib/qwtf_discord_bot/config.rb

@@ -6,20 +6,20 @@ class Config
   end
 
   def token
-    @token ||= @config["token"]
+    @token ||= @config['token']
   end
 
   def client_id
-    @client_id ||= @config["client_id"]
+    @client_id ||= @config['client_id']
   end
 
   def endpoints
-    @endpoints ||= @config["endpoints"].map do |endpoint|
+    @endpoints ||= @config['endpoints'].map do |endpoint|
       Endpoint.new(endpoint)
     end
   end
 
   def emojis
-    @emojis ||= @config["emojis"]
+    @emojis ||= @config['emojis']
   end
 end

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -6,6 +6,8 @@ require 'event_decorator'
 class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
+  MSG_SNIPPET_DELIMITER = ' · '
+
   def run
     bot = Discordrb::Commands::CommandBot.new(
       token: QwtfDiscordBot.config.token,
@@ -18,52 +20,48 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_msg("You've already joined", e.channel) if pug.joined?(e.user_id)
 
-        pug.join(e.user_id)
-
-        if pug.joined_player_count == 1
-          snippets = ["#{e.display_name} creates a PUG", pug.player_slots, pug.notify_roles]
-        else
-          snippets = ["#{e.display_name} joins the PUG", pug.player_slots]
-          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
-        end
-
-        send_msg(snippets.join(' | '), e.channel)
-
+        join_pug(e, pug)
         start_pug(pug, e) if pug.full?
       end
     end
 
     bot.command :status do |event, *args|
       setup_pug(event) do |e, pug|
-        msg = if pug.active?
-                [
-                  "#{e.display_names_for(pug.joined_players).join(', ')} joined",
-                  pug.player_slots
-                ].join(' | ')
-              else
-                'No PUG has been started. `!join` to create'
-              end
+        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
 
-        send_msg(msg, e.channel)
+        send_msg(
+          [
+            "#{pug.player_slots} joined",
+            pug_teams_message(pug, e).join("\n")
+          ].join("\n"),
+          e.channel
+        )
       end
     end
 
     bot.command :teamsize do |event, *args|
       setup_pug(event) do |e, pug|
-        new_teamsize = args[0]
+        new_teamsize = args[0].to_i
+        return send_msg('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
 
         if new_teamsize
           pug.teamsize = new_teamsize
 
           send_msg(
-            "Team size set to #{pug.teamsize} | #{pug.player_slots} joined",
+            [
+              "Team size set to #{pug.teamsize}",
+              "#{pug.player_slots} joined"
+            ].join(MSG_SNIPPET_DELIMITER),
             e.channel
           )
 
           start_pug(pug, e) if pug.full?
         else
           send_msg(
-            "Current team size is #{pug.teamsize} | #{pug.player_slots} joined",
+            [
+              "Current team size is #{pug.teamsize}",
+              "#{pug.player_slots} joined"
+            ].join(MSG_SNIPPET_DELIMITER),
             e.channel
           )
         end
@@ -85,7 +83,7 @@ class QwtfDiscordBotPug # :nodoc:
         snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
         send_msg(
-          snippets.join(' | '),
+          snippets.join(MSG_SNIPPET_DELIMITER),
           e.channel
         )
 
@@ -121,7 +119,7 @@ class QwtfDiscordBotPug # :nodoc:
           snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
 
           send_msg(
-            snippets.join(' | '),
+            snippets.join(MSG_SNIPPET_DELIMITER),
             e.channel
           )
 
@@ -130,6 +128,67 @@ class QwtfDiscordBotPug # :nodoc:
       end
     end
 
+    bot.command :team do |event, *args|
+      setup_pug(event) do |e, pug|
+        team_no = args[0].to_i
+        return send_msg("Choose a team between 1 and 4", e.channel) unless team_no.between?(1, 4)
+
+        user_id = e.user_id
+        return send_msg("You're already in team #{team_no}", e.channel) if pug.team(team_no).include?(user_id)
+
+        join_pug(e, pug) unless pug.joined?(user_id)
+        pug.join_team(team_no: team_no, player_id: user_id)
+
+        send_msg(
+          [
+            "#{e.display_name} joins team #{team_no}",
+            "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
+          ].join(MSG_SNIPPET_DELIMITER), e.channel
+        )
+
+        start_pug(pug, e) if pug.full?
+      end
+    end
+
+    bot.command :unteam do |event, *args|
+      setup_pug(event) do |e, pug|
+        user_id = e.user_id
+        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
+        return send_msg("You aren't in this PUG", e.channel) unless pug.joined?(user_id)
+        return send_msg("You aren't in a team", e.channel) if pug.team(0).include?(user_id)
+
+        pug.join_team(team_no: 0, player_id: user_id)
+        send_msg("#{e.display_name} has no team", e.channel)
+      end
+    end
+
+    bot.command :win do |event, *args|
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+
+        winning_team_no = args[0]
+
+        return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
+
+        pug.won_by(winning_team_no)
+
+        winning_team = pug.team(winning_team_no).map do |player_id|
+          e.display_name_for(player_id)
+        end
+
+        non_winning_teams = pug.actual_teams.tap { |team| team.delete(winning_team_no) }
+
+        losing_players = non_winning_teams.values.flatten.map do |player_id|
+          e.display_name_for(player_id)
+        end
+
+        send_msg(
+          "#{winning_team.join(', ')} defeat #{losing_players.join(', ')}",
+          e.channel
+        )
+      end
+    end
+
     bot.command :end do |event, *args|
       setup_pug(event) do |e, pug|
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
@@ -160,6 +219,19 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
+  def join_pug(e, pug)
+    pug.join(e.user_id)
+
+    if pug.joined_player_count == 1
+      snippets = ["#{e.display_name} creates a PUG", pug.player_slots, pug.notify_roles]
+    else
+      snippets = ["#{e.display_name} joins the PUG", pug.player_slots]
+      snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left.between?(1, 3)
+    end
+
+    send_msg(snippets.join(MSG_SNIPPET_DELIMITER), e.channel)
+  end
+
   def setup_pug(event)
     e = EventDecorator.new(event)
     pug = Pug.for(e.channel_id)
@@ -168,17 +240,49 @@ class QwtfDiscordBotPug # :nodoc:
   end
 
   def start_pug(pug, event)
+    pug_teams = pug.teams.map do |team_no, player_ids|
+      team_mentions = player_ids.map do |player_id|
+        event.mention_for(player_id)
+      end
+
+      team_status_line(
+        team_no: team_no.to_i,
+        names: team_mentions,
+        teamsize: pug.teamsize
+      )
+    end
+
     msg = [
       'Time to play!',
-      ['Team 1:', event.mentions_for(pug.team(1)).join(' ')].join(' '),
-      ['Team 2:', event.mentions_for(pug.team(2)).join(' ')].join(' ')
+      pug_teams
     ].join("\n")
 
     send_msg(msg, event.channel)
   end
 
-  def start_pug_send_msg(player_slots:, mentions:)
-    ['Time to play!', player_slots, mentions.join(' ')].join(' | ')
+  def pug_teams_message(pug, event)
+    pug.teams.map do |team_no, player_ids|
+      team_display_names = player_ids.map do |player_id|
+        event.display_name_for(player_id)
+      end
+
+      team_status_line(
+        team_no: team_no.to_i,
+        names: team_display_names,
+        teamsize: pug.teamsize
+      )
+    end
+  end
+
+  def team_status_line(team_no:, names:, teamsize:)
+    if team_no.to_i.zero?
+      ["No team: #{names.join(', ')}"]
+    else
+      [
+        "Team #{team_no}: #{names.join(', ')}",
+        "#{names.count}/#{teamsize}"
+      ].join(MSG_SNIPPET_DELIMITER)
+    end
   end
 
   def end_pug_message

data/lib/qwtf_discord_bot/qwtf_discord_bot_server.rb

@@ -27,7 +27,6 @@ class QwtfDiscordBotServer
           puts message
         end
       end
-
     end
 
     bot.command :all do |event|

data/lib/qwtf_discord_bot/qwtf_discord_bot_watcher.rb

@@ -12,7 +12,7 @@ class QwtfDiscordBotWatcher
         next if request.is_empty?
 
         request.player_names.each do |name|
-          redis_key = ["watcher", address, name].join(":")
+          redis_key = ['watcher', address, name].join(':')
 
           unless seen_recently?(redis_key)
             endpoint.channel_ids.each do |channel_id|

data/lib/qwtf_discord_bot/version.rb

@@ -1,3 +1,3 @@
 module QwtfDiscordBot
-  VERSION = File.read("VERSION").chomp.freeze
+  VERSION = File.read('VERSION').chomp.freeze
 end

data/lib/team.rb

@@ -1,7 +1,7 @@
 class Team
   attr_accessor :name, :number, :players
 
-  TEAMS = { "blue" => 1, "red" => 2, "yell" => 3, "gren" => 4, "spec" => 5 }.freeze
+  TEAMS = { 'blue' => 1, 'red' => 2, 'yell' => 3, 'gren' => 4, 'spec' => 5 }.freeze
 
   def initialize(name)
     @name = build_name(name)
@@ -19,27 +19,30 @@ class Team
 
   private
 
-    def field_name
-      name = @name.capitalize
-      return "#{name}" unless playing?
-      "#{name} | #{score}"
-    end
-
-    def playing?
-      (1..4).include?(@number)
-    end
-
-    def player_list
-      players.map(&:to_row).join("\n")
-    end
-
-    def score
-      return nil if @name == "spec"
-      @players.first.score
-    end
-
-    def build_name(name)
-      return name if TEAMS[name]
-      "spec"
-    end
+  def field_name
+    name = @name.capitalize
+    return name.to_s unless playing?
+
+    "#{name} | #{score}"
+  end
+
+  def playing?
+    (1..4).include?(@number)
+  end
+
+  def player_list
+    players.map(&:to_row).join("\n")
+  end
+
+  def score
+    return nil if @name == 'spec'
+
+    @players.first.score
+  end
+
+  def build_name(name)
+    return name if TEAMS[name]
+
+    'spec'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qwtf_discord_bot
 version: !ruby/object:Gem::Version
-  version: 5.1.11
+  version: 5.2.5
 platform: ruby
 authors:
 - Sheldon Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discordrb