qwtf_discord_bot 5.1.6 → 5.2.6

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,7 +6,7 @@ require 'event_decorator'
 class QwtfDiscordBotPug # :nodoc:
   include QwtfDiscordBot
 
-  FOUR_HOURS = 4 * 60 * 60
+  MSG_SNIPPET_DELIMITER = ' · '
 
   def run
     bot = Discordrb::Commands::CommandBot.new(
@@ -17,158 +17,202 @@ class QwtfDiscordBotPug # :nodoc:
     )
 
     bot.command :join do |event, *args|
-      set_pug(event) do |e, pug|
-        if pug.joined_players.include?(e.user_id)
-          message = "You've already joined"
-          send_and_log_message(message, e.channel)
-        else
-          pug.join(e.user_id)
-
-          message = if pug.joined_player_count == 1
-                      [
-                        "#{e.display_name} creates a PUG",
-                        pug.player_slots,
-                        pug.notify_roles
-                      ].join(' | ')
-                    elsif pug.slots_left.between?(1,3)
-                      [
-                        "#{e.display_name} joins the PUG",
-                        pug.player_slots,
-                        "#{pug.slots_left} more",
-                        pug.notify_roles
-                      ].join(' | ')
-                    else
-                      [
-                        "#{e.display_name} joins the PUG",
-                        pug.player_slots
-                      ].join(' | ')
-                    end
-
-          send_and_log_message(message, e.channel)
-
-          if pug.full?
-            message = start_pug(
-              pug.player_slots,
-              e.mentions_for(pug.joined_players)
-            )
-
-            send_and_log_message(message, e.channel)
-          end
-        end
+      setup_pug(event) do |e, pug|
+        return send_msg("You've already joined", e.channel) if pug.joined?(e.user_id)
+
+        join_pug(e, pug)
+        start_pug(pug, e) if pug.full?
       end
     end
 
     bot.command :status do |event, *args|
-      set_pug(event) do |e, pug|
-        message = 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
-
-        send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return send_msg('No PUG has been started. `!join` to create', e.channel) unless pug.active?
+
+        send_msg(
+          [
+            "#{pug.player_slots} joined",
+            pug_teams_message(pug, e).join("\n")
+          ].join("\n"),
+          e.channel
+        )
       end
     end
 
-    bot.command :maxplayers do |event, *args|
-      set_pug(event) do |e, pug|
-        new_maxplayers = args[0]
+    bot.command :teamsize do |event, *args|
+      setup_pug(event) do |e, pug|
+        return send_msg("Team size is #{pug.teamsize}", e.channel) unless args.any?
 
-        message = if new_maxplayers
-                    pug.maxplayers = new_maxplayers
-                    "Max number of players set to #{pug.maxplayers} | #{pug.player_slots} joined"
-                  else
-                    "Current max number of players is #{pug.maxplayers} | #{pug.player_slots} joined"
-                  end
+        new_teamsize = args[0].to_i
+        return send_msg('Team size should be a number higher than 0', e.channel) unless new_teamsize > 0
 
-        send_and_log_message(message, e.channel)
+        if new_teamsize
+          pug.teamsize = new_teamsize
 
