qwtf_discord_bot 5.2.6 → 5.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2adca9fb3f7b4a9f7e78544e5727dd1c93ceb908c25c0fcae46532439f69ceab
-  data.tar.gz: 120b8d090e1ba937d6ed89c1d3b625f7b6bcb40bc1e4774ed9ab473e89a04c26
+  metadata.gz: 287ada88fe7e7e8db0a61816eb5872adf7aa51aae6ceed90d55e446d42222484
+  data.tar.gz: 44b89de85fea1a429a14418d3fd0d5b3aabc7dec291502176a9ab16d5de45d69
 SHA512:
-  metadata.gz: dc26082fafb956166f461d6eb948cd515d8eea35b4cf586dc80b55280128263de6aa01526db469127b0730835843295022f16c6b6b1d417f3ea7711ceebb4d60
-  data.tar.gz: 3f13b345fc9b666927d3a9f8536b25ffd20539ae4c093e93549594a7c9a1aad0b25d530d939dc0512a2439f255fd764140ef6b8c577c1d06619a65478cd77391
+  metadata.gz: 3a3ea4bf9ef15c27795e60610a981948487eb626f65edd34eca71da52b3752f9134574598695ffe870046e9ea4f59e8feaa360ac76bdf3a3abe4a043c5bdcaec
+  data.tar.gz: d06a5a2efacdee2ee0ba62e180d9ee82dcacabc469828459619dc15174851b78aa726fcb35f56c0114eb843afeb83c3f15a2ff4c1c7a74684d3683394ffac746

data/README.md

@@ -86,15 +86,20 @@ This responds to discord messages:
     qwtf-discord-bot pug
 
 This responds to discord messages:
+  - `!status`
   - `!join`
   - `!leave`
-  - `!status`
-  - `!kick <@player>`
   - `!teamsize <no_of_players>`
+  - `!kick <@player>`
   - `!team <team_no>`
   - `!unteam`
+  - `!addmap <map_name>`
+  - `!removemap <map_name>`
+  - `!maps`
+  - `!map <map_name>`
   - `!win <team_no>`
-  - `!notify <@role @role2>`
+  - `!draw`
+  - `!notify <@role>`
   - `!end`
 
 

data/VERSION

@@ -1 +1 @@
-5.2.6
+5.3.4

data/docker-compose.yml

@@ -34,6 +34,7 @@ services:
       - redis
     environment:
       - REDIS_URL=redis://redis
+      - RATINGS_API_URL
     volumes:
       - type: bind
         source: "/home/ubuntu/.config/qwtf_discord_bot/config.yaml"

data/lib/event_decorator.rb

@@ -19,6 +19,10 @@ class EventDecorator
     user.id
   end
 
+  def mention
+    user.mention
+  end
+
   def users
     server.users
   end

data/lib/pug.rb

@@ -27,6 +27,26 @@ class Pug
     end
   end
 
+  def add_maps(maps)
+    redis.sadd(maps_key, maps)
+  end
+
+  def remove_maps(maps)
+    redis.srem(maps_key, maps)
+  end
+
+  def maps
+    redis.smembers(maps_key)
+  end
+
+  def vote(player_id:, map:)
+    redis.sadd(votes_key(map), player_id)
+  end
+
+  def vote_count(map)
+    redis.scard(votes_key(map)).to_i
+  end
+
   def team(number)
     redis.smembers(team_key(number)).map(&:to_i)
   end
@@ -39,6 +59,10 @@ class Pug
     joined_player_count >= maxplayers
   end
 
+  def empty?
+    joined_player_count.zero?
+  end
+
   def joined_player_count
     joined_players.count
   end
@@ -55,6 +79,14 @@ class Pug
     maxplayers - joined_player_count
   end
 
+  def game_map=(map)
+    redis.set([pug_key, 'map'].join(':'), map)
+  end
+
+  def game_map
+    redis.get([pug_key, 'map'].join(':'))
+  end
+
   def notify_roles=(roles)
     redis.set(notify_roles_key, roles)
   end
@@ -73,7 +105,6 @@ class Pug
 
   def leave(player_id)
     leave_teams(player_id)
-    end_pug if empty?
   end
 
   def end_pug
@@ -90,10 +121,6 @@ class Pug
     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) })
@@ -116,10 +143,6 @@ class Pug
     redis.keys([pug_key, 'teams:*'].join(':'))
   end
 
-  def empty?
-    joined_player_count.zero?
-  end
-
   def team_key(team_no)
     [pug_key, 'teams', team_no].join(':')
   end
@@ -128,8 +151,8 @@ class Pug
     [channel_key, 'pug'].join(':')
   end
 
