feat: implement scrims live chat popup

Author: Bulletdev

app/controllers/api/v1/organizations_controller.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Api
+  module V1
+    # Organizations Controller
+    # Allows org admins/owners to update their own organization settings and logo
+    class OrganizationsController < Api::V1::BaseController
+      before_action :set_organization
+      before_action :require_admin_or_owner
+
+      # PATCH /api/v1/organizations/:id
+      def update
+        if @organization.update(org_params)
+          render json: {
+            message: 'Organization updated successfully',
+            organization: OrganizationSerializer.render_as_hash(@organization)
+          }, status: :ok
+        else
+          render_error(
+            message: 'Validation failed',
+            code: 'VALIDATION_ERROR',
+            status: :unprocessable_entity,
+            details: @organization.errors.as_json
+          )
+        end
+      end
+
+      # POST /api/v1/organizations/:id/logo
+      def upload_logo
+        file = params[:file]
+
+        unless file
+          return render_error(
+            message: 'No file provided',
+            code: 'MISSING_FILE',
+            status: :unprocessable_entity
+          )
+        end
+
+        service = S3UploadService.new
+        result = service.upload(file, prefix: "orgs/#{@organization.id}/logo")
+        logo_url = service.signed_url(result[:key], expires_in: 365 * 24 * 3600)
+
+        # Store the key so we can regenerate the URL later; expose via signed URL now
+        @organization.update!(logo_url: logo_url)
+
+        render json: {
+          message: 'Logo uploaded successfully',
+          logo_url: logo_url
+        }, status: :ok
+      rescue ArgumentError => e
+        render_error(
+          message: e.message,
+          code: 'INVALID_FILE',
+          status: :unprocessable_entity
+        )
+      end
+
+      private
+
+      def set_organization
+        @organization = current_organization
+        render_not_found unless @organization
+      end
+
+      def require_admin_or_owner
+        allowed_roles = %w[admin owner]
+        unless allowed_roles.include?(@current_user.role)
+          return render_error(
+            message: 'Only admins and owners can update organization settings',
+            code: 'FORBIDDEN',
+            status: :forbidden
+          )
+        end
+      end
+
+      def org_params
+        params.require(:organization).permit(:name, :region, :public_tagline)
+      end
+    end
+  end
+end

app/controllers/api/v1/profile_controller.rb

@@ -97,7 +97,7 @@ def update_notifications
       private
 
       def profile_params
-        params.require(:user).permit(:full_name, :email, :avatar_url, :timezone, :language)
+        params.require(:user).permit(:full_name, :email, :avatar_url, :timezone, :language, :discord_user_id)
       end
 
       def notification_params

app/models/user.rb

@@ -27,6 +27,10 @@ class User < ApplicationRecord
   validates :role, presence: true, inclusion: { in: Constants::User::ROLES }
   validates :timezone, length: { maximum: 100 }
   validates :language, length: { maximum: 10 }
+  validates :discord_user_id,
+            uniqueness: { allow_blank: true },
+            format: { with: /\A\d{17,20}\z/, message: 'must be a valid Discord user ID (17–20 digits)',
+                      allow_blank: true }
   validates :password,
             length: { minimum: 8, message: 'must be at least 8 characters' },
             format: {

app/modules/core/serializers/user_serializer.rb

@@ -6,8 +6,8 @@ class UserSerializer < Blueprinter::Base
   identifier :id
 
   fields :email, :full_name, :role, :avatar_url, :timezone, :language,
-         :notifications_enabled, :notification_preferences, :last_login_at,
-         :created_at, :updated_at
+         :notifications_enabled, :notification_preferences, :discord_user_id,
+         :last_login_at, :created_at, :updated_at
 
   field :role_display do |user|
     user.full_role_name

app/modules/matchmaking/controllers/scrim_requests_controller.rb

@@ -78,6 +78,7 @@ def create
         )
 
         if request.save
+          DiscordDmService.notify_new_invite(request)
           render_created({ scrim_request: ScrimRequestSerializer.render_as_hash(request) },
                          message: 'Scrim request sent')
         else
@@ -158,8 +159,12 @@ def set_request
 
       def notify_discord(event, scrim_request)
         case event
-        when :accepted then DiscordNotificationService.notify_accepted(scrim_request)
-        when :declined then DiscordNotificationService.notify_declined(scrim_request)
+        when :accepted
+          DiscordNotificationService.notify_accepted(scrim_request)
+          DiscordDmService.notify_accepted(scrim_request)
+        when :declined
+          DiscordNotificationService.notify_declined(scrim_request)
+          DiscordDmService.notify_declined(scrim_request)
         end
       rescue StandardError => e
         Rails.logger.warn "[DiscordNotification] Failed to notify #{event}: #{e.message}"

