fix: solve RIOT ID string parsing

Author: Bulletdev

app/modules/players/services/riot_sync_service.rb

@@ -237,9 +237,10 @@ def search_riot_id(game_name, tag_line)
     Rails.logger.info("Regional endpoint: #{regional_endpoint}")
 
     # Use whitelisted host to prevent SSRF
-    # Use ERB::Util.url_encode instead of CGI.escape to properly encode spaces as %20 (not +)
-    encoded_game_name = ERB::Util.url_encode(game_name)
-    encoded_tag_line = ERB::Util.url_encode(tag_line)
+    # CGI.escape encodes spaces as '+', which is only valid in query strings, not path segments.
+    # Riot API path params require '%20' for spaces, so we replace '+' after escaping.
+    encoded_game_name = CGI.escape(game_name).gsub('+', '%20')
+    encoded_tag_line = CGI.escape(tag_line).gsub('+', '%20')
 
     Rails.logger.info("Encoded game_name: '#{game_name}' -> '#{encoded_game_name}'")
     Rails.logger.info("Encoded tag_line: '#{tag_line}' -> '#{encoded_tag_line}'")

app/modules/scrims/controllers/lobby_controller.rb

@@ -17,7 +17,7 @@ class LobbyController < Api::V1::BaseController
       def index
         scrims = Scrim.unscoped
                       .eager_load(:organization)
-                      .includes(:opponent_team)
+                      .includes(:opponent_team, organization: :players)
                       .where(scrims: { visibility: 'public' })
                       .where(organizations: { is_public: true })
                       .where('scrims.scheduled_at >= ?', Time.current)
@@ -69,10 +69,28 @@ def serialize_lobby_scrim(scrim)
             region: org.region,
             tier: org.try(:tier),
             public_tagline: org.try(:public_tagline),
-            discord_invite_url: org.try(:discord_invite_url)
+            discord_invite_url: org.try(:discord_invite_url),
+            roster: serialize_org_roster(org)
           }
         }
       end
+
+      # Returns the org's active players sorted by role, already preloaded via includes.
+      # Capped at 10 to keep the response lean.
+      def serialize_org_roster(org)
+        role_sort = %w[top jungle mid adc support]
+        players = org.players.select(&:active?)
+        players.sort_by { |p| [role_sort.index(p.role) || 99, p.summoner_name] }
+               .first(10)
+               .map do |p|
+          {
+            summoner_name: p.summoner_name,
+            role: p.role,
+            tier: p.solo_queue_tier,
+            tier_rank: p.solo_queue_rank
+          }
+        end
+      end
     end
   end
 end