Merge branch 'dev' into refactor-hardcoded-emails

.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'
 
@@ -130,10 +128,6 @@ gem 'rack-cors'
 
 gem 'icalendar'
 
-# for web push notifications
-gem 'web-push'
-gem 'serviceworker-rails'
-
 # for signups as requested by email service
 gem 'recaptcha'
 

Gemfile.lock

@@ -140,15 +140,15 @@ GEM
       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
@@ -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)
@@ -376,7 +376,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.19.4)
+    json (2.19.3)
     json-schema (6.2.0)
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
@@ -385,8 +385,6 @@ GEM
       concurrent-ruby
       railties (>= 4.1)
     jsonapi-swagger (0.8.1)
-    jwt (3.1.2)
-      base64
     kgio (2.11.4)
     kramdown (2.4.0)
       rexml
@@ -474,13 +472,12 @@ GEM
       oauth
       omniauth (~> 1.0)
     open-uri (0.1.0)
-    openssl (3.3.0)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
     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
@@ -501,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)
@@ -647,9 +642,9 @@ 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)
@@ -699,8 +694,6 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
-    serviceworker-rails (0.6.0)
-      railties (>= 3.1)
     sidekiq (7.3.10)
       base64
       connection_pool (>= 2.3.0, < 3)
@@ -753,9 +746,6 @@ GEM
       descendants_tracker (~> 0.0, >= 0.0.3)
     warden (1.2.9)
       rack (>= 2.0.9)
-    web-push (3.0.2)
-      jwt (~> 3.0)
-      openssl (~> 3.0)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
@@ -851,7 +841,6 @@ DEPENDENCIES
   pry
   puma
   query_diet
-  rack-attack
   rack-cors
   rack-protection (>= 2.0.1)
   rails (~> 7.2.0)
@@ -880,7 +869,6 @@ DEPENDENCIES
   scout_apm
   searchkick
   selenium-webdriver
-  serviceworker-rails
   sidekiq
   sitemap_generator
   sprockets (< 4)
@@ -889,14 +877,13 @@ DEPENDENCIES
   unicorn
   validate_url
   vcr
-  web-push
   webrat
   will_paginate
   will_paginate-bootstrap-style
   xmlrpc
 
 RUBY VERSION
-   ruby 3.4.9
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22

app/assets/config/manifest.js

@@ -1,4 +1,3 @@
 // = link_tree ../images
-// = link serviceworker.js
 // = link_directory ../javascripts .js
 // = link_directory ../stylesheets .css

app/assets/javascripts/push_notifications.js

@@ -1,59 +0,0 @@
-//
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
-// vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require rails-ujs
-//= require activestorage
-//= require_tree .
-
-function urlBase64ToUint8Array(base64String) {
-  const padding = '='.repeat((4 - base64String.length % 4) % 4);
-  const base64 = (base64String + padding)
-    .replace(/-/g, '+')
-    .replace(/_/g, '/');
-
-  const rawData = window.atob(base64);
-  const outputArray = new Uint8Array(rawData.length);
-
-  for (let i = 0; i < rawData.length; ++i) {
-    outputArray[i] = rawData.charCodeAt(i);
-  }
-  return outputArray;
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-  const pushButton = document.getElementById('enable-push-notifications');
-  if (pushButton) {
-    pushButton.addEventListener('click', () => {
-      if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.ready.then(registration => {
-          const vapidPublicKey = document.querySelector('meta[name="vapid-public-key"]').content;
-          const convertedVapidKey = urlBase64ToUint8Array(vapidPublicKey);
-
-          registration.pushManager.subscribe({
-            userVisibleOnly: true,
-            applicationServerKey: convertedVapidKey
-          }).then(subscription => {
-            fetch('/push_subscriptions', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-                'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').content
-              },
-              body: JSON.stringify({ subscription: subscription.toJSON() })
-            });
-          });
-        });
-      }
-    });
-  }
-});

app/assets/javascripts/serviceworker.js.erb