-        if pug.full?
-          message = start_pug(
-            pug.player_slots,
-            e.mentions_for(pug.joined_players)
+          send_msg(
+            [
+              "Team size set to #{pug.teamsize}",
+              "#{pug.player_slots} joined"
+            ].join(MSG_SNIPPET_DELIMITER),
+            e.channel
           )
 
-          send_and_log_message(message, e.channel)
+          start_pug(pug, e) if pug.full?
+        else
+          send_msg(
+            [
+              "Current team size is #{pug.teamsize}",
+              "#{pug.player_slots} joined"
+            ].join(MSG_SNIPPET_DELIMITER),
+            e.channel
+          )
         end
       end
     end
 
     bot.command :leave do |event, *args|
-      set_pug(event) do |e, pug|
-        if !pug.active?
-          message = "There's no active PUG to leave"
-          send_and_log_message(message, e.channel)
-        elsif !pug.joined_players.include?(e.user_id)
-          message = "You're not in the PUG"
-          send_and_log_message(message, e.channel)
-        else
-          pug.leave(e.user_id)
-          message = "#{e.display_name} leaves the PUG | #{pug.player_slots} remain"
-          send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+        return send_msg("You're not in the PUG", e.channel) unless pug.joined?(e.user_id)
 
-          if pug.empty?
-            message = end_pug(pug)
-            send_and_log_message(message, e.channel)
-          end
-        end
+        pug.leave(e.user_id)
+
+        snippets = [
+          "#{e.display_name} leaves the PUG",
+          "#{pug.player_slots} remain"
+        ]
+
+        snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+
+        send_msg(
+          snippets.join(MSG_SNIPPET_DELIMITER),
+          e.channel
+        )
+
+        send_msg(end_pug_message, e.channel) unless pug.active?
       end
     end
 
     bot.command :kick do |event, *args|
-      set_pug(event) do |e, pug|
-        if !pug.active?
-          message = "There's no active PUG"
-          return send_and_log_message(message, e.channel)
-        end
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
-        mention = args[0]
-        user_id = mention[3..-2].to_i
-        display_name = e.display_name_for(user_id)
+        args.each do |arg|
+          unless arg.match(/<@!\d+>/)
+            send_msg("#{arg} isn't a valid mention", e.channel)
+            next
+          end
 
-        if !pug.joined_players.include?(user_id)
-          message = "#{display_name} isn't in the PUG"
-          send_and_log_message(message, e.channel)
-        else
-          pug.leave(user_id)
-          message = "#{display_name} is kicked from the PUG | #{pug.player_slots} remain"
-          send_and_log_message(message, e.channel)
+          user_id = arg[3..-2].to_i
+          display_name = e.display_name_for(user_id) || arg
 
-          if pug.empty?
-            message = end_pug(pug)
-            send_and_log_message(message, e.channel)
+          unless pug.joined?(user_id)
+            send_msg("#{display_name} isn't in the PUG", e.channel)
+            next
           end
+
+          pug.leave(user_id)
+
+          snippets = [
+            "#{display_name} is kicked from the PUG",
+            "#{pug.player_slots} remain"
+          ]
+
+          snippets << "#{pug.slots_left} more #{pug.notify_roles}" if pug.slots_left == 1
+
+          send_msg(
+            snippets.join(MSG_SNIPPET_DELIMITER),
+            e.channel
+          )
+
+          break send_msg(end_pug_message, e.channel) unless pug.active?
         end
       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|
-      set_pug(event) do |e, pug|
-        message = if !pug.active?
-                    "There's no active PUG to end"
-                  else
-                    end_pug(pug)
-                  end
-
-        send_and_log_message(message, e.channel)
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+
+        pug.end_pug
+
+        send_msg(end_pug_message, e.channel)
       end
     end
 
     bot.command :notify do |event, *args|
-      set_pug(event) do |e, pug|
+      setup_pug(event) do |e, pug|
         roles = args.join(' ')
         pug.notify_roles = roles
 
-        message = if roles.empty?
-                    'Notification removed'
-                  else
-                    "Notification role set to #{roles}"
-                  end
+        msg = if roles.empty?
+                'Notification removed'
+              else
+                "Notification role set to #{roles}"
+              end
 
-        send_and_log_message(message, e.channel)
+        send_msg(msg, e.channel)
       end
     end
 
@@ -177,26 +221,81 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
-  def set_pug(event)
+  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)
     yield(e, pug)
+    nil # stop discordrb printing return value
   end
 
-  def start_pug(player_slots, mentions)
-    [
+  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!',
-      player_slots,
-      mentions.join(' ')
-    ].join(' | ')
+      pug_teams
+    ].join("\n")
+
+    send_msg(msg, event.channel)
   end
 
-  def end_pug(pug)
-    pug.end_pug
+  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
     'PUG ended'
   end
 
-  def send_and_log_message(message, channel)
+  def no_active_pug_message
+    "There's no active PUG"
+  end
+
+  def send_msg(message, channel)
     channel.send_message(message) && puts(message)
   end
 end