Merge pull request #4767 from Growstuff/bump-oauth-1.1.6

Bump oauth to 1.1.6
Merge pull request #4766 from Growstuff/bump-oauth-1.1.5
2026-09-08 12:06:59 -04:00 · 2026-08-23 18:03:46 +09:30 · 2026-08-23 18:00:37 +09:30 · 2026-08-23 18:00:25 +09:30 · 2026-08-23 18:00:09 +09:30 · 2026-08-23 17:58:45 +09:30
137 changed files with 1666 additions and 1151 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 @@
+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'

@@ -14,13 +14,13 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4

      - name: Log in to the Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -28,12 +28,12 @@ jobs:

      - name: Extract metadata (tags, labels) for Docker
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
        with:
          images: ghcr.io/${{ github.repository }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
        with:
          context: .
          push: true
@@ -1,25 +1,31 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
+# 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: 19
-Capybara/NegationMatcherAfterVisit:
+# Offense count: 407
+# This cop supports safe autocorrection (--autocorrect).
+Capybara/RSpec/HaveContent:
+  Enabled: false
+
+# 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: 14
-Capybara/SpecificMatcher:
+Capybara/RSpec/SpecificMatcher:
  Exclude:
    - 'spec/features/footer_spec.rb'
    - 'spec/features/gardens/adding_gardens_spec.rb'
@@ -28,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'

@@ -63,7 +69,13 @@ FactoryBot/ExcessiveCreateList:
    - 'spec/features/crops/show_spec.rb'
    - 'spec/features/percy/percy_spec.rb'

-# Offense count: 312
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLines:
+  Exclude:
+    - 'config/environments/production.rb'
+
+# Offense count: 311
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -81,7 +93,7 @@ Layout/HashAlignment:
    - 'spec/requests/api/v1/activities_request_spec.rb'
    - 'spec/requests/api/v1/members_request_spec.rb'

-# Offense count: 5
+# Offense count: 8
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -89,9 +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'
+    - '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).
@@ -99,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
@@ -158,7 +173,7 @@ Lint/UselessConstantScoping:
  Exclude:
    - 'app/controllers/members_controller.rb'

-# Offense count: 61
+# Offense count: 65
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
  Max: 295
@@ -180,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
@@ -195,7 +210,7 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
  Max: 144

-# Offense count: 8
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
  Max: 32
@@ -209,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:
@@ -221,34 +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: 298
+# Offense count: 311
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
  Enabled: false

-# Offense count: 36
+# Offense count: 2
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/models/harvest_prediction_spec.rb'
+    - 'spec/tasks/members_spec.rb'
+
+# 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: 146
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Exclude:
+    - 'spec/controllers/crops_controller_spec.rb'
+
+# 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: 32
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -283,27 +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/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

@@ -318,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:
@@ -329,11 +365,11 @@ RSpec/MultipleDescribes:
  Exclude:
    - 'spec/features/crops/crop_wranglers_spec.rb'

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

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

-# Offense count: 109
+# 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:
@@ -386,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
@@ -414,6 +461,13 @@ RSpec/VerifiedDoubles:
    - 'spec/controllers/gardens_controller_spec.rb'
    - 'spec/views/devise/shared/_links_spec.rb'

+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Inferences.
+RSpecRails/InferredSpecType:
+  Exclude:
+    - 'spec/mailers/harvest_reminder_mailer_spec.rb'
+
 # Offense count: 30
 # Configuration parameters: Database.
 # SupportedDatabases: mysql, postgresql
@@ -470,11 +524,25 @@ 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: 5
+Rails/I18nLocaleTexts:
+  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.
 Rails/InverseOf:
@@ -488,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:
@@ -614,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
@@ -623,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:
@@ -657,12 +738,13 @@ Style/FloatDivision:
  Exclude:
    - 'app/models/concerns/predict_planting.rb'

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

 # Offense count: 2
@@ -678,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).
@@ -736,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.10
@@ -1,4 +1,4 @@
-FROM ruby:3.4.8-trixie
+FROM ruby:3.4.10-trixie

 # Install system dependencies
 RUN apt-get update -qq && \