app/services/discord_dm_service.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+# Sends Discord DMs to ProStaff users via the prostaff-discord-bot webhook.
+#
+# Requires users to have their discord_user_id saved in their profile.
+# Only admins and owners of an org receive notifications.
+#
+# Called for:
+#   - New scrim invite received  → notify target org admins/owners
+#   - Invite accepted            → notify requesting org admins/owners
+#   - Invite declined            → notify requesting org admins/owners
+class DiscordDmService
+  BOT_WEBHOOK_URL    = ENV.fetch('DISCORD_BOT_WEBHOOK_URL', nil)
+  BOT_WEBHOOK_SECRET = ENV.fetch('DISCORD_BOT_WEBHOOK_SECRET', nil)
+
+  GOLD  = 0xC89B3C
+  GREEN = 0x00D364
+  RED   = 0xFF4444
+
+  def self.notify_new_invite(scrim_request)
+    notify_org(
+      org: scrim_request.target_organization,
+      embed: invite_embed(scrim_request)
+    )
+  end
+
+  def self.notify_accepted(scrim_request)
+    notify_org(
+      org: scrim_request.requesting_organization,
+      embed: accepted_embed(scrim_request)
+    )
+  end
+
+  def self.notify_declined(scrim_request)
+    notify_org(
+      org: scrim_request.requesting_organization,
+      embed: declined_embed(scrim_request)
+    )
+  end
+
+  # ── Private ────────────────────────────────────────────────────────────────
+
+  def self.notify_org(org:, embed:)
+    return unless BOT_WEBHOOK_URL.present?
+
+    org.users
+       .where(role: %w[owner admin])
+       .where.not(discord_user_id: [nil, ''])
+       .each do |user|
+         send_dm(discord_user_id: user.discord_user_id, embed: embed)
+       end
+  end
+  private_class_method :notify_org
+
+  def self.send_dm(discord_user_id:, embed:)
+    payload = {
+      secret: BOT_WEBHOOK_SECRET,
+      discord_user_id: discord_user_id,
+      embed: embed
+    }
+
+    conn = Faraday.new do |f|
+      f.request  :json
+      f.adapter  Faraday.default_adapter
+      f.options.timeout = 5
+    end
+
+    conn.post("#{BOT_WEBHOOK_URL}/webhooks/dm", payload)
+  rescue Faraday::Error => e
+    Rails.logger.warn("[DiscordDmService] DM to #{discord_user_id} failed: #{e.message}")
+  end
+  private_class_method :send_dm
+
+  def self.invite_embed(req)
+    proposed = req.proposed_at&.strftime('%d/%m/%Y às %H:%M UTC') || 'A combinar'
+
+    fields = [
+      { name: 'Adversário',    value: req.requesting_organization.name, inline: true },
+      { name: 'Data Proposta', value: proposed,                         inline: true },
+      { name: 'Jogos',         value: req.games_planned.to_s,           inline: true }
+    ]
+    fields << { name: 'Mensagem', value: req.message, inline: false } if req.message.present?
+
+    {
+      title: '🎮 Novo Convite de Scrim',
+      color: GOLD,
+      description: "**#{req.requesting_organization.name}** quer fazer um scrim com vocês!",
+      fields: fields,
+      footer: { text: 'scrims.lol — Acesse a plataforma para aceitar ou recusar' },
+      timestamp: Time.current.iso8601
+    }
+  end
+  private_class_method :invite_embed
+
+  def self.accepted_embed(req)
+    proposed = req.proposed_at&.strftime('%d/%m/%Y às %H:%M UTC') || 'A combinar'
+
+    {
+      title: '✅ Scrim Aceito!',
+      color: GREEN,
+      description: "**#{req.target_organization.name}** aceitou seu pedido de scrim.",
+      fields: [
+        { name: 'Adversário', value: req.target_organization.name, inline: true },
+        { name: 'Data',       value: proposed,                     inline: true },
+        { name: 'Jogos',      value: req.games_planned.to_s,       inline: true }
+      ],
+      footer: { text: 'scrims.lol' },
+      timestamp: Time.current.iso8601
+    }
+  end
+  private_class_method :accepted_embed
+
+  def self.declined_embed(req)
+    {
+      title: '❌ Scrim Recusado',
+      color: RED,
+      description: "**#{req.target_organization.name}** recusou seu pedido de scrim.",
+      fields: [
+        { name: 'Adversário', value: req.target_organization.name, inline: true }
+      ],
+      footer: { text: 'scrims.lol' },
+      timestamp: Time.current.iso8601
+    }
+  end
+  private_class_method :declined_embed
+end

config/routes.rb

@@ -57,6 +57,12 @@
         get 'me', to: '/authentication/controllers/auth#me'
       end
 
+      # Organization settings (for current user's org)
+      scope 'organizations/:id', as: 'organization' do
+        patch '', to: 'organizations#update', as: 'update'
+        post 'logo', to: 'organizations#upload_logo', as: 'logo'
+      end
+
       # Profile -- stays in api/v1
       scope :profile do
         get '', to: 'profile#show'

db/migrate/20260406300001_add_discord_user_id_to_users.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDiscordUserIdToUsers < ActiveRecord::Migration[7.1]
+  def change
+    add_column :users, :discord_user_id, :string
+    add_index  :users, :discord_user_id, unique: true, where: 'discord_user_id IS NOT NULL'
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_04_06_200002) do
+ActiveRecord::Schema[7.2].define(version: 2026_04_06_300001) do
   create_schema "auth"
   create_schema "extensions"
   create_schema "graphql"
@@ -982,6 +982,8 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "supabase_uid"
+    t.string "discord_user_id"
+    t.index ["discord_user_id"], name: "index_users_on_discord_user_id", unique: true, where: "(discord_user_id IS NOT NULL)"
     t.index ["email"], name: "index_users_on_email", unique: true
     t.index ["organization_id"], name: "index_users_on_organization_id"
     t.index ["role"], name: "index_users_on_role"