qwtf_discord_bot 5.1.5 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0adf9bb170277ec37dddc27d86049f6d678ddbb3b69530b114a177f11719d21
-  data.tar.gz: ff6c28db3deb0fad59b2ca45d4d53b3c45c622848cc15d6234d14b245c865413
+  metadata.gz: 27e4374d157a5f3cad0f5c1cc58ffb1e9fc0b9f6ca9b89391509635260bc460a
+  data.tar.gz: 2775f0952e46afb2af7dbff0a72b388e34f343ed896b3d909ca0b9d069f76ab4
 SHA512:
-  metadata.gz: 5dfb62990d27a5f250ea4ddbbe5f62583618e947c2c26d8df85308e2b99bb204a35a2b25347080a2352d4d1a7508e45e690fd7a636cd7e7baf1fc2305d8c9a60
-  data.tar.gz: 52590b32e2c4727c7ccd9b526bdc9f8abccb46b8d4e815d78cd7eb3cfd7dea669e57890b171dfdeb41c5a9de092d38147ae0b3469a97bb1450f96e713fe9b27a
+  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

@@ -89,8 +89,12 @@ This responds to discord messages:
   - `!join`
   - `!leave`
   - `!status`
-  - `!maxplayers <no_of_players>`
-  - `!notify <roles>`
+  - `!kick <@player>`
+  - `!teamsize <no_of_players>`
+  - `!team <team_no>`
+  - `!unteam`
+  - `!win <team_no>`
+  - `!notify <@role @role2>`
   - `!end`
 
 

data/VERSION

@@ -1 +1 @@
-5.1.5
+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,10 +23,18 @@ class EventDecorator
     server.users
   end
 
+  def mention_for(user_id)
+    find_user(user_id)&.mention
+  end
+
   def mentions_for(user_ids)
     find_users(user_ids).map(&:mention)
   end
 
+  def display_name_for(user_id)
+    find_user(user_id)&.display_name
+  end
+
   def display_names_for(user_ids)
     find_users(user_ids).map(&:display_name)
   end
@@ -51,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,5 +1,6 @@
 class Pug
-  DEFAULT_MAXPLAYERS = 8
+  DEFAULT_TEAMSIZE = 4
+  MIN_NO_OF_TEAMS = 2
 
   def self.for(channel_id)
     new(channel_id)
@@ -9,13 +10,29 @@ 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(number)
+    redis.smembers(team_key(number)).map(&:to_i)
+  end
+
+  def teamsize=(teamsize)
+    redis.set(teamsize_key, teamsize)
   end
 
   def full?
@@ -23,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
@@ -39,15 +60,11 @@ class Pug
   end
 
   def notify_roles
-    redis.get(notify_roles_key) || "@here"
+    redis.get(notify_roles_key) || '@here'
   end
 
-  def maxplayers=(maxplayers)
-    redis.set(maxplayers_key, maxplayers)
-  end
-
-  def maxplayers
-    (redis.get(maxplayers_key) || DEFAULT_MAXPLAYERS).to_i
+  def teamsize
+    (redis.get(teamsize_key) || DEFAULT_TEAMSIZE).to_i
   end
 
   def active?
@@ -55,37 +72,79 @@ class Pug
   end
 
   def leave(player_id)
-    redis.srem(players_key, player_id)
+    leave_teams(player_id)
+    end_pug if empty?
   end
 
-  def empty?
-    joined_player_count == 0
+  def end_pug
+    redis.keys([pug_key, "*"].join).each do |key|
+      redis.del(key)
+    end
   end
 
-  def end_pug
-    redis.del(pug_key)
-    redis.del(players_key)
+  def joined?(player_id)
+    joined_players.include?(player_id)
+  end
+
+  def maxplayers
+    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 maxplayers_key
-    [pug_key, "maxplayers"].join(":")
+  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 players_key
-    [pug_key, "players"].join(":")
+  def empty?
+    joined_player_count.zero?
+  end
+
+  def team_key(team_no)
+    [pug_key, 'teams', team_no].join(':')
   end
 
   def pug_key
-    ["pug", "channel", @channel_id].join(":")
+    [channel_key, 'pug'].join(':')
+  end
+
+  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(':')
   end
 
   def redis
     Redis.current
   end
+
+  def no_of_teams
+    [actual_teams.count, MIN_NO_OF_TEAMS].max
+  end
 end