@@ -25,7 +25,7 @@ ENV RAILS_ENV=production \
 WORKDIR /app

 # Install gems
-COPY Gemfile Gemfile.lock ./
+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
@@ -5,7 +5,9 @@ source 'https://rubygems.org'
 # Match ruby version in .ruby-version
 ruby File.read('.ruby-version')

-gem 'rails', '~> 7.2.0'
+gem 'rails', '~> 8.1.0'
+
+gem 'csv'

 # Keeping old sprockets
 # https://github.com/rails/sprockets-rails/issues/444#issuecomment-637817050
@@ -16,6 +18,7 @@ gem 'bundler', '>= 2.4.22'
 gem 'coffee-rails'
 gem 'haml'
 gem 'sassc-rails'
+gem 'oauth', '1.1.6' # Explicitly pinned, as the maintainer does huge (400 files, 45k lines) changes in point releases - required manual plus agentic security review.

 # API data
 gem 'jsonapi-resources'
@@ -33,49 +33,49 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    action_text-trix (2.1.19)
+      railties
+    actioncable (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.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.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.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.1.3.1)
+      actionpack (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activesupport (= 8.1.3.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.1.3.1)
+      actionview (= 8.1.3.1)
+      activesupport (= 8.1.3.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.1.3.1)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionview (8.1.3.1)
+      activesupport (= 8.1.3.1)
      builder (~> 3.1)
-      cgi
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
@@ -89,41 +89,46 @@ GEM
    active_utils (3.6.0)
      activesupport (>= 4.2)
      i18n
-    activejob (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activejob (8.1.3.1)
+      activesupport (= 8.1.3.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.1.3.1)
+      activesupport (= 8.1.3.1)
+    activerecord (8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activesupport (= 8.1.3.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.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      marcel (~> 1.0)
-    activesupport (7.2.3.1)
+    activesupport (8.1.3.1)
      base64
-      benchmark (>= 0.3)
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.3.1)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
+      json
      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)
+    anonymous_loader (0.1.3)
+      version_gem (~> 1.1, >= 1.1.14)
    ast (2.4.3)
+    auth-sanitizer (0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
    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.1279.0)
+    aws-sdk-core (3.254.1)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
@@ -131,34 +136,23 @@ 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.229.0)
+      aws-sdk-core (~> 3, >= 3.254.1)
      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.13.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.13.0)
+      axe-core-api (= 4.13.0)
+    axe-core-rspec (4.13.0)
+      axe-core-api (= 4.13.0)
    base64 (0.3.0)
    bcrypt (3.1.22)
-    benchmark (0.5.0)
    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
@@ -177,7 +171,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 +192,18 @@ 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)
+    cgi (0.5.2)
    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 +213,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)
@@ -232,11 +224,11 @@ GEM
      gli (>= 2.7.0)
      i18n (>= 0.6.4)
      rubyzip (>= 1.0.0)
-    csv (3.3.5)
+    csv (3.3.6)
    csv_shaper (1.4.0)
      activesupport (>= 3.0.0)
      csv
-    dalli (5.0.2)
+    dalli (5.1.0)
      logger
    database_cleaner (2.1.0)
      database_cleaner-active_record (>= 2, < 3)
@@ -245,17 +237,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 +266,9 @@ GEM
    elasticsearch-transport (7.0.0)
      faraday
      multi_json
-    erb (6.0.2)
+    erb (6.0.7)
    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 +276,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 +298,22 @@ 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.4.1)
+      prism (>= 1.1.0)
      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.77.0)
      haml (>= 5.0)
      parallel (>= 1.10)
      rainbow
@@ -339,7 +330,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 +346,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)
+    io-console (0.9.1)
+    irb (1.18.0)
      pp (>= 0.6.0)
      prism (>= 1.3.0)
      rdoc (>= 4.0.0)