-  def channel_key
-    ['channel', @channel_id].join(':')
+  def maps_key
+    [channel_key, 'maps'].join(':')
   end
 
   def notify_roles_key
@@ -140,6 +163,18 @@ class Pug
     [channel_key, 'teamsize'].join(':')
   end
 
+  def votes_keys
+    redis.keys([pug_key, 'votes:*'].join(':'))
+  end
+
+  def votes_key(map)
+    [channel_key, 'votes', map].join(':')
+  end
+
+  def channel_key
+    ['channel', @channel_id].join(':')
+  end
+
   def redis
     Redis.current
   end

data/lib/qwtf_discord_bot/qwtf_discord_bot_pug.rb

@@ -32,6 +32,7 @@ class QwtfDiscordBotPug # :nodoc:
         send_msg(
           [
             "#{pug.player_slots} joined",
+            "Map: #{pug.game_map}",
             pug_teams_message(pug, e).join("\n")
           ].join("\n"),
           e.channel
@@ -89,12 +90,13 @@ class QwtfDiscordBotPug # :nodoc:
           e.channel
         )
 
-        send_msg(end_pug_message, e.channel) unless pug.active?
+        end_pug(pug, e.channel) if pug.empty?
       end
     end
 
     bot.command :kick do |event, *args|
       setup_pug(event) do |e, pug|
+        return send_msg("Kick who? e.g. `!kick @#{e.display_name}`", e.channel) unless args.any?
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
         args.each do |arg|
@@ -103,7 +105,7 @@ class QwtfDiscordBotPug # :nodoc:
             next
           end
 
-          user_id = arg[3..-2].to_i
+          user_id = mention_to_user_id(arg)
           display_name = e.display_name_for(user_id) || arg
 
           unless pug.joined?(user_id)
@@ -125,30 +127,60 @@ class QwtfDiscordBotPug # :nodoc:
             e.channel
           )
 
-          break send_msg(end_pug_message, e.channel) unless pug.active?
+          break end_pug(pug, e.channel) if pug.empty?
         end
       end
     end
 
     bot.command :team do |event, *args|
       setup_pug(event) do |e, pug|
+        return send_msg("Which team? E.G. `!team 1`", e.channel) unless args.any?
+
         team_no = args[0].to_i
-        return send_msg("Choose a team between 1 and 4", e.channel) unless team_no.between?(1, 4)
+        return send_msg("Choose a team between 0 and 4", e.channel) unless team_no.between?(0, 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)
+        pug_already_full = pug.full?
 
-        join_pug(e, pug) unless pug.joined?(user_id)
-        pug.join_team(team_no: team_no, player_id: user_id)
+        if args.count == 1
+          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)
 
-        send_msg(
-          [
-            "#{e.display_name} joins team #{team_no}",
-            "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
-          ].join(MSG_SNIPPET_DELIMITER), e.channel
-        )
+          join_pug(e, pug) unless pug.joined?(user_id)
+          pug.join_team(team_no: team_no, player_id: user_id)
 
-        start_pug(pug, e) if pug.full?
+          send_msg(
+            [
+              "#{e.display_name} joins team #{team_no}",
+              "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
+            ].join(MSG_SNIPPET_DELIMITER), e.channel
+          )
+        else
+          args[1..-1].each do |mention|
+            unless mention.match(/<@!\d+>/)
+              send_msg("#{arg} isn't a valid mention", e.channel)
+              next
+            end
+
+            user_id = mention_to_user_id(mention)
+            display_name = e.display_name_for(user_id) || arg
+
+            unless pug.joined?(user_id)
+              send_msg("#{display_name} isn't in the PUG", e.channel)
+              next
+            end
+
+            pug.join_team(team_no: team_no, player_id: user_id)
+
+            send_msg(
+              [
+                "#{display_name} joins team #{team_no}",
+                "#{pug.team_player_count(team_no)}/#{pug.teamsize}"
+              ].join(MSG_SNIPPET_DELIMITER), e.channel
+            )
+          end
+        end
+
+        start_pug(pug, e) if !pug_already_full && pug.full?
       end
     end
 
@@ -172,22 +204,64 @@ class QwtfDiscordBotPug # :nodoc:
 
         return send_msg("Not a valid team", e.channel) unless pug.team(winning_team_no).any?
 
-        pug.won_by(winning_team_no)
+        actual_teams = pug.teams.reject! { |k| k == "0" }
+
+        team_results = actual_teams.inject({}) do |teams, (name, player_ids)|
+          players = player_ids.inject({}) do |memo, id|
+            memo.merge({ id => e.display_name_for(id) })
+          end
 
