Merge branch 'main' into codex/add-block-and-report-system

Signed-off-by: Robert Smith <[email protected]>

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -13,9 +13,9 @@ jobs:
           - ruby: '3.4.4'
             rails: '7.1.5.1'
             allowed_failure: false   # ✅ required
-          - ruby: '3.4.4'
-            rails: '7.2'
-            allowed_failure: true    # ⚠️ allowed to fail
+          # - ruby: '3.4.4'
+          #   rails: '7.2'
+          #   allowed_failure: true    # ⚠️ allowed to fail
           - ruby: '3.4.4'
             rails: '8.0'
             allowed_failure: true    # ⚠️ allowed to fail

AGENTS.md

@@ -1,5 +1,7 @@
 # AGENTS.md
 
+Instructions for GitHub Copilot and other automated contributors working in this repository.
+
 ## Project
 - Ruby: 3.4.4 (installed via rbenv in setup)
 - Rails: 7.1
@@ -13,18 +15,17 @@
 - Databases:
   - development: `community_engine_development`
   - test: `community_engine_test`
-- Use `DATABASE_URL` to connect (overrides fallback host in database.yml).
+- Use `DATABASE_URL` to connect (overrides fallback host in `config/database.yml`).
 
 ## Commands
-- Run tests: `bin/ci`  
+- **Tests:** `bin/ci`
   (Equivalent: `cd spec/dummy && bundle exec rspec`)
-- Lint: `bundle exec rubocop`
-- Security: `bundle exec brakeman -q -w2` and `bundle exec bundler-audit --update`
+- **Lint:** `bundle exec rubocop`
+- **Security:** `bundle exec brakeman -q -w2` and `bundle exec bundler-audit --update`
+- **Style:** `bin/codex_style_guard`
 
 ## Conventions
 - Make incremental changes with passing tests.
 - Avoid introducing new external services in tests; stub where possible.
-
-## Code Style
-- Always run `bin/codex_style_guard` before proposing a patch.
-- If RuboCop reports offenses after autocorrect, update the changes until it passes.
+- If RuboCop reports offenses after autocorrect, update and rerun until clean.
+- Keep commit messages and PR descriptions concise and informative.

Gemfile.lock

@@ -167,19 +167,19 @@ GEM
       unf
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1139.0)
-    aws-sdk-core (3.228.0)
+    aws-partitions (1.1142.0)
+    aws-sdk-core (3.229.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.109.0)
+    aws-sdk-kms (1.110.0)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.195.0)
+    aws-sdk-s3 (1.196.1)
       aws-sdk-core (~> 3, >= 3.228.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -658,7 +658,7 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.79.1)
+    rubocop (1.79.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

app/controllers/better_together/messages_controller.rb

@@ -35,7 +35,8 @@ def notify_participants(message)
       recipients = message.conversation.participants.where.not(id: message.sender_id)
 
       # Pass the array of recipients to the notification
-      BetterTogether::NewMessageNotifier.with(record: message).deliver_later(recipients)
+      BetterTogether::NewMessageNotifier.with(record: message,
+                                              conversation_id: message.conversation_id).deliver_later(recipients)
     end
 
     def broadcast_to_recipients(message, recipients)

app/controllers/better_together/metrics/search_queries_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  module Metrics
+    class SearchQueriesController < ApplicationController # rubocop:todo Style/Documentation
+      def create
+        query = params[:query]
+        results_count = params[:results_count]
+        locale = I18n.locale.to_s
+
+        if query.blank? || results_count.blank?
+          render json: { error: I18n.t('metrics.search_queries.invalid_parameters') },
+                 status: :unprocessable_entity and return
+        end
+
+        BetterTogether::Metrics::TrackSearchQueryJob.perform_later(query, results_count.to_i, locale)
+
+        render json: { success: true }, status: :ok
+      end
+    end
+  end
+end

app/controllers/better_together/people_controller.rb

@@ -75,7 +75,7 @@ def set_resource_instance
 
     def person_params
       params.require(:person).permit(
-        :name, :description, :profile_image, :slug, :locale,
+        :name, :description, :profile_image, :slug, :locale, :notify_by_email,
         :profile_image, :cover_image, :remove_profile_image, :remove_cover_image,
         *resource_class.permitted_attributes
       )

app/controllers/better_together/posts_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  # CRUD for BetterTogether::Post
+  class PostsController < FriendlyResourceController
+    protected
+
+    def resource_class
+      ::BetterTogether::Post
+    end
+
+    def resource_params
+      super.tap do |attrs|
+        attrs[:creator_id] = helpers.current_person&.id if action_name == 'create'
+      end
+    end
+  end
+end

app/controllers/better_together/search_controller.rb

@@ -18,6 +18,12 @@ def search # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             o['text']
           end
         end.flatten
+
+        BetterTogether::Metrics::TrackSearchQueryJob.perform_later(
+          @query,
+          search_results.length,
+          I18n.locale.to_s
+        )
       end
 
       # Use Kaminari for pagination

app/jobs/better_together/metrics/track_search_query_job.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  module Metrics
+    class TrackSearchQueryJob < MetricsJob # rubocop:todo Style/Documentation
+      def perform(query, results_count, locale)
+        BetterTogether::Metrics::SearchQuery.create!(
+          query: query,
+          results_count: results_count,
+          locale: locale,
+          searched_at: Time.current
+        )
+      end
+    end
+  end
+end

app/models/better_together/metrics/search_query.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module BetterTogether
+  module Metrics
+    class SearchQuery < ApplicationRecord # rubocop:todo Style/Documentation
+      validates :query, presence: true
+      validates :results_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+      validates :locale, presence: true, inclusion: { in: I18n.available_locales.map(&:to_s) }
+      validates :searched_at, presence: true
+    end
+  end
+end