Bump json from 2.21.1 to 2.21.2 (#4730 )

Bumps [json](https://github.com/ruby/json) from 2.21.1 to 2.21.2. - [Release notes](https://github.com/ruby/json/releases) - [Changelog](https://github.com/ruby/json/blob/master/CHANGES.md) - [Commits](https://github.com/ruby/json/compare/v2.21.1...v2.21.2) --- updated-dependencies: - dependency-name: json dependency-version: 2.21.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bump js-yaml from 4.3.0 to 4.3.1 (#4729 )
2026-09-08 12:06:59 -04:00 · 2026-08-09 22:31:00 +09:30 · 2026-08-08 13:33:52 +09:30 · 2026-08-07 21:22:32 +09:30 · 2026-08-07 21:22:12 +09:30 · 2026-08-05 18:41:52 +09:30
352 changed files with 4776 additions and 3401 deletions
@@ -1,7 +1,7 @@
 FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie

 # Install Rails
-RUN gem install rails:7.0.8
+RUN gem install rails:8.0.5

 # Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
 # The value is a comma-separated list of allowed domains
@@ -0,0 +1,30 @@
+.git
+.github
+.devcontainer
+log/*
+tmp/*
+!tmp/keep
+node_modules
+public/assets
+.env
+.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
@@ -0,0 +1 @@
+ko_fi: jennyscottthompson
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -74,7 +74,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -6,7 +6,7 @@ jobs:
  contributors:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
      - name: Install ruby version specified in .ruby-version
        uses: ruby/setup-ruby@v1
        with:
@@ -53,7 +53,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7

      - name: Configure sysctl limits
        run: |
@@ -76,7 +76,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v5
+        uses: actions/cache@v6
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -89,7 +89,7 @@ jobs:
          sudo apt-get -y install libpq-dev google-chrome-stable

      - name: Install NodeJS
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
        with:
          node-version: '24'

@@ -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@v7
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v4.6.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ghcr.io/${{ github.repository }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
@@ -1,48 +1,31 @@
 # 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-05-02 06:53:56 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
+# Offense count: 407
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
+Capybara/RSpec/HaveContent:
+  Enabled: false

-# Offense count: 19
-Capybara/NegationMatcherAfterVisit:
+# Offense count: 21
+Capybara/RSpec/NegationMatcherAfterVisit:
  Exclude:
    - 'spec/features/admin/reverting_crops_spec.rb'
    - 'spec/features/crops/crop_detail_page_spec.rb'
    - 'spec/features/crops/crop_wranglers_spec.rb'
    - 'spec/features/gardens/gardens_spec.rb'
+    - 'spec/features/members/blocking_spec.rb'
    - 'spec/features/members/deletion_spec.rb'
    - 'spec/features/members/following_spec.rb'
    - '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:
+Capybara/RSpec/SpecificMatcher:
  Exclude:
    - 'spec/features/footer_spec.rb'
    - 'spec/features/gardens/adding_gardens_spec.rb'
@@ -51,7 +34,7 @@ Capybara/SpecificMatcher:
    - 'spec/features/seeds/adding_seeds_spec.rb'

 # Offense count: 1
-Capybara/VisibilityMatcher:
+Capybara/RSpec/VisibilityMatcher:
  Exclude:
    - 'spec/features/shared_examples/crop_suggest.rb'

@@ -86,12 +69,13 @@ 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).
+Layout/EmptyLines:
+  Exclude:
+    - 'config/environments/production.rb'

-# Offense count: 312
+# Offense count: 311
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -99,10 +83,17 @@ FactoryBot/SyntaxMethods:
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Layout/HashAlignment:
  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/crops_helper.rb'
+    - 'app/models/concerns/search_harvests.rb'
+    - 'app/models/concerns/search_plantings.rb'
+    - 'app/models/crop.rb'
+    - 'config/sitemap.rb'
+    - 'lib/tasks/import.rake'
    - 'spec/requests/api/v1/activities_request_spec.rb'
    - 'spec/requests/api/v1/members_request_spec.rb'

-# Offense count: 6
+# Offense count: 8
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -110,10 +101,20 @@ Layout/LineLength:
  Exclude:
    - 'Gemfile'
    - 'app/controllers/admin/versions_controller.rb'
+    - 'app/controllers/crops_controller.rb'
    - 'app/models/concerns/predict_planting.rb'
    - 'app/models/crop.rb'
    - 'db/seeds.rb'
-    - 'spec/requests/api/v1/activities_request_spec.rb'
+    - 'lib/tasks/members.rake'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'app/models/activity.rb'
+    - 'app/models/concerns/predict_harvest.rb'

 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -121,23 +122,15 @@ Lint/AmbiguousOperatorPrecedence:
  Exclude:
    - 'app/controllers/activities_controller.rb'

-# Offense count: 4
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
  Exclude:
-    - 'app/models/concerns/search_activities.rb'
    - 'app/models/concerns/search_harvests.rb'
    - 'app/models/concerns/search_plantings.rb'
    - 'db/seeds.rb'

-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowSafeAssignment.
-Lint/AssignmentInCondition:
-  Exclude:
-    - 'app/helpers/crops_helper.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
@@ -157,18 +150,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:
@@ -187,27 +168,12 @@ 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:
    - 'app/controllers/members_controller.rb'

-# Offense count: 61
+# Offense count: 65
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
  Max: 295
@@ -229,12 +195,12 @@ Metrics/CollectionLiteralLength:
  Exclude:
    - 'lib/tasks/import.rake'

-# Offense count: 10
+# Offense count: 11
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
  Max: 32

-# Offense count: 82
+# Offense count: 83
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
  Max: 296
@@ -244,7 +210,7 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
  Max: 144

-# Offense count: 8
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
  Max: 32
@@ -258,6 +224,16 @@ Naming/PredicateMethod:
    - 'app/models/concerns/finishable.rb'
    - 'app/models/seed.rb'

+# Offense count: 1
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicatePrefix:
+  Exclude:
+    - 'app/models/member.rb'
+
 # Offense count: 3
 RSpec/AnyInstance:
  Exclude:
@@ -270,89 +246,54 @@ RSpec/BeEq:
  Exclude:
    - 'spec/requests/api/v1/activities_request_spec.rb'

-# Offense count: 1
+# Offense count: 2
 RSpec/BeforeAfterAll:
  Exclude:
    - 'spec/tasks/import_spec.rb'
+    - 'spec/tasks/members_spec.rb'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/ContextMethod:
-  Exclude:
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
-# Offense count: 299
+# Offense count: 311
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
  Enabled: false

-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
  Exclude:
-    - 'spec/tasks/import_spec.rb'
+    - 'spec/models/harvest_prediction_spec.rb'
+    - 'spec/tasks/members_spec.rb'

-# Offense count: 36
+# Offense count: 37
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
 # SupportedStyles: described_class, explicit
 RSpec/DescribedClass:
  Exclude:
+    - 'spec/mailers/harvest_reminder_mailer_spec.rb'
    - 'spec/models/like_spec.rb'
    - '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'
+    - 'spec/controllers/crops_controller_spec.rb'

-# Offense count: 146
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/EmptyLineAfterFinalLet:
+  Exclude:
+    - 'spec/controllers/crops_controller_spec.rb'
+
+# Offense count: 161
 # 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).
 # Configuration parameters: EnforcedStyle.
@@ -387,28 +328,18 @@ RSpec/IncludeExamples:
    - 'spec/views/photos/show.html.haml_spec.rb'
    - 'spec/views/seeds/index.rss.haml_spec.rb'

-# Offense count: 37
+# Offense count: 2
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
  Exclude:
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/plantings_controller_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-    - 'spec/features/members/list_spec.rb'
-    - 'spec/features/members/profile_spec.rb'
-    - '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'
+    - 'spec/models/activity_spec.rb'

-# Offense count: 719
+# Offense count: 711
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
  Enabled: false

-# Offense count: 41
+# Offense count: 43
 RSpec/LetSetup:
  Enabled: false

@@ -423,7 +354,7 @@ RSpec/MessageChain:
  Exclude:
    - 'spec/models/member_spec.rb'

-# Offense count: 23
+# Offense count: 65
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -434,11 +365,11 @@ RSpec/MultipleDescribes:
  Exclude:
    - 'spec/features/crops/crop_wranglers_spec.rb'

-# Offense count: 189
+# Offense count: 235
 RSpec/MultipleExpectations:
  Max: 19

-# Offense count: 166
+# Offense count: 171
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
  Max: 16
@@ -449,24 +380,35 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NamedSubject:
  Enabled: false

-# Offense count: 111
+# Offense count: 112
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
  Max: 6

-# Offense count: 407
+# Offense count: 366
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
  Enabled: false

-# Offense count: 4
+# Offense count: 9
 RSpec/PendingWithoutReason:
  Exclude:
+    - 'spec/features/members/blocking_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
    - 'spec/features/seeds/misc_seeds_spec.rb'
    - 'spec/features/unsubscribing_spec.rb'
+    - 'spec/models/ability_spec.rb'
    - 'spec/requests/api/v1/gardens_request_spec.rb'

+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
+# SupportedStyles: inflected, explicit
+RSpec/PredicateMatcher:
+  Exclude:
+    - 'spec/tasks/members_spec.rb'
+
 # Offense count: 2
 RSpec/RepeatedDescription:
  Exclude:
@@ -491,18 +433,18 @@ RSpec/ScatteredSetup:
    - 'spec/features/percy/percy_spec.rb'
    - 'spec/features/plantings/prediction_spec.rb'

-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
  Exclude:
    - 'spec/controllers/member_controller_spec.rb'
+    - 'spec/mailers/harvest_reminder_mailer_spec.rb'

-# Offense count: 3
+# Offense count: 2
 RSpec/StubbedMock:
  Exclude:
-    - 'spec/controllers/garden_types_controller_spec.rb'
-    - 'spec/controllers/gardens_controller_spec.rb'
+    - 'spec/controllers/photos_controller_spec.rb'
    - 'spec/models/member_spec.rb'

 # Offense count: 1
@@ -519,22 +461,12 @@ 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
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
 RSpecRails/InferredSpecType:
-  Enabled: false
+  Exclude:
+    - 'spec/mailers/harvest_reminder_mailer_spec.rb'

 # Offense count: 30
 # Configuration parameters: Database.
@@ -592,14 +524,24 @@ Rails/HasManyOrHasOneDependent:
    - 'app/models/crop.rb'
    - 'app/models/member.rb'

+# Offense count: 7
+Rails/HelperInstanceVariable:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+    - 'app/helpers/plantings_helper.rb'
+
 # Offense count: 1
 Rails/I18nLocaleAssignment:
  Exclude:
    - 'spec/features/locale_spec.rb'

-# Offense count: 40
+# Offense count: 5
 Rails/I18nLocaleTexts:
-  Enabled: false
+  Exclude:
+    - 'app/controllers/blocks_controller.rb'
+    - 'app/controllers/comments_controller.rb'
+    - 'app/controllers/messages_controller.rb'
+    - 'config/initializers/comfortable_mexican_sofa.rb'

 # Offense count: 1
 # Configuration parameters: IgnoreScopes.
@@ -614,6 +556,12 @@ Rails/LexicallyScopedActionFilter:
    - 'app/controllers/data_controller.rb'
    - 'app/controllers/registrations_controller.rb'

+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Rails/OrderArguments:
+  Exclude:
+    - 'app/models/activity.rb'
+
 # Offense count: 2
 Rails/OutputSafety:
  Exclude:
@@ -642,7 +590,7 @@ Rails/RakeEnvironment:
    - 'lib/tasks/i18n.rake'
    - 'lib/tasks/testing.rake'

-# Offense count: 9
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
 # AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -655,7 +603,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).
@@ -697,15 +644,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
@@ -737,12 +675,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:
@@ -756,7 +688,7 @@ Rake/MethodDefinitionInTask:
  Exclude:
    - 'lib/tasks/growstuff.rake'

-# Offense count: 4
+# Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
@@ -765,10 +697,17 @@ Rake/MethodDefinitionInTask:
 Style/ClassAndModuleChildren:
  Exclude:
    - 'app/controllers/admin/crops_controller.rb'
+    - 'config/initializers/rack_attack.rb'
    - 'lib/actions/oauth_signup_action.rb'
    - 'lib/haml/filters/escaped_markdown.rb'
    - 'lib/haml/filters/growstuff_markdown.rb'

+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/CollectionQuerying:
+  Exclude:
+    - 'app/models/member.rb'
+
 # Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CommentedKeyword:
@@ -799,12 +738,14 @@ Style/FloatDivision:
  Exclude:
    - 'app/models/concerns/predict_planting.rb'

-# Offense count: 22
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Exclude:
+    - 'db/migrate/20260429132911_add_send_harvest_reminder_to_members.rb'
+    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'

 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -819,11 +760,14 @@ Style/IdenticalConditionalBranches:
  Exclude:
    - 'lib/actions/oauth_signup_action.rb'

-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MapIntoArray:
+# Offense count: 4
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
  Exclude:
    - 'app/helpers/crops_helper.rb'
+    - 'app/models/concerns/predict_planting.rb'
+    - 'config/initializers/rack_attack.rb'
+    - 'lib/tasks/growstuff.rake'

 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -870,13 +814,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.
@@ -884,6 +821,13 @@ Style/RedundantArgument:
  Exclude:
    - 'app/helpers/application_helper.rb'

+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantBegin:
+  Exclude:
+    - 'app/models/concerns/predict_harvest.rb'
+    - 'app/models/harvest.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SafeForConstants.
@@ -1 +1 @@
-3.4.8
+3.4.9
@@ -248,6 +248,3 @@ linters:

  ZeroUnit:
    enabled: true
-
-  Compass::*:
-    enabled: false
@@ -0,0 +1,52 @@
+FROM ruby:3.4.9-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 .ruby-version ./
+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"]
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 # Match ruby version in .ruby-version
 ruby File.read('.ruby-version')

-gem 'rails', '~> 7.2.0'
+gem 'rails', '~> 8.0.0'

 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
@@ -116,6 +116,8 @@ gem 'xmlrpc' # fixes rake error - can be removed if not needed later

 gem 'puma'

+gem 'rack-attack'
+
 gem 'loofah', '>= 2.19.1'
 gem 'rack-protection', '>= 2.0.1'

@@ -204,5 +206,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'
@@ -33,49 +33,46 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actioncable (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionmailbox (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activestorage (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      mail (>= 2.8.0)
-    actionmailer (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionmailer (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      actionview (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (7.2.3.1)
-      actionview (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    actionpack (8.0.5.1)
+      actionview (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.3)
+      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
      useragent (~> 0.16)
-    actiontext (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actiontext (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activestorage (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionview (8.0.5.1)
+      activesupport (= 8.0.5.1)
      builder (~> 3.1)
-      cgi
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
@@ -89,22 +86,22 @@ GEM
    active_utils (3.6.0)
      activesupport (>= 4.2)
      i18n
-    activejob (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activejob (8.0.5.1)
+      activesupport (= 8.0.5.1)
      globalid (>= 0.3.6)
-    activemodel (7.2.3.1)
-      activesupport (= 7.2.3.1)
-    activerecord (7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activemodel (8.0.5.1)
+      activesupport (= 8.0.5.1)
+    activerecord (8.0.5.1)
+      activemodel (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      timeout (>= 0.4.0)
-    activestorage (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activestorage (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      marcel (~> 1.0)
-    activesupport (7.2.3.1)
+    activesupport (8.0.5.1)
      base64
      benchmark (>= 0.3)
      bigdecimal
@@ -113,17 +110,18 @@ GEM
      drb
      i18n (>= 1.6, < 2)
      logger (>= 1.4.2)
-      minitest (>= 5.1, < 6)
+      minitest (>= 5.1)
      securerandom (>= 0.3)
      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
    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.1240.0)
-    aws-sdk-core (3.245.0)
+    aws-partitions (1.1277.0)
+    aws-sdk-core (3.254.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
@@ -131,31 +129,21 @@ GEM
      bigdecimal
      jmespath (~> 1, >= 1.6.1)
      logger
-    aws-sdk-kms (1.123.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-kms (1.130.0)
+      aws-sdk-core (~> 3, >= 3.254.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-s3 (1.228.2)
+      aws-sdk-core (~> 3, >= 3.254.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.2)
+    axe-core-api (4.12.0)
      dumb_delegator
-      ostruct
-      virtus
-    axe-core-capybara (4.11.2)
-      axe-core-api (= 4.11.2)
-      dumb_delegator
-    axe-core-rspec (4.11.2)
-      axe-core-api (= 4.11.2)
-      dumb_delegator
-      ostruct
-      virtus
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
+    axe-core-capybara (4.12.0)
+      axe-core-api (= 4.12.0)
+    axe-core-rspec (4.12.0)
+      axe-core-api (= 4.12.0)
    base64 (0.3.0)
    bcrypt (3.1.22)
    benchmark (0.5.0)
@@ -177,7 +165,7 @@ GEM
      actionpack (>= 6.1)
      activemodel (>= 6.1)
    builder (3.3.0)
-    bullet (8.1.1)
+    bullet (8.1.3)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    byebug (13.0.0)
@@ -198,20 +186,17 @@ GEM
    capybara-screenshot (1.0.27)
      capybara (>= 1.0, < 4)
      launchy
-    carrierwave (3.0.7)
+    carrierwave (3.1.3)
      activemodel (>= 6.0.0)
      activesupport (>= 6.0.0)
      addressable (~> 2.6)
      image_processing (~> 1.1)
      marcel (~> 1.0.0)
      ssrf_filter (~> 1.0)
-    cgi (0.5.1)
    chartkick (5.2.1)
    childprocess (5.1.0)
      logger (~> 1.5)
    coderay (1.1.3)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
    coffee-rails (5.0.0)
      coffee-script (>= 2.2.0)
      railties (>= 5.2.0)
@@ -221,9 +206,9 @@ GEM
    coffee-script-source (1.12.2)
    comfy_bootstrap_form (4.0.9)
      rails (>= 5.0.0)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.8)
    connection_pool (2.5.5)
-    crass (1.0.6)
+    crass (1.0.7)
    crowdin-api (1.12.0)
      open-uri (>= 0.1.0, < 0.2.0)
      rest-client (>= 2.0.0, < 2.2.0)
@@ -236,7 +221,7 @@ GEM
    csv_shaper (1.4.0)
      activesupport (>= 3.0.0)
      csv
-    dalli (5.0.2)
+    dalli (5.0.6)
      logger
    database_cleaner (2.1.0)
      database_cleaner-active_record (>= 2, < 3)
@@ -245,17 +230,15 @@ GEM
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
    date (3.5.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    devise (5.0.3)
+    devise (5.0.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 7.0)
      responders
      warden (~> 1.2.3)
    diff-lcs (1.6.2)
-    discard (1.4.0)
-      activerecord (>= 4.2, < 9.0)
+    discard (2.0.0)
+      activerecord (>= 7.0, < 9.0)
    domain_name (0.6.20240107)
    dotenv (3.2.0)
    dotenv-rails (3.2.0)
@@ -276,9 +259,9 @@ GEM
    elasticsearch-transport (7.0.0)
      faraday
      multi_json
-    erb (6.0.2)
+    erb (6.0.6)
    erubi (1.13.1)
-    execjs (2.10.0)
+    execjs (2.10.1)
    factory_bot (6.5.5)
      activesupport (>= 6.1.0)
    factory_bot_rails (6.5.1)
@@ -286,18 +269,18 @@ GEM
      railties (>= 6.1.0)
    faker (3.8.0)
      i18n (>= 1.8.11, < 2)
-    faraday (2.14.1)
+    faraday (2.14.3)
      faraday-net_http (>= 2.0, < 3.5)
      json
      logger
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.4)
      net-http (~> 0.5)
-    ffi (1.17.3)
-    ffi (1.17.3-x86_64-linux-gnu)
+    ffi (1.17.4)
+    ffi (1.17.4-x86_64-linux-gnu)
    flickraw (0.9.10)
    font-awesome-sass (5.15.1)
      sassc (>= 1.11)
-    friendly_id (5.6.0)
+    friendly_id (5.7.0)
      activerecord (>= 4.0.0)
    gbifrb (0.2.0)
    geocoder (1.8.6)
@@ -308,21 +291,21 @@ GEM
      multi_json (>= 1.9.0)
    gli (2.22.2)
      ostruct
-    globalid (1.3.0)
+    globalid (1.4.0)
      activesupport (>= 6.1)
    gravatar-ultimate (2.0.0)
      activesupport (>= 2.3.14)
      rack
-    haml (7.2.0)
+    haml (7.2.2)
      temple (>= 0.8.2)
      thor
      tilt
-    haml-rails (3.0.0)
+    haml-rails (3.1.0)
      actionpack (>= 5.1)
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.73.0)
+    haml_lint (0.76.0)
      haml (>= 5.0)
      parallel (>= 1.10)
      rainbow
@@ -339,7 +322,7 @@ GEM
      csv
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
-    i18n (1.14.8)
+    i18n (1.15.2)
      concurrent-ruby (~> 1.0)
    i18n-tasks (1.1.2)
      activesupport (>= 4.0.2)
@@ -355,18 +338,17 @@ GEM
      terminal-table (>= 1.5.1)
    i18n_data (1.1.0)
      simple_po_parser (~> 1.1)
-    icalendar (2.12.2)
+    icalendar (2.12.4)
      base64
      ice_cube (~> 0.16)
      logger
      ostruct
    ice_cube (0.17.0)
-    ice_nine (0.11.2)
-    image_processing (1.12.2)
-      mini_magick (>= 4.9.5, < 5)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
      ruby-vips (>= 2.0.17, < 3)
    io-console (0.8.2)
-    irb (1.17.0)
+    irb (1.18.0)
      pp (>= 0.6.0)
      prism (>= 1.3.0)
      rdoc (>= 4.0.0)
@@ -376,7 +358,7 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.19.3)
+    json (2.21.2)
    json-schema (6.2.0)
      addressable (~> 2.8)
      bigdecimal (>= 3.1, < 5)
@@ -388,7 +370,7 @@ GEM
    kgio (2.11.4)
    kramdown (2.4.0)
      rexml
-    language_server-protocol (3.17.0.5)
+    language_server-protocol (3.17.0.6)
    launchy (3.1.1)
      addressable (~> 2.8)
      childprocess (~> 5.0)
@@ -404,10 +386,10 @@ GEM
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    logger (1.7.0)
-    loofah (2.25.1)
+    loofah (2.25.2)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
-    mail (2.9.0)
+    mail (2.9.1)
      logger
      mini_mime (>= 0.1.1)
      net-imap
@@ -432,17 +414,20 @@ GEM
    mimemagic (0.4.3)
      nokogiri (~> 1)
      rake
-    mini_magick (4.12.0)
+    mini_magick (5.3.1)
+      logger
    mini_mime (1.1.5)
    mini_portile2 (2.8.9)
-    minitest (5.27.0)
-    msgpack (1.8.0)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    msgpack (1.8.4)
    multi_json (1.19.1)
    multi_xml (0.8.1)
      bigdecimal (>= 3.1, < 5)
    net-http (0.9.1)
      uri (>= 0.11.1)
-    net-imap (0.5.12)
+    net-imap (0.6.6)
      date
      net-protocol
    net-pop (0.1.2)
@@ -453,13 +438,13 @@ GEM
      net-protocol
    netrc (0.11.0)
    nio4r (2.7.5)
-    nokogiri (1.19.2)
+    nokogiri (1.19.4)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (0.5.6)
-    oj (3.17.0)
+    oj (3.17.5)
      bigdecimal (>= 3.0)
      ostruct (>= 0.2)
    omniauth (1.9.2)
@@ -477,16 +462,16 @@ GEM
    paper_trail (17.0.0)
      activerecord (>= 7.1)
      request_store (~> 1.4)
-    parallel (2.0.1)
-    parser (3.3.11.1)
+    parallel (2.1.0)
+    parser (3.3.12.0)
      ast (~> 2.4.1)
      racc
-    percy-capybara (5.0.0)
+    percy-capybara (5.0.1)
      capybara (>= 3)
    pg (1.6.3)
    pg (1.6.3-x86_64-linux)
    popper_js (2.11.8)
-    pp (0.6.3)
+    pp (0.6.4)
      prettyprint
    prettyprint (0.2.0)
    prism (1.9.0)
@@ -494,15 +479,14 @@ GEM
      coderay (~> 1.1)
      method_source (~> 1.0)
      reline (>= 0.6.0)
-    psych (5.3.1)
-      date
-      stringio
    public_suffix (7.0.5)
-    puma (7.2.0)
+    puma (8.0.2)
      nio4r (~> 2.0)
    query_diet (0.7.3)
    racc (1.8.1)
    rack (2.2.23)
+    rack-attack (6.8.0)
+      rack (>= 1.0, < 4)
    rack-cors (2.0.2)
      rack (>= 2.0.0)
    rack-protection (3.2.0)
@@ -515,20 +499,20 @@ GEM
    rackup (1.0.1)
      rack (< 3)
      webrick
-    rails (7.2.3.1)
-      actioncable (= 7.2.3.1)
-      actionmailbox (= 7.2.3.1)
-      actionmailer (= 7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actiontext (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    rails (8.0.5.1)
+      actioncable (= 8.0.5.1)
+      actionmailbox (= 8.0.5.1)
+      actionmailer (= 8.0.5.1)
+      actionpack (= 8.0.5.1)
+      actiontext (= 8.0.5.1)
+      actionview (= 8.0.5.1)
+      activejob (= 8.0.5.1)
+      activemodel (= 8.0.5.1)
+      activerecord (= 8.0.5.1)
+      activestorage (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      bundler (>= 1.15.0)
-      railties (= 7.2.3.1)
+      railties (= 8.0.5.1)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -537,21 +521,20 @@ GEM
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.10)
+    rails-i18n (8.1.0)
      i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
+      railties (>= 8.0.0, < 9)
    rails_12factor (0.0.3)
      rails_serve_static_assets
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    railties (8.0.5.1)
+      actionpack (= 8.0.5.1)
+      activesupport (= 8.0.5.1)
      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
@@ -564,9 +547,14 @@ GEM
    rb-fsevent (0.11.2)
    rb-inotify (0.11.1)
      ffi (~> 1.0)
-    rdoc (7.2.0)
+    rbs (4.1.0)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
      erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
      tsort
    recaptcha (5.21.2)
    redis-client (0.26.2)
@@ -628,7 +616,7 @@ GEM
    rswag-ui (2.17.0)
      actionpack (>= 5.2, < 8.2)
      railties (>= 5.2, < 8.2)
-    rubocop (1.86.1)
+    rubocop (1.88.2)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
@@ -639,16 +627,16 @@ GEM
      rubocop-ast (>= 1.49.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
      parser (>= 3.3.7.2)
      prism (~> 1.7)
-    rubocop-capybara (2.22.1)
+    rubocop-capybara (3.0.0)
      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
+      rubocop (~> 1.81)
    rubocop-factory_bot (2.28.0)
      lint_roller (~> 1.1)
      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.34.3)
+    rubocop-rails (2.36.0)
      activesupport (>= 4.2.0)
      lint_roller (~> 1.1)
      rack (>= 1.1)
@@ -657,18 +645,20 @@ GEM
    rubocop-rake (0.7.1)
      lint_roller (~> 1.1)
      rubocop (>= 1.72.1)
-    rubocop-rspec (3.9.0)
+    rubocop-rspec (3.10.2)
      lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      regexp_parser (>= 2.0)
+      rubocop (~> 1.86, >= 1.86.2)
    rubocop-rspec_rails (2.32.0)
      lint_roller (~> 1.1)
      rubocop (~> 1.72, >= 1.72.1)
      rubocop-rspec (~> 3.5)
    ruby-progressbar (1.13.0)
    ruby-units (4.1.0)
-    ruby-vips (2.2.1)
+    ruby-vips (2.3.0)
      ffi (~> 1.12)
-    rubyzip (3.2.2)
+      logger
+    rubyzip (3.4.1)
    sass (3.7.4)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
@@ -682,13 +672,13 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (6.2.0)
+    scout_apm (6.2.1)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
      hashie
    securerandom (0.4.1)
-    selenium-webdriver (4.43.0)
+    selenium-webdriver (4.46.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@@ -701,7 +691,7 @@ GEM
      rack (>= 2.2.4, < 3.3)
      redis-client (>= 0.23.0, < 1)
    simple_po_parser (1.1.6)
-    sitemap_generator (6.3.0)
+    sitemap_generator (7.1.1)
      builder (~> 3.0)
    sprockets (3.7.5)
      base64
@@ -711,19 +701,17 @@ GEM
      actionpack (>= 5.2)
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
-    ssrf_filter (1.1.2)
-    stringio (3.2.0)
+    ssrf_filter (1.5.0)
    sysexits (1.2.0)
    temple (0.10.4)
    terminal-table (4.0.0)
      unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.7)
+    terser (1.2.8)
      execjs (>= 0.3.0, < 3)
    thor (1.5.0)
-    thread_safe (0.3.6)
-    tilt (2.7.0)
+    tilt (2.8.0)
    timecop (0.9.11)
-    timeout (0.5.0)
+    timeout (0.6.1)
    tsort (0.2.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
@@ -740,10 +728,6 @@ GEM
      activemodel (>= 3.0.0)
      public_suffix
    vcr (6.4.0)
-    virtus (2.0.0)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
    warden (1.2.9)
      rack (>= 2.0.9)
    webrat (0.7.3)
@@ -752,7 +736,7 @@ GEM
      rack-test (>= 0.5.3)
    webrick (1.9.2)
    websocket (1.2.11)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -764,7 +748,7 @@ GEM
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.2)

 PLATFORMS
  ruby
@@ -841,9 +825,10 @@ DEPENDENCIES
  pry
  puma
  query_diet
+  rack-attack
  rack-cors
  rack-protection (>= 2.0.1)
-  rails (~> 7.2.0)
+  rails (~> 8.0.0)
  rails-assets-leaflet.markercluster!
  rails-controller-testing
  rails_12factor
@@ -883,7 +868,7 @@ DEPENDENCIES
  xmlrpc

 RUBY VERSION
-   ruby 3.4.8p72
+   ruby 3.4.9

 BUNDLED WITH
   2.4.22
@@ -1,6 +1,6 @@
 {
  "name": "growstuff",
-  "stack": "heroku-18",
+  "stack": "heroku-26",
  "description": "Open data project for small-scale food growers",
  "scripts": {
    "postdeploy": "bundle exec rails db:seed"
@@ -4,21 +4,16 @@ class ActivitiesController < DataController
  def index
    @show_all = params[:all] == '1'

-    where = {}
-    where['active'] = true unless @show_all
+    @activities = Activity.includes(:owner).order(created_at: :desc)
+    @activities = @activities.active unless @show_all

-    if params[:member_slug]
-      @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id unless @owner.nil?
+    if params[:member_slug].present?
+      @owner = Member.find_by!(slug: params[:member_slug])
+      @activities = @activities.where(owner_id: @owner.id)
    end

-    @activities = Activity.search(
-      where:,
-      page:     params[:page],
-      limit:    30,
-      boost_by: [:created_at],
-      load:     false
-    )
+    @activities = @activities.paginate(page: params[:page], per_page: 30)
+
    @filename = "Growstuff-#{specifics}Activities-#{Time.zone.now.to_fs(:number)}.csv"
    respond_with(@activities)
  end
@@ -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
@@ -8,9 +8,9 @@ module Admin
    responders :flash

    def index
-      @members = Member.all
-      @members = @members.where("login_name ILIKE ?", "%#{search_term}%") unless search_term.nil?
-      @members = @members.order(:login_name).paginate(page: params[:page])
+      @members = Member.order(:login_name)
+      @members = @members.where("login_name ILIKE ?", "%#{search_term}%") if search_term.present?
+      @members = @members.paginate(page: params[:page])
    end

    def edit
@@ -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

@@ -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
@@ -3,6 +3,36 @@
 module Api
  module V1
    class CropsController < BaseController
+      def search
+        term = params[:term]
+        page = params.dig(:page, :number) || 1
+        per_page = params.dig(:page, :size) || Crop.per_page
+
+        search_results = CropSearchService.search(
+          term,
+          page:     page,
+          per_page: per_page,
+          load:     true
+        )
+
+        resources = search_results.map do |crop|
+          Api::V1::CropResource.new(crop, context)
+        end
+
+        serializer = JSONAPI::ResourceSerializer.new(Api::V1::CropResource)
+
+        data = resources.map do |resource|
+          serializer.object_hash(resource, {})
+        end
+
+        render json: {
+          data: data,
+          meta: {
+            record_count: search_results.total_count,
+            page_count:   search_results.total_pages
+          }
+        }
+      end
    end
  end
 end
@@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base
                    # profile stuff
                    :bio, :location, :latitude, :longitude,
                    # email settings
-                    :show_email, :newsletter, :send_notification_email, :send_planting_reminder)
+                    :show_email, :newsletter, :send_notification_email, :send_planting_reminder, :send_harvest_reminder)
    end

    devise_parameter_sanitizer.permit(:account_update) do |member|
@@ -80,7 +80,7 @@ class ApplicationController < ActionController::Base
                    :bio, :location, :latitude, :longitude,
                    :website_url, :instagram_handle, :facebook_handle, :bluesky_handle, :other_url,
                    # email settings
-                    :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
+                    :show_email, :newsletter, :send_notification_email, :send_planting_reminder, :send_harvest_reminder,
                    # update password
                    :current_password)
    end
@@ -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
@@ -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_or_to(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
@@ -3,6 +3,7 @@
 module Charts
  class CropsController < ApplicationController
    respond_to :json
+    before_action :set_crop

    def sunniness
      pie_chart_query 'sunniness'
@@ -13,20 +14,28 @@ module Charts
    end

    def harvested_for
-      @crop = Crop.find_by!(slug: params[:crop_slug])
-      render json: Harvest.joins(:plant_part)
-        .where(crop: @crop)
-        .group("plant_parts.name").count(:id)
+      data = Rails.cache.fetch("#{@crop.cache_key_with_version}/harvested_for", expires_in: 1.day) do
+        Harvest.joins(:plant_part)
+          .where(crop: @crop)
+          .group("plant_parts.name").count(:id)
+      end
+      render json: data
    end

    private

-    def pie_chart_query(field)
+    def set_crop
      @crop = Crop.find_by!(slug: params[:crop_slug])
-      render json: Planting.where(crop: @crop)
-        .where.not(field.to_sym => nil)
-        .where.not(field.to_sym => '')
-        .group(field.to_sym).count(:id)
+    end
+
+    def pie_chart_query(field)
+      data = Rails.cache.fetch("#{@crop.cache_key_with_version}/#{field}", expires_in: 1.day) do
+        Planting.where(crop: @crop)
+          .where.not(field.to_sym => nil)
+          .where.not(field.to_sym => '')
+          .group(field.to_sym).count(:id)
+      end
+      render json: data
    end
  end
 end
@@ -13,7 +13,7 @@ class CropsController < ApplicationController
    @crops = Crop.search('*', boost_by: %i(plantings_count harvests_count),
                              limit:    100,
                              page:     params[:page],
-                              load:     false)
+                              load:     (request.format.csv? || request.format.rss? ? { include: %i(parent scientific_names seeds harvests creator plantings) } : false))
    @num_requested_crops = requested_crops.size if current_member
    @filename = filename
    respond_with @crops
@@ -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)
@@ -13,9 +13,9 @@ 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_or_to(root_path)
  end
@@ -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

@@ -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

@@ -2,7 +2,7 @@

 class GardensController < DataController
  def index
-    @owner = Member.find_by(slug: params[:member_slug])
+    @owner = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
    @show_all = params[:all] == '1'
    @show_jump_to = params[:member_slug].present? || false

@@ -57,12 +57,23 @@ class GardensController < DataController
    redirect_to(member_gardens_path(@garden.owner))
  end

+  def fetch_wikidata
+    if @garden.populate_wikidata_info
+      @garden.save
+      flash[:notice] = "Wikidata information updated."
+    else
+      flash[:alert] = "Could not find Wikidata information for this location."
+    end
+    redirect_to @garden
+  end
+
  private

  def garden_params
    params.require(:garden).permit(
      :name, :slug, :description, :active,
-      :location, :latitude, :longitude, :area, :area_unit, :garden_type_id
+      :location, :latitude, :longitude, :area, :area_unit, :garden_type_id,
+      :location_wikidata_id, :lowest_temp_c, :highest_temp_c
    )
  end
 end
@@ -4,27 +4,26 @@ class HarvestsController < DataController
  after_action :update_crop_medians, only: %i(create update destroy)

  def index
-    where = {}
-    if params[:member_slug]
-      @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+    @harvests = Harvest.all
+
+    if params[:member_slug].present?
+      @owner = Member.find_by!(slug: params[:member_slug])
+      @harvests = @harvests.where(owner_id: @owner.id)
    end

    if params[:crop_slug]
      @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id
+      @harvests = @harvests.where(crop_id: @crop.id) if @crop
    end

    if params[:planting_slug]
      @planting = Planting.find_by(slug: params[:planting_slug])
-      where['planting_id'] = @planting.id
+      @harvests = @harvests.where(planting_id: @planting.id) if @planting
    end

-    @harvests = Harvest.search('*', where:,
-                                    limit:    100,
-                                    page:     params[:page],
-                                    load:     false,
-                                    boost_by: [:created_at])
+    @harvests = @harvests.includes(:crop, :owner, :plant_part)
+
+    @harvests = @harvests.recent.paginate(page: params[:page], per_page: 100)

    @filename = csv_filename

@@ -38,9 +37,9 @@ class HarvestsController < DataController
  end

  def new
-    @harvest = Harvest.new(harvested_at: Time.zone.today)
-    @planting = Planting.find_by(slug: params[:planting_slug]) if params[:planting_slug]
-    @crop = Crop.find_by(id: params[:crop_id])
+    @harvest = Harvest.new(new_harvest_params.merge(harvested_at: Time.zone.today))
+    @planting = @harvest.planting
+    @crop = @harvest.crop
    respond_with(@harvest)
  end

@@ -52,7 +51,7 @@ class HarvestsController < DataController
  def create
    @harvest.crop_id = @harvest.planting.crop_id if @harvest.planting_id
    @harvest.harvested_at = Time.zone.now if @harvest.harvested_at.blank?
-    @harvest.save
+    update_planting_rating if @harvest.save
    if params[:return] == 'planting'
      respond_with(@harvest, location: @harvest.planting)
    else
@@ -61,7 +60,7 @@ class HarvestsController < DataController
  end

  def update
-    @harvest.update(harvest_params)
+    update_planting_rating if @harvest.update(harvest_params)
    respond_with(@harvest)
  end

@@ -76,7 +75,17 @@ class HarvestsController < DataController
    params.require(:harvest)
      .permit(:planting_id, :crop_id, :harvested_at, :description,
              :quantity, :unit, :weight_quantity, :weight_unit,
-              :plant_part_id, :slug, :si_weight)
+              :plant_part_id, :slug, :si_weight, :overall_rating)
+      .merge(owner_id: current_member.id)
+  end
+
+  def new_harvest_params
+    return {} unless params[:harvest]
+
+    params.require(:harvest)
+      .permit(:planting_id, :crop_id, :harvested_at, :description,
+              :quantity, :unit, :weight_quantity, :weight_unit,
+            :plant_part_id, :slug, :si_weight, :overall_rating)
      .merge(owner_id: current_member.id)
  end

@@ -103,4 +112,10 @@ class HarvestsController < DataController
    @harvest.planting.update_harvest_days!
    @harvest.crop.update_harvest_medians
  end
+
+  def update_planting_rating
+    return if @harvest.planting.nil? || params[:harvest][:overall_rating].blank?
+
+    @harvest.planting.update(overall_rating: params[:harvest][:overall_rating])
+  end
 end
@@ -11,10 +11,10 @@ class LikesController < ApplicationController
      likeable_id:   params[:id]
    )
    if @like.likeable && @like.save
-      @like.likeable.reindex(refresh: true)
+      @like.likeable.reindex(refresh: true) if @like.likeable.respond_to?(:reindex)
      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

@@ -26,10 +26,10 @@ class LikesController < ApplicationController
    )

    if @like&.destroy
-      @like.likeable.reindex(refresh: true)
+      @like.likeable.reindex(refresh: true) if @like.likeable.respond_to?(:reindex)
      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

@@ -40,12 +40,9 @@ class MembersController < ApplicationController
      end
    end

-    @harvests = Harvest.search(
-      where:    { owner_id: @member.id },
-      boost_by: [:created_at],
-      limit:    16,
-      load:     false
-    )
+    @harvests = Harvest.where(owner_id: @member.id)
+                       .recent
+                       .limit(16)

    respond_to do |format|
      format.html # show.html.haml
@@ -90,11 +87,12 @@ class MembersController < ApplicationController

  EMAIL_TYPE_STRING = {
    send_notification_email: "direct message notifications",
-    send_planting_reminder:  "planting reminders"
+    send_planting_reminder:  "planting reminders",
+    send_harvest_reminder:   "harvest reminders"
  }.freeze

  def member_params
-    params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter)
+    params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter, :send_harvest_reminder)
  end

  def member_json_fields
@@ -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_or_to(root_path)
+        return
+      end
      body = params[:body]
      subject = params[:subject]
      @conversation = current_member.send_message(recipient, body, subject)
@@ -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

@@ -9,13 +9,17 @@ class PhotosController < ApplicationController
  responders :flash

  def index
-    @photos = Photo.search(
-      load:     false,
-      boost_by: [:created_at],
-      where:    index_where_clause,
-      page:     params[:page],
-      limit:    Photo.per_page
-    )
+    @photos = if @crop
+                @crop.photos
+              elsif @planting
+                @planting.photos
+              else
+                Photo.all
+              end
+
+    @photos = @photos.includes(:owner)
+                     .order(created_at: :desc)
+                     .paginate(page: params[:page], per_page: Photo.per_page)
    respond_with(@photos)
  end

@@ -102,29 +106,21 @@ class PhotosController < ApplicationController
    end

    @current_set = params[:set]
+    @current_tag = params[:tag]

    page = params[:page] || 1

    @sets = current_member.flickr_sets
-    photos, total = current_member.flickr_photos(page, @current_set)
+    photos, total = current_member.flickr_photos(page, @current_set, @current_tag)

    @photos = WillPaginate::Collection.create(page, 30, total) do |pager|
      pager.replace photos
    end
  end

-  def index_where_clause
-    if params[:crop_slug]
-      { crops: @crop.id }
-    elsif params[:planting_id]
-      { planting_id: @planting.id }
-    else
-      {}
-    end
-  end
-
  def set_crop_and_planting
    @crop = Crop.find params[:crop_slug] if params[:crop_slug]
    @planting = Planting.find params[:planting_id] if params[:planting_id]
+    @planting ||= Planting.find params[:planting_slug] if params[:planting_slug]
  end
 end
@@ -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
@@ -8,26 +8,10 @@ class PlantingsController < DataController
  def index
    @show_all = params[:all] == '1'

-    where = {}
-    where['active'] = true unless @show_all
+    @owner = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
+    @crop = Crop.find_by(slug: params[:crop_slug]) if params[:crop_slug]

-    if params[:member_slug]
-      @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id unless @owner.nil?
-    end
-
-    if params[:crop_slug]
-      @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id unless @crop.nil?
-    end
-
-    @plantings = Planting.search(
-      where:,
-      page:     params[:page],
-      limit:    30,
-      boost_by: [:created_at],
-      load:     false
-    )
+    @plantings = plantings

    @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_fs(:number)}.csv"
    respond_with(@plantings)
@@ -35,7 +19,7 @@ class PlantingsController < DataController

  def show
    @photos = @planting.photos.includes(:owner).order(date_taken: :desc)
-    @harvests = Harvest.search(where: { planting_id: @planting.id })
+    @harvests = Harvest.where(planting_id: @planting.id).recent
    @current_activities = @planting.activities.current.includes(:owner).order(created_at: :desc)
    @finished_activities = @planting.activities.finished.includes(:owner).order(created_at: :desc)
    @matching_seeds = matching_seeds
@@ -116,11 +100,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

@@ -160,7 +144,7 @@ class PlantingsController < DataController
  end

  def matching_seeds
-    Seed.where(crop: @planting.crop, owner: @planting.owner)
+    @matching_seeds ||= Seed.where(crop: @planting.crop, owner: @planting.owner)
      .where('(finished_at IS NULL OR finished_at >= ?)', @planting.planted_at)
      .where('(saved_at IS NULL OR saved_at <= ?)', @planting.planted_at)
  end
@@ -8,7 +8,7 @@ class PostsController < ApplicationController
  respond_to :rss, only: %i(index show)

  def index
-    @author = Member.find_by(slug: params[:member_slug])
+    @author = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
    @posts = posts
    respond_with(@posts)
  end
@@ -21,6 +21,10 @@ class PostsController < ApplicationController
  def new
    @post = Post.new
    @forum = Forum.find_by(id: params[:forum_id])
+    if params[:crop_id]
+      @crop = Crop.friendly.find(params[:crop_id])
+      @post.body = "[#{@crop.name}](crop)"
+    end
    respond_with(@post)
  end

@@ -29,17 +33,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

@@ -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

@@ -2,36 +2,32 @@

 class SeedsController < DataController
  def index
-    where = {}
+    @seeds = Seed.all

    if params[:member_slug].present?
-      @owner = Member.find_by(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+      @owner = Member.find_by!(slug: params[:member_slug])
+      @seeds = @seeds.where(owner_id: @owner.id)
    end

    if params[:crop_slug].present?
      @crop = Crop.find_by(slug: params[:crop_slug])
-      where['crop_id'] = @crop.id
+      @seeds = @seeds.where(crop_id: @crop.id) if @crop
    end

    if params[:planting_id].present?
      @planting = Planting.find_by(slug: params[:planting_id])
-      where['parent_planting'] = @planting.id
+      @seeds = @seeds.where(parent_planting_id: @planting.id) if @planting
    end

-    where['tradeable_to'] = params[:tradeable_to] if params[:tradeable_to].present?
+    @seeds = @seeds.where(tradable_to: params[:tradeable_to]) if params[:tradeable_to].present?

    @show_all = (params[:all] == '1')
-    where['finished'] = false unless @show_all
+    @seeds = @seeds.current unless @show_all

    @filename = csv_filename
-    @seeds = Seed.search(
-      where:,
-      page:     params[:page],
-      limit:    30,
-      boost_by: [:created_at],
-      load:     false
-    )
+    @seeds = @seeds.includes(:crop, :owner)
+                   .order(created_at: :desc)
+                   .paginate(page: params[:page], per_page: 30)

    respond_with(@seeds)
  end
@@ -61,7 +57,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 +66,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

@@ -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
@@ -130,9 +130,9 @@ module ApplicationHelper
      doc = Nokogiri::XML(response.body)
      doc.xpath('//xmlns:entry').first(2).map do |entry|
        {
-          title:   entry.xpath('xmlns:title').text,
+          title: entry.xpath('xmlns:title').text,
          content: entry.xpath('xmlns:content').text,
-          link:    entry.xpath('xmlns:link/@href').text,
+          link: entry.xpath('xmlns:link/@href').text,
          updated: entry.xpath('xmlns:updated').text
        }
      end
@@ -2,28 +2,47 @@

 module CropsHelper
  def crop_or_parent(crop, attribute)
-    default = crop.send(attribute)
-    return default if default.present?
+    @crop_or_parent_cache ||= {}
+    cache_key = [crop.persisted? ? crop.id : crop.object_id, attribute]
+    return @crop_or_parent_cache[cache_key] if @crop_or_parent_cache.key?(cache_key)

-    parent = crop
-    while parent = parent.parent
-      return parent.send(attribute) if parent&.send(attribute).present?
+    @crop_or_parent_cache[cache_key] = begin
+      value = crop.send(attribute)
+      if value.blank?
+        parent = crop
+        while (parent = parent.parent)
+          parent_value = parent.send(attribute)
+          if parent_value.present?
+            value = parent_value
+            break
+          end
+        end
+      end
+      value
    end
-
-    # For scopes, arrays, etc return the empty value
-    default
  end

  def display_seed_availability(member, crop)
-    seeds = member.seeds.where(crop:)
-    total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
+    @seed_availability_cache ||= {}
+    cache_key = [
+      member.persisted? ? member.id : member.object_id,
+      crop.persisted? ? crop.id : crop.object_id
+    ]
+    return @seed_availability_cache[cache_key] if @seed_availability_cache.key?(cache_key)

-    return "You don't have any seeds of this crop." if seeds.none?
+    @seed_availability_cache[cache_key] = begin
+      seeds = member.seeds.where(crop:)

-    if total_quantity == 0
-      "You have an unknown quantity of seeds of this crop."
-    else
-      "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
+      if seeds.none?
+        "You don't have any seeds of this crop."
+      else
+        total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
+        if total_quantity == 0
+          "You have an unknown quantity of seeds of this crop."
+        else
+          "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
+        end
+      end
    end
  end

@@ -40,53 +59,57 @@ module CropsHelper
  end

  def crop_jsonld_data(crop, full_attributes: true)
-    same_as_urls = [crop.en_wikipedia_url]
-    crop.scientific_names.each do |scientific_name|
-      same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}" if scientific_name.wikidata_id.present?
-    end
-
-    subject_of_entities = []
-    if full_attributes
-      if crop.en_youtube_url.present?
-        subject_of_entities << {
-          '@type': "VideoObject",
-          url:     crop.en_youtube_url
-        }
-      end
-
-      crop.posts.each do |post|
-        subject_of_entities << {
-          '@type':         "SocialMediaPosting",
-          url:             post_url(post),
-          author:          {
-            '@type': 'Person',
-            name:    post.author.login_name
-          },
-          'datePublished': post.created_at
-        }
+    Rails.cache.fetch([crop.cache_key_with_version, "jsonld", full_attributes]) do
+      same_as_urls = [crop.en_wikipedia_url]
+      crop.scientific_names.each do |scientific_name|
+        if scientific_name.wikidata_id.present?
+          same_as_urls << "https://www.wikidata.org/wiki/#{scientific_name.wikidata_id}"
+        end
      end

+      subject_of_entities = []
      images = []
-      crop.photos.each do |photo|
-        images << photo.fullsize_url
+      if full_attributes
+        if crop.en_youtube_url.present?
+          subject_of_entities << {
+            '@type': "VideoObject",
+            url:     crop.en_youtube_url
+          }
+        end
+
+        crop.posts.each do |post|
+          subject_of_entities << {
+            '@type': "SocialMediaPosting",
+            url:     post_url(post),
+            author:  {
+              '@type': 'Person',
+              name:    post.author.login_name
+            },
+            datePublished: post.created_at
+          }
+        end
+
+        crop.photos.each do |photo|
+          images << photo.fullsize_url
+        end
      end
+
+      # TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
+      # has_many :plantings, dependent: :destroy
+      # has_many :seeds, dependent: :destroy
+      # has_many :harvests, dependent: :destroy
+
+      {
+        '@context':     "https://schema.org",
+        '@type':        "BioChemEntity",
+        name:           crop.name,
+        taxonomicRange: crop.scientific_names.map(&:name),
+        description:    crop.description,
+        sameAs:         same_as_urls,
+        alternateName:  crop.alternate_names.map(&:name),
+        subjectOf:      subject_of_entities,
+        image:          images
+      }.compact
    end
-
-    # TODO: Review plantings, seeds, harvests as a subtype of social media post or event that ended? Or creative work?
-    # has_many :plantings, dependent: :destroy
-    # has_many :seeds, dependent: :destroy
-    # has_many :harvests, dependent: :destroy
-
-    {
-      '@context':     "https://schema.org",
-      '@type':        "BioChemEntity",
-      name:           crop.name,
-      taxonomicRange: crop.scientific_names.map(&:name),
-      description:    crop.description,
-      sameAs:         same_as_urls,
-      alternateName:  crop.alternate_names.map(&:name),
-      subjectOf:      subject_of_entities,
-      image:          images
-    }.compact
  end
 end
@@ -46,9 +46,13 @@ module PlantingsHelper
  # Returns a list of gardens the planting can be transplanted to
  # based on the planting's owner.
  def transplantable_gardens_by_owner(planting)
-    garden_ids = planting.owner.gardens.select(:id).to_a + GardenCollaborator.where(member_id: planting.owner.id).select(:garden_id).to_a
+    @transplantable_gardens ||= {}
+    cache_key = planting.id || planting.object_id
+    @transplantable_gardens[cache_key] ||= begin
+      garden_ids = planting.owner.gardens.select(:id).to_a + GardenCollaborator.where(member_id: planting.owner.id).select(:garden_id).to_a

-    Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
+      Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
+    end
  end

  def days_from_now_to_last_harvest(planting)
@@ -57,6 +57,19 @@ class NotifierMailer < ApplicationMailer
    mail(to: @member.email, subject: @subject) if @member.send_planting_reminder
  end

+  def harvest_reminder(member)
+    @member = member
+    @plantings = @member.plantings.active.select(&:harvest_in_next_week?)
+    @sitename = ENV.fetch('GROWSTUFF_SITE_NAME', nil)
+    @subject = I18n.t('notifier_mailer.harvest_reminder.subject', sitename: @sitename)
+
+    # Encrypting
+    message = { member_id: @member.id, type: :send_harvest_reminder }
+    @signed_message = verifier.generate(message)
+
+    mail(to: @member.email, subject: @subject) if @member.send_harvest_reminder
+  end
+
  def new_crop_request(member, request)
    @member = member
    @request = request
@@ -123,6 +123,7 @@ class Ability
    can :create,  GardenCollaborator, garden: { owner_id: member.id }
    can :update,  GardenCollaborator, garden: { owner_id: member.id }
    can :destroy, GardenCollaborator, garden: { owner_id: member.id }
+    can :destroy, GardenCollaborator, member_id: member.id

    can :create,  Activity
    can :update,  Activity, owner_id: member.id
@@ -164,6 +165,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
@@ -4,7 +4,6 @@ class Activity < ApplicationRecord
  extend FriendlyId
  include Ownable
  include Finishable
-  include SearchActivities
  include Likeable

  belongs_to :garden, optional: true
@@ -46,4 +45,17 @@ class Activity < ApplicationRecord
  def planting_slug
    planting&.crop&.slug
  end
+
+  scope :active, -> { where(finished: [false, nil]) }
+
+  def self.homepage_records(limit)
+    # Get the latest activity for each owner, then return the latest 'limit' of those
+    Activity.where(id: Activity.unscoped.select("DISTINCT ON (owner_id) id").order("owner_id, created_at DESC"))
+            .order(created_at: :desc)
+            .limit(limit)
+  end
+
+  def self.reindex(refresh: false); end
+
+  def reindex(refresh: false); end
 end
@@ -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
@@ -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,14 @@ class Comment < ApplicationRecord
  def to_s
    "#{author.login_name} commented on #{commentable.subject}"
  end
+
+  private
+
+  def author_is_not_blocked
+    return unless author
+
+    return unless commentable.author.already_blocking?(author)
+
+    errors.add(:base, "You cannot comment on a post of a member who has blocked you.")
+  end
 end
@@ -40,8 +40,15 @@ module MemberFlickr
    # Fetches a collection of photos from Flickr
    # Returns a [[page of photos], total] pair.
    # Total is needed for pagination.
-    def flickr_photos(page_num = 1, set = nil)
-      result = if set
+    def flickr_photos(page_num = 1, set = nil, tags = nil)
+      result = if tags.present?
+                 flickr.photos.search(
+                   user_id:  'me',
+                   tags:     tags,
+                   page:     page_num,
+                   per_page: 30
+                 )
+               elsif set.present?
                 flickr.photosets.getPhotos(
                   photoset_id: set,
                   page:        page_num,
@@ -6,23 +6,31 @@ module PredictHarvest
  included do
    # dates
    def first_harvest_date
-      harvests_with_dates.minimum(:harvested_at)
+      return @first_harvest_date if defined?(@first_harvest_date)
+
+      @first_harvest_date = harvests_with_dates.minimum(:harvested_at)
    end

    def last_harvest_date
-      harvests_with_dates.maximum(:harvested_at)
+      return @last_harvest_date if defined?(@last_harvest_date)
+
+      @last_harvest_date = harvests_with_dates.maximum(:harvested_at)
    end

    def first_harvest_predicted_at
-      return unless crop.median_days_to_first_harvest.present? && planted_at.present?
+      return @first_harvest_predicted_at if defined?(@first_harvest_predicted_at)

-      planted_at + crop.median_days_to_first_harvest.days
+      @first_harvest_predicted_at = if crop.median_days_to_first_harvest.present? && planted_at.present?
+                                      planted_at + crop.median_days_to_first_harvest.days
+                                    end
    end

    def last_harvest_predicted_at
-      return unless crop.median_days_to_last_harvest.present? && planted_at.present?
+      return @last_harvest_predicted_at if defined?(@last_harvest_predicted_at)

-      planted_at + crop.median_days_to_last_harvest.days
+      @last_harvest_predicted_at = if crop.median_days_to_last_harvest.present? && planted_at.present?
+                                     planted_at + crop.median_days_to_last_harvest.days
+                                   end
    end

    # actions
@@ -52,10 +60,16 @@ module PredictHarvest
    def before_harvest_time?
      first_harvest_predicted_at.present? &&
        harvests.empty? &&
-        first_harvest_predicted_at.present? &&
        first_harvest_predicted_at > Time.zone.today
    end

+    def harvest_in_next_week?
+      first_harvest_predicted_at.present? &&
+        harvests.empty? &&
+        first_harvest_predicted_at >= Time.zone.today &&
+        first_harvest_predicted_at <= Time.zone.today + 7.days
+    end
+
    def harvest_months
      Rails.cache.fetch("#{cache_key_with_version}/harvest_months", expires_in: 5.minutes) do
        neighbours_for_harvest_predictions.where.not(harvested_at: nil)
@@ -65,16 +79,18 @@ module PredictHarvest
    end

    def neighbours_for_harvest_predictions
-      # use this planting's harvest if any
-      return harvests if harvests.size.positive?
-
-      # otherwise use nearby plantings
-      if location
-        return Harvest.where(planting: nearby_same_crop.has_harvests)
-            .where.not(planting_id: nil)
+      @neighbours_for_harvest_predictions ||= begin
+        # use this planting's harvest if any
+        if harvests.size.positive?
+          harvests
+        # otherwise use nearby plantings
+        elsif location
+          Harvest.where(planting: nearby_same_crop.has_harvests)
+              .where.not(planting_id: nil)
+        else
+          Harvest.none
+        end
      end
-
-      Harvest.none
    end

    private
@@ -13,40 +13,49 @@ module PredictPlanting

    # dates
    def finish_predicted_at
-      if planted_at.blank? || failed?
-        nil
-      elsif crop.median_lifespan.present?
-        planted_at + crop.median_lifespan.days
-      elsif crop.parent.present? && crop.parent.median_lifespan.present?
-        planted_at + crop.parent.median_lifespan.days
-      end
+      return @finish_predicted_at if defined?(@finish_predicted_at)
+
+      @finish_predicted_at = if planted_at.blank? || failed?
+                               nil
+                             elsif crop.median_lifespan.present?
+                               planted_at + crop.median_lifespan.days
+                             elsif crop.parent.present? && crop.parent.median_lifespan.present?
+                               planted_at + crop.parent.median_lifespan.days
+                             end
    end

    # days
    def expected_lifespan
-      if actual_lifespan.present?
-        actual_lifespan
-      elsif crop.median_lifespan.present?
-        crop.median_lifespan
-      elsif crop.parent.present? && crop.parent.median_lifespan.present?
-        crop.parent.median_lifespan
-      end
+      return @expected_lifespan if defined?(@expected_lifespan)
+
+      @expected_lifespan = if actual_lifespan.present?
+                             actual_lifespan
+                           elsif crop.median_lifespan.present?
+                             crop.median_lifespan
+                           elsif crop.parent.present? && crop.parent.median_lifespan.present?
+                             crop.parent.median_lifespan
+                           end
    end

    def actual_lifespan
-      return unless planted_at.present? && finished_at.present? && !failed?
+      return @actual_lifespan if defined?(@actual_lifespan)

-      (finished_at - planted_at).to_i
+      @actual_lifespan = if planted_at.present? && finished_at.present? && !failed?
+                           (finished_at - planted_at).to_i
+                         end
    end

    def age_in_days
-      return if planted_at.blank?
-      return if failed?
+      return @age_in_days if defined?(@age_in_days)

-      known_last_day ||= finished_at || Time.zone.today
-      known_last_day = Time.zone.today if known_last_day > Time.zone.today
+      @age_in_days = if planted_at.blank? || failed?
+                       nil
+                     else
+                       known_last_day = finished_at || Time.zone.today
+                       known_last_day = Time.zone.today if known_last_day > Time.zone.today

-      (known_last_day - planted_at).to_i
+                       (known_last_day - planted_at).to_i
+                     end
    end

    def percentage_grown
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module SearchActivities
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   active:     { type: :boolean },
-                   created_at: { type: :integer },
-                   updated_at: { type: :integer },
-                   due_date:   { type: :date }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        active:,
-        finished:         finished?,
-        name:,
-        due_date:,
-        category:,
-        garden_id:,
-        garden_name:      garden&.name,
-        garden_slug:      garden&.garden_slug,
-        planting_id:,
-        planting_name:    planting&.crop&.name,
-        planting_slug:    planting&.slug,
-        description:,
-
-        # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
-
-        # timestamps
-        created_at:       created_at.to_i,
-        updated_at:       updated_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      records = []
-      owners = []
-      1..limit.times do
-        where = {
-          # photos_count: { gt: 0 },
-          owner_id: { not: owners }
-        }
-        one_record = search('*',
-                            limit:    1,
-                            where:,
-                            boost_by: [:created_at],
-                            load:     false).first
-        return records if one_record.nil?
-
-        owners << one_record.owner_id
-        records << one_record
-      end
-      records
-    end
-  end
-end
@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-module SearchHarvests
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   harvests_count: { type: :integer },
-                   photos_count:   { type: :integer },
-                   created_at:     { type: :integer },
-                   harvested_at:   { type: :date }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        quantity:,
-
-        # crop
-        crop_id:,
-        crop_name:,
-        crop_slug:        crop.slug,
-
-        # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
-        plant_part_name:  plant_part&.name,
-
-        # planting
-        planting_id:,
-        planting_slug:    planting&.slug,
-
-        # photo
-        has_photos:       photos.size.positive?,
-        thumbnail_url:    default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
-
-        # counts
-        photos_count:     photos.count,
-
-        # timestamps
-        harvested_at:,
-        created_at:       created_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      records = []
-      owners = []
-      1..limit.times do
-        where = {
-          # Disabled for now so that more relevant harvests are
-          # surfaced; even if we're falling back to crop photos.
-          # photos_count: { gt: 0 },
-          owner_id: { not: owners }
-        }
-        one_record = search('*',
-                            limit:    1,
-                            where:,
-                            boost_by: [:created_at],
-                            load:     false).first
-        return records if one_record.nil?
-
-        owners << one_record.owner_id
-        records << one_record
-      end
-      records
-    end
-  end
-end
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module SearchPhotos
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   title:      { type: :text },
-                   created_at: { type: :integer }
-                 }
-               }
-
-    def search_data
-      {
-        id:,
-        title:,
-        thumbnail_url:,
-        fullsize_url:,
-        # crops
-        crops:                  crops.pluck(:id),
-        # likes
-        liked_by_members_names:,
-        # owner
-        owner_id:,
-        owner_login_name:,
-        owner_slug:,
-        # counts
-        likes_count:,
-
-        created_at:             created_at.to_i
-      }
-    end
-  end
-end
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-module SearchPlantings
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   active:         { type: :boolean },
-                   created_at:     { type: :integer },
-                   harvests_count: { type: :integer },
-                   photos_count:   { type: :integer },
-                   owner_location: { type: :text }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        active:,
-        finished:                   finished?,
-        has_photos:                 photos.size.positive?,
-        location:,
-        percentage_grown:           percentage_grown.to_i,
-        planted_at:,
-        planted_from:,
-        planted_year:               planted_at&.year,
-        quantity:,
-        sunniness:,
-        garden_id:,
-        garden_slug:                garden&.garden_slug,
-        garden_name:                garden&.name,
-        description:,
-
-        first_harvest_predicted_at:,
-        finish_predicted_at:,
-
-        # crops
-        crop_id:,
-        crop_name:,
-        crop_slug:,
-        crop_perennial:,
-
-        # owner
-        owner_id:,
-        owner_location:,
-        owner_login_name:,
-        owner_slug:,
-
-        # photos
-        thumbnail_url:              default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
-        # counts
-        photos_count:               photos.size,
-        harvests_count:,
-
-        # timestamps
-        created_at:                 created_at.to_i,
-        updated_at:                 updated_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      records = []
-      owners = []
-      1..limit.times do
-        where = {
-          # Disabled for now so that more relevant plantings are
-          # surfaced; even if we're falling back to crop photos.
-          # photos_count: { gt: 0 },
-          owner_id: { not: owners }
-        }
-        one_record = search('*',
-                            limit:    1,
-                            where:,
-                            boost_by: [:created_at],
-                            load:     false).first
-        return records if one_record.nil?
-
-        owners << one_record.owner_id
-        records << one_record
-      end
-      records
-    end
-  end
-end
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module SearchSeeds
-  extend ActiveSupport::Concern
-
-  included do
-    searchkick merge_mappings: true,
-               settings:       { number_of_shards: 1, number_of_replicas: 0 },
-               mappings:       {
-                 properties: {
-                   id:           { type: :integer },
-                   created_at:   { type: :integer },
-                   plant_before: { type: :text },
-                   photos_count: { type: :integer },
-                   tradable_to:  { type: :text }
-                 }
-               }
-
-    def search_data
-      {
-        slug:,
-        finished:         finished?,
-        gmo:,
-        active:,
-        heirloom:,
-        location:         owner.location,
-        organic:,
-        quantity:,
-        plant_before:     plant_before&.to_fs(:ymd),
-        tradable_to:,
-        tradable:,
-
-        # crop
-        crop_id:,
-        crop_name:        crop.name,
-        crop_slug:        crop.slug,
-
-        # owner
-        owner_id:,
-        owner_location:,
-        owner_login_name:,
-        owner_slug:,
-
-        # planting
-        parent_planting:,
-
-        # counts
-        photos_count:     photos.size,
-
-        # photo
-        has_photos:       photos.size.positive?,
-        thumbnail_url:    default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
-
-        created_at:       created_at.to_i
-      }
-    end
-
-    def self.homepage_records(limit)
-      search('*', limit:,
-                  where:    {
-                    finished: false,
-                    tradable: true,
-                    _or:      [{ plant_before: nil }, { plant_before: { lt: Date.today } }]
-                  },
-                  boost_by: [:created_at],
-                  load:     false)
-    end
-  end
-end
@@ -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:      {
+            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?
@@ -165,9 +165,11 @@ class Crop < ApplicationRecord
  end

  def all_companions
-    return companions unless parent
-
-    (companions + parent.all_companions).uniq
+    @all_companions ||= if parent
+                          (companions + parent.all_companions).uniq
+                        else
+                          companions
+                        end
  end

  before_destroy :destroy_reverse_companionships
@@ -190,12 +192,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
@@ -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,14 @@ class Follow < ApplicationRecord
      notifiable:   self
    )
  end
+
+  private
+
+  def follower_is_not_blocked
+    return unless follower
+
+    return unless followed.already_blocking?(follower)
+
+    errors.add(:base, "You cannot follow a member who has blocked you.")
+  end
 end
@@ -21,6 +21,7 @@ class Garden < ApplicationRecord
  after_validation :cleanup_area
  after_validation :geocode
  after_validation :empty_unwanted_geocodes
+  after_validation :populate_wikidata_info, if: :will_save_change_to_location?
  after_save :mark_inactive_garden_plantings_as_finished

  scope :active, -> { where(active: true) }
@@ -32,7 +33,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 +54,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
@@ -92,6 +93,19 @@ class Garden < ApplicationRecord
    end
  end

+  def populate_wikidata_info
+    return false if location.blank?
+
+    wd_id = WikidataService.find_wikidata_id(location)
+    return false if wd_id.blank?
+
+    self.location_wikidata_id = wd_id
+    temps = WikidataService.fetch_temps(wd_id)
+    self.highest_temp_c = temps[:highest_temp_c]
+    self.lowest_temp_c = temps[:lowest_temp_c]
+    true
+  end
+
  protected

  def strip_blanks
@@ -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
@@ -5,9 +5,10 @@ class Harvest < ApplicationRecord
  extend FriendlyId
  include PhotoCapable
  include Ownable
-  include SearchHarvests
  include Likeable

+  attr_accessor :overall_rating
+
  friendly_id :harvest_slug, use: %i(slugged finders)

  # Constants
@@ -58,18 +59,18 @@ class Harvest < ApplicationRecord
  ##
  ## Validations
  validates :crop, approved: true
-  validates :crop, presence: { message: "must be present and exist in our database" }
-  validates :plant_part, presence: { message: "must be present and exist in our database" }
+  validates :crop, presence: { message: :crop_not_found }
+  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
@@ -109,37 +110,53 @@ class Harvest < ApplicationRecord
  def to_s
    # 50 individual apples, weighing 3lb
    # 2 buckets of apricots, weighing 10kg
-    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+    @to_s ||= "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
  end

  def quantity_to_human
-    return number_to_human(quantity.to_s, strip_insignificant_zeros: true) if quantity
-
-    ""
+    @quantity_to_human ||= if quantity
+                             number_to_human(quantity.to_s, strip_insignificant_zeros: true)
+                           else
+                             ""
+                           end
  end

  def unit_to_human
-    return "" unless quantity && unit
-    return 'individual' if unit == 'individual'
-    return "#{unit} of" if quantity == 1
-
-    "#{unit.pluralize} of"
+    @unit_to_human ||= begin
+      if !quantity || !unit
+        ""
+      elsif unit == 'individual'
+        'individual'
+      elsif quantity == 1
+        "#{unit} of"
+      else
+        "#{unit.pluralize} of"
+      end
+    end
  end

  def weight_to_human
-    return "" unless weight_quantity
-
-    "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
+    @weight_to_human ||= if weight_quantity
+                           "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
+                         else
+                           ""
+                         end
  end

  def crop_name_to_human
-    if unit != 'individual' # buckets of apricot*s*
-      crop.name.pluralize
-    elsif quantity == 1
-      crop.name
-    else
-      crop.name.pluralize
-    end.to_s
+    @crop_name_to_human ||= begin
+      if unit != 'individual' # buckets of apricot*s*
+        crop.name.pluralize
+      elsif quantity == 1
+        crop.name
+      else
+        crop.name.pluralize
+      end.to_s
+    end
+  end
+
+  def self.homepage_records(limit)
+    recent.one_per_owner.limit(limit)
  end

  private
@@ -147,7 +164,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 +172,13 @@ class Harvest < ApplicationRecord

    return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?

-    errors.add(:owner,
-               "of harvest must be the same as planting, or a collaborator on that garden")
+    errors.add(:owner, :same_owner_required)
  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
@@ -5,4 +5,24 @@ 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
+    return unless author&.already_blocking?(member)
+
+    errors.add(:base, "You cannot like content of a member who has blocked you.")
+  end
 end
@@ -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,
@@ -70,6 +79,7 @@ class Member < ApplicationRecord
  scope :interesting, -> { confirmed.located.recently_signed_in.has_plantings }
  scope :has_plantings, -> { joins(:plantings).group("members.id") }
  scope :wants_reminders, -> { where(send_planting_reminder: true) }
+  scope :wants_harvest_reminders, -> { where(send_harvest_reminder: true) }

  # Include default devise modules. Others available are:
  # :token_authenticatable, :confirmable,
@@ -96,21 +106,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 :other_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: :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
@@ -152,7 +162,7 @@ class Member < ApplicationRecord
  end

  def unread_count
-    receipts.where(is_read: false).count
+    @unread_count ||= receipts.where(is_read: false).count
  end

  def self.login_name_or_email(login)
@@ -164,12 +174,12 @@ class Member < ApplicationRecord
  end

  def self.nearest_to(place)
-    nearby_members = []
-    if place
-      latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
-      nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) } if latitude && longitude
-    end
-    nearby_members
+    return [] if place.blank?
+
+    latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
+    return [] unless latitude && longitude
+
+    Member.located.near([latitude, longitude], 1000)
  end

  def already_following?(member)
@@ -179,4 +189,33 @@ 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
+
+  def has_activity?
+    (gardens.exists? && gardens.count > 1) ||
+      plantings.exists? ||
+      harvests.exists? ||
+      seeds.exists? ||
+      photos.exists? ||
+      forums.exists? ||
+      activities.exists? ||
+      posts.exists? ||
+      comments.exists? ||
+      requested_crops.exists? ||
+      created_crops.exists? ||
+      likes.exists? ||
+      created_alternate_names.exists? ||
+      created_scientific_names.exists? ||
+      follows.exists? ||
+      inverse_follows.exists? ||
+      blocks.exists? ||
+      inverse_blocks.exists?
+  end
 end
@@ -3,7 +3,6 @@
 class Photo < ApplicationRecord
  include Likeable
  include Ownable
-  include SearchPhotos

  PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze

@@ -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
@@ -7,7 +7,6 @@ class Planting < ApplicationRecord
  include Ownable
  include PredictPlanting
  include PredictHarvest
-  include SearchPlantings
  include Likeable

  friendly_id :planting_slug, use: %i(slugged finders)
@@ -72,7 +71,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 +79,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
@@ -119,33 +118,40 @@ class Planting < ApplicationRecord
  end

  def nearby_same_crop
-    return Planting.none if location.blank? || latitude.blank? || longitude.blank?
+    return @nearby_same_crop if defined?(@nearby_same_crop)

-    # latitude, longitude = Geocoder.coordinates(location, params: { limit: 1 })
-    Planting.joins(:garden)
-      .where(crop:)
-      .located
-      .where('gardens.latitude < ? AND gardens.latitude > ?',
-             latitude + 10, latitude - 10)
+    @nearby_same_crop = if location.blank? || latitude.blank? || longitude.blank?
+                          Planting.none
+                        else
+                          # latitude, longitude = Geocoder.coordinates(location, params: { limit: 1 })
+                          Planting.joins(:garden)
+                            .where(crop:)
+                            .located
+                            .where('gardens.latitude < ? AND gardens.latitude > ?',
+                                   latitude + 10, latitude - 10)
+                        end
+  end
+
+  def self.homepage_records(limit)
+    recent.one_per_owner.limit(limit)
  end

  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,
-               "must be the same as garden, or a collaborator on that garden")
+    errors.add(:owner, :same_owner_required)
  end
 end
@@ -49,9 +49,10 @@ class Post < ApplicationRecord

  # return posts sorted by recent activity
  def self.recently_active
-    Post.order(created_at: :desc).sort do |a, b|
-      b.recent_activity <=> a.recent_activity
-    end
+    left_joins(:comments)
+      .select('posts.*, COALESCE(MAX(comments.created_at), posts.created_at) AS last_activity_at')
+      .group('posts.id')
+      .order(Arel.sql('last_activity_at DESC'))
  end

  def owner_id
@@ -5,7 +5,6 @@ class Seed < ApplicationRecord
  include PhotoCapable
  include Finishable
  include Ownable
-  include SearchSeeds

  friendly_id :seed_slug, use: %i(slugged finders)

@@ -28,7 +27,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 +35,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, " \
-                                                                          "locally, nationally, or internationally" }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: :tradable_to_inclusion }
  validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
-                                                                  "are organic or not, or that you don't know" }
+                      inclusion:   { in: ORGANIC_VALUES, message: :organic_inclusion }
  validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
-                                                          "genetically modified or not, or that you don't know" }
+                  inclusion:   { in: GMO_VALUES, message: :gmo_inclusion }
  validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
-                                                                    "are heirloom, hybrid, or unknown" }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: :heirloom_inclusion }
  validates :source, allow_blank: true,
-                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
-                                                                "or that you don't know" }
+                     inclusion:   { in: SOURCE_VALUES, message: :source_inclusion }

  #
  # Delegations
@@ -78,4 +72,11 @@ class Seed < ApplicationRecord
  def to_s
    I18n.t('seeds.string', crop: crop.name, owner:)
  end
+
+  def self.homepage_records(limit)
+    current.tradable
+           .where("plant_before IS NULL OR plant_before < ?", Time.zone.today)
+           .order(created_at: :desc)
+           .limit(limit)
+  end
 end
@@ -2,7 +2,7 @@

 class CropSearchService
  # Crop.search(string)
-  def self.search(query, page: 1, per_page: 12, current_member: nil)
+  def self.search(query, page: 1, per_page: 12, current_member: nil, **options)
    search_params = {
      page:,
      per_page:,
@@ -12,7 +12,7 @@ class CropSearchService
      includes:     %i(scientific_names alternate_names),
      misspellings: { edit_distance: 2 },
      load:         false
-    }
+    }.merge(options)
    # prioritise crops the member has planted
    search_params[:boost_where] = { planters_ids: current_member.id } if current_member

@@ -85,7 +85,7 @@ class GbifService
  end

  def import!
-    Crop.order(updated_at: :desc).each do |crop|
+    Crop.order(updated_at: :desc).find_each do |crop|
      Rails.logger.debug { "#{crop.id}, #{crop.name}" }
      update_crop(crop) if crop.valid?
    rescue ActiveRecord::RecordInvalid
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+
+class WikidataService
+  CELSIUS_UNIT_ID = 'http://www.wikidata.org/entity/Q25267'
+  FAHRENHEIT_UNIT_ID = 'http://www.wikidata.org/entity/Q42289'
+
+  def self.find_wikidata_id(location_name)
+    return nil if location_name.blank?
+
+    uri = URI("https://www.wikidata.org/w/api.php?action=wbsearchentities&search=#{URI.encode_www_form_component(location_name)}&language=en&format=json")
+    req = Net::HTTP::Get.new(uri)
+    req['User-Agent'] = "Growstuff (https://www.growstuff.org; admin@growstuff.org)"
+
+    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+      http.request(req)
+    end
+
+    data = JSON.parse(response.body)
+    data.dig('search', 0, 'id')
+  rescue StandardError => e
+    Rails.logger.error "WikidataService.find_wikidata_id error: #{e.message}"
+    nil
+  end
+
+  def self.fetch_temps(wikidata_id)
+    return {} if wikidata_id.blank?
+
+    uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=claims&format=json")
+    req = Net::HTTP::Get.new(uri)
+    req['User-Agent'] = "Growstuff (https://www.growstuff.org; admin@growstuff.org)"
+
+    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+      http.request(req)
+    end
+
+    data = JSON.parse(response.body)
+    claims = data.dig('entities', wikidata_id, 'claims') || {}
+
+    highest_temp = extract_temp(claims['P6591'])
+    lowest_temp = extract_temp(claims['P7422'])
+
+    {
+      highest_temp_c: highest_temp,
+      lowest_temp_c: lowest_temp
+    }
+  rescue StandardError => e
+    Rails.logger.error "WikidataService.fetch_temps error: #{e.message}"
+    {}
+  end
+
+  def self.extract_temp(claim_data)
+    return nil if claim_data.blank?
+
+    # We take the first value
+    main_snak = claim_data.first&.dig('mainsnak')
+    return nil unless main_snak&.dig('datavalue', 'type') == 'quantity'
+
+    quantity_data = main_snak.dig('datavalue', 'value')
+    amount = quantity_data['amount'].to_f
+    unit = quantity_data['unit']
+
+    case unit
+    when CELSIUS_UNIT_ID
+      amount
+    when FAHRENHEIT_UNIT_ID
+      (amount - 32) * 5.0 / 9.0
+    else
+      nil
+    end
+  end
+end
@@ -3,7 +3,7 @@
 - content_for :breadcrumbs do
  - if @owner
    %li.breadcrumb-item= link_to 'Activities', activities_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s activities", activities_path(owner: @owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s activities", member_activities_path(@owner)
  - else
    %li.breadcrumb-item.active= link_to 'Activities', activities_path

@@ -16,14 +16,14 @@
      %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
        = f.label :crop_id, class: 'control-label col-md-2'
        .col-md-8
-          = collection_select(:alternate_name, :crop_id,
-                              Crop.all, :id, :name,
+          = select(:alternate_name, :crop_id,
+                              Crop.order(:name).pluck(:name, :id),
                              { selected: @alternate_name.crop_id || @crop.id },
                              class: 'form-control')

@@ -1,6 +1,12 @@
 - if crop.approved? && signed_in?
+  - active_plantings = current_member.plantings.where(crop: crop).active

  .btn-group.crop-actions{"aria-label" => "Crop Actions", role: "group"}
    = render 'plantings/modal', planting: Planting.new(crop: crop, owner: current_member)
    = render 'harvests/modal', harvest: Harvest.new(crop: @crop,  owner: current_member)
    = render 'seeds/modal', seed: Seed.new(crop: @crop,  owner: current_member)
+    = link_to new_post_path(crop_id: crop.slug), class: 'btn', id: 'post-button' do
+      = post_icon
+      Post
+    - if active_plantings.any?
+      = render 'plantings/failed_modal', crop: crop, active_plantings: active_plantings
@@ -85,7 +85,7 @@

      -# Only crop wranglers see the crop hierarchy (for now)
      - if can? :wrangle, @crop
-        = f.collection_select(:parent_id, Crop.all.order(:name), :id, :name,
+        = f.select(:parent_id, Crop.order(:name).pluck(:name, :id),
          { include_blank: true, label: 'Parent crop'})
        %span.help-block Optional. For setting up crop hierarchies for varieties etc.

@@ -5,18 +5,19 @@
      %p Nobody has harvested this crop yet.
  - unless crop.harvests.empty?
    %ul.list-group.list-group-flush
-      - Harvest.where(crop: crop).includes(:owner).order(harvested_at: :desc).limit(3).each do |harvest|
-        %li.list-group-item
-          = link_to harvest_path(harvest), class: 'card-link' do
-            = harvest_icon
-            #{harvest.owner} harvested #{display_quantity(harvest)}.
-          .float-right= render 'members/location', member: harvest.owner
-          .harvest-timeago
-            %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
+      - Rails.cache.fetch([crop, "recent_harvests", Time.zone.today]) do
+        - Harvest.where(crop: crop).includes(:owner).order(harvested_at: :desc).limit(3).each do |harvest|
+          %li.list-group-item
+            = link_to harvest_path(harvest), class: 'card-link' do
+              = harvest_icon
+              #{harvest.owner} harvested #{display_quantity(harvest)}.
+            .float-right= render 'members/location', member: harvest.owner
+            .harvest-timeago
+              %small #{standard_time_distance(harvest.harvested_at, Time.zone.now.to_date)}
      %li.list-group-item= link_to "View all #{crop.name} harvests", crop_harvests_path(crop), class: 'card-link'
      - if crop.approved?
        - if current_member
-          %li.list-group-item= link_to "Harvest #{crop.name}", new_harvest_path(crop_id: crop.id), class: 'btn btn-block'
+          %li.list-group-item= link_to "Harvest #{crop.name}", new_harvest_path(harvest: { crop_id: crop.id }), class: 'btn btn-block'
        - else
          %li.list-group-item.active
            = icon 'fas', 'user'
@@ -8,6 +8,8 @@
          = link_to planting_path(planting), class: 'card-link' do
            = planting_icon
            = planting
+          - if can?(:edit, planting)
+            .float-right= render 'plantings/actions', planting: planting
          .float-right= render 'members/location', member: planting.owner
  .card-footer
    - if crop.approved?
@@ -6,7 +6,7 @@
    Nobody has posted about #{crop.name.pluralize} yet.
  %p
    - if can? :create, Post
-      = link_to "Post something", new_post_path, class: 'btn btn-default'
+      = link_to "Post something", new_post_path(crop_id: crop.slug), class: 'btn btn-default'
    - else
      = render partial: "shared/signin_signup",
              locals: { to: "post your tips and experiences growing #{crop.name.pluralize}" }
@@ -44,8 +44,10 @@ csv.headers *all_headers
@crops.each do |c|
  csv.row c do |csv, crop|

-    csv.cells :id, :name, :en_wikipedia_url
-    csv.cell :growstuff_url, crop_url(c)
+    csv.cell :id, c.id
+    csv.cell :name, c.name
+    csv.cell :en_wikipedia_url, c.en_wikipedia_url
+    csv.cell :growstuff_url, crop_url(slug: c.slug)

    if c.scientific_names.any?
      csv.cell :default_scientific_name, c.default_scientific_name
@@ -58,10 +60,10 @@ csv.headers *all_headers
    end

    csv.cell :plantings_count, c.plantings_count || 0
-    csv.cell :seeds_count, c.seeds.size[]
+    csv.cell :seeds_count, c.seeds.size
    csv.cell :harvests_count, c.harvests.size

-  # Sunniness
+    # Sunniness

    sunniness = c.sunniness
    sunniness_rec = sunniness.max_by{|k,v| v}
@@ -74,7 +76,7 @@ csv.headers *all_headers

    # Planted from

-    planted_from  = c.planted_from
+    planted_from = c.planted_from
    planted_from_rec = planted_from.max_by{|k,v| v}
    if planted_from_rec
      csv.cell :plant_from_recommendation, planted_from_rec[0]
@@ -105,12 +107,11 @@ csv.headers *all_headers
      csv.cell col, harvested_plant_parts[pp] || 0
    end

-    csv.cell :added_by_member_id, c.creator.id
-    csv.cell :added_by_member_name, c.creator.to_s
+    csv.cell :added_by_member_id, c.creator&.id
+    csv.cell :added_by_member_name, c.creator&.to_s
    csv.cell :date_added, c.created_at.to_fs(:db)
    csv.cell :last_modified, c.updated_at.to_fs(:db)

    csv.cell :license, "CC-BY-SA Growstuff http://growstuff.org/"
-
  end
 end
@@ -36,10 +36,11 @@
      = cute_icon
      = render 'predictions', crop: @crop
    - if @crop.all_companions.any?
-      %section.companions
-        %h2 Companions
-        - @crop.all_companions.each do |companion|
-          = render 'crops/tiny', crop: companion
+      - cache [@crop, 'companions'] do
+        %section.companions
+          %h2 Companions
+          - @crop.all_companions.each do |companion|
+            = render 'crops/tiny', crop: companion

    - if crop_or_parent(@crop, :en_youtube_url).present?
      %section.youtube
@@ -73,10 +74,11 @@
              = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"

    - if @crop.varieties.any?
-      %section.varieties
-        %h2 Varieties
-        .index-cards
-          = render 'varieties', crop: @crop
+      - cache [@crop, 'varieties'] do
+        %section.varieties
+          %h2 Varieties
+          .index-cards
+            = render 'varieties', crop: @crop

    %section.crop-map
      %h2
@@ -134,9 +136,11 @@
    = render 'harvests', crop: @crop
    = render 'find_seeds', crop: @crop

-    = render 'openfarm_data', crop: @crop
+    - cache [@crop, 'openfarm_data'] do
+      = render 'openfarm_data', crop: @crop

-    = render 'nutritional_data', crop: @crop
+    - cache [@crop, 'nutritional_data'] do
+      = render 'nutritional_data', crop: @crop

    = cute_icon
    .card
@@ -28,6 +28,12 @@
        = f.check_box :send_planting_reminder
        Receive regular reminders to track your planting and harvesting.

+  .form-group
+    .col-md-offset-2.col-md-8.checkbox
+      %label
+        = f.check_box :send_harvest_reminder
+        Receive regular reminders of upcoming harvests.
+
  .form-group
    .col-md-offset-2.col-md-8.checkbox
      %label
@@ -6,6 +6,7 @@

 - @forums.each do |forum|
  %h2= forum
+  %p= forum.description
  %p
    = localize_plural(forum.posts, Post)
    |
@@ -102,6 +102,8 @@
          %strong Collaborators:
          - if can?(:create, GardenCollaborator.new(garden: @garden))
            = link_to "Manage", garden_garden_collaborators_path(@garden)
+          - elsif current_member.present? && (collab = @garden.garden_collaborators.find_by(member: current_member))
+            = link_to "Leave garden", garden_garden_collaborator_path(@garden, collab), method: :delete, class: 'text-danger', data: { confirm: 'Are you sure you want to leave this garden?' }
          - if @garden.garden_collaborators.any?
            %ul
              - @garden.garden_collaborators.each do |collabator|
@@ -122,6 +124,31 @@
            %strong Garden type:
            = @garden.garden_type.name

+        - if @garden.location_wikidata_id.present?
+          %hr
+          %p
+            %small
+              Data about this location from 
+              = link_to "wikidata", "https://www.wikidata.org/wiki/#{@garden.location_wikidata_id}", target: '_blank', rel: 'noopener noreferrer'
+
+          %p
+            %strong Highest temperature:
+            - if @garden.highest_temp_c.present?
+              = "#{ @garden.highest_temp_c.round(1) }°C"
+            - else
+              Not known
+          %p
+            %strong Lowest temperature:
+            - if @garden.lowest_temp_c.present?
+              = "#{ @garden.lowest_temp_c.round(1) }°C"
+            - else
+              Not known
+
+        - elsif can?(:edit, @garden) && @garden.location.present?
+          .alert.alert-info
+            %p Wikidata information is missing for this location.
+            = button_to "Fetch Wikidata info", fetch_wikidata_garden_path(@garden), method: :post, class: 'btn btn-info btn-sm'
+
    .card
      .card-header
        %h4 #{@garden.owner}'s gardens
@@ -52,6 +52,17 @@
          = f.select(:weight_unit, Harvest::WEIGHT_UNITS_VALUES, { include_blank: false }, class: 'form-control')
      = f.text_area :description, rows: 6, label: 'Notes'

+      - if @planting.present?
+        .row
+          .col-md-12
+            = f.range_field :overall_rating, min: 1, max: 5, value: @planting.overall_rating, include_blank: 'Leave blank', label: 'Overall Rating - Planting', list: "rating-list", title: "How well is the planting going?"
+            %datalist{"id": "rating-list"}
+              %option{"value": "1"} Poor
+              %option{"value": "2"}
+              %option{"value": "3"}
+              %option{"value": "4"}
+              %option{"value": "5"} Great
+
    .card-footer
      .text-right= f.submit 'Save'

@@ -13,7 +13,7 @@
          .index-cards
            - harvest.crop.plant_parts.order(:name).each do |plant_part|
              .card
-                = link_to harvests_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), method: :post do
+                = link_to new_harvest_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}) do
                  .card-title.text-center
                    %h3= plant_part_icon(plant_part.name)
                    %h3= plant_part.name
@@ -22,10 +22,12 @@
        %h6 All Plant parts
        %nav.nav
          - PlantPart.all.order(:name).each do |plant_part|
-            = link_to harvests_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), method: :post, class: 'nav-link border' do
+            = link_to new_harvest_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), class: 'nav-link border' do
              = plant_part_icon(plant_part.name)
              = plant_part

+
+
 %a.btn#modalHarvestButton{"data-bs-target" => "#modelHarvestForm", "data-bs-toggle" => "modal", href: ""}
  = harvest_icon
  Record harvest
@@ -1,3 +1,4 @@
-%p
-  %small
-    = harvest.harvested_at
+- cache harvest do
+  %p
+    %small
+      = harvest.harvested_at
@@ -4,7 +4,7 @@
 - content_for :breadcrumbs do
  - if @owner
    %li.breadcrumb-item= link_to 'Harvests', harvests_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s harvests", harvests_path(owner: @owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s harvests", member_harvests_path(@owner)
  - else
    %li.breadcrumb-item.active= link_to "Harvests", harvests_path
 .row
@@ -1,11 +1,12 @@
 %h2= t('.recently_planted')
 - Planting.homepage_records(6).each do |planting|
-  = link_to planting_path(slug: planting['slug']), class: 'list-group-item list-group-item-action flex-column align-items-start' do
+  - next unless planting.thumbnail_url.present?
+  = link_to planting_path(slug: planting.slug), class: 'list-group-item list-group-item-action flex-column align-items-start' do
    .d-flex.w-100.justify-content-between.homepage--list-item
      %p.mb-2
-        = image_tag planting['thumbnail_url'], width: 75, class: 'rounded shadow', alt: "Image of #{planting['crop_name']} by #{planting['owner_login_name']}"
+        = image_tag planting.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{planting.crop_name} by #{planting.owner_login_name}"
      .text-right
-        %h4= planting['crop_name']
-        - if planting['planted_from'].present?
-          %span.badge.badge-success= planting['planted_from'].pluralize
-        %small.text-muted planted by #{planting['owner_login_name']}
+        %h4= planting.crop_name
+        - if planting.planted_from.present?
+          %span.badge.badge-success= planting.planted_from.pluralize
+        %small.text-muted planted by #{planting.owner_login_name}
@@ -1 +1 @@
 .4.8
 .4.9