@@ -1,13 +0,0 @@
-self.addEventListener('push', function(event) {
-  const data = event.data.json();
-  const title = data.title || 'Growstuff';
-  const options = {
-    body: data.body,
-    icon: '/assets/growstuff-apple-touch-icon-precomposed.png',
-    badge: '/assets/growstuff-apple-touch-icon-precomposed.png'
-  };
-
-  event.waitUntil(
-    self.registration.showNotification(title, options)
-  );
-});

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

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

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/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/push_subscriptions_controller.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-class PushSubscriptionsController < ApplicationController
-  before_action :authenticate_member!
-
-  def create
-    subscription = current_member.push_subscriptions.find_or_initialize_by(endpoint: params[:subscription][:endpoint])
-    subscription.update(
-      p256dh: params[:subscription][:keys][:p256dh],
-      auth: params[:subscription][:keys][:auth]
-    )
-    head :ok
-  end
-
-  def destroy
-    subscription = current_member.push_subscriptions.find_by(endpoint: params[:endpoint])
-    subscription&.destroy
-    head :ok
-  end
-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/jobs/push_notification_job.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-class PushNotificationJob < ApplicationJob
-  queue_as :default
-
-  def perform(*args)
-    Member.where.not(timezone: nil).pluck(:timezone).uniq.each do |timezone|
-      Time.use_zone(timezone) do
-        if Time.zone.now.hour == 8
-          Member.where(timezone: timezone).each do |member|
-            send_planting_notifications(member)
-            send_activity_notifications(member)
-          end
-        end
-      end
-    end
-  end
-
-  private
-
-  def send_planting_notifications(member)
-    member.plantings.active.annual.each do |planting|
-      if planting.finish_is_predicatable? && (planting.late? || planting.super_late?)
-        PushNotificationService.new(member, "Your #{planting.crop_name} planting is ready to be marked as finished.").send
-      end
-    end
-  end
-
-  def send_activity_notifications(member)
-    due_activities = member.activities.where(due_date: Date.today, finished: false)
-    due_activities.each do |activity|
-      PushNotificationService.new(member, "Activity due: #{activity.name}").send
-    end
-  end
-end

app/mailers/application_mailer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
+  default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
   layout 'mailer'
 end

app/mailers/notifier_mailer.rb

@@ -2,7 +2,7 @@
 
 class NotifierMailer < ApplicationMailer
   # include NotificationsHelper
-  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  default from: "Growstuff <#{Rails.configuration.x.email[:from]}>"
 
   def verifier
     unless ENV['RAILS_SECRET_TOKEN']
@@ -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/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/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/harvest.rb

@@ -109,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/member.rb

@@ -79,7 +79,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 +161,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)
@@ -197,25 +196,4 @@ class Member < ApplicationRecord
   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/push_subscription.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class PushSubscription < ApplicationRecord
-  belongs_to :member
-end

app/services/push_notification_service.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class PushNotificationService
-  def initialize(member, message)
-    @member = member
-    @message = message
-  end
-
-  def send
-    @member.push_subscriptions.each do |subscription|
-      begin
-        WebPush.payload_send(
-          message: JSON.generate(title: 'Growstuff', body: @message),
-          endpoint: subscription.endpoint,
-          p256dh: subscription.p256dh,
-          auth: subscription.auth,
-          vapid: {
-            subject: "mailto:#{ENV.fetch('GROWSTUFF_EMAIL', 'noreply@growstuff.org')}",
-            public_key: ENV['GROWSTUFF_VAPID_PUBLIC_KEY'],
-            private_key: ENV['GROWSTUFF_VAPID_PRIVATE_KEY']
-          }
-        )
-      rescue WebPush::InvalidSubscription => e
-        # A subscription can become invalid if the user revokes the permission.
-        # In this case, we should delete the subscription.
-        subscription.destroy
-        Rails.logger.info "Subscription deleted because it was invalid: #{e.message}"
-      end
-    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

@@ -5,8 +5,5 @@
     = 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,15 +5,14 @@
       %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

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

@@ -73,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
@@ -135,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/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/layouts/_head.html.haml

@@ -32,11 +32,9 @@
   - else
     %meta{name: "description", content: "Growstuff is a community of food gardeners. Let's learn to grow food together. All our data is open data."}
   = csrf_meta_tags
-  %meta{name: "vapid-public-key", content: ENV['GROWSTUFF_VAPID_PUBLIC_KEY']}
   = stylesheet_link_tag "application", media: "all"
 
   %link{ href: path_to_image("growstuff-apple-touch-icon-precomposed.png"), rel: "apple-touch-icon-precomposed" }
   %link{ href: "https://fonts.googleapis.com/css?family=Modak|Raleway&display=swap", rel: "stylesheet" }
   = favicon_link_tag 'favicon.ico'
-  = serviceworker_js_tag
   = tag("meta", name: "google-site-verification", content: "j249rPGdBqZ7gcShcdsSXCnGN5lqCuTISJnlQXxOfu4")