@@ -376,7 +366,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 +378,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 +394,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 +422,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 +446,23 @@ 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)
+    oauth (1.1.6)
+      auth-sanitizer (~> 0.2, >= 0.2.1)
+      base64 (~> 0.1)
+      cgi
+      oauth-tty (~> 1.0, >= 1.0.8)
+      snaky_hash (~> 2.0, >= 2.0.5)
+      version_gem (~> 1.1, >= 1.1.11)
+    oauth-tty (1.0.13)
+      anonymous_loader (~> 0.1, >= 0.1.3)
+      auth-sanitizer (~> 0.2, >= 0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
+    oj (3.17.6)
      bigdecimal (>= 3.0)
      ostruct (>= 0.2)
    omniauth (1.9.2)
@@ -477,16 +480,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 +497,12 @@ GEM
      coderay (~> 1.1)
      method_source (~> 1.0)
      reline (>= 0.6.0)
-    psych (5.3.1)
-      date
-      stringio
    public_suffix (7.0.5)
-    puma (8.0.0)
+    puma (8.0.2)
      nio4r (~> 2.0)
    query_diet (0.7.3)
    racc (1.8.1)
-    rack (2.2.23)
+    rack (2.2.24)
    rack-attack (6.8.0)
      rack (>= 1.0, < 4)
    rack-cors (2.0.2)
@@ -517,20 +517,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.1.3.1)
+      actioncable (= 8.1.3.1)
+      actionmailbox (= 8.1.3.1)
+      actionmailer (= 8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actiontext (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      bundler (>= 1.15.0)
-      railties (= 7.2.3.1)
+      railties (= 8.1.3.1)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -539,21 +539,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.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
      irb (~> 1.13)
      rackup (>= 1.0.0)
      rake (>= 12.2)
@@ -566,15 +565,20 @@ GEM
    rb-fsevent (0.11.2)
    rb-inotify (0.11.1)
      ffi (~> 1.0)
-    rdoc (7.2.0)
+    rbs (4.1.2)
+      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)
      connection_pool
    regexp_parser (2.12.0)
-    reline (0.6.3)
+    reline (0.7.0)
      io-console (~> 0.5)
    request_store (1.7.0)
      rack (>= 1.4)
@@ -630,7 +634,7 @@ GEM
    rswag-ui (2.17.0)
      actionpack (>= 5.2, < 8.2)
      railties (>= 5.2, < 8.2)
-    rubocop (1.86.1)
+    rubocop (1.89.0)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
@@ -641,36 +645,38 @@ 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.37.0)
      activesupport (>= 4.2.0)
      lint_roller (~> 1.1)
      rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
      rubocop-ast (>= 1.44.0, < 2.0)
    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)
@@ -684,13 +690,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.47.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@@ -703,8 +709,11 @@ 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)
+    snaky_hash (2.0.7)
+      hashie (>= 0.1.0, < 6)
+      version_gem (~> 1.1, >= 1.1.14)
    sprockets (3.7.5)
      base64
      concurrent-ruby (~> 1.0)
@@ -713,19 +722,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)
+    temple (0.10.7)
    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.9.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)
@@ -742,10 +749,7 @@ 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)
+    version_gem (1.1.15)
    warden (1.2.9)
      rack (>= 2.0.9)
    webrat (0.7.3)
@@ -754,7 +758,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)
@@ -766,7 +770,7 @@ GEM
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.7.5)
+    zeitwerk (2.8.3)

 PLATFORMS
  ruby
@@ -797,6 +801,7 @@ DEPENDENCIES
  comfortable_mexican_sofa!
  connection_pool (< 3)
  crowdin-cli
+  csv
  csv_shaper
  dalli
  database_cleaner
@@ -834,6 +839,7 @@ DEPENDENCIES
  material_icons
  memcachier
  msgpack
+  oauth (= 1.1.6)
  oj
  omniauth (~> 1.3)
  omniauth-flickr (>= 0.0.15)
@@ -846,7 +852,7 @@ DEPENDENCIES
  rack-attack
  rack-cors
  rack-protection (>= 2.0.1)
-  rails (~> 7.2.0)
+  rails (~> 8.1.0)
  rails-assets-leaflet.markercluster!
  rails-controller-testing
  rails_12factor
@@ -886,7 +892,7 @@ DEPENDENCIES
  xmlrpc

 RUBY VERSION