-        winning_team = pug.team(winning_team_no).map do |player_id|
-          e.display_name_for(player_id)
+          result = winning_team_no.to_i == name.to_i ? 1 : -1
+          teams.merge({ name => { players: players, result: result } })
         end
 
-        non_winning_teams = pug.actual_teams.tap { |team| team.delete(winning_team_no) }
+        post_results(
+          {
+            match: {
+              map: pug.game_map,
+              teams: team_results
+            }
+          }.to_json
+        )
+
+        # 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
 
-        losing_players = non_winning_teams.values.flatten.map do |player_id|
-          e.display_name_for(player_id)
+        send_msg("Team #{winning_team_no} wins", e.channel)
+      end
+    end
+
+    bot.command :draw do |event, *args|
+      setup_pug(event) do |e, pug|
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+
+        actual_teams = pug.teams.reject! { |k| k == "0" }
+
+        team_results = actual_teams.inject({}) do |teams, (name, player_ids)|
+          players = player_ids.inject({}) do |memo, id|
+            memo.merge({ id => e.display_name_for(id) })
+          end
+
+        teams.merge({ name => { players: players, result: 0 } })
         end
 
-        send_msg(
-          "#{winning_team.join(', ')} defeat #{losing_players.join(', ')}",
-          e.channel
+        post_results(
+          {
+            match: {
+              map: pug.game_map,
+              teams: team_results
+            }
+          }.to_json
         )
+
+        send_msg("Match drawn", e.channel)
       end
     end
 
@@ -195,9 +269,55 @@ class QwtfDiscordBotPug # :nodoc:
       setup_pug(event) do |e, pug|
         return send_msg(no_active_pug_message, e.channel) unless pug.active?
 
-        pug.end_pug
+        end_pug(pug, e.channel)
+      end
+    end
+
+    bot.command :addmap do |event, *args|
+      setup_pug(event) do |e, pug|
+        maps = args
+        return send_msg("What map? e.g. `!addmap 2fort5r`", e.channel) unless maps.any?
+
+        pug.add_maps(maps)
+        send_msg("#{maps.join(', ')} added to maps", e.channel)
+      end
+    end
+
+    bot.command :removemap do |event, *args|
+      setup_pug(event) do |e, pug|
+        maps = args
+        return send_msg("What map? e.g. `!removemap 2fort5r`", e.channel) unless maps.any?
+
+        pug.remove_maps(maps)
+        send_msg("#{maps.join(', ')} removed from maps", e.channel)
+      end
+    end
+
+    bot.command :maps do |event, *args|
+      setup_pug(event) do |e, pug|
+        maps = pug.maps
+        return send_msg('No maps have been added. `!addmap`', e.channel) unless maps.any?
 
-        send_msg(end_pug_message, e.channel)
+        send_msg(maps.join(', '), e.channel)
+      end
+    end
+
+    bot.command :map do |event, *args|
+      setup_pug(event) do |e, pug|
+        maps = pug.maps
+        return send_msg('No maps have been added. `!addmap`', e.channel) unless maps.any?
+        return send_msg(no_active_pug_message, e.channel) unless pug.active?
+
+        if args.empty?
+          return send_msg('No map has been set for the current PUG', e.channel) unless pug.game_map
+          send_msg("Current map is #{pug.game_map}", e.channel)
+        else
+          game_map = args.first
+          return send_msg("#{game_map} isn't in the map list. `!addmap` to add it.", e.channel) unless maps.include?(game_map)
+
+          pug.game_map = game_map
+          send_msg("Map set to #{game_map}", e.channel)
+        end
       end
     end
 
@@ -221,6 +341,10 @@ class QwtfDiscordBotPug # :nodoc:
 
   private
 
+  def mention_to_user_id(mention)
+    mention[3..-2].to_i
+  end
+
   def join_pug(e, pug)
     pug.join(e.user_id)
 
@@ -287,8 +411,9 @@ class QwtfDiscordBotPug # :nodoc:
     end
   end
 
-  def end_pug_message
-    'PUG ended'
+  def end_pug(pug, channel_id)
+    pug.end_pug
+    send_msg('PUG ended', channel_id)
   end
 
   def no_active_pug_message
@@ -298,4 +423,13 @@ class QwtfDiscordBotPug # :nodoc:
   def send_msg(message, channel)
     channel.send_message(message) && puts(message)
   end
+
+  def post_results(json)
+    uri = URI("#{ENV['RATINGS_API_URL']}matches/")
+    req = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
+    req.body = json
+    Net::HTTP.start(uri.hostname, uri.port) do |http|
+      http.request(req)
+    end
+  end
 end

metadata

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