app/views/members/_notifications.html.haml

@@ -1,8 +0,0 @@
-.card.mt-3
-  .card-body
-    %h5.card-title Notifications
-    %p
-      Install Growstuff as a Progressive Web App (PWA) to get notifications on your device.
-      Look for the "Add to Home Screen" option in your browser's menu.
-    %button.btn.btn-primary#enable-push-notifications
-      Enable Push Notifications

app/views/members/show.html.haml

@@ -73,8 +73,6 @@
 
         = render 'members/follow_buttons', member: @member
 
-        = render "notifications", member: @member if can?(:update, @member)
-
         - if can?(:destroy, @member)
           %hr/
           = link_to admin_member_path(slug: @member.slug), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-block btn-light text-danger' do

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

config/application.rb

@@ -62,9 +62,9 @@ module Growstuff
 
     # Growstuff-specific configuration variables
     config.currency = 'AUD'
-    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
+    config.bot_email = Rails.configuration.x.email[:from]
     config.user_agent = 'Growstuff'
-    config.user_agent_email = "info@growstuff.org"
+    config.user_agent_email = Rails.configuration.x.email[:from]
 
     Gibbon::API.api_key = ENV['GROWSTUFF_MAILCHIMP_APIKEY'] || 'notarealkey'
     # API key can't be blank or tests fail
@@ -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/devise.rb

@@ -6,7 +6,7 @@ Devise.setup do |config|
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"
+  config.mailer_sender = "Growstuff <#{Rails.configuration.x.email[:from]}>"
 
   config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)
 

config/initializers/email.rb

@@ -0,0 +1,9 @@
+module Growstuff
+  class Application < Rails::Application
+    config.x.email = {
+      from: ENV.fetch('GROWSTUFF_EMAIL', 'info@growstuff.org'),
+      admin: ENV.fetch('GROWSTUFF_ADMIN_EMAIL', 'sysadmin@growstuff.org'),
+      support: ENV.fetch('GROWSTUFF_SUPPORT_EMAIL', 'info@growstuff.org')
+    }
+  end
+end

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

@@ -21,7 +21,6 @@ Rails.application.routes.draw do
   match '/members/:id/finish_signup' => 'members#finish_signup', via: %i(get patch), as: :finish_signup
 
   resources :authentications, only: %i(create destroy)
-  resources :push_subscriptions, only: %i(create destroy)
 
   get "home/index"
   get '/community-gardens', to: 'home#community_gardens'

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/20240929041436_add_timezone_to_members.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddTimezoneToMembers < ActiveRecord::Migration[7.2]
-  def change
-    add_column :members, :timezone, :string
-  end
-end

db/migrate/20240929041437_create_push_subscriptions.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class CreatePushSubscriptions < ActiveRecord::Migration[7.2]
-  def change
-    create_table :push_subscriptions do |t|
-      t.references :member, null: false, foreign_key: true
-      t.string :endpoint, null: false
-      t.string :p256dh, null: false
-      t.string :auth, null: false
-
-      t.timestamps
-    end
-    add_index :push_subscriptions, :endpoint, 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"
 
@@ -786,8 +786,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.string "timezone"
-    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
@@ -898,7 +896,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
     t.integer "harvests_count", default: 0
     t.integer "likes_count", default: 0
     t.boolean "failed", default: false, null: false
-    t.boolean "from_other_source"
     t.integer "overall_rating"
     t.index ["crop_id"], name: "index_plantings_on_crop_id"
     t.index ["garden_id"], name: "index_plantings_on_garden_id"
@@ -922,43 +919,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
     t.index ["slug"], name: "index_posts_on_slug", unique: true
   end
 
-  create_table "problem_posts", force: :cascade do |t|
-    t.bigint "problem_id"
-    t.bigint "post_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["post_id"], name: "index_problem_posts_on_post_id"
-    t.index ["problem_id", "post_id"], name: "index_problem_posts_on_problem_id_and_post_id", unique: true
-    t.index ["problem_id"], name: "index_problem_posts_on_problem_id"
-  end
-
-  create_table "problems", force: :cascade do |t|
-    t.string "name"
-    t.string "reason_for_rejection"
-    t.string "rejection_notes"
-    t.string "approval_status", default: "pending", null: false
-    t.bigint "requester_id"
-    t.bigint "creator_id"
-    t.string "slug"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["creator_id"], name: "index_problems_on_creator_id"
-    t.index ["name"], name: "index_problems_on_name"
-    t.index ["requester_id"], name: "index_problems_on_requester_id"
-    t.index ["slug"], name: "index_problems_on_slug"
-  end
-
-  create_table "push_subscriptions", force: :cascade do |t|
-    t.bigint "member_id", null: false
-    t.string "endpoint", null: false
-    t.string "p256dh", null: false
-    t.string "auth", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["endpoint"], name: "index_push_subscriptions_on_endpoint", unique: true
-    t.index ["member_id"], name: "index_push_subscriptions_on_member_id"
-  end
-
   create_table "roles", id: :serial, force: :cascade do |t|
     t.string "name", null: false
     t.text "description"