-   ruby 3.4.8p72
+   ruby 3.4.10p104

 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
@@ -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
@@ -3,6 +3,7 @@
 module Charts
  class CropsController < ApplicationController
    respond_to :json
+    before_action :set_crop

    def sunniness
      pie_chart_query 'sunniness'
@@ -13,7 +14,6 @@ module Charts
    end

    def harvested_for
-      @crop = Crop.find_by!(slug: params[:crop_slug])
      data = Rails.cache.fetch("#{@crop.cache_key_with_version}/harvested_for", expires_in: 1.day) do
        Harvest.joins(:plant_part)
          .where(crop: @crop)
@@ -24,12 +24,18 @@ module Charts

    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
@@ -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,7 +11,7 @@ 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: t('messages.unable_to_like'))
@@ -26,7 +26,7 @@ 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: t('messages.unable_to_unlike'))
@@ -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
@@ -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
@@ -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
@@ -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

@@ -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
@@ -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
@@ -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
@@ -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,
@@ -18,9 +18,11 @@ module PhotoCapable
    def thumbnail_url
      df = default_photo

-      return unless df
-
-      df.source == 'flickr' ? df.fullsize_url : df.thumbnail_url
+      if df
+        df.source == 'flickr' ? df.fullsize_url : df.thumbnail_url
+      elsif respond_to?(:crop) && crop.present?
+        crop.thumbnail_url
+      end
    end

    def most_liked_photo
@@ -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
@@ -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
@@ -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) }
@@ -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
@@ -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
@@ -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
@@ -79,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,
@@ -161,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)
@@ -3,7 +3,6 @@
 class Photo < ApplicationRecord
  include Likeable
  include Ownable
-  include SearchPhotos

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

@@ -28,6 +28,7 @@ class PhotoAssociation < ApplicationRecord

  def photo_and_item_have_same_owner
    return if photographable_type == 'Crop'
+    return if photographable.blank?

    errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
  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)
@@ -119,14 +118,22 @@ 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
@@ -5,7 +5,6 @@ class Seed < ApplicationRecord
  include PhotoCapable
  include Finishable
  include Ownable
-  include SearchSeeds

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

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

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

@@ -5,5 +5,8 @@
    = 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
