Merge branch 'dev' of https://github.com/Growstuff/growstuff into openfarm-bye-bye

.dockerignore

@@ -7,6 +7,7 @@ tmp/*
 node_modules
 public/assets
 .env
+.ruby-version
 .ruby-gemset
 .editorconfig
 .esignore

.github/FUNDING.yml

@@ -1 +0,0 @@
-ko_fi: jennyscottthompson

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

@@ -14,13 +14,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         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@v6
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

.rubocop_todo.yml

@@ -1,31 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-02 06:53:56 UTC using RuboCop version 1.86.1.
+# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 407
-# This cop supports safe autocorrection (--autocorrect).
-Capybara/RSpec/HaveContent:
-  Enabled: false
-
-# Offense count: 21
-Capybara/RSpec/NegationMatcherAfterVisit:
+# Offense count: 19
+Capybara/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/RSpec/SpecificMatcher:
+Capybara/SpecificMatcher:
   Exclude:
     - 'spec/features/footer_spec.rb'
     - 'spec/features/gardens/adding_gardens_spec.rb'
@@ -34,7 +28,7 @@ Capybara/RSpec/SpecificMatcher:
     - 'spec/features/seeds/adding_seeds_spec.rb'
 
 # Offense count: 1
-Capybara/RSpec/VisibilityMatcher:
+Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/shared_examples/crop_suggest.rb'
 
@@ -69,13 +63,7 @@ FactoryBot/ExcessiveCreateList:
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLines:
-  Exclude:
-    - 'config/environments/production.rb'
-
-# Offense count: 311
+# Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -93,7 +81,7 @@ Layout/HashAlignment:
     - 'spec/requests/api/v1/activities_request_spec.rb'
     - 'spec/requests/api/v1/members_request_spec.rb'
 
-# Offense count: 8
+# Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -101,20 +89,9 @@ 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).
@@ -122,15 +99,23 @@ Lint/AmbiguousOperatorPrecedence:
   Exclude:
     - 'app/controllers/activities_controller.rb'
 
-# Offense count: 3
+# Offense count: 4
 # 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
@@ -173,7 +158,7 @@ Lint/UselessConstantScoping:
   Exclude:
     - 'app/controllers/members_controller.rb'
 
-# Offense count: 65
+# Offense count: 61
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 295
@@ -195,12 +180,12 @@ Metrics/CollectionLiteralLength:
   Exclude:
     - 'lib/tasks/import.rake'
 
-# Offense count: 11
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 83
+# Offense count: 82
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 296
@@ -210,7 +195,7 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Max: 144
 
-# Offense count: 10
+# Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 32
@@ -224,16 +209,6 @@ 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:
@@ -246,54 +221,34 @@ RSpec/BeEq:
   Exclude:
     - 'spec/requests/api/v1/activities_request_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/tasks/import_spec.rb'
-    - 'spec/tasks/members_spec.rb'
 
-# Offense count: 311
+# Offense count: 298
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
-# Offense count: 2
-# Configuration parameters: IgnoredMetadata.
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/models/harvest_prediction_spec.rb'
-    - 'spec/tasks/members_spec.rb'
-
-# Offense count: 37
+# Offense count: 36
 # 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: 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
+# Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 27
 
+# Offense count: 32
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
@@ -328,18 +283,27 @@ RSpec/IncludeExamples:
     - 'spec/views/photos/show.html.haml_spec.rb'
     - 'spec/views/seeds/index.rss.haml_spec.rb'
 
-# Offense count: 2
+# Offense count: 37
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
   Exclude:
-    - 'spec/models/activity_spec.rb'
+    - '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'
 
-# Offense count: 711
+# Offense count: 719
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# Offense count: 43
+# Offense count: 41
 RSpec/LetSetup:
   Enabled: false
 
@@ -354,7 +318,7 @@ RSpec/MessageChain:
   Exclude:
     - 'spec/models/member_spec.rb'
 
-# Offense count: 65
+# Offense count: 23
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -365,11 +329,11 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 235
+# Offense count: 191
 RSpec/MultipleExpectations:
   Max: 19
 
-# Offense count: 171
+# Offense count: 166
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 16
@@ -380,35 +344,24 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NamedSubject:
   Enabled: false
 
-# Offense count: 112
+# Offense count: 109
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 366
+# Offense count: 407
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 9
+# Offense count: 4
 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:
@@ -433,18 +386,18 @@ RSpec/ScatteredSetup:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/plantings/prediction_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 # 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: 2
+# Offense count: 3
 RSpec/StubbedMock:
   Exclude:
-    - 'spec/controllers/photos_controller_spec.rb'
+    - 'spec/controllers/garden_types_controller_spec.rb'
+    - 'spec/controllers/gardens_controller_spec.rb'
     - 'spec/models/member_spec.rb'
 
 # Offense count: 1
@@ -461,13 +414,6 @@ 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
@@ -524,25 +470,11 @@ 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:
@@ -556,12 +488,6 @@ 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:
@@ -688,7 +614,7 @@ Rake/MethodDefinitionInTask:
   Exclude:
     - 'lib/tasks/growstuff.rake'
 
-# Offense count: 5
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
@@ -697,17 +623,10 @@ 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:
@@ -738,13 +657,12 @@ Style/FloatDivision:
   Exclude:
     - 'app/models/concerns/predict_planting.rb'
 
-# Offense count: 2
+# Offense count: 1
 # 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
@@ -760,14 +678,11 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'lib/actions/oauth_signup_action.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/MapIntoArray:
   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).
@@ -821,13 +736,6 @@ 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.

.ruby-version

@@ -1 +1 @@
-3.4.9
+3.4.8

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.4.9-trixie
+FROM ruby:3.4.8-trixie
 
 # Install system dependencies
 RUN apt-get update -qq && \

Gemfile

@@ -116,8 +116,6 @@ gem 'xmlrpc' # fixes rake error - can be removed if not needed later
 
 gem 'puma'
 
-gem 'rack-attack'
-
 gem 'loofah', '>= 2.19.1'
 gem 'rack-protection', '>= 2.0.1'
 

Gemfile.lock

@@ -122,8 +122,8 @@ GEM
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1252.0)
-    aws-sdk-core (3.248.0)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -131,24 +131,24 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.128.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.224.0)
-      aws-sdk-core (~> 3, >= 3.248.0)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.11.3)
+    axe-core-api (4.11.2)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.3)
-      axe-core-api (= 4.11.3)
+    axe-core-capybara (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
-    axe-core-rspec (4.11.3)
-      axe-core-api (= 4.11.3)
+    axe-core-rspec (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
       ostruct
       virtus
@@ -236,7 +236,7 @@ GEM
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (5.0.4)
+    dalli (5.0.2)
       logger
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
@@ -247,7 +247,7 @@ GEM
     date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (5.0.4)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 7.0)
@@ -276,7 +276,7 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.4)
+    erb (6.0.2)
     erubi (1.13.1)
     execjs (2.10.0)
     factory_bot (6.5.5)
@@ -286,7 +286,7 @@ GEM
       railties (>= 6.1.0)
     faker (3.8.0)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.2)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -297,7 +297,7 @@ GEM
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
-    friendly_id (5.7.0)
+    friendly_id (5.6.0)
       activerecord (>= 4.0.0)
     gbifrb (0.2.0)
     geocoder (1.8.6)
@@ -355,7 +355,7 @@ GEM
       terminal-table (>= 1.5.1)
     i18n_data (1.1.0)
       simple_po_parser (~> 1.1)
-    icalendar (2.12.3)
+    icalendar (2.12.2)
       base64
       ice_cube (~> 0.16)
       logger
@@ -366,7 +366,7 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.2)
-    irb (1.18.0)
+    irb (1.17.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
@@ -376,7 +376,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.5)
+    json (2.19.3)
     json-schema (6.2.0)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
@@ -453,13 +453,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.19.3)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.19.3-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.17.1)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -477,7 +477,7 @@ GEM
     paper_trail (17.0.0)
       activerecord (>= 7.1)
       request_store (~> 1.4)
-    parallel (2.1.0)
+    parallel (2.0.1)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
@@ -498,13 +498,11 @@ GEM
       date
       stringio
     public_suffix (7.0.5)
-    puma (8.0.1)
+    puma (8.0.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
     rack (2.2.23)
-    rack-attack (6.8.0)
-      rack (>= 1.0, < 4)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -630,7 +628,7 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.86.2)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -644,13 +642,13 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.23.0)
+    rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      rubocop (~> 1.72, >= 1.72.1)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.35.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -670,7 +668,7 @@ GEM
     ruby-units (4.1.0)
     ruby-vips (2.2.1)
       ffi (~> 1.12)
-    rubyzip (3.3.0)
+    rubyzip (3.2.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -690,7 +688,7 @@ GEM
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.44.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -725,7 +723,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.7.0)
     timecop (0.9.11)
-    timeout (0.6.1)
+    timeout (0.5.0)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -843,7 +841,6 @@ DEPENDENCIES
   pry
   puma
   query_diet
-  rack-attack
   rack-cors
   rack-protection (>= 2.0.1)
   rails (~> 7.2.0)
@@ -886,7 +883,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.4.9
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22

app/controllers/activities_controller.rb

@@ -4,16 +4,21 @@ class ActivitiesController < DataController
   def index
     @show_all = params[:all] == '1'
 
-    @activities = Activity.includes(:owner).order(created_at: :desc)
-    @activities = @activities.active unless @show_all
+    where = {}
+    where['active'] = true unless @show_all
 
-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
-      @activities = @activities.where(owner_id: @owner.id)
+    if params[:member_slug]
+      @owner = Member.find_by(slug: params[:member_slug])
+      where['owner_id'] = @owner.id unless @owner.nil?
     end
 
-    @activities = @activities.paginate(page: params[:page], per_page: 30)
-
+    @activities = Activity.search(
+      where:,
+      page:     params[:page],
+      limit:    30,
+      boost_by: [:created_at],
+      load:     false
+    )
     @filename = "Growstuff-#{specifics}Activities-#{Time.zone.now.to_fs(:number)}.csv"
     respond_with(@activities)
   end

app/controllers/admin/members_controller.rb

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

app/controllers/api/v1/crops_controller.rb

@@ -3,36 +3,6 @@
 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

app/controllers/application_controller.rb

@@ -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, :send_harvest_reminder)
+                    :show_email, :newsletter, :send_notification_email, :send_planting_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, :send_harvest_reminder,
+                    :show_email, :newsletter, :send_notification_email, :send_planting_reminder,
                     # update password
                     :current_password)
     end

app/controllers/blocks_controller.rb

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

app/controllers/charts/crops_controller.rb

@@ -3,7 +3,6 @@
 module Charts
   class CropsController < ApplicationController
     respond_to :json
-    before_action :set_crop
 
     def sunniness
       pie_chart_query 'sunniness'
@@ -14,28 +13,20 @@ module Charts
     end
 
     def harvested_for
-      data = Rails.cache.fetch("#{@crop.cache_key_with_version}/harvested_for", expires_in: 1.day) do
-        Harvest.joins(:plant_part)
-          .where(crop: @crop)
-          .group("plant_parts.name").count(:id)
-      end
-      render json: data
+      @crop = Crop.find_by!(slug: params[:crop_slug])
+      render json: Harvest.joins(:plant_part)
+        .where(crop: @crop)
+        .group("plant_parts.name").count(:id)
     end
 
     private
 
-    def set_crop
-      @crop = Crop.find_by!(slug: params[:crop_slug])
-    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
+      @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
   end
 end

app/controllers/crops_controller.rb

@@ -13,7 +13,7 @@ class CropsController < ApplicationController
     @crops = Crop.search('*', boost_by: %i(plantings_count harvests_count),
                               limit:    100,
                               page:     params[:page],
-                              load:     (request.format.csv? || request.format.rss? ? { include: %i(parent scientific_names seeds harvests creator plantings) } : false))
+                              load:     false)
     @num_requested_crops = requested_crops.size if current_member
     @filename = filename
     respond_with @crops

app/controllers/gardens_controller.rb

@@ -2,7 +2,7 @@
 
 class GardensController < DataController
   def index
-    @owner = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
+    @owner = Member.find_by(slug: params[:member_slug])
     @show_all = params[:all] == '1'
     @show_jump_to = params[:member_slug].present? || false
 
@@ -57,23 +57,12 @@ 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_wikidata_id, :lowest_temp_c, :highest_temp_c
+      :location, :latitude, :longitude, :area, :area_unit, :garden_type_id
     )
   end
 end

app/controllers/harvests_controller.rb

@@ -5,8 +5,8 @@ class HarvestsController < DataController
 
   def index
     where = {}
-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
+    if params[:member_slug]
+      @owner = Member.find_by(slug: params[:member_slug])
       where['owner_id'] = @owner.id
     end
 
@@ -23,7 +23,7 @@ class HarvestsController < DataController
     @harvests = Harvest.search('*', where:,
                                     limit:    100,
                                     page:     params[:page],
-                                    load:     (request.format.csv? ? { include: %i(crop owner plant_part) } : false),
+                                    load:     false,
                                     boost_by: [:created_at])
 
     @filename = csv_filename
@@ -38,9 +38,9 @@ class HarvestsController < DataController
   end
 
   def new
-    @harvest = Harvest.new(new_harvest_params.merge(harvested_at: Time.zone.today))
-    @planting = @harvest.planting
-    @crop = @harvest.crop
+    @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])
     respond_with(@harvest)
   end
 
@@ -52,7 +52,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?
-    update_planting_rating if @harvest.save
+    @harvest.save
     if params[:return] == 'planting'
       respond_with(@harvest, location: @harvest.planting)
     else
@@ -61,7 +61,7 @@ class HarvestsController < DataController
   end
 
   def update
-    update_planting_rating if @harvest.update(harvest_params)
+    @harvest.update(harvest_params)
     respond_with(@harvest)
   end
 
@@ -76,17 +76,7 @@ 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, :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)
+              :plant_part_id, :slug, :si_weight)
       .merge(owner_id: current_member.id)
   end
 
@@ -113,10 +103,4 @@ 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

app/controllers/members_controller.rb

@@ -90,12 +90,11 @@ class MembersController < ApplicationController
 
   EMAIL_TYPE_STRING = {
     send_notification_email: "direct message notifications",
-    send_planting_reminder:  "planting reminders",
-    send_harvest_reminder:   "harvest reminders"
+    send_planting_reminder:  "planting reminders"
   }.freeze
 
   def member_params
-    params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter, :send_harvest_reminder)
+    params.require(:member).permit(:login_name, :tos_agreement, :email, :newsletter)
   end
 
   def member_json_fields

app/controllers/messages_controller.rb

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

app/controllers/photos_controller.rb

@@ -102,12 +102,11 @@ 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, @current_tag)
+    photos, total = current_member.flickr_photos(page, @current_set)
 
     @photos = WillPaginate::Collection.create(page, 30, total) do |pager|
       pager.replace photos
@@ -119,8 +118,6 @@ class PhotosController < ApplicationController
       { crops: @crop.id }
     elsif params[:planting_id]
       { planting_id: @planting.id }
-    elsif params[:planting_slug]
-      { plantings: @planting.id }
     else
       {}
     end
@@ -129,6 +126,5 @@ class PhotosController < ApplicationController
   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

app/controllers/plantings_controller.rb

@@ -11,9 +11,9 @@ class PlantingsController < DataController
     where = {}
     where['active'] = true unless @show_all
 
-    if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
-      where['owner_id'] = @owner.id
+    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]
@@ -160,7 +160,7 @@ class PlantingsController < DataController
   end
 
   def matching_seeds
-    @matching_seeds ||= Seed.where(crop: @planting.crop, owner: @planting.owner)
+    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

app/controllers/posts_controller.rb

@@ -8,7 +8,7 @@ class PostsController < ApplicationController
   respond_to :rss, only: %i(index show)
 
   def index
-    @author = Member.find_by!(slug: params[:member_slug]) if params[:member_slug].present?
+    @author = Member.find_by(slug: params[:member_slug])
     @posts = posts
     respond_with(@posts)
   end
@@ -21,10 +21,6 @@ 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
 

app/controllers/seeds_controller.rb

@@ -5,7 +5,7 @@ class SeedsController < DataController
     where = {}
 
     if params[:member_slug].present?
-      @owner = Member.find_by!(slug: params[:member_slug])
+      @owner = Member.find_by(slug: params[:member_slug])
       where['owner_id'] = @owner.id
     end
 
@@ -30,7 +30,7 @@ class SeedsController < DataController
       page:     params[:page],
       limit:    30,
       boost_by: [:created_at],
-      load:     (request.format.csv? ? { include: %i(crop owner) } : false)
+      load:     false
     )
 
     respond_with(@seeds)

app/helpers/crops_helper.rb

@@ -2,47 +2,28 @@
 
 module CropsHelper
   def crop_or_parent(crop, attribute)
-    @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)
+    default = crop.send(attribute)
+    return default if default.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
+    parent = crop
+    while parent = parent.parent
+      return parent.send(attribute) if parent&.send(attribute).present?
     end
+
+    # For scopes, arrays, etc return the empty value
+    default
   end
 
   def display_seed_availability(member, crop)
-    @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)
+    seeds = member.seeds.where(crop:)
+    total_quantity = seeds.where.not(quantity: nil).sum(:quantity)
 
-    @seed_availability_cache[cache_key] = begin
-      seeds = member.seeds.where(crop:)
+    return "You don't have any seeds of this crop." if seeds.none?
 
-      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
+    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
 
@@ -59,57 +40,53 @@ module CropsHelper
   end
 
   def crop_jsonld_data(crop, full_attributes: true)
-    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 = []
-      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
+    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
+        }
+      end
+
+      images = []
+      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
 end

app/helpers/plantings_helper.rb

@@ -46,13 +46,9 @@ 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)
-    @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_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)
-    end
+    Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
   end
 
   def days_from_now_to_last_harvest(planting)

app/mailers/notifier_mailer.rb

@@ -57,19 +57,6 @@ 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

app/models/ability.rb

@@ -79,7 +79,6 @@ class Ability
       can :manage, CropCompanion
       can :manage, ScientificName
       can :manage, AlternateName
-      can :openfarm, Crop
       can :gbif, Crop
     end
 
@@ -123,7 +122,6 @@ 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
@@ -165,12 +163,6 @@ class Ability
     can :destroy, Follow
     cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
-    # blocking/unblocking permissions
-    can :create, Block
-    cannot :create, Block, blocked_id: member.id # can't block yourself
-
-    can :destroy, Block, blocker_id: member.id # can only unblock your own blocks
-
     cannot :create, GardenType
     cannot :update, GardenType
     cannot :destroy, GardenType

app/models/activity.rb

@@ -4,6 +4,7 @@ class Activity < ApplicationRecord
   extend FriendlyId
   include Ownable
   include Finishable
+  include SearchActivities
   include Likeable
 
   belongs_to :garden, optional: true
@@ -45,17 +46,4 @@ 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

app/models/block.rb

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

app/models/comment.rb

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

app/models/concerns/member_flickr.rb

@@ -40,15 +40,8 @@ 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, tags = nil)
-      result = if tags.present?
-                 flickr.photos.search(
-                   user_id:  'me',
-                   tags:     tags,
-                   page:     page_num,
-                   per_page: 30
-                 )
-               elsif set.present?
+    def flickr_photos(page_num = 1, set = nil)
+      result = if set
                  flickr.photosets.getPhotos(
                    photoset_id: set,
                    page:        page_num,

app/models/concerns/predict_harvest.rb

@@ -6,31 +6,23 @@ module PredictHarvest
   included do
     # dates
     def first_harvest_date
-      return @first_harvest_date if defined?(@first_harvest_date)
-
-      @first_harvest_date = harvests_with_dates.minimum(:harvested_at)
+      harvests_with_dates.minimum(:harvested_at)
     end
 
     def last_harvest_date
-      return @last_harvest_date if defined?(@last_harvest_date)
-
-      @last_harvest_date = harvests_with_dates.maximum(:harvested_at)
+      harvests_with_dates.maximum(:harvested_at)
     end
 
     def first_harvest_predicted_at
-      return @first_harvest_predicted_at if defined?(@first_harvest_predicted_at)
+      return unless crop.median_days_to_first_harvest.present? && planted_at.present?
 
-      @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
+      planted_at + crop.median_days_to_first_harvest.days
     end
 
     def last_harvest_predicted_at
-      return @last_harvest_predicted_at if defined?(@last_harvest_predicted_at)
+      return unless crop.median_days_to_last_harvest.present? && planted_at.present?
 
-      @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
+      planted_at + crop.median_days_to_last_harvest.days
     end
 
     # actions
@@ -60,16 +52,10 @@ 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)
@@ -79,18 +65,16 @@ module PredictHarvest
     end
 
     def neighbours_for_harvest_predictions
-      @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
+      # 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)
       end
+
+      Harvest.none
     end
 
     private

app/models/concerns/predict_planting.rb

@@ -13,49 +13,40 @@ module PredictPlanting
 
     # dates
     def finish_predicted_at
-      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
+      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
-      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
+      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 @actual_lifespan if defined?(@actual_lifespan)
+      return unless planted_at.present? && finished_at.present? && !failed?
 
-      @actual_lifespan = if planted_at.present? && finished_at.present? && !failed?
-                           (finished_at - planted_at).to_i
-                         end
+      (finished_at - planted_at).to_i
     end
 
     def age_in_days
-      return @age_in_days if defined?(@age_in_days)
+      return if planted_at.blank?
+      return if failed?
 
-      @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 ||= 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
-                     end
+      (known_last_day - planted_at).to_i
     end
 
     def percentage_grown

app/models/concerns/search_activities.rb

@@ -0,0 +1,66 @@
+# 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

app/models/crop.rb

@@ -4,7 +4,6 @@ class Crop < ApplicationRecord
   has_paper_trail
   extend FriendlyId
   include PhotoCapable
-  include OpenFarmData
   include GbifData
   include SearchCrops
 
@@ -165,11 +164,9 @@ class Crop < ApplicationRecord
   end
 
   def all_companions
-    @all_companions ||= if parent
-                          (companions + parent.all_companions).uniq
-                        else
-                          companions
-                        end
+    return companions unless parent
+
+    (companions + parent.all_companions).uniq
   end
 
   before_destroy :destroy_reverse_companionships

app/models/follow.rb

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

app/models/garden.rb

@@ -21,7 +21,6 @@ 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) }
@@ -93,19 +92,6 @@ 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

app/models/harvest.rb

@@ -8,8 +8,6 @@ class Harvest < ApplicationRecord
   include SearchHarvests
   include Likeable
 
-  attr_accessor :overall_rating
-
   friendly_id :harvest_slug, use: %i(slugged finders)
 
   # Constants
@@ -111,49 +109,37 @@ class Harvest < ApplicationRecord
   def to_s
     # 50 individual apples, weighing 3lb
     # 2 buckets of apricots, weighing 10kg
-    @to_s ||= "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
+    "#{quantity_to_human} #{unit_to_human} #{crop_name_to_human} #{weight_to_human}".strip
   end
 
   def quantity_to_human
-    @quantity_to_human ||= if quantity
-                             number_to_human(quantity.to_s, strip_insignificant_zeros: true)
-                           else
-                             ""
-                           end
+    return number_to_human(quantity.to_s, strip_insignificant_zeros: true) if quantity
+
+    ""
   end
 
   def unit_to_human
-    @unit_to_human ||= begin
-      if !quantity || !unit
-        ""
-      elsif unit == 'individual'
-        'individual'
-      elsif quantity == 1
-        "#{unit} of"
-      else
-        "#{unit.pluralize} of"
-      end
-    end
+    return "" unless quantity && unit
+    return 'individual' if unit == 'individual'
+    return "#{unit} of" if quantity == 1
+
+    "#{unit.pluralize} of"
   end
 
   def weight_to_human
-    @weight_to_human ||= if weight_quantity
-                           "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
-                         else
-                           ""
-                         end
+    return "" unless weight_quantity
+
+    "weighing #{number_to_human(weight_quantity, strip_insignificant_zeros: true)} #{weight_unit}"
   end
 
   def crop_name_to_human
-    @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
+    if unit != 'individual' # buckets of apricot*s*
+      crop.name.pluralize
+    elsif quantity == 1
+      crop.name
+    else
+      crop.name.pluralize
+    end.to_s
   end
 
   private

app/models/like.rb

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

app/models/member.rb

@@ -52,15 +52,6 @@ class Member < ApplicationRecord
   has_many :followed, through: :follows
   has_many :followers, through: :inverse_follows, source: :follower
 
-  #
-  # Blocking other members
-  has_many :blocks, class_name: "Block", foreign_key: "blocker_id", dependent: :destroy,
-                    inverse_of: :blocker
-  has_many :inverse_blocks, class_name: "Block", foreign_key: "blocked_id",
-                            dependent: :destroy, inverse_of: :blocked
-  has_many :blocked_members, through: :blocks, source: :blocked
-  has_many :blockers, through: :inverse_blocks, source: :blocker
-
   #
   # Global data records this member created
   has_many :requested_crops, class_name: 'Crop', foreign_key: 'requester_id', dependent: :nullify,
@@ -79,7 +70,6 @@ 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,
@@ -162,7 +152,7 @@ class Member < ApplicationRecord
   end
 
   def unread_count
-    @unread_count ||= receipts.where(is_read: false).count
+    receipts.where(is_read: false).count
   end
 
   def self.login_name_or_email(login)
@@ -174,12 +164,12 @@ class Member < ApplicationRecord
   end
 
   def self.nearest_to(place)
-    return [] if place.blank?
-
-    latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
-    return [] unless latitude && longitude
-
-    Member.located.near([latitude, longitude], 1000)
+    nearby_members = []
+    if place
+      latitude, longitude = Geocoder.coordinates(place, params: { limit: 1 })
+      nearby_members = Member.located.sort_by { |x| x.distance_from([latitude, longitude]) } if latitude && longitude
+    end
+    nearby_members
   end
 
   def already_following?(member)
@@ -189,33 +179,4 @@ class Member < ApplicationRecord
   def get_follow(member)
     follows.find_by(followed_id: member.id) if already_following?(member)
   end
-
-  def already_blocking?(member)
-    blocks.exists?(blocked_id: member.id)
-  end
-
-  def get_block(member)
-    blocks.find_by(blocked_id: member.id) if already_blocking?(member)
-  end
-
-  def has_activity?
-    (gardens.exists? && gardens.count > 1) ||
-      plantings.exists? ||
-      harvests.exists? ||
-      seeds.exists? ||
-      photos.exists? ||
-      forums.exists? ||
-      activities.exists? ||
-      posts.exists? ||
-      comments.exists? ||
-      requested_crops.exists? ||
-      created_crops.exists? ||
-      likes.exists? ||
-      created_alternate_names.exists? ||
-      created_scientific_names.exists? ||
-      follows.exists? ||
-      inverse_follows.exists? ||
-      blocks.exists? ||
-      inverse_blocks.exists?
-  end
 end

app/models/planting.rb

@@ -119,18 +119,14 @@ class Planting < ApplicationRecord
   end
 
   def nearby_same_crop
-    return @nearby_same_crop if defined?(@nearby_same_crop)
+    return Planting.none if location.blank? || latitude.blank? || longitude.blank?
 
-    @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
+    # 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
 
   private

app/models/post.rb

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

app/services/crop_search_service.rb

@@ -2,7 +2,7 @@
 
 class CropSearchService
   # Crop.search(string)
-  def self.search(query, page: 1, per_page: 12, current_member: nil, **options)
+  def self.search(query, page: 1, per_page: 12, current_member: nil)
     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
 

app/services/gbif_service.rb

@@ -85,7 +85,7 @@ class GbifService
   end
 
   def import!
-    Crop.order(updated_at: :desc).find_each do |crop|
+    Crop.order(updated_at: :desc).each do |crop|
       Rails.logger.debug { "#{crop.id}, #{crop.name}" }
       update_crop(crop) if crop.valid?
     rescue ActiveRecord::RecordInvalid
@@ -126,12 +126,9 @@ class GbifService
 
     gbif_record = fetch(gbif_usage_key)
     if gbif_record.present?
-      #   crop.update! openfarm_data: gbif_record.fetch('data', false)
-      #   save_companions(crop, gbif_record)
       save_photos(crop, gbif_usage_key)
     else
       Rails.logger.debug "\tcrop not found on GBIF"
-      #   crop.update!(openfarm_data: false)
     end
   end
 

app/services/wikidata_service.rb

@@ -1,74 +0,0 @@
-# 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

app/views/activities/index.html.haml

@@ -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", member_activities_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s activities", activities_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to 'Activities', activities_path
 

app/views/alternate_names/_form.html.haml

@@ -22,8 +22,8 @@
       .form-group
         = f.label :crop_id, class: 'control-label col-md-2'
         .col-md-8
-          = select(:alternate_name, :crop_id,
-                              Crop.order(:name).pluck(:name, :id),
+          = collection_select(:alternate_name, :crop_id,
+                              Crop.all, :id, :name,
                               { selected: @alternate_name.crop_id || @crop.id },
                               class: 'form-control')
 

app/views/crops/_actions.html.haml

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

app/views/crops/_form.html.haml

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

app/views/crops/_harvests.html.haml

@@ -5,19 +5,18 @@
       %p Nobody has harvested this crop yet.
   - unless crop.harvests.empty?
     %ul.list-group.list-group-flush
-      - 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)}
+      - 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(harvest: { crop_id: crop.id }), class: 'btn btn-block'
+          %li.list-group-item= link_to "Harvest #{crop.name}", new_harvest_path(crop_id: crop.id), class: 'btn btn-block'
         - else
           %li.list-group-item.active
             = icon 'fas', 'user'

app/views/crops/_plantings.html.haml

@@ -8,8 +8,6 @@
           = link_to planting_path(planting), class: 'card-link' do
             = planting_icon
             = planting
-          - if can?(:edit, planting)
-            .float-right= render 'plantings/actions', planting: planting
           .float-right= render 'members/location', member: planting.owner
   .card-footer
     - if crop.approved?

app/views/crops/_posts.html.haml

@@ -6,7 +6,7 @@
     Nobody has posted about #{crop.name.pluralize} yet.
   %p
     - if can? :create, Post
-      = link_to "Post something", new_post_path(crop_id: crop.slug), class: 'btn btn-default'
+      = link_to "Post something", new_post_path, class: 'btn btn-default'
     - else
       = render partial: "shared/signin_signup",
               locals: { to: "post your tips and experiences growing #{crop.name.pluralize}" }

app/views/crops/index.csv.shaper

@@ -44,10 +44,8 @@ csv.headers *all_headers
 @crops.each do |c|
   csv.row c do |csv, crop|
 
-    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)
+    csv.cells :id, :name, :en_wikipedia_url
+    csv.cell :growstuff_url, crop_url(c)
 
     if c.scientific_names.any?
       csv.cell :default_scientific_name, c.default_scientific_name
@@ -60,10 +58,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}
@@ -76,7 +74,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]
@@ -107,11 +105,12 @@ 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

app/views/crops/show.html.haml

@@ -36,11 +36,10 @@
       = cute_icon
       = render 'predictions', crop: @crop
     - if @crop.all_companions.any?
-      - cache [@crop, 'companions'] do
-        %section.companions
-          %h2 Companions
-          - @crop.all_companions.each do |companion|
-            = render 'crops/tiny', crop: companion
+      %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
@@ -74,11 +73,10 @@
               = pie_chart crop_harvested_for_path(@crop, format: :json), legend: "bottom"
 
     - if @crop.varieties.any?
-      - cache [@crop, 'varieties'] do
-        %section.varieties
-          %h2 Varieties
-          .index-cards
-            = render 'varieties', crop: @crop
+      %section.varieties
+        %h2 Varieties
+        .index-cards
+          = render 'varieties', crop: @crop
 
     %section.crop-map
       %h2
@@ -136,11 +134,9 @@
     = render 'harvests', crop: @crop
     = render 'find_seeds', crop: @crop
 
-    - cache [@crop, 'openfarm_data'] do
-      = render 'openfarm_data', crop: @crop
+    = render 'openfarm_data', crop: @crop
 
-    - cache [@crop, 'nutritional_data'] do
-      = render 'nutritional_data', crop: @crop
+    = render 'nutritional_data', crop: @crop
 
     = cute_icon
     .card

app/views/devise/registrations/_edit_email.html.haml

@@ -28,12 +28,6 @@
         = 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

app/views/forums/index.html.haml

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

app/views/gardens/show.html.haml

@@ -102,8 +102,6 @@
           %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|
@@ -124,31 +122,6 @@
             %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

app/views/harvests/_form.html.haml

@@ -52,17 +52,6 @@
           = 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'
 

app/views/harvests/_modal.html.haml

@@ -13,7 +13,7 @@
           .index-cards
             - harvest.crop.plant_parts.order(:name).each do |plant_part|
               .card
-                = link_to new_harvest_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}) do
+                = link_to harvests_path(harvest: {planting_id: harvest.planting_id, crop_id: harvest.crop_id, plant_part_id: plant_part.id}), method: :post do
                   .card-title.text-center
                     %h3= plant_part_icon(plant_part.name)
                     %h3= plant_part.name
@@ -22,12 +22,10 @@
         %h6 All Plant parts
         %nav.nav
           - PlantPart.all.order(:name).each do |plant_part|
-            = 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
+            = 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
               = plant_part_icon(plant_part.name)
               = plant_part
 
-
-
 %a.btn#modalHarvestButton{"data-bs-target" => "#modelHarvestForm", "data-bs-toggle" => "modal", href: ""}
   = harvest_icon
   Record harvest

app/views/harvests/_popover.html.haml

@@ -1,4 +1,3 @@
-- cache harvest do
-  %p
-    %small
-      = harvest.harvested_at
+%p
+  %small
+    = harvest.harvested_at

app/views/harvests/index.html.haml

@@ -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", member_harvests_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s harvests", harvests_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to "Harvests", harvests_path
 .row

app/views/home/_plantings.html.haml

@@ -1,6 +1,5 @@
 %h2= t('.recently_planted')
 - Planting.homepage_records(6).each do |planting|
-  - 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

app/views/members/_follow_buttons.haml

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

app/views/notifier_mailer/harvest_reminder.html.haml

@@ -1,33 +0,0 @@
-%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)

app/views/photos/new.html.haml

@@ -21,14 +21,13 @@
     Please select a photo from your recent uploads.
 
 
-  %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 && !@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"
 
   - if @sets && @current_set
     %h2= @sets.key(@current_set)

app/views/plantings/_failed_modal.html.haml

@@ -1,26 +0,0 @@
-#modelFailedPlantingForm.modal.fade{"aria-hidden" => "true", "aria-labelledby" => "failed-planting-button", role: "dialog", tabindex: "-1"}
-  .modal-dialog{role: "document"}
-    .modal-content
-      .modal-header.text-center
-        %h4.modal-title.w-100.font-weight-bold Mark #{crop.name} planting as failed
-        %button.close{"aria-label" => "Close", "data-bs-dismiss" => "modal", type: "button"}
-          %span{"aria-hidden" => "true"} ×
-      .modal-body
-        %p Which planting would you like to mark as failed?
-
-        %ul.list-group
-          - active_plantings.each do |planting|
-            %li.list-group-item
-              = link_to planting_path(planting, planting: {failed: 1}), method: :put do
-                .d-flex.justify-content-between
-                  %span
-                    %h4= planting.garden.name
-                    %p Planted #{planting.planted_at}
-                  %span
-                    = finished_icon
-        .mt-3.text-right
-          = link_to 'cancel', '', "data-bs-dismiss" => "modal", class: 'btn btn-secondary'
-
-%a.btn#failed-planting-button{"data-bs-target" => "#modelFailedPlantingForm", "data-bs-toggle" => "modal", href: ""}
-  = finished_icon
-  Mark as failed

app/views/plantings/index.html.haml

@@ -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", member_plantings_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s plantings", plantings_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to 'Plantings', plantings_path
 

app/views/scientific_names/_form.html.haml

@@ -17,8 +17,8 @@
   .form-group
     = f.label :crop_id, class: 'control-label col-md-2'
     .col-md-8
-      = select(:scientific_name, :crop_id, Crop.order(:name).pluck(:name, :id),
-        { selected: @scientific_name.crop_id || @crop.id },
+      = collection_select(:scientific_name, :crop_id, Crop.all.order(:name), :id,
+        :name, { selected: @scientific_name.crop_id || @crop.id },
         class: 'form-control')
   .form-group
     = f.label :name, class: 'control-label col-md-2'

app/views/seeds/index.csv.shaper

@@ -32,7 +32,7 @@ csv.headers :id,
 
     csv.cell :quantity
 
-    csv.cell :plant_before, s.plant_before ? s.plant_before.to_fs(:db) : ''
+    csv.cell :plant_before, s.plant_before ? s.plant_before.to_s(:db) : ''
 
     csv.cell :tradable_to
     csv.cell :from_location, s.owner.location

app/views/seeds/index.html.haml

@@ -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", member_seeds_path(@owner)
+    %li.breadcrumb-item.active= link_to "#{@owner}'s seeds", seeds_path(owner: @owner)
   - else
     %li.breadcrumb-item.active= link_to 'Seeds', seeds_path
 

app/views/shared/_flash_messages.html.haml

@@ -3,4 +3,4 @@
     %button.close{ type: "button", "data-bs-dismiss" => "alert" }
       %span{ "aria-hidden" => true } ×
       %span.sr-only Close
-    = sanitize(content)
+    = content

config/application.rb

@@ -73,8 +73,6 @@ module Growstuff
     config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)
 
     # config.active_record.raise_in_transactional_callbacks = true
-    config.middleware.insert_before 0, Rack::Attack
-
     config.middleware.insert_before 0, Rack::Cors do
       allow do
         origins '*'

config/environments/production.rb

@@ -16,6 +16,10 @@ 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.

config/initializers/rack_attack.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-class Rack::Attack
-  ### Throttle Config ###
-
-  if Rails.env.production?
-    # Throttle requests to /plantings, /harvests, and /members to 10 per minute per IP
-    # Includes API routes
-    throttle('req/ip/restricted_routes', limit: 20, period: 1.minute) do |req|
-      if req.path =~ %r{^/(plantings|harvests|members)(/|$)} || req.path =~ %r{^/api/v1/(plantings|harvests|members)(/|$)}
-        req.ip
-      end
-    end
-
-    ### Fail2Ban Config ###
-
-    # Block IPs that make too many requests to suspicious paths
-    # After 5 "bad" requests in 10 minutes, block the IP for 1 hour
-    blocklist('fail2ban/pentesters') do |req|
-      Fail2Ban.filter("pentesters-#{req.ip}", maxretry: 5, findtime: 10.minutes, bantime: 1.hour) do
-        # The count for the IP is incremented if the return value is truthy.
-        req.path.include?('wp-admin') ||
-          req.path.include?('wp-login') ||
-          req.path.include?('cgi-bin') ||
-          req.path.end_with?('.php', '.asp', '.aspx', '.jsp', '.exe', '.env', '.git')
-      end
-    end
-  end
-
-  ### Custom Response Headers ###
-
-  # Add Retry-After header to throttled responses
-  self.throttled_response_retry_after_header = true
-end

config/initializers/sidekiq.rb

@@ -3,9 +3,9 @@
 # config/initializers/sidekiq.rb
 
 Sidekiq.configure_server do |config|
-  config.redis = { url: 'redis://localhost:6379/0' }
+  config.redis = { url: 'redis://localhost:6379/0', namespace: "app3_sidekiq_#{Rails.env}" }
 end
 
 Sidekiq.configure_client do |config|
-  config.redis = { url: 'redis://localhost:6379/0' }
+  config.redis = { url: 'redis://localhost:6379/0', namespace: "app3_sidekiq_#{Rails.env}" }
 end

config/locales/en.yml

@@ -456,9 +456,3 @@ 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"

config/routes.rb

@@ -32,7 +32,6 @@ 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
@@ -106,7 +105,6 @@ Rails.application.routes.draw do
   resources :forums
 
   resources :follows, only: %i(create destroy)
-  resources :blocks, only: %i(create destroy)
 
   post 'likes' => 'likes#create'
   delete 'likes' => 'likes#destroy'
@@ -123,7 +121,6 @@ Rails.application.routes.draw do
 
     resources :follows
     get 'followers' => 'follows#followers'
-    resources :blocks, only: %i(create destroy)
   end
 
   resources :messages
@@ -158,7 +155,6 @@ 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

db/migrate/20240218035144_add_activities.rb

@@ -15,5 +15,7 @@ class AddActivities < ActiveRecord::Migration[7.1]
     end
 
     add_column :members, :activities_count, :integer
+
+    Activity.reindex
   end
 end

db/migrate/20250511035341_add_wikidata_and_temps_to_gardens.rb

@@ -1,7 +0,0 @@
-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

db/migrate/20250901144900_create_blocks.rb

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

db/migrate/20260429132911_add_send_harvest_reminder_to_members.rb

@@ -1,5 +0,0 @@
-class AddSendHarvestReminderToMembers < ActiveRecord::Migration[7.2]
-  def change
-    add_column :members, :send_harvest_reminder, :boolean, default: true, null: false
-  end
-end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
+ActiveRecord::Schema[7.2].define(version: 2025_12_01_045000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -384,16 +384,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
     t.index ["member_id"], name: "index_authentications_on_member_id"
   end
 
-  create_table "blocks", force: :cascade do |t|
-    t.bigint "blocker_id"
-    t.bigint "blocked_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["blocked_id"], name: "index_blocks_on_blocked_id"
-    t.index ["blocker_id", "blocked_id"], name: "index_blocks_on_blocker_id_and_blocked_id", unique: true
-    t.index ["blocker_id"], name: "index_blocks_on_blocker_id"
-  end
-
   create_table "comfy_cms_categories", id: :serial, force: :cascade do |t|
     t.integer "site_id", null: false
     t.string "label", null: false
@@ -631,9 +621,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) 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
@@ -789,7 +776,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) 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
@@ -986,8 +972,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
-  add_foreign_key "blocks", "members", column: "blocked_id"
-  add_foreign_key "blocks", "members", column: "blocker_id"
   add_foreign_key "harvests", "plantings"
   add_foreign_key "mailboxer_conversation_opt_outs", "mailboxer_conversations", column: "conversation_id", name: "mb_opt_outs_on_conversations_id"
   add_foreign_key "mailboxer_notifications", "mailboxer_conversations", column: "conversation_id", name: "notifications_on_conversation_id"

lib/tasks/growstuff.rake

@@ -48,23 +48,8 @@ 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.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
+      Member.confirmed.wants_reminders.each do |m|
+        Notifier.planting_reminder(m).deliver_now! unless m.plantings.active.empty?
       end
     end
   end

lib/tasks/members.rake

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-namespace :members do
-  desc "Remove inactive members with no activity and last login > 24 months ago"
-  # usage: rake members:cleanup_inactive
-  # usage: DRY_RUN=true rake members:cleanup_inactive
-  task cleanup_inactive: :environment do
-    limit_date = 3.years.ago
-    dry_run = ENV.fetch('DRY_RUN', 'false') == 'true'
-
-    inactive_members = Member.where("last_sign_in_at < ? OR (last_sign_in_at IS NULL AND created_at < ?)", limit_date, limit_date)
-
-    count = 0
-    inactive_members.find_each do |member|
-      # Check for activity using the model method
-      unless member.has_activity?
-        if dry_run
-          puts "[DRY RUN] Would delete inactive member: #{member.login_name} (ID: #{member.id}, Last login: #{member.last_sign_in_at || 'Never'}, Created: #{member.created_at})"
-        else
-          puts "Deleting inactive member: #{member.login_name} (ID: #{member.id}, Last login: #{member.last_sign_in_at || 'Never'}, Created: #{member.created_at})"
-          member.destroy
-        end
-        count += 1
-      end
-    end
-
-    if dry_run
-      puts "Total inactive members that would be deleted: #{count}"
-    else
-      puts "Total inactive members deleted: #{count}"
-    end
-  end
-end

lib/tasks/search.rake

@@ -7,5 +7,6 @@ namespace :search do
     Planting.reindex
     Harvest.reindex
     Seed.reindex
+    Activity.reindex
   end
 end

public/robots.txt

@@ -123,27 +123,13 @@ Disallow: /
 User-agent: WebReaper
 Disallow: /
 
-# Semrush seem to crawl everything.
+# 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
 User-agent: SemrushBot
-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: /
+Crawl-delay: 5
 
 #
 # Friendly, low-speed bots are welcome viewing pages, but not

spec/controllers/charts/crops_controller_spec.rb

@@ -7,42 +7,21 @@ describe Charts::CropsController do
     let(:crop) { create(:crop) }
 
     describe 'sunniness' do
-      it "returns a successful response" do
-        get :sunniness, params: { crop_slug: crop.to_param }
-        expect(response).to be_successful
-      end
+      before { get :sunniness, params: { crop_slug: crop.to_param } }
 
-      it "caches the result" do
-        cache_key = "#{crop.cache_key_with_version}/sunniness"
-        expect(Rails.cache).to receive(:fetch).with(cache_key, expires_in: 1.day).and_call_original
-        get :sunniness, params: { crop_slug: crop.to_param }
-      end
+      it { expect(response).to be_successful }
     end
 
     describe 'planted_from' do
-      it "returns a successful response" do
-        get :planted_from, params: { crop_slug: crop.to_param }
-        expect(response).to be_successful
-      end
+      before { get :planted_from, params: { crop_slug: crop.to_param } }
 
-      it "caches the result" do
-        cache_key = "#{crop.cache_key_with_version}/planted_from"
-        expect(Rails.cache).to receive(:fetch).with(cache_key, expires_in: 1.day).and_call_original
-        get :planted_from, params: { crop_slug: crop.to_param }
-      end
+      it { expect(response).to be_successful }
     end
 
     describe 'harvested_for' do
-      it "returns a successful response" do
-        get :harvested_for, params: { crop_slug: crop.to_param }
-        expect(response).to be_successful
-      end
+      before { get :harvested_for, params: { crop_slug: crop.to_param } }
 
-      it "caches the result" do
-        cache_key = "#{crop.cache_key_with_version}/harvested_for"
-        expect(Rails.cache).to receive(:fetch).with(cache_key, expires_in: 1.day).and_call_original
-        get :harvested_for, params: { crop_slug: crop.to_param }
-      end
+      it { expect(response).to be_successful }
     end
   end
 end

spec/controllers/crops_controller_spec.rb

@@ -73,21 +73,6 @@ describe CropsController do
     end
   end
 
-  describe "GET CSV" do
-    let!(:tomato) { create(:tomato, en_wikipedia_url: "https://en.wikipedia.org/wiki/Tomato") }
-    before do
-      Crop.reindex
-      get :index, format: "csv"
-    end
-
-    it { is_expected.to be_successful }
-    it { expect(response.content_type).to eq("text/csv; charset=utf-8") }
-    it "contains tomato", pending: "not properly functional" do
-      expect(assigns(:crops)).not_to be_empty
-      expect(response.body).to include("tomato")
-    end
-  end
-
   describe 'CREATE' do
     subject { put :create, params: crop_params }
 

spec/controllers/forums_controller_spec.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe ForumsController do
-  let(:admin) { create(:admin_member) }
-  let(:member) { create(:member) }
-  let(:forum) { create(:forum) }
-
-  describe "GET #index" do
-    it "returns a success response" do
-      get :index
-      expect(response).to be_successful
-    end
-
-    it "assigns @forums" do
-      forum # create forum
-      get :index
-      expect(assigns(:forums)).to include(forum)
-    end
-  end
-
-  describe "GET #show" do
-    it "returns a success response" do
-      get :show, params: { id: forum.to_param }
-      expect(response).to be_successful
-    end
-  end
-
-  context "as an admin" do
-    before { sign_in admin }
-
-    describe "GET #new" do
-      it "returns a success response" do
-        get :new
-        expect(response).to be_successful
-      end
-    end
-
-    describe "GET #edit" do
-      it "returns a success response" do
-        get :edit, params: { id: forum.to_param }
-        expect(response).to be_successful
-      end
-    end
-
-    describe "POST #create" do
-      context "with valid params" do
-        let(:valid_attributes) { { name: "New Forum", description: "A new forum", owner_id: admin.id } }
-
-        it "creates a new Forum" do
-          expect do
-            post :create, params: { forum: valid_attributes }
-          end.to change(Forum, :count).by(1)
-        end
-
-        it "redirects to the created forum" do
-          post :create, params: { forum: valid_attributes }
-          expect(response).to redirect_to(Forum.last)
-        end
-      end
-    end
-
-    describe "PUT #update" do
-      context "with valid params" do
-        let(:new_attributes) { { name: "Updated Name" } }
-
-        it "updates the requested forum" do
-          put :update, params: { id: forum.to_param, forum: new_attributes }
-          forum.reload
-          expect(forum.name).to eq("Updated Name")
-        end
-
-        it "redirects to the forum" do
-          put :update, params: { id: forum.to_param, forum: new_attributes }
-          expect(response).to redirect_to(forum)
-        end
-      end
-    end
-
-    describe "DELETE #destroy" do
-      it "destroys the requested forum" do
-        forum # ensure forum exists
-        expect do
-          delete :destroy, params: { id: forum.to_param }
-        end.to change(Forum, :count).by(-1)
-      end
-
-      it "redirects to the forums list" do
-        delete :destroy, params: { id: forum.to_param }
-        expect(response).to redirect_to(forums_url)
-      end
-    end
-  end
-
-  context "as a regular member" do
-    before { sign_in member }
-
-    describe "GET #new" do
-      it "denies access" do
-        get :new
-        expect(response).to redirect_to(root_path)
-      end
-    end
-
-    describe "POST #create" do
-      it "denies access" do
-        post :create, params: { forum: { name: "Forbidden" } }
-        expect(response).to redirect_to(root_path)
-      end
-    end
-  end
-end

spec/controllers/harvests_controller_spec.rb

@@ -115,21 +115,6 @@ describe HarvestsController, :search do
 
         it { expect(Harvest.last.planting.id).to eq(planting.id) }
       end
-
-      describe "updates planting rating" do
-        let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
-
-        it "updates the planting rating when provided" do
-          post :create, params: {
-            harvest: valid_attributes.merge(
-              planting_id:    planting.id,
-              crop_id:        planting.crop_id,
-              overall_rating: 4
-            )
-          }
-          expect(planting.reload.overall_rating).to eq(4)
-        end
-      end
     end
 
     describe "with invalid params" do
@@ -186,18 +171,6 @@ describe HarvestsController, :search do
 
         it { expect(response).to redirect_to(harvest) }
       end
-
-      describe "updates planting rating" do
-        let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
-        let(:harvest) do
-          create(:harvest, valid_attributes.merge(planting_id: planting.id, crop_id: planting.crop_id))
-        end
-
-        it "updates the planting rating when provided" do
-          put :update, params: { slug: harvest.to_param, harvest: { overall_rating: 3 } }
-          expect(planting.reload.overall_rating).to eq(3)
-        end
-      end
     end
 
     describe "with invalid params" do

spec/controllers/photos_controller_spec.rb

@@ -60,7 +60,6 @@ describe PhotosController, :search do
       sign_in member
       member.stub(:flickr_photos) { [[], 0] }
       member.stub(:flickr_sets) { { "foo" => "bar" } }
-      member.stub(:flickr_auth_valid?) { true }
       controller.stub(:current_member) { member }
     end
 
@@ -86,16 +85,6 @@ describe PhotosController, :search do
       it { expect(assigns(:item)).to eq garden }
       it { expect(flash[:alert]).not_to be_present }
     end
-
-    describe "filtering by tag" do
-      let(:tag) { "tomato" }
-
-      it "passes the tag to flickr_photos" do
-        expect(member).to receive(:flickr_photos).with(anything, nil, tag).and_return([[], 0])
-        get :new, params: { type: "planting", id: planting.id, tag: tag }
-        expect(assigns(:current_tag)).to eq tag
-      end
-    end
   end
 
   describe "POST create" do

spec/controllers/places_controller_spec.rb

@@ -9,18 +9,18 @@ describe PlacesController do
 
   describe "GET show" do
     before do
-      @london_member = create(:london_member)
-      @edinburgh_member = create(:edinburgh_member)
+      @member_london = create(:london_member)
+      @member_south_pole = create(:south_pole_member)
     end
 
     it "assigns place name" do
-      get :show, params: { place: @london_member.location }
-      assigns(:place).should eq @london_member.location
+      get :show, params: { place: @member_london.location }
+      assigns(:place).should eq @member_london.location
     end
 
     it "assigns nearby members" do
-      get :show, params: { place: @london_member.location }
-      assigns(:nearby_members).should eq [@london_member, @edinburgh_member]
+      get :show, params: { place: @member_london.location }
+      assigns(:nearby_members).should eq [@member_london, @member_south_pole]
     end
   end
 

spec/controllers/posts_controller_spec.rb

@@ -10,20 +10,6 @@ describe PostsController do
     { author_id: member.id, subject: "blah", body: "blah blah" }
   end
 
-  describe '#new' do
-    let(:crop) { create(:crop, name: 'Bush Bean') }
-
-    it 'pre-populates the body when crop_id is present' do
-      get :new, params: { crop_id: crop.slug }
-      expect(assigns(:post).body).to eq("[#{crop.name}](crop)")
-    end
-
-    it 'does not pre-populate the body when crop_id is absent' do
-      get :new
-      expect(assigns(:post).body).to be_nil
-    end
-  end
-
   describe '#index' do
     before do
       create_list(:post, 100)

spec/factories/activity.rb

@@ -21,9 +21,5 @@ FactoryBot.define do
       description { "Stake tomato" }
       planting
     end
-
-    trait :reindex do
-      # Activity is not using elasticsearch anymore, so we don't need to reindex
-    end
   end
 end

spec/factories/post.rb

@@ -21,9 +21,5 @@ FactoryBot.define do
     factory :forum_post do
       forum
     end
-
-    trait :reindex do
-      # Post is not using elasticsearch, but this trait is used in some tests
-    end
   end
 end

spec/features/forums_spec.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe "Forums usage", :js do
-  let!(:forum) { create(:forum, name: "General Discussion", description: "Talk about anything") }
-  let(:member) { create(:member) }
-
-  describe "browsing forums" do
-    it "shows the list of forums" do
-      visit forums_path
-      expect(page).to have_content("General Discussion")
-      expect(page).to have_content("Talk about anything")
-    end
-  end
-
-  describe "viewing a forum" do
-    let!(:post) { create(:post, forum: forum, subject: "Hello World", author: member) }
-
-    it "shows forum details and posts" do
-      visit forum_path(forum)
-      expect(page).to have_css("h1", text: "General Discussion")
-      expect(page).to have_content("Talk about anything")
-      expect(page).to have_content("Hello World")
-      expect(page).to have_link("Post something")
-    end
-  end
-
-  describe "starting a new post from a forum" do
-    include_context 'signed in member'
-
-    it "pre-fills the forum when creating a new post" do
-      visit forum_path(forum)
-      click_link "Post something"
-
-      expect(page).to have_current_path(new_post_path(forum_id: forum.id))
-      expect(page).to have_content("This post will be posted in the forum #{forum.name}")
-
-      fill_in "post_subject", with: "My New Post"
-      fill_in "post_body", with: "Content of my post"
-      click_button "Post"
-
-      expect(page).to have_content("Post was successfully created")
-      expect(Post.last.forum).to eq(forum)
-    end
-  end
-end

spec/features/harvests/harvesting_a_crop_spec.rb

@@ -54,8 +54,6 @@ describe "Harvesting a crop", :js, :search do
         visit crop_path(maize)
         click_link "Record harvest"
         click_link plant_part.name
-        # We then navigate to the new_harvest_path, and save.
-        click_button "Save"
       end
 
       it { expect(page).to have_content "harvest was successfully created." }
@@ -71,22 +69,9 @@ describe "Harvesting a crop", :js, :search do
         click_link plant_part.name
       end
 
-      it "saves" do
-        # We then navigate to the new_harvest_path, and save.
-        click_button "Save"
-
-        expect(page).to have_content "harvest was successfully created."
-        expect(page).to have_content planting.garden.name
-        expect(page).to have_content "maize"
-      end
-
-      it "updates the planting rating" do
-        find_by_id('harvest_overall_rating').set 4
-        click_button "Save"
-        
-        expect(page).to have_content "harvest was successfully created."
-        expect(planting.reload.overall_rating).to eq 4
-      end
+      it { expect(page).to have_content "harvest was successfully created." }
+      it { expect(page).to have_content planting.garden.name }
+      it { expect(page).to have_content "maize" }
     end
 
     context "Editing a harvest" do

spec/features/members/blocking_spec.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe "blocks", :js do
-  context "when signed in" do
-    include_context 'signed in member'
-    let(:other_member) { create(:member) }
-
-    it "your profile doesn't have a block button" do
-      visit member_path(member)
-      expect(page).to have_no_link "Block"
-      expect(page).to have_no_link "Unblock"
-    end
-
-    context "blocking another member" do
-      before { visit member_path(other_member) }
-
-      it "has a block button" do
-        expect(page).to have_link "Block", href: blocks_path(blocked: other_member.slug)
-      end
-
-      it "has correct message and unblock button" do
-        click_link 'Block'
-        expect(page).to have_content "Blocked #{other_member.login_name}"
-        expect(page).to have_link "Unblock", href: block_path(member.get_block(other_member))
-      end
-
-      it "has correct message and block button after unblock" do
-        click_link 'Block'
-        click_link 'Unblock'
-        expect(page).to have_content "Unblocked #{other_member.login_name}"
-        visit member_path(other_member) # unblocking redirects to root
-        expect(page).to have_link "Block", href: blocks_path(blocked: other_member.slug)
-      end
-
-      context "when a member is blocked" do
-        before do
-          click_link 'Block'
-        end
-
-        it "prevents following" do
-          visit member_path(other_member)
-          expect(page).to have_no_link "Follow"
-        end
-
-        xit "prevents messaging" do
-          visit new_message_path(recipient_id: other_member.id)
-          fill_in "Subject", with: "Test message"
-          fill_in "Body", with: "Test message body"
-          click_button "Send message"
-          expect(page).to have_content "You cannot send a message to a member who has blocked you."
-        end
-
-        xit "prevents commenting" do
-          post = create(:post, author: other_member)
-          visit post_path(post)
-          fill_in "comment_body", with: "Test comment"
-          click_button "Post Comment"
-          expect(page).to have_content "You cannot comment on a post of a member who has blocked you."
-        end
-
-        xit "prevents liking" do
-          post = create(:post, author: other_member)
-          visit post_path(post)
-          click_link "Like"
-          expect(page).to have_content "You cannot like content of a member who has blocked you."
-        end
-      end
-    end
-  end
-end

spec/features/members/following_spec.rb

@@ -23,17 +23,6 @@ describe "follows", :js do
       expect(page).to have_no_link "Unfollow"
     end
 
-    context "when the other member is blocked" do
-      before do
-        member.blocks.create(blocked: other_member)
-        visit member_path(other_member)
-      end
-
-      it "does not have a follow button" do
-        expect(page).to have_no_link "Follow"
-      end
-    end
-
     context "following another member" do
       before { visit member_path(other_member) }
 

spec/helpers/photos_helper_spec.rb

@@ -4,7 +4,6 @@ require 'rails_helper'
 
 describe PhotosHelper do
   let(:crop) { create(:crop) }
-  let(:crop_photo_of) { create(:photo, source: 'openfarm') }
   let(:crop_photo_flickr) { create(:photo, source: 'flickr') }
 
   let(:garden) { create(:garden) }