@@ -1031,10 +991,5 @@ ActiveRecord::Schema[7.2].define(version: 2026_04_29_132911) do
   add_foreign_key "photo_associations", "crops"
   add_foreign_key "photo_associations", "photos"
   add_foreign_key "plantings", "seeds", column: "parent_seed_id", name: "parent_seed", on_delete: :nullify
-  add_foreign_key "problem_posts", "posts"
-  add_foreign_key "problem_posts", "problems"
-  add_foreign_key "problems", "members", column: "creator_id"
-  add_foreign_key "problems", "members", column: "requester_id"
-  add_foreign_key "push_subscriptions", "members"
   add_foreign_key "seeds", "plantings", column: "parent_planting_id", name: "parent_planting", on_delete: :nullify
 end

env-example

@@ -65,9 +65,3 @@ MAILGUN_SMTP_SERVER=""
 # In production, replace them with real ones
 RECAPTCHA_SITE_KEY="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
 RECAPTCHA_SECRET_KEY="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe"
-
-# VAPID keys for web push notifications
-# These are insecure and should be replaced with real keys in production
-# Generate new keys with `bundle exec rake webpush:generate_keys`
-GROWSTUFF_VAPID_PUBLIC_KEY="BFf_pM3_3q0g1hIUiWf_nQdYj524I4E-mp3jW_j_7X-B-xWpW-j_8X_8X_8X_8X_8X_8X_8X_8X_8"
-GROWSTUFF_VAPID_PRIVATE_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

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/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/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/mailers/harvest_reminder_mailer_spec.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe NotifierMailer, type: :mailer do
-  let(:member) { create(:member) }
-  let(:mail)   { NotifierMailer.harvest_reminder(member) }
-
-  it "has a greeting" do
-    expect(mail.body.encoded).to match "Hello"
-  end
-
-  context "when member has upcoming harvests" do
-    let(:crop) { create(:crop, median_days_to_first_harvest: 20) }
-    let!(:planting) { create(:planting, owner: member, crop: crop, planted_at: 15.days.ago) }
-    let(:plantings) { [planting] }
-
-    it "lists the upcoming harvest" do
-      expect(mail.body.encoded).to match "Upcoming harvests in your garden"
-      expect(mail.body.encoded).to match planting.crop.name
-      expect(mail.body.encoded).to match (Time.zone.today + 5.days).to_date.to_s
-    end
-
-    it "has an unsubscribe link" do
-      expect(mail.body.encoded).to match "Unsubscribe from harvest reminders"
-    end
-  end
-end

spec/models/activity_spec.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Activity do
-  describe '.homepage_records' do
-    let(:member1) { create(:member) }
-    let(:member2) { create(:member) }
-
-    it 'returns the latest activities per owner' do
-      create(:activity, owner: member1, created_at: 2.days.ago)
-      latest_activity1 = create(:activity, owner: member1, created_at: 1.day.ago)
-      latest_activity2 = create(:activity, owner: member2, created_at: Time.current)
-
-      records = described_class.homepage_records(10)
-      expect(records).to contain_exactly(latest_activity1, latest_activity2)
-    end
-
-    it 'respects the limit' do
-      create(:activity, owner: member1)
-      create(:activity, owner: member2)
-
-      records = described_class.homepage_records(1)
-      expect(records.length).to eq(1)
-    end
-  end
-
-  describe 'active scope' do
-    it 'returns activities that are not finished' do
-      active_activity = create(:activity, finished: false)
-      finished_activity = create(:activity, finished: true)
-
-      expect(described_class.active).to include(active_activity)
-      expect(described_class.active).not_to include(finished_activity)
-    end
-
-    it 'treats nil finished as active' do
-      activity = create(:activity, finished: nil)
-      expect(described_class.active).to include(activity)
-    end
-  end
-end