@@ -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'
@@ -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
@@ -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
@@ -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}
@@ -0,0 +1,33 @@
+%p Hello #{@member.login_name},
+
+%h2= t('notifier_mailer.harvest_reminder.heading')
+
+%p= t('notifier_mailer.harvest_reminder.intro')
+
+%ul
+  - @plantings.each do |planting|
+    %li
+      = render 'planting', planting: planting
+      (Predicted harvest date: #{planting.first_harvest_predicted_at.to_date})
+
+%p
+  Harvested anything lately?
+  = link_to "Track your harvests here.", new_harvest_url, class: 'btn'
+
+%p
+  Track and predict your entire garden, and keep your garden records up to date at
+  = link_to member_gardens_url(@member), class: 'btn' do
+    your garden overview
+  and on
+  = link_to member_url(@member) do
+    your profile page
+
+%h4
+  See you soon on #{@sitename}!
+
+= render partial: 'signature'
+
+%hr/
+%p
+  Don't want to get these emails any more?
+  = link_to t('notifier_mailer.harvest_reminder.unsubscribe'), unsubscribe_member_url(message: @signed_message)
@@ -21,13 +21,14 @@
    Please select a photo from your recent uploads.


-  - if @sets && !@sets.empty?
-    %p
-      = bootstrap_form_tag(url: new_photo_path, method: :get, layout: :inline) do |f|
-        = f.select :set, options_for_select(@sets, @current_set), label: "Choose a photo album"
-        = hidden_field_tag :type, @type
-        = hidden_field_tag :id, @id
-        = f.submit "Search", class: "btn btn-success"
+  %p
+    = bootstrap_form_tag(url: new_photo_path, method: :get, layout: :inline) do |f|
+      - if @sets && !@sets.empty?
+        = f.select :set, options_for_select(@sets, @current_set), label: "Choose a photo album", include_blank: true
+      = f.text_field :tag, value: @current_tag, label: "or search by tag"
+      = hidden_field_tag :type, @type
+      = hidden_field_tag :id, @id
+      = f.submit "Search", class: "btn btn-success"

  - if @sets && @current_set
    %h2= @sets.key(@current_set)
@@ -4,7 +4,7 @@
 - content_for :breadcrumbs do
  - if @owner
    %li.breadcrumb-item= link_to 'Plantings', plantings_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s plantings", plantings_path(owner: @owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s plantings", member_plantings_path(@owner)
  - else
    %li.breadcrumb-item.active= link_to 'Plantings', plantings_path

@@ -7,34 +7,34 @@ cal.description = "Plantings by #{@owner.login_name}"
  event = Icalendar::Event.new

  lines = []
-  lines << "Quantity: #{planting['quantity'] ? planting['quantity'] : 'unknown' }"
-  lines << "Planted on: #{planting['planted_at'] ? planting['planted_at'] : 'unknown' }"
-  lines << "Sunniness: #{planting['sunniness'] ? planting['sunniness'] : 'unknown' }"
-  lines << "Planted from: #{planting['planted_from'] ? planting['planted_from'] : 'unknown' }"
-  lines << "First harvest from: #{planting['first_harvest_predicted_at'] ? planting['first_harvest_predicted_at'] : 'unknown' }"
-  lines << "Last harvest from: #{planting['last_harvest_predicted_at'] ? planting['last_harvest_predicted_at'] : 'unknown' }"
-  lines << "Finish predicted at: #{planting['finish_predicted_at'] ? planting['finish_predicted_at'] : 'unknown'}"
-  lines << "Finished at: #{planting['finished_at'] ? planting['finished_at'] : 'unknown' }"
+  lines << "Quantity: #{planting.quantity || 'unknown' }"
+  lines << "Planted on: #{planting.planted_at || 'unknown' }"
+  lines << "Sunniness: #{planting.sunniness || 'unknown' }"
+  lines << "Planted from: #{planting.planted_from || 'unknown' }"
+  lines << "First harvest from: #{planting.first_harvest_predicted_at || 'unknown' }"
+  lines << "Last harvest from: #{planting.last_harvest_predicted_at || 'unknown' }"
+  lines << "Finish predicted at: #{planting.finish_predicted_at || 'unknown'}"
+  lines << "Finished at: #{planting.finished_at || 'unknown' }"

  lines << planting.description
-  finish_date = Date.parse(planting['finished_at'] || planting['finish_predicted_at'] || planting['last_harvest_predicted_at']) rescue nil
+  finish_date = (planting.finished_at || planting.finish_predicted_at || planting.last_harvest_predicted_at)&.to_date

-  event.dtstart     = Time.at(planting['created_at'])
-  event.dtend       = finish_date || 1.day.from_now
-  event.summary     = planting['crop_name']
+  event.dtstart     = planting.created_at
+  event.dtend       = finish_date || 1.day.from_now.to_date
+  event.summary     = planting.crop.name
  event.description = lines.join("\n")
  event.ip_class    = "PUBLIC"
-  event.url = planting_url(slug: planting['slug'])
+  event.url = planting_url(slug: planting.slug)

  cal.add_event(event)

  if finish_date && finish_date > Date.today
-    predicted_date = Date.parse(planting['first_harvest_predicted_at']) if planting['first_harvest_predicted_at']
+    predicted_date = planting.first_harvest_predicted_at&.to_date

    todo = Icalendar::Todo.new
    todo.dtstart = predicted_date || finish_date || Date.today
    todo.due = finish_date
-    todo.summary = "Harvest #{planting['crop_name']}"
+    todo.summary = "Harvest #{planting.crop.name}"

    cal.add_todo(todo)

@@ -42,9 +42,9 @@ cal.description = "Plantings by #{@owner.login_name}"
    event = Icalendar::Event.new
    event.dtstart = predicted_date || finish_date || Date.today
    event.dtend = finish_date
-    event.summary = "Harvest #{planting['crop_name']}"
+    event.summary = "Harvest #{planting.crop.name}"
    event.ip_class    = "PUBLIC"
-    event.url = planting_url(slug: planting['slug'])
+    event.url = planting_url(slug: planting.slug)

    cal.add_event(event)
  end
@@ -6,15 +6,15 @@
    %link= plantings_url
    - @plantings.each do |planting|
      %item
-        %title #{planting['crop_name']} in #{planting['location']}
-        %pubdate= planting['created_at'].to_fs(:rfc822)
+        %title #{planting.crop_name} in #{planting.location}
+        %pubdate= planting.created_at.to_fs(:rfc822)
        %description
          :escaped
-            <p>Quantity: #{planting['quantity'] ? planting['quantity'] : 'unknown' }</p>
-            <p>Planted on: #{planting['planted_at'] ? planting['planted_at'] : 'unknown' }</p>
-            <p>Sunniness: #{planting['sunniness'] ? planting['sunniness'] : 'unknown' }</p>
-            <p>Planted from: #{planting['planted_from'] ? planting['planted_from'] : 'unknown' }</p>
+            <p>Quantity: #{planting.quantity ? planting.quantity : 'unknown' }</p>
+            <p>Planted on: #{planting.planted_at ? planting.planted_at : 'unknown' }</p>
+            <p>Sunniness: #{planting.sunniness ? planting.sunniness : 'unknown' }</p>
+            <p>Planted from: #{planting.planted_from ? planting.planted_from : 'unknown' }</p>
          :escaped_markdown
-            #{ strip_tags markdownify(planting['description']) }
-        %link= planting_url(slug: planting['slug'])
-        %guid= planting_url(slug: planting['slug'])
+            #{ strip_tags markdownify(planting.description) }
+        %link= planting_url(slug: planting.slug)
+        %guid= planting_url(slug: planting.slug)
@@ -32,7 +32,7 @@ csv.headers :id,

    csv.cell :quantity

-    csv.cell :plant_before, s.plant_before ? s.plant_before.to_s(:db) : ''
+    csv.cell :plant_before, s.plant_before ? s.plant_before.to_fs(:db) : ''

    csv.cell :tradable_to
    csv.cell :from_location, s.owner.location
@@ -1,7 +1,7 @@
 - content_for :breadcrumbs do
  - if @owner
    %li.breadcrumb-item= link_to 'Seeds', seeds_path
-    %li.breadcrumb-item.active= link_to "#{@owner}'s seeds", seeds_path(owner: @owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s seeds", member_seeds_path(@owner)
  - else
    %li.breadcrumb-item.active= link_to 'Seeds', seeds_path

@@ -17,6 +17,6 @@
            <p>Heirloom? #{seed.heirloom}</p>
          - if seed.tradable
            :escaped
-              <p>Will trade #{seed.tradable_to} from #{seed.location ||= 'unknown location'}</p>
+              <p>Will trade #{seed.tradable_to} from #{seed.location || 'unknown location'}</p>
        %link= seed_url(slug: seed.slug)
        %guid= seed_url(slug: seed.slug)
@@ -3,4 +3,4 @@
    %button.close{ type: "button", "data-bs-dismiss" => "alert" }
      %span{ "aria-hidden" => true } &times;
      %span.sr-only Close
-    = content
+    = sanitize(content)
@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+exec "./bin/rails", "server", *ARGV
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+# explicit rubocop config increases performance slightly while avoiding config confusion.
+ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
+
+load Gem.bin_path("rubocop", "rubocop")
@@ -14,7 +14,11 @@ Bundler.require(*Rails.groups)
 module Growstuff
  class Application < Rails::Application
    # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 8.1
+
+    # Rails 7.1+ requires a coder for `serialize`.
+    # We set YAML as the default for compatibility with gems like Mexican Sofa.
+    config.active_record.default_column_serializer = YAML

    I18n.config.enforce_available_locales = true

@@ -16,10 +16,6 @@ Rails.application.configure do
  config.consider_all_requests_local       = false
  config.action_controller.perform_caching = true

-  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
-  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
-  # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = true

  # Disable serving static files from the `/public` folder by default since
  # Apache or NGINX already handles this.
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# JSONAPI::Resources (0.10.7) is currently incompatible with Rails 8.1
+# because ActionDispatch::Routing::Mapper::Resources::Resource.initialize now expects keyword arguments for only/except.
+# This patch ensures that it passes keyword arguments correctly.
+# Remove when https://github.com/JSONAPI-Resources/jsonapi-resources/issues/1488 is fixed
+
+if defined?(JSONAPI)
+  module ActionDispatch
+    module Routing
+      class Mapper
+        module Resources
+          class Resource
+            alias_method :original_initialize, :initialize
+
+            def initialize(entities, api_only, shallow, options = {})
+              # In Rails 8.1, initialize(entities, api_only, shallow, only: nil, except: nil, **options)
+              # and jsonapi-resources passes them in the options hash.
+              if options.is_a?(Hash)
+                only = options.delete(:only)
+                except = options.delete(:except)
+                original_initialize(entities, api_only, shallow, only: only, except: except, **options)
+              else
+                original_initialize(entities, api_only, shallow, options)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  module JSONAPI
+    module RoutingExt
+      module Mapper
+        def jsonapi_resource_scope(resource, resource_type)
+          # The original implementation uses Resource.new which we patched above.
+          # We need to make sure we don't break Rails 5/6/7/8 logic if it were to run there.
+          @scope = @scope.new(scope_level_resource: resource, jsonapi_resource: resource_type)
+
+          controller(resource.resource_scope) { yield }
+        ensure
+          @scope = @scope.parent
+        end
+      end
+    end
+  end
+end
@@ -27,6 +27,11 @@ class Rack::Attack
    end
  end

+  # Abusive services
+  blocklist('block Semrush crawler') do |request|
+    request.user_agent.to_s.downcase.include?('semrush')
+  end
+  
  ### Custom Response Headers ###

  # Add Retry-After header to throttled responses
@@ -3,9 +3,9 @@
 # config/initializers/sidekiq.rb

 Sidekiq.configure_server do |config|
-  config.redis = { url: 'redis://localhost:6379/0', namespace: "app3_sidekiq_#{Rails.env}" }
+  config.redis = { url: 'redis://localhost:6379/0' }
 end

 Sidekiq.configure_client do |config|
-  config.redis = { url: 'redis://localhost:6379/0', namespace: "app3_sidekiq_#{Rails.env}" }
+  config.redis = { url: 'redis://localhost:6379/0' }
 end
@@ -456,3 +456,9 @@ en:
      all: Not authorized to %{action} %{subject}.
    read:
      notification: You must be signed in to view notifications.
+  notifier_mailer:
+    harvest_reminder:
+      subject: "Upcoming harvests in your garden - %{sitename}"
+      heading: "Upcoming harvests in your garden"
+      intro: "Based on our predictions, the following plantings in your garden are likely to be ready for harvest within the next week:"
+      unsubscribe: "Unsubscribe from harvest reminders"
@@ -32,6 +32,7 @@ Rails.application.routes.draw do

  resources :gardens, concerns: :has_photos, param: :slug do
    get 'timeline' => 'charts/gardens#timeline', constraints: { format: 'json' }
+    post 'fetch_wikidata' => 'gardens#fetch_wikidata', on: :member

    resources :garden_collaborators
  end
@@ -157,6 +158,7 @@ Rails.application.routes.draw do
  namespace :api do
    namespace :v1 do
      jsonapi_resources :activities
+      get "crops/search", to: "crops#search"
      jsonapi_resources :crops
      jsonapi_resources :gardens
      jsonapi_resources :harvests
@@ -4,12 +4,6 @@ class ElasticIndexing < ActiveRecord::Migration[5.2]
  def up
    say 'indexing crops'
    Crop.reindex
-    say 'indexing plantings'
-    Planting.reindex
-    say 'indexing seeds'
-    Seed.reindex
-    say 'indexing harvests'
-    Harvest.reindex
    say 'indexing photos'
    Photo.reindex
  end
@@ -15,7 +15,5 @@ class AddActivities < ActiveRecord::Migration[7.1]
    end

    add_column :members, :activities_count, :integer
-
-    Activity.reindex
  end
 end
@@ -0,0 +1,7 @@
+class AddWikidataAndTempsToGardens < ActiveRecord::Migration[7.2]
+  def change
+    add_column :gardens, :location_wikidata_id, :string
+    add_column :gardens, :lowest_temp_c, :float
+    add_column :gardens, :highest_temp_c, :float
+  end
+end
@@ -0,0 +1,5 @@
+class AddSendHarvestReminderToMembers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :members, :send_harvest_reminder, :boolean, default: true, null: false
+  end
+end
@@ -10,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
+ActiveRecord::Schema[8.0].define(version: 2026_04_29_132911) do
  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
+  enable_extension "pg_catalog.plpgsql"

  create_table "active_storage_attachments", force: :cascade do |t|
    t.string "name", null: false
@@ -631,6 +631,9 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
    t.decimal "area"
    t.string "area_unit"
    t.integer "garden_type_id"
+    t.string "location_wikidata_id"
+    t.float "lowest_temp_c"
+    t.float "highest_temp_c"
    t.index ["garden_type_id"], name: "index_gardens_on_garden_type_id"
    t.index ["owner_id"], name: "index_gardens_on_owner_id"
    t.index ["slug"], name: "index_gardens_on_slug", unique: true
@@ -786,6 +789,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
    t.string "facebook_handle"
    t.string "bluesky_handle"
    t.string "other_url"
+    t.boolean "send_harvest_reminder", default: true, null: false
    t.index ["confirmation_token"], name: "index_members_on_confirmation_token", unique: true
    t.index ["discarded_at"], name: "index_members_on_discarded_at"
    t.index ["email"], name: "index_members_on_email", unique: true
@@ -48,8 +48,23 @@ namespace :growstuff do
    # Heroku scheduler only lets us run things daily, so this checks
    # Send on Monday
    if Time.zone.today.wday == 1
-      Member.confirmed.wants_reminders.each do |m|
-        Notifier.planting_reminder(m).deliver_now! unless m.plantings.active.empty?
+      Member.confirmed.wants_reminders.find_each do |m|
+        NotifierMailer.planting_reminder(m).deliver_later unless m.plantings.active.empty?
+      end
+    end
+  end
+
+  desc "Send harvest reminder email"
+  # usage: rake growstuff:send_harvest_reminders
+
+  task send_harvest_reminders: :environment do
+    # Heroku scheduler only lets us run things daily, so this checks
+    # Send on Wednesday
+    if Time.zone.today.wday == 3
+      Member.confirmed.wants_harvest_reminders.find_each do |m|
+        if m.plantings.active.any?(&:harvest_in_next_week?)
+          NotifierMailer.harvest_reminder(m).deliver_later
+        end
      end
    end
  end
@@ -4,9 +4,5 @@ namespace :search do
  desc 'reindex'
  task reindex: :environment do
    Crop.reindex
-    Planting.reindex
-    Harvest.reindex
-    Seed.reindex
-    Activity.reindex
  end
 end
@@ -123,13 +123,27 @@ Disallow: /
 User-agent: WebReaper
 Disallow: /

-# Per their statement, semrushbot respects crawl-delay directives
-# We want them to overall stay within reasonable request rates to
-# the backend (20 rps); keeping in mind that the crawl-delay will 
-# be applied by site and not globally by the bot, 5 seconds seem
-# like a reasonable approximation
+# Semrush seem to crawl everything.
 User-agent: SemrushBot
-Crawl-delay: 5
+Disallow: /
+ 
+User-agent: SiteAuditBot
+Disallow: /
+ 
+User-agent: SemrushBot-BA
+Disallow: /
+ 
+User-agent: SemrushBot-SI
+Disallow: /
+ 
+User-agent: SemrushBot-SWA
+Disallow: /
+ 
+User-agent: SplitSignalBot
+Disallow: /
+ 
+User-agent: SemrushBot-OCOB
+Disallow: /

 #
 # Friendly, low-speed bots are welcome viewing pages, but not
@@ -1 +1 @@
 .4.8
 .4.10