Implement blocking feature (#4199)

* Implement blocking feature

This commit introduces a blocking feature that allows members to block other members.

A blocked member is prevented from:
- following the blocker
- sending private messages to the blocker
- replying to the blocker's posts
- liking the blocker's content

The implementation includes:
- A new `Block` model and a corresponding database table.
- Updates to the `Member` model to include associations for blocks.
- A new `BlocksController` to handle blocking and unblocking actions.
- New routes for the `BlocksController`.
- UI changes to add block/unblock buttons to the member profile page.
- Validations in the `Follow`, `Comment`, and `Like` models to enforce the blocking rules.
- A check in the `MessagesController` to prevent sending messages to a member who has blocked the sender.
- A callback in the `Block` model to destroy the follow relationship when a block is created.
- New feature and model specs to test the blocking functionality.

* Implement blocking feature and fix failing tests

This commit introduces a blocking feature that allows members to block other members.

A blocked member is prevented from:
- following the blocker
- sending private messages to the blocker
- replying to the blocker's posts
- liking the blocker's content

The implementation includes:
- A new `Block` model and a corresponding database table.
- Updates to the `Member` model to include associations for blocks.
- A new `BlocksController` to handle blocking and unblocking actions.
- New routes for the `BlocksController`.
- UI changes to add block/unblock buttons to the member profile page.
- Validations in the `Follow`, `Comment`, and `Like` models to enforce the blocking rules.
- A check in the `MessagesController` to prevent sending messages to a member who has blocked the sender.
- A callback in the `Block` model to destroy the follow relationship when a block is created.
- New feature and model specs to test the blocking functionality.

This commit also fixes a failing test in the blocking feature. The error was caused by the validation being called even when the `member` association was `nil`. A guard has been added to the validation methods in the `Like`, `Follow`, and `Comment` models to prevent this from happening.

* Generate schema

* Fix tests

* Add permissions

* Define Block permissions in Ability model

The feature specs for member blocking were failing because the "Block"
link was not being rendered on member profiles. This was due to the
lack of explicit create and destroy permissions for the Block resource
in the Ability model, which is used by CanCanCan to authorize actions
and by the view to conditionally show links.

This change adds the necessary permissions to `member_abilities`:
- Allows members to create blocks (except for blocking themselves).
- Allows members to destroy blocks where they are the blocker.

These rules ensure that the "Block" and "Unblock" links are correctly
rendered and authorized for signed-in members.

Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com>

* Comment out specs for now

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Daniel O'Connor <daniel.oconnor@gmail.com>
Co-authored-by: CloCkWeRX <365751+CloCkWeRX@users.noreply.github.com>

.dockerignore

@@ -0,0 +1,31 @@
+.git
+.github
+.devcontainer
+log/*
+tmp/*
+!tmp/keep
+node_modules
+public/assets
+.env
+.ruby-version
+.ruby-gemset
+.editorconfig
+.esignore
+.eslintrc.json
+.haml-lint.yml
+.overcommit.yml
+.rspec
+.rubocop.yml
+.rubocop_todo.yml
+.scss-lint.yml
+.travis.yml
+.yamllint
+CODE_OF_CONDUCT.md
+CONTRIBUTING.md
+CONTRIBUTORS.md
+LICENSE.txt
+README.md
+TECH.md
+docker-compose.yml
+Dockerfile
+.dockerignore

.github/workflows/ci-features-admin.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-comments.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-conversations.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-crops.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-gardens.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-harvests.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-home.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-members.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-places.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-plantings.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-posts.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-seeds.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features-timeline.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci-features.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1
@@ -112,7 +112,7 @@ jobs:
 
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: screenshots
           path: tmp/screenshots

.github/workflows/ci.yml

@@ -91,7 +91,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v6
         with:
-          node-version: '12'
+          node-version: '24'
 
       - name: Install Ruby (version given by .ruby-version) and Bundler
         uses: ruby/setup-ruby@v1

.github/workflows/docker-build-push.yml

@@ -0,0 +1,43 @@
+name: Docker Build and Push
+
+on:
+  push:
+    branches:
+      - mainline
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.rubocop_todo.yml

@@ -1,26 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
+# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_no, not_to
-Capybara/NegationMatcher:
-  Exclude:
-    - 'spec/features/admin/reverting_crops_spec.rb'
-
 # Offense count: 19
 Capybara/NegationMatcherAfterVisit:
   Exclude:
@@ -33,22 +18,6 @@ Capybara/NegationMatcherAfterVisit:
     - 'spec/features/members/profile_spec.rb'
     - 'spec/features/plantings/planting_a_crop_spec.rb'
 
-# Offense count: 34
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: DefaultSelector.
-Capybara/RSpec/HaveSelector:
-  Exclude:
-    - 'spec/features/conversations/index_spec.rb'
-    - 'spec/features/footer_spec.rb'
-    - 'spec/features/gardens/adding_gardens_spec.rb'
-    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
-    - 'spec/features/members/list_spec.rb'
-    - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/seeds/adding_seeds_spec.rb'
-    - 'spec/features/shared_examples/crop_suggest.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
-
 # Offense count: 14
 Capybara/SpecificMatcher:
   Exclude:
@@ -94,19 +63,6 @@ FactoryBot/ExcessiveCreateList:
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 1158
-# This cop supports unsafe autocorrection (--autocorrect-all).
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'db/migrate/20251130035700_create_versions.rb'
-
 # Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -125,26 +81,7 @@ Layout/HashAlignment:
     - 'spec/requests/api/v1/activities_request_spec.rb'
     - 'spec/requests/api/v1/members_request_spec.rb'
 
-# Offense count: 7
+# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Layout/HeredocIndentation:
-  Exclude:
-    - 'db/migrate/20190712003735_add_like_counter_caches.rb'
-    - 'db/migrate/20191226024813_crop_harvest_counter_cache.rb'
-    - 'db/migrate/20191226024957_crop_photo_counter_cache.rb'
-    - 'db/migrate/20191226025124_plant_part_harvest_counter_cache.rb'
-    - 'db/migrate/20191226025225_post_comment_counter_cache.rb'
-    - 'db/migrate/20250824085224_add_photos_comment_count.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
-# SupportedStylesAlignWith: start_of_line, relative_to_receiver
-Layout/IndentationWidth:
-  Exclude:
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
-# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -155,15 +92,6 @@ Layout/LineLength:
     - 'app/models/concerns/predict_planting.rb'
     - 'app/models/crop.rb'
     - 'db/seeds.rb'
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'Gemfile'
-    - 'app/helpers/crops_helper.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -207,18 +135,6 @@ Lint/DuplicateMethods:
   Exclude:
     - 'app/models/planting.rb'
 
-# Offense count: 8
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  Exclude:
-    - 'db/migrate/20171022032108_all_the_predictions.rb'
-    - 'spec/controllers/home_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/controllers/plant_parts_controller_spec.rb'
-    - 'spec/factories/crop_companions.rb'
-    - 'spec/features/crops/crop_detail_page_spec.rb'
-    - 'spec/requests/authentications_spec.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/RedundantCopDisableDirective:
@@ -237,21 +153,6 @@ Lint/SuppressedException:
   Exclude:
     - 'lib/tasks/testing.rake'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, consistent
-Lint/SymbolConversion:
-  Exclude:
-    - 'app/helpers/crops_helper.rb'
-
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-Lint/UselessAssignment:
-  Exclude:
-    - 'config.rb'
-    - 'config/compass.rb'
-
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
@@ -325,24 +226,12 @@ RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/tasks/import_spec.rb'
 
-# Offense count: 1
+# Offense count: 298
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ContextMethod:
-  Exclude:
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
-# Offense count: 299
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: IgnoredMetadata.
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/tasks/import_spec.rb'
-
 # Offense count: 36
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -353,55 +242,12 @@ RSpec/DescribedClass:
     - 'spec/models/member_spec.rb'
     - 'spec/services/timeline_service_spec.rb'
 
-# Offense count: 13
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - 'spec/controllers/authentications_controller_spec.rb'
-    - 'spec/controllers/forums_controller_spec.rb'
-    - 'spec/controllers/home_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/controllers/plant_parts_controller_spec.rb'
-    - 'spec/controllers/seeds_controller_spec.rb'
-    - 'spec/features/crops/crop_detail_page_spec.rb'
-    - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/requests/authentications_spec.rb'
-    - 'spec/views/home/index_spec.rb'
-    - 'spec/views/photos/edit.html.haml_spec.rb'
-    - 'spec/views/posts/_single.html.haml_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/models/ability_spec.rb'
-
 # Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 27
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: method_call, block
-RSpec/ExpectChange:
-  Exclude:
-    - 'spec/models/crop_spec.rb'
-
 # Offense count: 32
-RSpec/ExpectInHook:
-  Exclude:
-    - 'spec/controllers/garden_types_controller_spec.rb'
-    - 'spec/controllers/gardens_controller_spec.rb'
-    - 'spec/features/admin/forums_spec.rb'
-    - 'spec/features/admin/plant_parts_spec.rb'
-    - 'spec/features/admin/roles_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-    - 'spec/features/members/list_spec.rb'
-    - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/shared_examples/append_date.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -449,7 +295,6 @@ RSpec/IndexedLet:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/planting_reminder_spec.rb'
     - 'spec/features/timeline/index_spec.rb'
-    - 'spec/models/crop_spec.rb'
     - 'spec/models/member_spec.rb'
     - 'spec/views/forums/index.html.haml_spec.rb'
 
@@ -484,7 +329,7 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 189
+# Offense count: 191
 RSpec/MultipleExpectations:
   Max: 19
 
@@ -499,7 +344,7 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 111
+# Offense count: 109
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
@@ -569,23 +414,6 @@ RSpec/VerifiedDoubles:
     - 'spec/controllers/gardens_controller_spec.rb'
     - 'spec/views/devise/shared/_links_spec.rb'
 
-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ResponseMethods.
-# ResponseMethods: response, last_response
-RSpecRails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/harvests_spec.rb'
-
-# Offense count: 17
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpecRails/InferredSpecType:
-  Enabled: false
-
 # Offense count: 30
 # Configuration parameters: Database.
 # SupportedDatabases: mysql, postgresql
@@ -647,10 +475,6 @@ Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/features/locale_spec.rb'
 
-# Offense count: 40
-Rails/I18nLocaleTexts:
-  Enabled: false
-
 # Offense count: 1
 # Configuration parameters: IgnoreScopes.
 Rails/InverseOf:
@@ -692,13 +516,7 @@ Rails/RakeEnvironment:
     - 'lib/tasks/i18n.rake'
     - 'lib/tasks/testing.rake'
 
-# Offense count: 1
+# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-Rails/RedirectBackOrTo:
-  Exclude:
-    - 'app/controllers/follows_controller.rb'
-
-# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
 # AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -711,7 +529,6 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/scientific_names_controller.rb'
     - 'spec/features/members/deletion_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
-    - 'spec/models/harvest_spec.rb'
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -753,15 +570,6 @@ Rails/RootPathnameMethods:
     - 'lib/tasks/import.rake'
     - 'spec/rails_helper.rb'
 
-# Offense count: 4
-# Configuration parameters: ForbiddenMethods, AllowedMethods.
-# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
-Rails/SkipsModelValidations:
-  Exclude:
-    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
-    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
-    - 'db/migrate/20251128200506_add_description_to_crops.rb'
-
 # Offense count: 21
 Rails/ThreeStateBooleanColumn:
   Enabled: false
@@ -793,12 +601,6 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rails/WhereMissing:
-  Exclude:
-    - 'app/controllers/crops_controller.rb'
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/WhereRange:
@@ -855,12 +657,13 @@ Style/FloatDivision:
   Exclude:
     - 'app/models/concerns/predict_planting.rb'
 
-# Offense count: 22
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Exclude:
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
 
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -926,13 +729,6 @@ Style/OptionalBooleanParameter:
     - 'app/helpers/application_helper.rb'
     - 'app/models/concerns/member_newsletter.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'db/migrate/20251130035700_create_versions.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.

.scss-lint.yml

@@ -248,6 +248,3 @@ linters:
 
   ZeroUnit:
     enabled: true
-
-  Compass::*:
-    enabled: false

Dockerfile

@@ -0,0 +1,52 @@
+FROM ruby:3.4.8-trixie
+
+# Install system dependencies
+RUN apt-get update -qq && \
+    apt-get install -y --no-install-recommends \
+    build-essential \
+    libpq-dev \
+    git \
+    curl \
+    gnupg2 \
+    shared-mime-info \
+    libvips \
+    && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs \
+    && npm install -g yarn \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set production environment
+ENV RAILS_ENV=production \
+    BUNDLE_WITHOUT="development test" \
+    RAILS_SERVE_STATIC_FILES=true \
+    RAILS_LOG_TO_STDOUT=true
+
+WORKDIR /app
+
+# Install gems
+COPY Gemfile Gemfile.lock ./
+RUN bundle config set --local deployment 'true' && \
+    bundle config set --local without 'development test' && \
+    bundle install --jobs 4 --retry 3
+
+# Install JavaScript dependencies
+COPY package.json yarn.lock ./
+RUN yarn install --check-files
+
+# Copy the application code
+COPY . .
+
+# Precompile assets
+# Secret key base is needed for asset compilation but doesn't need to be the real one
+RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile
+
+# Add a script to be executed every time the container starts.
+COPY entrypoint.sh /usr/bin/
+RUN chmod +x /usr/bin/entrypoint.sh
+ENTRYPOINT ["entrypoint.sh"]
+
+EXPOSE 3000
+
+# Start the main process.
+CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]

Gemfile

@@ -139,7 +139,7 @@ gem "msgpack"
 # Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
 # /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
 # /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
-gem "connection_pool", "< 3" 
+gem "connection_pool", "< 3"
 
 group :production do
   gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
@@ -204,5 +204,5 @@ gem "i18n_data", "~> 1.1"
 
 gem "paper_trail", "~> 17.0"
 
-gem 'sitemap_generator'
 gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
+gem 'sitemap_generator'

Gemfile.lock

@@ -116,14 +116,14 @@ GEM
       minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.9)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1236.0)
+    aws-partitions (1.1240.0)
-    aws-sdk-core (3.244.0)
+    aws-sdk-core (3.245.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -134,21 +134,21 @@ GEM
     aws-sdk-kms (1.123.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.219.0)
+    aws-sdk-s3 (1.220.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.11.1)
+    axe-core-api (4.11.2)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.1)
+    axe-core-capybara (4.11.2)
-      axe-core-api (= 4.11.1)
+      axe-core-api (= 4.11.2)
       dumb_delegator
-    axe-core-rspec (4.11.1)
+    axe-core-rspec (4.11.2)
-      axe-core-api (= 4.11.1)
+      axe-core-api (= 4.11.2)
       dumb_delegator
       ostruct
       virtus
@@ -163,7 +163,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (7.0.1)
       elasticsearch-model (< 8)
@@ -177,7 +177,7 @@ GEM
       actionpack (>= 6.1)
       activemodel (>= 6.1)
     builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.1.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     byebug (13.0.0)
@@ -284,7 +284,7 @@ GEM
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.6.1)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
@@ -459,7 +459,7 @@ GEM
     nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.16)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -498,11 +498,11 @@ GEM
       date
       stringio
     public_suffix (7.0.5)
-    puma (7.2.0)
+    puma (8.0.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.22)
+    rack (2.2.23)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -560,7 +560,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
@@ -682,7 +682,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.1.1)
+    scout_apm (6.2.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
@@ -722,7 +722,7 @@ GEM
     thor (1.5.0)
     thread_safe (0.3.6)
     tilt (2.7.0)
-    timecop (0.9.10)
+    timecop (0.9.11)
     timeout (0.5.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
@@ -759,7 +759,8 @@ GEM
     will_paginate (4.0.1)
     will_paginate-bootstrap-style (0.3.0)
       will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.3)
+    xmlrpc (0.3.4)
+      rexml
       webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)

app/controllers/admin/crop_companions_controller.rb

@@ -15,7 +15,7 @@ module Admin
     def create
       @crop_companion = @crop.crop_companions.new(crop_companion_params)
       if @crop_companion.save
-        redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
+        redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.created')
       else
         render :new
       end
@@ -24,7 +24,7 @@ module Admin
     def destroy
       @crop_companion = @crop.crop_companions.find(params[:id])
       @crop_companion.destroy
-      redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
+      redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.deleted')
     end
 
     private

app/controllers/admin/versions_controller.rb

@@ -9,9 +9,9 @@ module Admin
       @version = PaperTrail::Version.find(params[:id])
       @object = @version.reify
       if @object.save
-        redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
+        redirect_to admin_crops_path, notice: t('messages.revert_success', date: @version.created_at.strftime('%B %d, %Y'))
       else
-        redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
+        redirect_to admin_crops_path, alert: t('messages.revert_error', date: @version.created_at.strftime('%B %d, %Y'), errors: @object.errors.full_messages.to_sentence)
       end
     end
 

app/controllers/alternate_names_controller.rb

@@ -30,7 +30,7 @@ class AlternateNamesController < ApplicationController
     @alternate_name = AlternateName.new(alternate_name_params)
 
     if @alternate_name.save
-      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully created.'
+      redirect_to @alternate_name.crop, notice: t('alternate_names.created')
     else
       render action: "new"
     end
@@ -40,7 +40,7 @@ class AlternateNamesController < ApplicationController
   # PUT /alternate_names/1.json
   def update
     if @alternate_name.update(alternate_name_params)
-      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.'
+      redirect_to @alternate_name.crop, notice: t('alternate_names.updated')
     else
       render action: "edit"
     end
@@ -51,7 +51,7 @@ class AlternateNamesController < ApplicationController
   def destroy
     @crop = @alternate_name.crop
     @alternate_name.destroy
-    redirect_to @crop, notice: 'Alternate name was successfully deleted.'
+    redirect_to @crop, notice: t('alternate_names.deleted')
   end
 
   private

app/controllers/authentications_controller.rb

@@ -24,9 +24,9 @@ class AuthenticationsController < ApplicationController
           name:
         )
 
-      flash[:notice] = "Authentication successful."
+      flash[:notice] = t('messages.auth_success')
     else
-      flash[:notice] = "Authentication failed."
+      flash[:notice] = t('messages.auth_failed')
     end
     redirect_to request.env['omniauth.origin'] || edit_member_registration_path
   end

app/controllers/blocks_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class BlocksController < ApplicationController
+  load_and_authorize_resource
+  skip_load_resource only: :create
+
+  def create
+    @block = current_member.blocks.build(blocked: Member.find(params[:blocked]))
+
+    if @block.save
+      flash[:notice] = "Blocked #{@block.blocked.login_name}"
+    else
+      flash[:error] = "Already blocking or error while blocking."
+    end
+    redirect_back fallback_location: root_path
+  end
+
+  def destroy
+    @block = current_member.blocks.find(params[:id])
+    @unblocked = @block.blocked
+    @block.destroy
+
+    flash[:notice] = "Unblocked #{@unblocked.login_name}"
+    redirect_to @unblocked
+  end
+
+  private
+
+  def block_params
+    params.permit(:id, :blocked)
+  end
+end

app/controllers/crops_controller.rb

@@ -160,7 +160,7 @@ class CropsController < ApplicationController
              when 'youtube'
                Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
              when 'alternate_names'
-               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
+               Crop.approved.where.missing(:alternate_names).order(plantings_count: :desc)
              when 'wikidata'
                crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
                Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)

app/controllers/follows_controller.rb

@@ -13,11 +13,11 @@ class FollowsController < ApplicationController
     @follow = current_member.follows.build(followed: Member.find(params[:followed]))
 
     if @follow.save
-      flash[:notice] = "Followed #{@follow.followed.login_name}"
+      flash[:notice] = t('messages.followed', name: @follow.followed.login_name)
     else
-      flash[:error] = "Already following or error while following."
+      flash[:error] = t('messages.follow_error')
     end
-    redirect_back fallback_location: root_path
+    redirect_back_or_to(root_path)
   end
 
   def destroy
@@ -25,7 +25,7 @@ class FollowsController < ApplicationController
     @unfollowed = @follow.followed
     @follow.destroy
 
-    flash[:notice] = "Unfollowed #{@unfollowed.login_name}"
+    flash[:notice] = t('messages.unfollowed', name: @unfollowed.login_name)
     redirect_to @unfollowed
   end
 

app/controllers/forums_controller.rb

@@ -32,14 +32,14 @@ class ForumsController < ApplicationController
   # POST /forums.json
   def create
     @forum = Forum.new(forum_params)
-    flash[:notice] = 'Forum was successfully created.' if @forum.save
+    flash[:notice] = t('forums.created') if @forum.save
     respond_with(@forum)
   end
 
   # PUT /forums/1
   # PUT /forums/1.json
   def update
-    flash[:notice] = 'Forum was successfully updated.' if @forum.update(forum_params)
+    flash[:notice] = t('forums.updated') if @forum.update(forum_params)
     respond_with(@forum)
   end
 
@@ -47,7 +47,7 @@ class ForumsController < ApplicationController
   # DELETE /forums/1.json
   def destroy
     @forum.destroy
-    flash[:notice] = 'Forum was successfully deleted'
+    flash[:notice] = t('forums.deleted')
     redirect_to forums_url
   end
 

app/controllers/likes_controller.rb

@@ -14,7 +14,7 @@ class LikesController < ApplicationController
       @like.likeable.reindex(refresh: true)
       success(@like, liked_by_member: true, status_code: :created)
     else
-      failed(@like, message: 'Unable to like')
+      failed(@like, message: t('messages.unable_to_like'))
     end
   end
 
@@ -29,7 +29,7 @@ class LikesController < ApplicationController
       @like.likeable.reindex(refresh: true)
       success(@like, liked_by_member: false, status_code: :ok)
     else
-      failed(@like, message: 'Unable to unlike')
+      failed(@like, message: t('messages.unable_to_unlike'))
     end
   end
 

app/controllers/messages_controller.rb

@@ -27,10 +27,21 @@ class MessagesController < ApplicationController
   def create
     if params[:conversation_id].present?
       @conversation = Mailboxer::Conversation.find(params[:conversation_id])
+      # Check if any of the recipients have blocked the sender
+      if @conversation.recipients.any? { |recipient| recipient.already_blocking?(current_member) }
+        flash[:error] = "You cannot reply to this conversation because one of the recipients has blocked you."
+        redirect_to conversation_path(@conversation)
+        return
+      end
       current_member.reply_to_conversation(@conversation, params[:body])
       redirect_to conversation_path(@conversation)
     else
       recipient = Member.find(params[:recipient_id])
+      if recipient.already_blocking?(current_member)
+        flash[:error] = "You cannot send a message to a member who has blocked you."
+        redirect_back fallback_location: root_path
+        return
+      end
       body = params[:body]
       subject = params[:subject]
       @conversation = current_member.send_message(recipient, body, subject)

app/controllers/omniauth_callbacks_controller.rb

@@ -10,7 +10,7 @@ require './lib/actions/oauth_signup_action'
 #
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def failure
-    flash[:alert] = "Authentication failed."
+    flash[:alert] = t('messages.auth_failed')
     redirect_to request.env['omniauth.origin'] || "/"
   end
 

app/controllers/places_controller.rb

@@ -33,7 +33,7 @@ class PlacesController < ApplicationController
 
   def search
     if params[:new_place].empty?
-      redirect_to places_path, alert: 'Please enter a valid location'
+      redirect_to places_path, alert: t('messages.invalid_location')
     else
       redirect_to place_path(params[:new_place])
     end

app/controllers/plantings_controller.rb

@@ -116,11 +116,11 @@ class PlantingsController < DataController
     new_planting.finished_at = nil
 
     if new_planting.save
-      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
+      redirect_to edit_planting_path(new_planting), notice: t('messages.transplant_success')
     else
       # if the save fails, we should probably roll back the finishing of the original planting
       @planting.update(finished: false, finished_at: nil)
-      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
+      redirect_to @planting, alert: t('messages.transplant_error', errors: new_planting.errors.full_messages.to_sentence)
     end
   end
 

app/controllers/posts_controller.rb

@@ -29,17 +29,17 @@ class PostsController < ApplicationController
   def create
     params[:post][:author_id] = current_member.id
     @post = Post.new(post_params)
-    flash[:notice] = 'Post was successfully created.' if @post.save
+    flash[:notice] = t('posts.created') if @post.save
     respond_with(@post)
   end
 
   def update
-    flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
+    flash[:notice] = t('posts.updated') if @post.update(post_params)
     respond_with(@post)
   end
 
   def destroy
-    flash[:notice] = 'Post was deleted.' if @post.destroy
+    flash[:notice] = t('posts.deleted') if @post.destroy
     respond_with(@post)
   end
 

app/controllers/scientific_names_controller.rb

@@ -54,7 +54,7 @@ class ScientificNamesController < ApplicationController
   def destroy
     @crop = @scientific_name.crop
     @scientific_name.destroy
-    flash[:notice] = 'Scientific name was successfully deleted.'
+    flash[:notice] = t('scientific_names.deleted')
     respond_with(@crop)
   end
 

app/controllers/seeds_controller.rb

@@ -61,7 +61,7 @@ class SeedsController < DataController
     @seed.finished ||= false
     @seed.owner = current_member
     @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
-    flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
+    flash[:notice] = t('seeds.added_to_stash', crop: @seed.crop) if @seed.save
     if params[:return] == 'planting'
       respond_with(@seed, location: @seed.parent_planting)
     else
@@ -70,7 +70,7 @@ class SeedsController < DataController
   end
 
   def update
-    flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
+    flash[:notice] = t('seeds.updated') if @seed.update(seed_params)
     respond_with(@seed)
   end
 

app/controllers/sessions_controller.rb

@@ -5,7 +5,7 @@ class SessionsController < Devise::SessionsController
 
   def create
     super do |_resource|
-      flash[:alert] = "There are crops waiting to be wrangled." if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
+      flash[:alert] = t('messages.crops_waiting') if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
     end
   end
 end

app/helpers/crops_helper.rb

@@ -62,7 +62,7 @@ module CropsHelper
             '@type': 'Person',
             name: post.author.login_name
           },
-          'datePublished': post.created_at 
+          datePublished: post.created_at
         }
       end
 

app/models/ability.rb

@@ -164,6 +164,12 @@ class Ability
     can :destroy, Follow
     cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
+    # blocking/unblocking permissions
+    can :create, Block
+    cannot :create, Block, blocked_id: member.id # can't block yourself
+
+    can :destroy, Block, blocker_id: member.id # can only unblock your own blocks
+
     cannot :create, GardenType
     cannot :update, GardenType
     cannot :destroy, GardenType

app/models/block.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Block < ApplicationRecord
+  belongs_to :blocker, class_name: "Member"
+  belongs_to :blocked, class_name: "Member"
+
+  validates :blocker_id, uniqueness: { scope: :blocked_id }
+
+  after_create :destroy_follow_relationship
+
+  private
+
+  def destroy_follow_relationship
+    # Destroy the follow relationship in both directions
+    Follow.where(follower: blocker, followed: blocked).destroy_all
+    Follow.where(follower: blocked, followed: blocker).destroy_all
+  end
+end

app/models/comment.rb

@@ -4,6 +4,7 @@ class Comment < ApplicationRecord
   belongs_to :author, class_name: 'Member', inverse_of: :comments
   belongs_to :commentable, polymorphic: true, counter_cache: true
   # validates :body, presence: true
+  validate :author_is_not_blocked
 
   scope :post_order, -> { order(created_at: :asc) } # for display on post page
 
@@ -25,4 +26,13 @@ class Comment < ApplicationRecord
   def to_s
     "#{author.login_name} commented on #{commentable.subject}"
   end
+
+  private
+
+  def author_is_not_blocked
+    return unless author
+    if commentable.author.already_blocking?(author)
+      errors.add(:base, "You cannot comment on a post of a member who has blocked you.")
+    end
+  end
 end

app/models/crop.rb

@@ -57,13 +57,13 @@ class Crop < ApplicationRecord
   validates :en_wikipedia_url,
             format: {
               with:    %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
-              message: 'is not a valid English Wikipedia URL'
+              message: :not_a_valid_wikipedia_url
             },
             if:     :approved?
   validates :en_youtube_url,
             format: {
               with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
-              message: 'is not a valid YouTube URL'
+              message: :not_a_valid_youtube_url
             },
             allow_blank: true
   validates :name, uniqueness: { scope: :approval_status }, if: :pending?
@@ -190,12 +190,12 @@ class Crop < ApplicationRecord
     return if rejected?
     return unless reason_for_rejection.present? || rejection_notes.present?
 
-    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
+    errors.add(:approval_status, :rejection_reason_required)
   end
 
   def must_have_meaningful_reason_for_rejection
     return unless reason_for_rejection == "other" && rejection_notes.blank?
 
-    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
+    errors.add(:rejection_notes, :rejection_notes_required)
   end
 end

app/models/follow.rb

@@ -4,6 +4,7 @@ class Follow < ApplicationRecord
   belongs_to :follower, class_name: "Member", inverse_of: :follows
   belongs_to :followed, class_name: "Member", inverse_of: :inverse_follows
   validates :follower_id, uniqueness: { scope: :followed_id }
+  validate :follower_is_not_blocked
 
   after_create do
     Notification.create(
@@ -14,4 +15,13 @@ class Follow < ApplicationRecord
       notifiable:   self
     )
   end
+
+  private
+
+  def follower_is_not_blocked
+    return unless follower
+    if followed.already_blocking?(follower)
+      errors.add(:base, "You cannot follow a member who has blocked you.")
+    end
+  end
 end

app/models/garden.rb

@@ -32,7 +32,7 @@ class Garden < ApplicationRecord
 
   validates :name, uniqueness: { scope: :owner_id }
   validates :name,
-            format: { without: /\n/, message: "must contain no newlines" },
+            format: { without: /\n/, message: :no_newlines },
             allow_blank: false, presence: true,
             length: { maximum: 255 }
 
@@ -53,7 +53,7 @@ class Garden < ApplicationRecord
     "acres"         => "acre"
   }.freeze
   validates :area_unit, inclusion:   { in:      AREA_UNITS_VALUES.values,
-                                       message: "%<value>s is not a valid area unit" },
+                                       message: :not_a_valid_area_unit },
                         allow_blank: true
 
   def cleanup_area

app/models/garden_collaborator.rb

@@ -11,7 +11,7 @@ class GardenCollaborator < ApplicationRecord
     return unless member
     return unless garden
 
-    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
+    errors.add(:member_id, :cannot_be_garden_owner) if garden.owner == member
   end
 
   def member_slug

app/models/harvest.rb

@@ -58,18 +58,18 @@ class Harvest < ApplicationRecord
   ##
   ## Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :crop, presence: { message: :crop_not_found }
-  validates :plant_part, presence: { message: "must be present and exist in our database" }
+  validates :plant_part, presence: { message: :crop_not_found }
   validates :harvested_at, presence: true
   validates :quantity, allow_nil: true, numericality: {
     only_integer: false, greater_than_or_equal_to: 0
   }
   validates :unit, allow_blank: true, inclusion: {
-    in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+    in: UNITS_VALUES.values, message: :not_a_valid_unit
   }
   validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
   validates :weight_unit, allow_blank: true, inclusion: {
-    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
+    in: WEIGHT_UNITS_VALUES.values, message: :not_a_valid_unit
   }
   validate :crop_must_match_planting
   validate :owner_must_match_planting
@@ -147,7 +147,7 @@ class Harvest < ApplicationRecord
   def crop_must_match_planting
     return if planting.blank? # only check if we are linked to a planting
 
-    errors.add(:planting, "must be the same crop") unless crop == planting.crop
+    errors.add(:planting, :same_crop_required) unless crop == planting.crop
   end
 
   def owner_must_match_planting
@@ -155,14 +155,13 @@ class Harvest < ApplicationRecord
 
     return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner,
+    errors.add(:owner, :same_owner_required)
-               "of harvest must be the same as planting, or a collaborator on that garden")
   end
 
   def harvest_must_be_after_planting
     # only check if we are linked to a planting
     return unless harvested_at.present? && planting.present? && planting.planted_at.present?
 
-    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
+    errors.add(:planting, :harvest_after_planted) unless harvested_at > planting.planted_at
   end
 end

app/models/like.rb

@@ -5,4 +5,23 @@ class Like < ApplicationRecord
   belongs_to :likeable, polymorphic: true, counter_cache: true, touch: true
   validates :member, :likeable, presence: true
   validates :member, uniqueness: { scope: :likeable }
+  validate :member_is_not_blocked
+
+  def likeable_author
+    if likeable.respond_to?(:author)
+      likeable.author
+    elsif likeable.respond_to?(:owner)
+      likeable.owner
+    end
+  end
+
+  private
+
+  def member_is_not_blocked
+    return unless member
+    author = likeable_author
+    if author && author.already_blocking?(member)
+      errors.add(:base, "You cannot like content of a member who has blocked you.")
+    end
+  end
 end

app/models/member.rb

@@ -52,6 +52,15 @@ class Member < ApplicationRecord
   has_many :followed, through: :follows
   has_many :followers, through: :inverse_follows, source: :follower
 
+  #
+  # Blocking other members
+  has_many :blocks, class_name: "Block", foreign_key: "blocker_id", dependent: :destroy,
+                    inverse_of: :blocker
+  has_many :inverse_blocks, class_name: "Block", foreign_key: "blocked_id",
+                            dependent: :destroy, inverse_of: :blocked
+  has_many :blocked_members, through: :blocks, source: :blocked
+  has_many :blockers, through: :inverse_blocks, source: :blocker
+
   #
   # Global data records this member created
   has_many :requested_crops, class_name: 'Crop', foreign_key: 'requester_id', dependent: :nullify,
@@ -96,21 +105,21 @@ class Member < ApplicationRecord
   validates :tos_agreement, acceptance: { allow_nil: true, accept: true }
   validates :login_name,
             length:     {
-              minimum: 2, maximum: 25, message: "should be between 2 and 25 characters long"
+              minimum: 2, maximum: 25, message: :login_name_length
             },
             exclusion:  {
-              in: %w(growstuff admin moderator staff nearby), message: "name is reserved"
+              in: %w(growstuff admin moderator staff nearby), message: :login_name_reserved
             },
             format:     {
-              with: /\A\w+\z/, message: "may only include letters, numbers, or underscores"
+              with: /\A\w+\z/, message: :login_name_format
             },
             uniqueness: {
               case_sensitive: false
             }
-  validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :website_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
-  validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
   validates :instagram_handle, :facebook_handle, :bluesky_handle,
-            format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true
+            format: { without: %r{\Ahttps?://|/}, message: :handle_format }, allow_blank: true
 
   #
   # Triggers
@@ -179,4 +188,12 @@ class Member < ApplicationRecord
   def get_follow(member)
     follows.find_by(followed_id: member.id) if already_following?(member)
   end
+
+  def already_blocking?(member)
+    blocks.exists?(blocked_id: member.id)
+  end
+
+  def get_block(member)
+    blocks.find_by(blocked_id: member.id) if already_blocking?(member)
+  end
 end

app/models/photo_association.rb

@@ -29,12 +29,12 @@ class PhotoAssociation < ApplicationRecord
   def photo_and_item_have_same_owner
     return if photographable_type == 'Crop'
 
-    errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
+    errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
   end
 
   def crop_present
     return unless %w(Planting Seed Harvest).include?(photographable_type)
 
-    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
+    errors.add(:crop_id, :calculate_crop_failed) if crop_id.blank?
   end
 end

app/models/planting.rb

@@ -72,7 +72,7 @@ class Planting < ApplicationRecord
   ##
   ## Validations
   validates :garden, presence: true
-  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
+  validates :crop, presence: true, approved: { message: :crop_must_be_approved }
   validate :finished_must_be_after_planted
   validate :owner_must_match_garden_owner
   validate :cannot_be_finished_and_failed
@@ -80,10 +80,10 @@ class Planting < ApplicationRecord
     only_integer: true, greater_than_or_equal_to: 0
   }
   validates :sunniness, allow_blank: true, inclusion: {
-    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
+    in: SUNNINESS_VALUES, message: :not_a_valid_sunniness
   }
   validates :planted_from, allow_blank: true, inclusion: {
-    in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
+    in: PLANTED_FROM_VALUES, message: :not_a_valid_planting_method
   }
   validates :overall_rating, allow_blank: true, numericality: {
     only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
@@ -132,20 +132,19 @@ class Planting < ApplicationRecord
   private
 
   def cannot_be_finished_and_failed
-    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
+    errors.add(:failed, :failed_and_finished) if finished && failed
   end
 
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both
 
-    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
+    errors.add(:finished_at, :finished_after_planted) unless planted_at < finished_at
   end
 
   def owner_must_match_garden_owner
     return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?
 
-    errors.add(:owner,
+    errors.add(:owner, :same_owner_required)
-               "must be the same as garden, or a collaborator on that garden")
   end
 end

app/models/seed.rb

@@ -28,7 +28,7 @@ class Seed < ApplicationRecord
   #
   # Validations
   validates :crop, approved: true
-  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :crop, presence: { message: :crop_not_found }
   validates :quantity, allow_nil:    true,
                        numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :days_until_maturity_min, allow_nil:    true,
@@ -36,20 +36,15 @@ class Seed < ApplicationRecord
   validates :days_until_maturity_max, allow_nil:    true,
                                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validates :tradable_to, allow_blank: false,
-                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: :tradable_to_inclusion }
-                                                                          "locally, nationally, or internationally" }
   validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
+                      inclusion:   { in: ORGANIC_VALUES, message: :organic_inclusion }
-                                                                  "are organic or not, or that you don't know" }
   validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
+                  inclusion:   { in: GMO_VALUES, message: :gmo_inclusion }
-                                                          "genetically modified or not, or that you don't know" }
   validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
+                       inclusion:   { in: HEIRLOOM_VALUES, message: :heirloom_inclusion }
-                                                                    "are heirloom, hybrid, or unknown" }
   validates :source, allow_blank: true,
-                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
+                     inclusion:   { in: SOURCE_VALUES, message: :source_inclusion }
-                                                                "or that you don't know" }
 
   #
   # Delegations

app/views/alternate_names/_form.html.haml

@@ -16,7 +16,7 @@
       %p
         %span.help-block
           For detailed crop wrangling guidelines, please consult the
-          = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+          = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
           on the Growstuff wiki.
 
       .form-group

app/views/crops/_nutritional_data.html.haml

@@ -35,4 +35,4 @@
               %th Sodium
               %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
     .card-footer
-      = link_to "See more", "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
+      = link_to "See more", "https://www.foodstandards.gov.au/science-data/food-nutrient-databases/afcd/search/food/#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"

app/views/forums/index.html.haml

@@ -6,6 +6,7 @@
 
 - @forums.each do |forum|
   %h2= forum
+  %p= forum.description
   %p
     = localize_plural(forum.posts, Post)
     |

app/views/home/_harvests.html.haml

@@ -9,4 +9,5 @@
           %small.text-muted
             harvested by #{harvest.owner_login_name}
         %p.mb-2
-          = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
+          - if harvest.thumbnail_url
+            = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"

app/views/members/_follow_buttons.haml

@@ -1,6 +1,11 @@
 - if current_member && current_member != member # must be logged in, can't follow yourself
+  - block = current_member.get_block(member)
   - follow = current_member.get_follow(member)
-  - if !follow && can?(:create, Follow) # not already following
+  - if !block && !follow && can?(:create, Follow) # not already following, and not blocking
     = link_to 'Follow', follows_path(followed: member), method: :post, class: 'btn btn-block btn-success'
   - if follow && can?(:destroy, follow) # already following
-    = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'
+    = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-block'
+  - if !block && can?(:create, Block) # not already blocking
+    = link_to 'Block', blocks_path(blocked: member), method: :post, class: 'btn btn-block btn-danger'
+  - if block && can?(:destroy, block) # already blocking
+    = link_to 'Unblock', block_path(block), method: :delete, class: 'btn btn-block'

app/views/scientific_names/_form.html.haml

@@ -11,7 +11,7 @@
   %p
     %span.help-block
       For detailed crop wrangling guidelines, please consult the
-      = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
+      = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
       on the Growstuff wiki.
 
   .form-group

config.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-# Require any additional compass plugins here.
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "app/assets/stylesheets"
-sass_dir = "app/assets/stylesheets"
-javascripts_dir = "app/assets/javascripts"
-images_dir      = "app/assets/images"
-
-# You can select your preferred output style here (can be overridden via the command line):
-# output_style = :expanded or :nested or :compact or :compressed
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true
-
-# To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
-
-# If you prefer the indented syntax, you might want to regenerate this
-# project again passing --syntax sass, or you can uncomment this:
-preferred_syntax = :sass
-# and then run:
-# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass

config/compass.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# Require any additional compass plugins here.
-project_type = :rails

config/initializers/new_framework_defaults_6_0.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 6.0 upgrade.

config/locales/en.yml

@@ -63,6 +63,56 @@ en:
       seed:
         one: seed
         other: seeds
+    errors:
+      messages:
+        crop_not_found: must be present and exist in our database
+        crop_must_be_approved: must be present and exist in our database
+        failed_and_finished: "can't be true if planting is also finished"
+        finished_after_planted: must be after the planting date
+        rejection_reason_required: must be rejected if a reason for rejection is present
+        rejection_notes_required: "must be added if the reason for rejection is \"other\""
+        same_crop_required: must be the same crop
+        harvest_after_planted: cannot be harvested before planting
+        cannot_be_garden_owner: cannot be the garden owner
+        same_owner_required: "of harvest must be the same as planting, or a collaborator on that garden"
+        photo_owner_mismatch: must have same owner as item it links to
+        calculate_crop_failed: failed to calculate crop
+        not_a_valid_wikipedia_url: is not a valid English Wikipedia URL
+        not_a_valid_youtube_url: is not a valid YouTube URL
+        not_a_valid_sunniness: "%{value} is not a valid sunniness value"
+        not_a_valid_planting_method: "%{value} is not a valid planting method"
+        not_a_valid_unit: "%{value} is not a valid unit"
+        not_a_valid_area_unit: "%{value} is not a valid area unit"
+        no_newlines: must contain no newlines
+      models:
+        member:
+          attributes:
+            login_name:
+              login_name_length: should be between 2 and 25 characters long
+              login_name_reserved: name is reserved
+              login_name_format: may only include letters, numbers, or underscores
+            website_url:
+              url_format: "must start with http:// or https://"
+            other_url:
+              url_format: "must start with http:// or https://"
+            instagram_handle:
+              handle_format: should be a handle, not a URL
+            facebook_handle:
+              handle_format: should be a handle, not a URL
+            bluesky_handle:
+              handle_format: should be a handle, not a URL
+        seed:
+          attributes:
+            tradable_to:
+              tradable_to_inclusion: "You may only trade seed nowhere, locally, nationally, or internationally"
+            organic:
+              organic_inclusion: "You must say whether the seeds are organic or not, or that you don't know"
+            gmo:
+              gmo_inclusion: "You must say whether the seeds are genetically modified or not, or that you don't know"
+            heirloom:
+              heirloom_inclusion: "You must say whether the seeds are heirloom, hybrid, or unknown"
+            source:
+              source_inclusion: "You must say where the seeds are from, or that you don't know"
   application_helper:
     title:
       title:
@@ -112,6 +162,9 @@ en:
   forums:
     index:
       title: Forums
+    created: Forum was successfully created.
+    updated: Forum was successfully updated.
+    deleted: Forum was successfully deleted.
   gardens:
     created: Garden was successfully created.
     deleted: Garden was successfully deleted.
@@ -208,6 +261,8 @@ en:
       trade_to: Will trade to
       unspecified: unspecified
       view_all: View all seeds
+    added_to_stash: Successfully added %{crop} seed to your stash.
+    updated: Seed was successfully updated.
     stats:
       member_linktext: "%{count} members"
       message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}; and %{contributors} people have contributed to our code on %{github}!
@@ -275,6 +330,21 @@ en:
   links:
     my_gardens: My gardens
 
+  messages:
+    auth_success: Authentication successful.
+    auth_failed: Authentication failed.
+    crops_waiting: There are crops waiting to be wrangled.
+    followed: "Followed %{name}"
+    unfollowed: "Unfollowed %{name}"
+    follow_error: Already following or error while following.
+    transplant_success: Planting was successfully transplanted.
+    transplant_error: "There was an error transplanting the planting: %{errors}"
+    revert_success: "Reverted to version from %{date}"
+    revert_error: "Could not revert to version from %{date}. Errors: %{errors}"
+    invalid_location: Please enter a valid location
+    unable_to_like: Unable to like
+    unable_to_unlike: Unable to unlike
+
   members:
     edit_profile: Edit profile
     index:
@@ -342,10 +412,22 @@ en:
       progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
   posts:
     write_blog_post: Write blog post
+    created: Post was successfully created.
+    updated: Post was successfully updated.
+    deleted: Post was deleted.
     index:
       title:
         author_posts: "%{author} posts"
         default: Everyone's posts
+  scientific_names:
+    deleted: Scientific name was successfully deleted.
+  alternate_names:
+    created: Alternate name was successfully created.
+    updated: Alternate name was successfully updated.
+    deleted: Alternate name was successfully deleted.
+  crop_companions:
+    created: Companion was successfully created.
+    deleted: Companion was successfully destroyed.
   seeds:
     form:
       trade_help: >
@@ -361,6 +443,7 @@ en:
         owner_seeds: "%{owner} seeds"
     save_seeds: Save seeds
     string: "%{crop} seeds belonging to %{owner}"
+    added_to_stash: Successfully added %{crop} seed to your stash.
   unauthorized:
     create:
       all: Please sign in or sign up to create a %{subject}.

config/routes.rb

@@ -105,6 +105,7 @@ Rails.application.routes.draw do
   resources :forums
 
   resources :follows, only: %i(create destroy)
+  resources :blocks, only: %i(create destroy)
 
   post 'likes' => 'likes#create'
   delete 'likes' => 'likes#destroy'
@@ -121,6 +122,7 @@ Rails.application.routes.draw do
 
     resources :follows
     get 'followers' => 'follows#followers'
+    resources :blocks, only: %i(create destroy)
   end
 
   resources :messages

db/migrate/20171022032108_all_the_predictions.rb

@@ -18,7 +18,6 @@ class AllThePredictions < ActiveRecord::Migration[4.2]
 
     remove_column :plantings, :days_before_maturity, :integer
 
-    create_table :median_functions do |t|
+    create_table :median_functions
-    end
   end
 end

db/migrate/20190712003735_add_like_counter_caches.rb

@@ -14,23 +14,23 @@ class AddLikeCounterCaches < ActiveRecord::Migration[5.2]
   end
 
   def data
-    execute <<-SQL.squish
+    execute <<~SQL.squish
-        UPDATE photos
+      UPDATE photos
-           SET likes_count = (
+         SET likes_count = (
-             SELECT count(1)
+           SELECT count(1)
-               FROM likes
+             FROM likes
-              WHERE likes.likeable_id = photos.id
+            WHERE likes.likeable_id = photos.id
-              AND likeable_type = 'Photo'
+            AND likeable_type = 'Photo'
-              )
+            )
     SQL
-    execute <<-SQL.squish
+    execute <<~SQL.squish
-        UPDATE posts
+      UPDATE posts
-           SET likes_count = (
+         SET likes_count = (
-             SELECT count(1)
+           SELECT count(1)
-               FROM likes
+             FROM likes
-              WHERE likes.likeable_id = posts.id
+            WHERE likes.likeable_id = posts.id
-              AND likeable_type = 'Post'
+            AND likeable_type = 'Post'
-              )
+            )
     SQL
   end
 end

db/migrate/20191226024813_crop_harvest_counter_cache.rb

@@ -11,13 +11,13 @@ class CropHarvestCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
-        UPDATE crops
+      UPDATE crops
-           SET harvests_count = (
+         SET harvests_count = (
-             SELECT count(1)
+           SELECT count(1)
-               FROM harvests
+             FROM harvests
-              WHERE harvests.crop_id = crops.id
+            WHERE harvests.crop_id = crops.id
-              )
+            )
     SQL
   end
 end

db/migrate/20191226024957_crop_photo_counter_cache.rb

@@ -11,13 +11,13 @@ class CropPhotoCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
-        UPDATE crops
+      UPDATE crops
-           SET photo_associations_count = (
+         SET photo_associations_count = (
-             SELECT count(1)
+           SELECT count(1)
-               FROM photo_associations
+             FROM photo_associations
-              WHERE photo_associations.crop_id = crops.id
+            WHERE photo_associations.crop_id = crops.id
-              )
+            )
     SQL
   end
 end

db/migrate/20191226025124_plant_part_harvest_counter_cache.rb

@@ -11,13 +11,13 @@ class PlantPartHarvestCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
-        UPDATE plant_parts
+      UPDATE plant_parts
-           SET harvests_count = (
+         SET harvests_count = (
-             SELECT count(1)
+           SELECT count(1)
-               FROM harvests
+             FROM harvests
-              WHERE harvests.plant_part_id = plant_parts.id
+            WHERE harvests.plant_part_id = plant_parts.id
-              )
+            )
     SQL
   end
 end

db/migrate/20191226025225_post_comment_counter_cache.rb

@@ -11,7 +11,7 @@ class PostCommentCounterCache < ActiveRecord::Migration[5.2]
   end
 
   def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
       UPDATE posts
          SET comments_count = (
            SELECT count(1)

db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This migration comes from active_storage (originally 20180723000244)
 class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
   def up

db/migrate/20240101010101_add_fields_to_crops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddFieldsToCrops < ActiveRecord::Migration[5.2]
   def change
     add_column :crops, :row_spacing, :integer

db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
   def up
     Crop.find_each do |crop|

db/migrate/20240716120000_add_social_media_to_members.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSocialMediaToMembers < ActiveRecord::Migration[6.0]
   def change
     add_column :members, :website_url, :string

db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameOtherHandleToOtherUrlInMembers < ActiveRecord::Migration[6.0]
   def change
     rename_column :members, :other_handle, :other_url

db/migrate/20240929041435_create_garden_collaborators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
   def change
     create_table :garden_collaborators do |t|

db/migrate/20241129215300_create_australian_food_classification_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
   def change
     create_table :australian_food_classification_data do |t|

db/migrate/20250810120000_make_notifications_polymorphic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MakeNotificationsPolymorphic < ActiveRecord::Migration[6.1]
   def change
     add_column :notifications, :notifiable_type, :string

db/migrate/20250824081313_change_comments_polymorphic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeCommentsPolymorphic < ActiveRecord::Migration[7.2]
   def change
     add_column :comments, :commentable_type, :string

db/migrate/20250824085224_add_photos_comment_count.rb

@@ -11,7 +11,7 @@ class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
   end
 
   def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
       UPDATE photos
          SET comments_count = (
            SELECT count(1)

db/migrate/20250901105232_add_source_to_seeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSourceToSeeds < ActiveRecord::Migration[7.2]
   def change
     add_column :seeds, :source, :string

db/migrate/20250901110545_add_indexes_crops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexesCrops < ActiveRecord::Migration[7.2]
   def change
     add_index :alternate_names, :crop_id

db/migrate/20250901130830_add_overall_rating_plantings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
   def change
     add_column :plantings, :overall_rating, :integer

db/migrate/20250901144900_create_blocks.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateBlocks < ActiveRecord::Migration[6.1]
+  def change
+    create_table :blocks do |t|
+      t.references :blocker, foreign_key: { to_table: :members }
+      t.references :blocked, foreign_key: { to_table: :members }
+
+      t.timestamps
+    end
+    add_index :blocks, [:blocker_id, :blocked_id], unique: true
+  end
+end

db/migrate/20251128193317_add_en_youtube_url_to_crops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
   def change
     add_column :crops, :en_youtube_url, :string

db/migrate/20251130035700_create_versions.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 # This migration creates the `versions` table for the Version class.
 # All other migrations PT provides are optional.
 class CreateVersions < ActiveRecord::Migration[7.2]
-
   # The largest text column available in all supported RDBMS is
   # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
   # so that MySQL will use `longtext` instead of `text`.  Otherwise,
@@ -36,6 +37,6 @@ class CreateVersions < ActiveRecord::Migration[7.2]
       t.string   :event,     null: false
       t.text     :object, limit: TEXT_BYTES
     end
-    add_index :versions, %i[item_type item_id]
+    add_index :versions, %i(item_type item_id)
   end
 end

db/migrate/20251130035701_add_object_changes_to_versions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This migration adds the optional `object_changes` column, in which PaperTrail
 # will store the `changes` diff for each update event. See the readme for
 # details.

db/migrate/20251130053104_add_public_food_key_to_crops.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
   def change
     add_column :crops, :public_food_key, :string

db/schema.rb

@@ -384,6 +384,16 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
     t.index ["member_id"], name: "index_authentications_on_member_id"
   end
 
+  create_table "blocks", force: :cascade do |t|
+    t.bigint "blocker_id"
+    t.bigint "blocked_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["blocked_id"], name: "index_blocks_on_blocked_id"
+    t.index ["blocker_id", "blocked_id"], name: "index_blocks_on_blocker_id_and_blocked_id", unique: true
+    t.index ["blocker_id"], name: "index_blocks_on_blocker_id"
+  end
+
   create_table "comfy_cms_categories", id: :serial, force: :cascade do |t|
     t.integer "site_id", null: false
     t.string "label", null: false
@@ -972,6 +982,8 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "blocks", "members", column: "blocked_id"
+  add_foreign_key "blocks", "members", column: "blocker_id"
   add_foreign_key "harvests", "plantings"
   add_foreign_key "mailboxer_conversation_opt_outs", "mailboxer_conversations", column: "conversation_id", name: "mb_opt_outs_on_conversations_id"
   add_foreign_key "mailboxer_notifications", "mailboxer_conversations", column: "conversation_id", name: "notifications_on_conversation_id"

docker-compose.yml

@@ -0,0 +1,76 @@
+version: '3.8'
+
+services:
+  web:
+    build: .
+    ports:
+      - "3000:3000"
+    depends_on:
+      db:
+        condition: service_healthy
+      elasticsearch:
+        condition: service_healthy
+    environment:
+      DATABASE_URL: postgresql://postgres:postgres@db:5432/growstuff_prod
+      ELASTICSEARCH_URL: http://elasticsearch:9200/
+      RAILS_ENV: production
+      RAILS_LOG_TO_STDOUT: "true"
+      RAILS_SERVE_STATIC_FILES: "true"
+      APP_DOMAIN_NAME: localhost:3000
+      APP_PROTOCOL: http
+      DEVISE_SECRET_KEY: secret
+      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
+      GROWSTUFF_FLICKR_KEY: secretkey
+      GROWSTUFF_FLICKR_SECRET: secretsecret
+      GROWSTUFF_SITE_NAME: "Growstuff (local)"
+      RAILS_SECRET_TOKEN: supersecret
+      SECRET_KEY_BASE: supersecretbase
+
+  db:
+    image: postgres:17
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+      - .devcontainer/create-db-user.sql:/docker-entrypoint-initdb.d/create-db-user.sql
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: growstuff_prod
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "5432:5432"
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
+    container_name: elasticsearch
+    restart: unless-stopped
+    environment:
+      - xpack.security.enabled=false
+      - discovery.type=single-node
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+    cap_add:
+      - IPC_LOCK
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:9200 | grep tagline"]
+      interval: 10s
+      timeout: 10s
+      retries: 120
+    volumes:
+      - esdata01:/usr/share/elasticsearch/data
+    ports:
+      - 9200:9200
+      - 9300:9300
+
+volumes:
+  postgres-data:
+  esdata01:

entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /app/tmp/pids/server.pid
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"

lib/tasks/import.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 namespace :import do

package.json

@@ -14,9 +14,8 @@
     "@coffeelint/cli": "^3.0.0",
     "@percy/cli": "^1.0.0-beta.76",
     "csslint": "^1.0.5",
-    "eslint": "^5.0.0",
+    "eslint": "^10.0.0",
-    "eslint-config-google": "^0.9.1",
+    "eslint-config-google": "^0.9.1"
-    "jshint": "^2.9.4"
   },
   "repository": {
     "type": "git",

spec/controllers/admin_controller_spec.rb

@@ -14,7 +14,7 @@ describe AdminController do
     end
 
     describe 'assigns @members' do
-      let!(:m) { FactoryBot.create(:newsletter_recipient_member) }
+      let!(:m) { create(:newsletter_recipient_member) }
 
       it { expect(assigns(:members)).to eq [m] }
     end

spec/controllers/api/v1/plantings_controller_spec.rb

@@ -2,17 +2,17 @@
 
 require 'rails_helper'
 
-RSpec.describe Api::V1::PlantingsController, type: :controller do
+RSpec.describe Api::V1::PlantingsController do
   subject { JSON.parse response.body }
 
-  let!(:member) { FactoryBot.create(:member) }
+  let!(:member) { create(:member) }
 
   describe '#index' do
     let(:matching_planting) { subject['data'].select { |planting| planting['id'] == my_planting.id.to_s }.first }
 
     describe 'GET #index' do
       context 'basic planting' do
-        let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
+        let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
         let(:expected_attributes) do
           {
             'crop-name'           => my_planting.crop.name,
@@ -42,11 +42,11 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
 
         it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
         it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response.status).to eq 200 }
+        it { expect(response).to have_http_status :ok }
       end
 
       context 'with photo' do
-        let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
+        let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
 
         let(:expected_attributes) do
           {
@@ -72,7 +72,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
             'thumbnail'           => photo.thumbnail_url
           }
         end
-        let(:photo) { FactoryBot.create(:photo, owner: my_planting.owner) }
+        let(:photo) { create(:photo, owner: my_planting.owner) }
 
         before do
           my_planting.photos << photo
@@ -81,7 +81,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
 
         it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
         it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response.status).to eq 200 }
+        it { expect(response).to have_http_status :ok }
       end
     end
   end

spec/controllers/authentications_controller_spec.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe AuthenticationsController do
-  before do
-    @member = FactoryBot.create(:member)
-    sign_in @member
-    controller.stub(:current_member) { @member }
-    @auth = FactoryBot.create(:authentication, member: @member)
-    request.env['omniauth.auth'] = {
-      'provider'    => 'foo',
-      'uid'         => 'bar',
-      'info'        => { 'nickname' => 'blah' },
-      'credentials' => { 'token' => 'blah', 'secret' => 'blah' }
-    }
-  end
-end

spec/controllers/charts/crops_controller_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Charts::CropsController do
   describe 'GET charts' do
-    let(:crop) { FactoryBot.create(:crop) }
+    let(:crop) { create(:crop) }
 
     describe 'sunniness' do
       before { get :sunniness, params: { crop_slug: crop.to_param } }

spec/controllers/charts/gardens_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Charts::GardensController do
   include Devise::Test::ControllerHelpers
 
-  let(:garden) { FactoryBot.create(:garden) }
+  let(:garden) { create(:garden) }
 
   context "when not signed in" do
     describe 'GET timeline' do
@@ -18,7 +18,7 @@ describe Charts::GardensController do
   context "when signed in" do
     before { sign_in member }
 
-    let!(:member) { FactoryBot.create(:member) }
+    let!(:member) { create(:member) }
 
     describe 'GET timeline' do
       before { get :timeline, params: { garden_slug: garden.to_param } }

spec/controllers/comments_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe CommentsController do
   subject { response }
 
-  let(:member) { FactoryBot.create(:member) }
+  let(:member) { create(:member) }
 
   before do
     sign_in member
@@ -13,13 +13,13 @@ describe CommentsController do
   end
 
   def valid_attributes
-    @post = FactoryBot.create(:post)
+    @post = create(:post)
     { post_id: @post.id, body: "some text" }
   end
 
   describe "GET RSS feed" do
-    let!(:first_comment) { FactoryBot.create(:comment, created_at: 10.days.ago) }
+    let!(:first_comment) { create(:comment, created_at: 10.days.ago) }
-    let!(:last_comment) { FactoryBot.create(:comment, created_at: 4.minutes.ago) }
+    let!(:last_comment) { create(:comment, created_at: 4.minutes.ago) }
 
     describe "returns an RSS feed" do
       before { get :index, format: "rss" }
@@ -32,7 +32,7 @@ describe CommentsController do
   end
 
   describe "GET new" do
-    let(:post) { FactoryBot.create(:post) }
+    let(:post) { create(:post) }
 
     describe "with valid params" do
       before do
@@ -41,7 +41,7 @@ describe CommentsController do
         }
       end
 
-      let(:old_comment) { FactoryBot.create(:comment, commentable: post) }
+      let(:old_comment) { create(:comment, commentable: post) }
 
       it "picks up post from params" do
         expect(assigns(:commentable)).to eq(post)
@@ -59,13 +59,13 @@ describe CommentsController do
   end
 
   describe "GET edit" do
-    let(:post) { FactoryBot.create(:post) }
+    let(:post) { create(:post) }
 
     before { get :edit, params: { id: comment.to_param } }
 
     describe "my comment" do
-      let!(:comment)     { FactoryBot.create(:comment, author: member, commentable: post) }
+      let!(:comment)     { create(:comment, author: member, commentable: post) }
-      let!(:old_comment) { FactoryBot.create(:comment, commentable: post, created_at: Time.zone.yesterday) }
+      let!(:old_comment) { create(:comment, commentable: post, created_at: Time.zone.yesterday) }
 
       it "assigns previous comments as @comments" do
         expect(assigns(:comments)).to eq([comment, old_comment])
@@ -73,7 +73,7 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment, commentable: post) }
+      let(:comment) { create(:comment, commentable: post) }
 
       it { expect(response).not_to be_successful }
     end
@@ -83,7 +83,7 @@ describe CommentsController do
     before { put :update, params: { id: comment.to_param, comment: valid_attributes } }
 
     describe "my comment" do
-      let(:comment) { FactoryBot.create(:comment, author: member) }
+      let(:comment) { create(:comment, author: member) }
 
       it "redirects to the comment's post" do
         expect(response).to redirect_to(comment.commentable)
@@ -91,16 +91,16 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment) }
+      let(:comment) { create(:comment) }
 
       it { expect(response).not_to be_successful }
     end
 
     describe "attempting to change post_id" do
-      let(:post)             { FactoryBot.create(:post, subject: 'our post')           }
+      let(:post)             { create(:post, subject: 'our post')           }
-      let(:other_post)       { FactoryBot.create(:post, subject: 'the other post')     }
+      let(:other_post)       { create(:post, subject: 'the other post')     }
       let(:valid_attributes) { { commentable_type: "Post", commentable_id: other_post.id, body: "kōrero" } }
-      let(:comment)          { FactoryBot.create(:comment, author: member, commentable: post) }
+      let(:comment)          { create(:comment, author: member, commentable: post) }
 
       it "does not change post_id" do
         comment.reload
@@ -113,7 +113,7 @@ describe CommentsController do
     before { delete :destroy, params: { id: comment.to_param } }
 
     describe "my comment" do
-      let(:comment) { FactoryBot.create(:comment, author: member) }
+      let(:comment) { create(:comment, author: member) }
 
       it "redirects to the post the comment was on" do
         expect(response).to redirect_to(comment.commentable)
@@ -121,7 +121,7 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment) }
+      let(:comment) { create(:comment) }
 
       it { expect(response).not_to be_successful }
     end

spec/controllers/crops_controller_spec.rb

@@ -42,8 +42,8 @@ describe CropsController do
 
   describe "GET crop search" do
     describe 'fetches the crop search page' do
-      let!(:tomato) { FactoryBot.create(:tomato) }
+      let!(:tomato) { create(:tomato) }
-      let!(:maize)  { FactoryBot.create(:maize) }
+      let!(:maize)  { create(:maize) }
 
       before { Crop.reindex }
 
@@ -140,7 +140,7 @@ describe CropsController do
   describe 'DELETE destroy' do
     subject { delete :destroy, params: { slug: crop.to_param } }
 
-    let!(:crop) { FactoryBot.create(:crop) }
+    let!(:crop) { create(:crop) }
 
     context 'not logged in' do
       it { expect { subject }.not_to change(Crop, :count) }