spec/models/harvest_prediction_spec.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe "Harvest prediction logic" do
-  let(:crop) { create(:crop, median_days_to_first_harvest: 20) }
-  let(:planting) { create(:planting, crop: crop) }
-
-  describe "#harvest_in_next_week?" do
-    it "is true if predicted harvest is in 5 days" do
-      planting.planted_at = 15.days.ago
-      expect(planting.harvest_in_next_week?).to be true
-    end
-
-    it "is true if predicted harvest is today" do
-      planting.planted_at = 20.days.ago
-      expect(planting.harvest_in_next_week?).to be true
-    end
-
-    it "is true if predicted harvest is in 7 days" do
-      planting.planted_at = 13.days.ago
-      expect(planting.harvest_in_next_week?).to be true
-    end
-
-    it "is false if predicted harvest is in 8 days" do
-      planting.planted_at = 12.days.ago
-      expect(planting.harvest_in_next_week?).to be false
-    end
-
-    it "is false if predicted harvest was yesterday" do
-      planting.planted_at = 21.days.ago
-      expect(planting.harvest_in_next_week?).to be false
-    end
-
-    it "is false if there are already harvests" do
-      planting.planted_at = 15.days.ago
-      create(:harvest, planting: planting, owner: planting.owner, crop: planting.crop, harvested_at: 1.day.ago)
-      expect(planting.harvest_in_next_week?).to be false
-    end
-  end
-end

spec/spec_helper.rb

@@ -50,6 +50,7 @@ RSpec.configure do |config|
     Photo.reindex
     Planting.reindex
     Seed.reindex
+    Activity.reindex
   end
 
   config.before(:suite) do

spec/tasks/members_spec.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-require 'rake'
-
-describe 'members:cleanup_inactive' do
-  before :all do
-    Rails.application.load_tasks
-  end
-
-  let(:cleanup_task) { Rake::Task['members:cleanup_inactive'] }
-
-  before do
-    cleanup_task.reenable
-  end
-
-  it "deletes inactive members with no gardens and no other activity" do
-    inactive_no_activity = create(:member, last_sign_in_at: 25.months.ago)
-
-    # We must explicitly remove the default garden to test the "no gardens" condition
-    inactive_no_activity.gardens.destroy_all
-    expect(inactive_no_activity.gardens.count).to eq(0)
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(inactive_no_activity.id)).to be_falsey
-  end
-
-  it "does not delete inactive members with a garden (even if empty)" do
-    inactive_with_garden = create(:member, last_sign_in_at: 25.months.ago)
-    # They have 1 default garden
-    expect(inactive_with_garden.gardens.count).to eq(1)
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(inactive_with_garden.id)).to be_truthy
-  end
-
-  it "does not delete members with recent login" do
-    recent_member = create(:member, last_sign_in_at: 1.month.ago)
-    recent_member.gardens.destroy_all
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(recent_member.id)).to be_truthy
-  end
-
-  it "does not delete inactive members with activity (posts)" do
-    inactive_with_post = create(:member, last_sign_in_at: 25.months.ago)
-    inactive_with_post.gardens.destroy_all
-    create(:post, author: inactive_with_post)
-
-    cleanup_task.invoke
-
-    expect(Member.exists?(inactive_with_post.id)).to be_truthy
-  end
-
-  it "honors DRY_RUN environment variable" do
-    inactive_no_activity = create(:member, last_sign_in_at: 25.months.ago)
-    inactive_no_activity.gardens.destroy_all
-
-    ENV['DRY_RUN'] = 'true'
-    cleanup_task.invoke
-    ENV['DRY_RUN'] = nil
-
-    expect(Member.exists?(inactive_no_activity.id)).to be_truthy
-  end
-end

spec/views/layouts/_header_spec.rb

@@ -90,19 +90,13 @@ describe 'layouts/_header.html.haml', type: "view" do
       expect(rendered).to have_content 'Inbox'
       expect(rendered).not_to match(/Inbox \d+/)
     end
-  end
 
-  context 'logged in, has notifications' do
-    before do
-      @member = create(:member)
-      create(:notification, recipient: @member)
-      sign_in @member
-      controller.stub(:current_user) { @member }
-    end
-
-    it 'shows inbox count' do
-      render
-      rendered.should have_content 'Inbox 1'
+    context 'has notifications' do
+      it 'shows inbox count' do
+        create(:notification, recipient: @member)
+        render
+        expect(rendered).to have_content 'Inbox 1'
+      end
     end
   end
 end