feat: Convert navbar to Bootstrap 5.1 offcanvas menu

This commit changes the navbar to use the Bootstrap 5.1 offcanvas component. The following changes were made: - Modified `app/views/layouts/_header.html.haml` to update the navbar-toggler to trigger the offcanvas menu. - Modified `app/views/layouts/_menu.haml` to wrap the menu in an offcanvas component.
2026-05-25 17:31:18 -04:00 · 2025-09-01 07:56:38 +00:00
119 changed files with 455 additions and 699 deletions
--- a/.github/workflows/ci-features-admin.yml
+++ b/.github/workflows/ci-features-admin.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-comments.yml
+++ b/.github/workflows/ci-features-comments.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-conversations.yml
+++ b/.github/workflows/ci-features-conversations.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-crops.yml
+++ b/.github/workflows/ci-features-crops.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-gardens.yml
+++ b/.github/workflows/ci-features-gardens.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-harvests.yml
+++ b/.github/workflows/ci-features-harvests.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-home.yml
+++ b/.github/workflows/ci-features-home.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-members.yml
+++ b/.github/workflows/ci-features-members.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-places.yml
+++ b/.github/workflows/ci-features-places.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-plantings.yml
+++ b/.github/workflows/ci-features-plantings.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-posts.yml
+++ b/.github/workflows/ci-features-posts.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-seeds.yml
+++ b/.github/workflows/ci-features-seeds.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features-timeline.yml
+++ b/.github/workflows/ci-features-timeline.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci-features.yml
+++ b/.github/workflows/ci-features.yml
@@ -38,7 +38,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
  contributors:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
      - name: Install ruby version specified in .ruby-version
        uses: ruby/setup-ruby@v1
        with:
@@ -53,7 +53,7 @@ jobs:

    steps:
      - name: Checkout this repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Configure sysctl limits
        run: |
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -12,7 +12,6 @@ submit the change with your pull request.
 - Miles Gould / [pozorvlak](https://github.com/pozorvlak)
 - Mackenzie Morgan / [maco](https://github.com/maco)
 - Brenda Wallace / [br3nda](https://github.com/br3nda)
- Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)

 ## Contributors

@@ -69,6 +68,7 @@ submit the change with your pull request.
 - Jym Paul Carandang / [jacarandang](https://github.com/jacarandang)
 - Anthony Atkinson / [sha1sum](https://github.com/sha1sum)
 - Terence Conquest / [twconquest](https://github.com/twconquest)
+- Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
 - DV Dasari / [dv2](https://github.com/dv2)
 - Eric Tillberg / [Thrillberg](https://github.com/Thrillberg)
 - Lucas Nogueira / [lucasnogueira](https://github.com/lucasnogueira)
@@ -95,11 +95,10 @@ submit the change with your pull request.
 - Ítalo Pires / [italopires](https://github.com/italopires)
 - Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
 - Dominick Thornton / [domthor](https://github.com/domthor)
- 
+
 ## Bots

 ### Security and Dependency Updates
 - `codefactor-io[bot]`
 - DeppBot / [deppbot](https://github.com/deppbot)
 - `dependabot[bot]` [dependabot](https://github.com/dependabot-bot) / [dependabot-preview](https://github.com/apps/dependabot-preview)
- [google-labs-jules[bot]](https://github.com/apps/google-labs-jules)
--- a/5
+++ b/5
@@ -91,9 +91,10 @@ gem 'bootstrap-datepicker-rails'
 # DRY-er easier bootstrap 4 forms
 gem "bootstrap_form", ">= 4.5.0"

-# For connecting to other services (eg Flickr)
+# For connecting to other services (eg Twitter)
 gem 'omniauth', '~> 1.3'
 gem 'omniauth-flickr', '>= 0.0.15'
+gem 'omniauth-twitter'

 # Pretty charts
 gem "chartkick"
@@ -201,5 +202,3 @@ group :travis do
 end


-
-gem "i18n_data", "~> 1.1"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -341,8 +341,6 @@ GEM
      rainbow (>= 2.2.2, < 4.0)
      ruby-progressbar (~> 1.8, >= 1.8.1)
      terminal-table (>= 1.5.1)
-    i18n_data (1.1.0)
-      simple_po_parser (~> 1.1)
    icalendar (2.11.2)
      base64
      ice_cube (~> 0.16)
@@ -442,7 +440,7 @@ GEM
    nokogiri (1.18.9-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (0.5.6)
-    oj (3.16.11)
+    oj (3.16.10)
      bigdecimal (>= 3.0)
      ostruct (>= 0.2)
    omniauth (1.9.2)
@@ -454,9 +452,12 @@ GEM
    omniauth-oauth (1.1.0)
      oauth
      omniauth (~> 1.0)
+    omniauth-twitter (1.4.0)
+      omniauth-oauth (~> 1.1)
+      rack
    open-uri (0.1.0)
    orm_adapter (0.5.0)
-    ostruct (0.6.3)
+    ostruct (0.6.2)
    parallel (1.27.0)
    parser (3.3.9.0)
      ast (~> 2.4.1)
@@ -607,7 +608,7 @@ GEM
    rswag-ui (2.16.0)
      actionpack (>= 5.2, < 8.1)
      railties (>= 5.2, < 8.1)
-    rubocop (1.80.0)
+    rubocop (1.79.2)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
@@ -661,7 +662,7 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (5.7.1)
+    scout_apm (5.7.0)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
@@ -679,7 +680,6 @@ GEM
      logger
      rack (>= 2.2.4)
      redis-client (>= 0.22.2)
-    simple_po_parser (1.1.6)
    sprockets (3.7.5)
      base64
      concurrent-ruby (~> 1.0)
@@ -704,7 +704,7 @@ GEM
    trollop (1.16.2)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.5)
+    unicode-display_width (3.1.4)
      unicode-emoji (~> 4.0, >= 4.0.4)
    unicode-emoji (4.0.4)
    unicorn (6.1.0)
@@ -793,7 +793,6 @@ DEPENDENCIES
  haml_lint (>= 0.25.1)
  hashie (>= 3.5.3)
  i18n-tasks
-  i18n_data (~> 1.1)
  icalendar
  jquery-rails
  jquery-ui-rails!
@@ -811,6 +810,7 @@ DEPENDENCIES
  oj
  omniauth (~> 1.3)
  omniauth-flickr (>= 0.0.15)
+  omniauth-twitter
  percy-capybara (~> 5.0.0)
  pg
  platform-api
--- a/README.md
+++ b/README.md
@@ -62,3 +62,5 @@ For more information about this project, contact [info@growstuff.org](mailto:inf

 Security Issues: If you find an authorization bypass or data breach, please contact our maintainers directly at [maintainers@growstuff.org](mailto:maintainers@growstuff.org).

+You can also contact us on [Twitter](http://twitter.com/growstufforg/) or
+[Facebook](https://www.facebook.com/pages/Growstuff/1531133417099494) or [Github](https://github.com/Growstuff/growstuff/issues)..
--- a/app/assets/images/location-not-set.en.png
+++ b/app/assets/images/location-not-set.en.png
--- a/app/assets/images/twitter_32.png
+++ b/app/assets/images/twitter_32.png
--- a/app/assets/stylesheets/_members.scss
+++ b/app/assets/stylesheets/_members.scss
@@ -33,6 +33,13 @@
  }
 }

+.location-not-set {
+  background-image: image-url("location-not-set.en.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  height: 250px;
+  width: 100%;
+}
 .card {
  .badge-location {
    background-color: darken($blue, 10%);
--- a/app/controllers/alternate_names_controller.rb
+++ b/app/controllers/alternate_names_controller.rb
@@ -57,6 +57,6 @@ class AlternateNamesController < ApplicationController
  private

  def alternate_name_params
-    params.require(:alternate_name).permit(:crop_id, :name, :creator_id, :language)
+    params.require(:alternate_name).permit(:crop_id, :name, :creator_id)
  end
 end
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -13,55 +13,43 @@ class CommentsController < ApplicationController
  end

  def new
-    @commentable = find_commentable
    @comment = Comment.new
-    if @commentable
-      @comments = @commentable.comments
+    @post = Post.find_by(id: params[:post_id])
+
+    if @post
+      @comments = @post.comments
      respond_with(@comments)
    else
      redirect_to(request.referer || root_url,
-                  alert: "Can't post a comment on a non-existent commentable")
+                  alert: "Can't post a comment on a non-existent post")
    end
  end

  def edit
-    # TODO: Why does this need a collection of comments?
-    @comments = @comment.commentable.comments
-    @commentable = @comment.commentable
+    @comments = @comment.post.comments
  end

  def create
    @comment = Comment.new(comment_params)
-    @commentable = @comment.commentable
    @comment.author = current_member
    @comment.save
-    respond_with @comment, location: @commentable
+    respond_with @comment, location: @comment.post
  end

  def update
    @comment.update(body: comment_params['body'])
-    respond_with @comment, location: @comment.commentable
+    respond_with @comment, location: @comment.post
  end

  def destroy
-    @commentable = @comment.commentable
+    @post = @comment.post
    @comment.destroy
-    respond_with(@commentable)
+    respond_with(@post)
  end

  private

-  def find_commentable
-    return unless params[:comment]
-
-    if params[:comment][:commentable_type] == 'Photo'
-      Photo.find(params[:comment][:commentable_id])
-    elsif params[:comment][:commentable_type] == 'Post'
-      Post.find(params[:comment][:commentable_id])
-    end
-  end
-
  def comment_params
-    params.require(:comment).permit(:body, :commentable_id, :commentable_type)
+    params.require(:comment).permit(:body, :post_id)
  end
 end
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -166,7 +166,7 @@ class CropsController < ApplicationController
  end

  def save_crop_names
-    AlternateName.create!(names_params(:alt_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id, language: "EN" } })
+    AlternateName.create!(names_params(:alt_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id } })
    ScientificName.create!(names_params(:sci_name).map { |n| { name: n, creator_id: current_member.id, crop_id: @crop.id } })
  end

@@ -181,18 +181,20 @@ class CropsController < ApplicationController
  def recreate_names(param_name, name_type)
    return if params[param_name].blank?

-    @crop.send("#{name_type}_names").each(&:destroy)
+    destroy_names(name_type)
    params[param_name].each_value do |value|
-      next if value.empty?
-
-      if name_type == 'alternate'
-        @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id, language: "EN")
-      else
-        @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id)
-      end
+      create_name!(name_type, value) unless value.empty?
    end
  end

+  def destroy_names(name_type)
+    @crop.send("#{name_type}_names").each(&:destroy)
+  end
+
+  def create_name!(name_type, value)
+    @crop.send("#{name_type}_names").create!(name: value, creator_id: current_member.id)
+  end
+
  def crop_params
    params.require(:crop).permit(
      :name, :en_wikipedia_url,
@@ -214,12 +216,12 @@ class CropsController < ApplicationController
  def crop_json_fields
    {
      include: {
-        plantings: {
+        plantings:        {
          include: {
            owner: { only: %i(id login_name location latitude longitude) }
          }
        },
-        scientific_names: { only: [:name] }, alternate_names:  { only: %i(name language) }
+        scientific_names: { only: [:name] }, alternate_names:  { only: [:name] }
      }
    }
  end
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -16,6 +16,7 @@ class MembersController < ApplicationController

  def show
    @member        = Member.confirmed.kept.find_by!(slug: params[:slug])
+    @twitter_auth  = @member.auth('twitter')
    @flickr_auth   = @member.auth('flickr')
    @posts         = @member.posts

--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -28,7 +28,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
    @authentication = action.establish_authentication(auth, member)

    if action.member_created?
-      raise "Invalid provider" unless %w(flickr).index(auth['provider'].to_s)
+      raise "Invalid provider" unless %w(twitter flickr).index(auth['provider'].to_s)

      session["devise.#{auth['provider']}_data"] = request.env["omniauth.auth"]
      sign_in member
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -21,7 +21,6 @@ class PhotosController < ApplicationController

  def show
    @crops = Crop.distinct.joins(:photo_associations).where(photo_associations: { photo: @photo })
-    @comment = Comment.new(commentable: @photo)
    respond_with(@photo)
  end

--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -91,32 +91,6 @@ class PlantingsController < DataController
    respond_with @planting, location: @planting.garden
  end

-  def transplant
-    # The `load_and_authorize_resource` in DataController will handle finding the
-    # planting and authorizing the action.
-    # We still need to authorize the new garden
-    new_garden = Garden.find(params[:garden_id])
-    authorize! :update, new_garden
-
-    # Mark original planting as finished
-    @planting.update(finished: true, finished_at: Time.zone.now)
-
-    # Create a new planting
-    new_planting = @planting.dup
-    new_planting.garden = new_garden
-    new_planting.slug = nil # let friendly_id generate a new slug
-    new_planting.finished = false
-    new_planting.finished_at = nil
-
-    if new_planting.save
-      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
-    else
-      # if the save fails, we should probably roll back the finishing of the original planting
-      @planting.update(finished: false, finished_at: nil)
-      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
-    end
-  end
-
  private

  def update_crop_medians
@@ -133,7 +107,7 @@ class PlantingsController < DataController
      :crop_id, :description, :garden_id, :planted_at,
      :parent_seed_id,
      :quantity, :sunniness, :planted_from, :finished,
-      :finished_at, :failed
+      :finished_at
    )
  end

--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -6,6 +6,7 @@ class RegistrationsController < Devise::RegistrationsController
  prepend_before_action :check_captcha, only: [:create] # Change this to be any actions you want to protect with recaptcha.

  def edit
+    @twitter_auth  = current_member.auth('twitter')
    @flickr_auth   = current_member.auth('flickr')
    render "edit"
  end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -50,6 +50,7 @@ module ApplicationHelper

      uri.query = "&width=#{size}&height=#{size}" if uri.host == 'graph.facebook.com'

+      # TODO: Assess twitter - https://dev.twitter.com/overview/general/user-profile-images-and-banners
      # TODO: Assess flickr  - https://www.flickr.com/services/api/misc.buddyicons.html

      return uri.to_s
--- a/app/helpers/buttons_helper.rb
+++ b/app/helpers/buttons_helper.rb
@@ -2,7 +2,6 @@

 module ButtonsHelper
  include IconsHelper
-
  def garden_plant_something_button(garden, classes: "btn btn-default")
    return unless can? :edit, garden

@@ -98,7 +97,7 @@ module ButtonsHelper
  end

  def planting_finish_button(planting, classes: 'btn btn-default btn-secondary')
-    return unless can?(:edit, planting) || planting.finished || planting.failed
+    return unless can?(:edit, planting) || planting.finished

    link_to planting_path(slug: planting.slug, planting: { finished: 1 }),
            method: :put, class: "#{classes} append-date" do
@@ -106,15 +105,6 @@ module ButtonsHelper
    end
  end

-  def planting_failed_button(planting, classes: 'btn btn-default btn-secondary')
-    return unless can?(:edit, planting) || planting.finished || planting.failed
-
-    link_to planting_path(slug: planting.slug, planting: { failed: 1 }),
-            method: :put, class: "#{classes}" do
-      finished_icon + ' ' + t('buttons.mark_as_failed')
-    end
-  end
-
  def seed_finish_button(seed, classes: 'btn btn-default')
    return unless can?(:create, Planting) && seed.active

@@ -132,7 +122,7 @@ module ButtonsHelper
  end

  def planting_save_seeds_button(planting, classes: 'btn btn-default')
-    return unless can?(:edit, planting) && !planting.failed?
+    return unless can?(:edit, planting)

    link_to new_planting_seed_path(planting_slug: planting.slug), class: classes do
      seed_icon + ' ' + t('buttons.save_seeds')
--- a/app/helpers/plantings_helper.rb
+++ b/app/helpers/plantings_helper.rb
@@ -43,14 +43,6 @@ module PlantingsHelper
    (planting.first_harvest_predicted_at - Time.zone.today).to_i
  end

-  # Returns a list of gardens the planting can be transplanted to
-  # based on the planting's owner.
-  def transplantable_gardens_by_owner(planting)
-    garden_ids = planting.owner.gardens.select(:id).to_a + GardenCollaborator.where(member_id: planting.owner.id).select(:garden_id).to_a
-
-    Garden.active.where.not(id: planting.garden_id).where(id: garden_ids)
-  end
-
  def days_from_now_to_last_harvest(planting)
    return unless planting.planted_at.present? && planting.last_harvest_predicted_at.present?

--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -111,10 +111,6 @@ class Ability
    can :update, Planting do |planting|
      planting.garden.garden_collaborators.where(member_id: member.id).any?
    end
-    can :transplant, Planting, garden: { owner_id: member.id }
-    can :transplant, Planting do |planting|
-      planting.garden.garden_collaborators.where(member_id: member.id).any?
-    end
    can :destroy, Planting do |planting|
      planting.garden.garden_collaborators.where(member_id: member.id).any?
    end
--- a/app/models/alternate_name.rb
+++ b/app/models/alternate_name.rb
@@ -5,7 +5,6 @@ class AlternateName < ApplicationRecord
  belongs_to :creator, class_name: 'Member', inverse_of: :created_alternate_names
  validates :name, presence: true
  validates :crop, presence: true
-  validates :language, presence: true

  after_commit :reindex

--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -2,27 +2,26 @@

 class Comment < ApplicationRecord
  belongs_to :author, class_name: 'Member', inverse_of: :comments
-  belongs_to :commentable, polymorphic: true, counter_cache: true
-  # validates :body, presence: true
+  belongs_to :post, counter_cache: true

  scope :post_order, -> { order(created_at: :asc) } # for display on post page

  after_create do
-    recipient = commentable.author.id
+    recipient = post.author.id
    sender    = author.id
    # don't send notifications to yourself
    if recipient != sender
      Notification.create(
        recipient_id: recipient,
        sender_id:    sender,
-        subject:      "#{author} commented on #{commentable.subject}",
+        subject:      "#{author} commented on #{post.subject}",
        body:,
-        notifiable:   commentable
+        post_id:      post.id
      )
    end
  end

  def to_s
-    "#{author.login_name} commented on #{commentable.subject}"
+    "#{author.login_name} commented on #{post.subject}"
  end
 end
--- a/app/models/concerns/finishable.rb
+++ b/app/models/concerns/finishable.rb
@@ -8,12 +8,7 @@ module Finishable
    scope :current, -> { where.not(finished: true) }

    def active
-      # Plantings can fail. At the moment, activities and seeds cannot.
-      if respond_to?(:failed)
-        !finished && !failed
-      else
-        !finished
-      end
+      !finished
    end
  end
 end
--- a/app/models/concerns/predict_harvest.rb
+++ b/app/models/concerns/predict_harvest.rb
@@ -38,7 +38,7 @@ module PredictHarvest

    # status
    def harvest_time?
-      return false if crop.perennial || finished || failed
+      return false if crop.perennial || finished

      # We have harvests but haven't finished
      harvests.size.positive? ||
--- a/app/models/concerns/predict_planting.rb
+++ b/app/models/concerns/predict_planting.rb
@@ -8,12 +8,12 @@ module PredictPlanting
    before_save :calculate_lifespan

    def calculate_lifespan
-      self.lifespan = (planted_at.present? && finished_at.present? && !failed? ? finished_at - planted_at : nil)
+      self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
    end

    # dates
    def finish_predicted_at
-      if planted_at.blank? || failed?
+      if planted_at.blank?
        nil
      elsif crop.median_lifespan.present?
        planted_at + crop.median_lifespan.days
@@ -34,18 +34,15 @@ module PredictPlanting
    end

    def actual_lifespan
-      return unless planted_at.present? && finished_at.present? && !failed?
+      return unless planted_at.present? && finished_at.present?

      (finished_at - planted_at).to_i
    end

    def age_in_days
      return if planted_at.blank?
-      return if failed?

      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

@@ -53,9 +50,9 @@ module PredictPlanting
      Rails.cache.fetch("#{cache_key_with_version}/percentage_grown", expires_in: 8.hours) do
        if finished?
          100
-        elsif !planted? || failed?
+        elsif !planted?
          0
-        elsif crop.perennial || (finish_predicted_at.nil? && finished_at.nil?) # This covers future dated finished_at that hasn't occurrred yet.
+        elsif crop.perennial || finish_predicted_at.nil?
          nil
        else
          calculate_percentage_grown
@@ -74,7 +71,7 @@ module PredictPlanting
    end

    def late?
-      crop.annual? && !finished && !failed &&
+      crop.annual? && !finished &&
        planted_at.present? &&
        finish_predicted_at.present? &&
        finish_predicted_at <= Time.zone.today
--- a/app/models/csv_importer.rb
+++ b/app/models/csv_importer.rb
@@ -59,7 +59,7 @@ class CsvImporter

    alternate_names.split(/,\s*/).each do |name|
      altname = AlternateName.find_by(name:, crop: @crop)
-      altname ||= AlternateName.create! name:, crop: @crop, language: "EN", creator: cropbot
+      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
      @crop.alternate_names << altname
    end
  end
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -10,8 +10,7 @@ class Follow < ApplicationRecord
      recipient_id: followed_id,
      sender_id:    follower_id,
      subject:      "#{follower.login_name} is now following you",
-      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. ",
-      notifiable:   self
+      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
    )
  end
 end
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -5,7 +5,6 @@ class Garden < ApplicationRecord
  include Geocodable
  include PhotoCapable
  include Ownable
-
  friendly_id :garden_slug, use: %i(slugged finders)

  has_many :plantings, dependent: :destroy
@@ -45,7 +44,6 @@ class Garden < ApplicationRecord
      .where.not(gardens: { latitude: nil })
      .where.not(gardens: { longitude: nil })
  }
-
  AREA_UNITS_VALUES = {
    "square metres" => "square metre",
    "square feet"   => "square foot",
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -3,7 +3,7 @@
 class Notification < ApplicationRecord
  belongs_to :sender, class_name: 'Member', inverse_of: :sent_notifications
  belongs_to :recipient, class_name: 'Member', inverse_of: :notifications
-  belongs_to :notifiable, polymorphic: true
+  belongs_to :post, optional: true

  validates :subject, length: { maximum: 255 }

--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -8,7 +8,6 @@ class Photo < ApplicationRecord
  PHOTO_CAPABLE = %w(Garden Planting Harvest Seed Post Crop).freeze

  has_many :photo_associations, dependent: :delete_all, inverse_of: :photo
-  has_many :comments, as: :commentable, dependent: :destroy

  # This doesn't work, ActiveRecord tries to use the polymoriphic photographable
  # relationship instead.
@@ -84,14 +83,6 @@ class Photo < ApplicationRecord
    "#{title} by #{owner.login_name}"
  end

-  def subject
-    title
-  end
-
-  def author
-    owner
-  end
-
  def flickr_photo_id
    source_id if source == 'flickr'
  end
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -43,8 +43,7 @@ class Planting < ApplicationRecord
      .where.not(gardens: { latitude: nil })
      .where.not(gardens: { longitude: nil })
  }
-  scope :active, -> { where(finished: false, failed: false).where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
-  scope :failed, -> { where(failed: true) }
+  scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }
  scope :annual, -> { joins(:crop).where(crops: { perennial: false }) }
  scope :perennial, -> { joins(:crop).where(crops: { perennial: true }) }
  scope :interesting, -> { has_photos.one_per_owner.order(planted_at: :desc) }
@@ -73,7 +72,6 @@ class Planting < ApplicationRecord
  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
  validate :finished_must_be_after_planted
  validate :owner_must_match_garden_owner
-  validate :cannot_be_finished_and_failed
  validates :quantity, allow_nil: true, numericality: {
    only_integer: true, greater_than_or_equal_to: 0
  }
@@ -98,11 +96,7 @@ class Planting < ApplicationRecord
  end

  def finished?
-    (finished || (finished_at.present? && finished_at <= Time.zone.today)) && !failed?
-  end
-
-  def failed?
-    failed
+    finished || (finished_at.present? && finished_at <= Time.zone.today)
  end

  def planted?
@@ -126,10 +120,6 @@ class Planting < ApplicationRecord

  private

-  def cannot_be_finished_and_failed
-    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
-  end
-
  # check that any finished_at date occurs after planted_at
  def finished_must_be_after_planted
    return unless planted_at && finished_at # only check if we have both
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -3,7 +3,6 @@
 class Post < ApplicationRecord
  extend FriendlyId
  include Likeable
-
  friendly_id :author_date_subject, use: %i(slugged finders)
  include PhotoCapable

@@ -11,10 +10,9 @@ class Post < ApplicationRecord
  # Relationships
  belongs_to :author, class_name: 'Member', inverse_of: :posts
  belongs_to :forum, optional: true
-  has_many :comments, as: :commentable, dependent: :destroy
+  has_many :comments, dependent: :destroy
  has_many :crop_posts, dependent: :delete_all
  has_many :crops, through: :crop_posts
-  has_many :notifications, as: :notifiable, dependent: :destroy

  after_create :send_notification
  #
@@ -97,7 +95,6 @@ class Post < ApplicationRecord
      Notification.create(
        recipient_id:,
        sender_id:    sender,
-        notifiable:   self,
        subject:      "#{author} mentioned you in their post #{subject}",
        body:
      )
--- a/app/resources/api/v1/planting_resource.rb
+++ b/app/resources/api/v1/planting_resource.rb
@@ -13,7 +13,6 @@ module Api

      attribute :slug
      attribute :planted_at
-      attribute :failed
      attribute :finished
      attribute :finished_at
      attribute :quantity
@@ -38,7 +37,9 @@ module Api
      filter :finished

      attribute :percentage_grown
-      delegate :percentage_grown, to: :@model
+      def percentage_grown
+        @model.percentage_grown
+      end

      attribute :crop_name
      attribute :crop_slug
--- a/app/views/activities/_form.html.haml
+++ b/app/views/activities/_form.html.haml
@@ -47,7 +47,7 @@

      .row
        .col-md-6
-          = f.check_box :finished, label: t('buttons.mark_as_finished')
+          = f.check_box :finished, label: 'Mark as finished'
          %span.help-block= t('.finish_helper')

    .card-footer
--- a/app/views/alternate_names/_form.html.haml
+++ b/app/views/alternate_names/_form.html.haml
@@ -31,8 +31,7 @@
        = f.label :name, class: 'control-label col-md-2'
        .col-md-8
          = f.text_field :name, class: 'form-control'
-        .col-md-8
-          = f.select :language, I18nData.languages.map {|code, name| [name.split(";").first, code] }, class: 'form-control'
+
      .form-group
        .form-actions.col-md-offset-2.col-md-8
          = f.submit 'Save', class: 'btn btn-primary'
--- a/app/views/comments/_description.haml
+++ b/app/views/comments/_description.haml
@@ -1 +1 @@
-#{link_to 'commented', event_model} on #{link_to event_model.commentable, event_model.commentable}
+#{link_to 'commented', event_model} on #{link_to event_model.post, event_model.post}
--- a/app/views/comments/_form.html.haml
+++ b/app/views/comments/_form.html.haml
@@ -1,4 +1,3 @@
- @comment ||= Comment.new(commentable: @commentable)
 .card.col-md-8.col-lg-7.mx-auto.float-none.white.z-depth-1.py-2.px-2
  .card-body
    - if content_for? :title
@@ -15,13 +14,13 @@
              %li= msg

      .md-form
-        = f.text_area :body, rows: 6, class: 'form-control md-textarea', autofocus: 'autofocus', required: true, pattern: '\w+'
+        = f.text_area :body, rows: 6, class: 'form-control md-textarea', autofocus: 'autofocus'
        = f.label :body, "Your comment:"

      %span.help-block
        = render partial: "shared/markdown_help"
      .actions.text-right
        = f.submit 'Post comment', class: 'btn btn-primary'
-      .field
-        = f.hidden_field :commentable_id, value: @commentable.id
-        = f.hidden_field :commentable_type, value: @commentable.class.name
+      - if defined?(@post)
+        .field
+          = f.hidden_field :post_id, value: @post.id
--- a/app/views/comments/edit.html.haml
+++ b/app/views/comments/edit.html.haml
@@ -2,6 +2,6 @@

 %p
  Editing comment on
-  = link_to @comment.commentable.subject, @comment.commentable
+  = link_to @comment.post.subject, @comment.post

-= render 'form', locals: { comment: @comment, commentable: @comment.commentable }
+= render 'form'
--- a/app/views/comments/index.rss.haml
+++ b/app/views/comments/index.rss.haml
@@ -5,18 +5,17 @@
    %link= comments_url
    - @comments.each do |comment|
      %item
-        %title Comment by #{comment.author.login_name} on #{comment.commentable.subject}
+        %title Comment by #{comment.author.login_name} on #{comment.post.subject}
        %description
          :escaped_markdown
            <p>
            Comment on
-            #{ link_to comment.commentable.subject, polymorphic_url(comment.commentable) }
+            #{ link_to comment.post.subject, post_url(comment.post) }
            </p>

          :escaped_markdown
            #{ strip_tags markdownify(comment.body) }

        %pubdate= comment.created_at.to_fs(:rfc822)
-        %link= polymorphic_url(comment.commentable)
+        %link= post_url(comment.post)
        %guid= comment_url(comment)
-
--- a/app/views/comments/new.html.haml
+++ b/app/views/comments/new.html.haml
@@ -1,17 +1,11 @@
 = content_for :title, "New comment"
- if @commentable.is_a?(Post)
-  %section.blog-post
-    .card.post{ id: "post-#{@commentable.id}" }
-      .card-header
-        %h2.display-3= @commentable.subject
-      .card-body= render "posts/single", post: @commentable || @comment.commentable, subject: true
- elsif @commentable.is_a?(Photo)
-  %section.blog-post
-    .card.photo{ id: "photo-#{@commentable.id}" }
-      .card-header
-        %h2.display-3= @commentable.subject
-      .card-body= render "photos/card", photo: @commentable || @comment.commentable, subject: true

-= render partial: "comments/comments", locals: { commentable: @commentable || @comment.commentable }
+%section.blog-post
+  .card.post{ id: "post-#{@post.id}" }
+    .card-header
+      %h2.display-3= @post.subject
+    .card-body= render "posts/single", post: @post || @comment.post, subject: true

-= render 'form', locals: { comment: @comment, commentable: @commentable || @comment.commentable }
+= render partial: "posts/comments", locals: { post: @post || @comment.post }
+
+= render 'form'
--- a/app/views/crops/_alternate_names.html.haml
+++ b/app/views/crops/_alternate_names.html.haml
@@ -5,7 +5,7 @@
      - if can? :edit, an
        .dropdown.planting-actions
          %a#crop-actions-altnames.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", :type => "button", :href => '#'}
-            = "#{an.name} (#{an.language})"
+            = an.name
          .dropdown-menu.dropdown-menu-xs{"aria-labelledby" => "crop-actions-altnames"}
            - if can? :edit, an
              = link_to edit_alternate_name_path(an), class: 'dropdown-item' do
@@ -16,7 +16,7 @@
                = delete_icon
                = t('.delete')
      - else
-        .badge= "#{an.name} (#{an.language})"
+        .badge= an.name


  %p.text-right
--- a/app/views/devise/registrations/_edit_apps.html.haml
+++ b/app/views/devise/registrations/_edit_apps.html.haml
@@ -3,6 +3,19 @@
    html: { method: :put, class: 'form-horizontal' }) do |_f|
  %br/
  = render 'devise/shared/error_messages', resource: resource
+  .row
+    .col-md-12
+      %p
+        = image_tag "twitter_32.png", size: "32x32", alt: 'Twitter logo'
+        - if @twitter_auth
+          You are connected to Twitter as
+          = link_to @twitter_auth.name, "https://twitter.com/#{@twitter_auth.name}"
+          = link_to "Disconnect", @twitter_auth,
+                    confirm: "Are you sure you want to remove this connection?",
+                    method: :delete, class: "remove btn btn-danger"
+        - else
+          = link_to 'Connect to Twitter', '/members/auth/twitter', class: 'btn'
+
  .row
    .col-md-12
      %p
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -6,6 +6,6 @@
        %span.site-name Growstuff
  .nav= render 'crops/search_bar'
  .nav
-    %button.navbar-toggler{ "aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "collapse", type: "button" }
+    %button.navbar-toggler{ "aria-controls" => "offcanvasNavbar", "aria-label" => "Toggle navigation", "data-bs-target" => "#offcanvasNavbar", "data-bs-toggle" => "offcanvas", type: "button" }
      %i.fas.fa-ellipsis-v.navbar-toggler-icon
    = render 'layouts/menu'
--- a/app/views/layouts/_menu.haml
+++ b/app/views/layouts/_menu.haml
@@ -1,98 +1,102 @@
-#navbarSupportedContent.collapse.navbar-collapse
-  %ul.navbar-nav.mr-auto
-    - if signed_in?
-      %li.nav-item
-        = link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
-          = image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
-      %li.nav-item
-        = link_to member_gardens_path(current_member), class: 'nav-link text-white', title: "My gardens" do
-          = image_icon 'gardens'
-      %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
-          = image_tag "icons/gardener.svg", class: 'img img-icon', alt: t('.record'), aria: { hidden: "true" }
-          = t('.record')
-        .dropdown-menu
-          = link_to new_planting_path, class: 'dropdown-item' do
-            = image_icon('planting-add')
-            = t('buttons.new_planting')
-          = link_to new_harvest_path, class: 'dropdown-item' do
-            = image_icon('harvest-add')
-            = t('buttons.new_harvest')
-          = link_to new_activity_path, class: 'dropdown-item' do
-            = image_icon('activity-add')
-            = t('buttons.new_activity')
-          = link_to new_seed_path, class: 'dropdown-item' do
-            = image_icon('seed-add')
-            = t('buttons.new_seeds')
-          = link_to new_post_path, class: 'dropdown-item' do
-            = post_icon
-            = t('buttons.new_post')
-
-    - cache("everyone-menu", expires_in: 1.week) do
-      %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
-        .dropdown-menu
-          = link_to crops_path, class: 'dropdown-item' do
-            = t('.browse_crops')
-          = link_to seeds_path, class: 'dropdown-item' do
-            = seed_icon
-            = t('.seeds')
-          = link_to plantings_path, class: 'dropdown-item' do
-            = planting_icon
-            = t('.plantings')
-          = link_to harvests_path, class: 'dropdown-item' do
-            = harvest_icon
-            = t('.harvests')
-      %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
-        .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
-          = link_to t('.community_map'), places_path, class: 'dropdown-item'
-          = link_to t('.browse_members'), members_path, class: 'dropdown-item'
-          = link_to t('.posts'), posts_path, class: 'dropdown-item'
-          = link_to t('.forums'), forums_path, class: 'dropdown-item'
-
-    - if member_signed_in?
-      - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
+.offcanvas.offcanvas-start#offcanvasNavbar{ 'aria-labelledby' => 'offcanvasNavbarLabel', 'tabindex' => '-1' }
+  .offcanvas-header
+    %h5.offcanvas-title#offcanvasNavbarLabel Menu
+    %button.btn-close.text-reset{ 'data-bs-dismiss' => 'offcanvas', 'aria-label' => 'Close' }
+  .offcanvas-body
+    %ul.navbar-nav.mr-auto
+      - if signed_in?
+        %li.nav-item
+          = link_to timeline_index_path, method: :get, class: 'nav-link' do
+            = image_tag 'icons/notification.svg', class: 'img img-icon', alt: "Notifications"
+        %li.nav-item
+          = link_to member_gardens_path(current_member), class: 'nav-link', title: "My gardens" do
+            = image_icon 'gardens'
        %li.nav-item.dropdown
-          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
+            = image_tag "icons/gardener.svg", class: 'img img-icon', alt: t('.record'), aria: { hidden: "true" }
+            = t('.record')
+          .dropdown-menu
+            = link_to new_planting_path, class: 'dropdown-item' do
+              = image_icon('planting-add')
+              = t('buttons.new_planting')
+            = link_to new_harvest_path, class: 'dropdown-item' do
+              = image_icon('harvest-add')
+              = t('buttons.new_harvest')
+            = link_to new_activity_path, class: 'dropdown-item' do
+              = image_icon('activity-add')
+              = t('buttons.new_activity')
+            = link_to new_seed_path, class: 'dropdown-item' do
+              = image_icon('seed-add')
+              = t('buttons.new_seeds')
+            = link_to new_post_path, class: 'dropdown-item' do
+              = post_icon
+              = t('buttons.new_post')
+
+      - cache("everyone-menu", expires_in: 1.week) do
+        %li.nav-item.dropdown
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.crops')
+          .dropdown-menu
+            = link_to crops_path, class: 'dropdown-item' do
+              = t('.browse_crops')
+            = link_to seeds_path, class: 'dropdown-item' do
+              = seed_icon
+              = t('.seeds')
+            = link_to plantings_path, class: 'dropdown-item' do
+              = planting_icon
+              = t('.plantings')
+            = link_to harvests_path, class: 'dropdown-item' do
+              = harvest_icon
+              = t('.harvests')
+        %li.nav-item.dropdown
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.community')
          .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
-            - if current_member.role?(:crop_wrangler)
-              = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
-            - if current_member.role?(:admin)
-              = link_to t('.admin'), admin_path, class: 'dropdown-item'
+            = link_to t('.community_map'), places_path, class: 'dropdown-item'
+            = link_to t('.browse_members'), members_path, class: 'dropdown-item'
+            = link_to t('.posts'), posts_path, class: 'dropdown-item'
+            = link_to t('.forums'), forums_path, class: 'dropdown-item'

-      %li.nav-item.dropdown
-        %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
-          = image_tag(avatar_uri(current_member, 50), alt: 'Avatar of current member', height: 25, width: 25, aria: { hidden: "true" })
-          = current_member.login_name
-          - if current_member.unread_count.positive?
-            %span.badge.badge-info= current_member.unread_count
-        .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
-          = link_to member_path(current_member), class: 'dropdown-item' do
-            = t('.profile')
-          = link_to member_activities_path(current_member), class: 'dropdown-item' do
-            = t('.activities')
-          = link_to member_gardens_path(current_member), class: 'dropdown-item' do
-            = t('.gardens')
-          = link_to member_plantings_path(current_member), class: 'dropdown-item' do
-            = t('.plantings')
-          = link_to member_harvests_path(current_member), class: 'dropdown-item' do
-            = t('.harvest')
-          = link_to member_seeds_path(current_member), class: 'dropdown-item' do
-            = t('.seeds')
-          = link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
+      - if member_signed_in?
+        - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
+          %li.nav-item.dropdown
+            %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}= t('.admin')
+            .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
+              - if current_member.role?(:crop_wrangler)
+                = link_to t('.crop_wrangling'), wrangle_crops_path, class: 'dropdown-item'
+              - if current_member.role?(:admin)
+                = link_to t('.admin'), admin_path, class: 'dropdown-item'

-          - if current_member.unread_count.positive?
+        %li.nav-item.dropdown
+          %a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", href: "#", role: "button"}
+            = image_tag(avatar_uri(current_member, 50), alt: 'Avatar of current member', height: 25, width: 25, aria: { hidden: "true" })
+            = current_member.login_name
+            - if current_member.unread_count.positive?
+              %span.badge.badge-info= current_member.unread_count
+          .dropdown-menu{"aria-labelledby" => "navbarDropdown"}
+            = link_to member_path(current_member), class: 'dropdown-item' do
+              = t('.profile')
+            = link_to member_activities_path(current_member), class: 'dropdown-item' do
+              = t('.activities')
+            = link_to member_gardens_path(current_member), class: 'dropdown-item' do
+              = t('.gardens')
+            = link_to member_plantings_path(current_member), class: 'dropdown-item' do
+              = t('.plantings')
+            = link_to member_harvests_path(current_member), class: 'dropdown-item' do
+              = t('.harvest')
+            = link_to member_seeds_path(current_member), class: 'dropdown-item' do
+              = t('.seeds')
+            = link_to t('.posts'), member_posts_path(current_member), class: 'dropdown-item'
+
+            - if current_member.unread_count.positive?
+              .dropdown-divider
+              %strong
+                = link_to(conversations_path, class: 'dropdown-item') do
+                  = t('.inbox')
+                  %span.badge.badge-info= current_member.unread_count
+            - else
+              = link_to t('.inbox'), conversations_path, class: 'dropdown-item'
            .dropdown-divider
-            %strong
-              = link_to(conversations_path, class: 'dropdown-item') do
-                = t('.inbox')
-                %span.badge.badge-info= current_member.unread_count
-          - else
-            = link_to t('.inbox'), conversations_path, class: 'dropdown-item'
-          .dropdown-divider
-          = link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item'
+            = link_to t('.sign_out'), destroy_member_session_path, method: :delete, class: 'dropdown-item'

-    - else
-      %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn btn-signin'
-      %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn btn-signup'
+      - else
+        %li.nav-item= link_to t('.sign_in'), new_member_session_path, id: 'navbar-signin', class: 'btn btn-signin'
+        %li.nav-item= link_to t('.sign_up'), new_member_registration_path, id: 'navbar-signup', class: 'btn btn-signup'
--- a/app/views/members/_bio.html.haml
+++ b/app/views/members/_bio.html.haml
@@ -1 +1,13 @@
 %h2 All about #{member.login_name}
+%p
+  %small
+    %a{href: "#content"}
+      Skip to main content
+- if member.bio.blank?
+  - if can? :edit, member
+    = link_to "Add a bio to complete your profile.", edit_member_registration_path
+  - else
+    #{member.login_name} hasn't written a bio yet.
+- else
+  :markdown
+    #{ strip_tags markdownify(member.bio) }
--- a/app/views/members/_contact.html.haml
+++ b/app/views/members/_contact.html.haml
@@ -1,4 +1,4 @@
- if member.website_url.present? || member.instagram_handle.present? || member.facebook_handle.present? || member.bluesky_handle.present? || member.other_url.present? || flickr_auth || member.show_email
+- if member.website_url.present? || member.instagram_handle.present? || member.facebook_handle.present? || member.bluesky_handle.present? || member.other_url.present? || twitter_auth || flickr_auth || member.show_email
  %h4 Contact

  - if member.website_url.present?
@@ -26,6 +26,11 @@
      = icon 'fas', 'link', class: 'fa-fw'
      = link_to "More...", member.other_url, target: '_blank', rel: 'noopener noreferrer'

+  - if twitter_auth
+    %p
+      = image_tag "twitter_32.png", size: "32x32", alt: 'Twitter logo'
+      = link_to twitter_auth.name, "https://twitter.com/#{twitter_auth.name}", target: '_blank', rel: 'noopener noreferrer'
+
  - if flickr_auth
    %p
      = image_tag "flickr_32.png", size: "32x32", alt: 'Flickr logo'
--- a/app/views/members/_map.html.haml
+++ b/app/views/members/_map.html.haml
@@ -5,5 +5,5 @@
    = link_to member.location, place_path(member.location, anchor: "members")
 - else
  .location-not-set
-    %h1 Location not known or geocodable
-    %p We can't show you what's nearby
+    .sr-only Location not known
+    .sr-only We can't show you what's nearby
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -21,21 +21,6 @@
        .row
          .col= render "bio", member: @member
          .col= render "avatar", member: @member
-        .row
-          .col
-            %p
-              %small
-                %a{href: "#content"}
-                  Skip to main content
-            - if @member.bio.blank?
-              - if can? :edit, @member
-                = link_to "Add a bio to complete your profile.", edit_member_registration_path
-              - else
-                #{@member.login_name} hasn't written a bio yet.
-            - else
-              :markdown
-                #{ strip_tags markdownify(@member.bio) }
-
        - if @member.roles.any?
          %p
            - @member.roles.each do |role|
@@ -45,16 +30,12 @@
            = icon 'fas', 'map-marker'
            = truncate(@member.location, length: 15, separator: ' ', omission: '... ')
        %p
-          %small
-            %strong Member since
-            %br
-            = @member.created_at.to_fs(:date)
+          %strong Member since
+          = @member.created_at.to_fs(:date)
        - if @member.last_sign_in_at
          %p
-            %small
-              %strong Last Login
-              %br
-              = @member.last_sign_in_at&.to_fs(:default)
+            %strong Last Login
+            = @member.last_sign_in_at&.to_fs(:default)

        - if can? :update, @member
          = link_to edit_member_registration_path, class: 'btn btn-block' do
@@ -77,7 +58,8 @@

      = render "stats", member: @member
      .card-footer
-        = render "contact", member: @member, flickr_auth: @flickr_auth
+        = render "contact", member: @member, twitter_auth: @twitter_auth,
+                                              flickr_auth: @flickr_auth

  .col-md-10#content
    .row
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -46,12 +46,4 @@
      - else
        = @photo.license_name

-    = render "associations", photo: @photo
-.row
-  - if can? :create, Comment
-    = link_to new_comment_path(comment: { commentable_type: 'Photo', commentable_id: @photo.id }), class: 'btn' do
-      = icon 'fas', 'comment'
-      Comment
-.row
-  .col-md-9
-    = render 'comments/comments', commentable: @photo
+    = render "associations", photo: @photo
--- a/app/views/plantings/_actions.html.haml
+++ b/app/views/plantings/_actions.html.haml
@@ -7,16 +7,7 @@
      - if planting.active
        = planting_plan_something_button(planting, classes: 'dropdown-item')
        = planting_finish_button(planting, classes: 'dropdown-item')
-        = planting_failed_button(planting, classes: 'dropdown-item')
        = planting_harvest_button(planting, classes: 'dropdown-item')
        = planting_save_seeds_button(planting, classes: 'dropdown-item')
-      - if can?(:transplant, planting) && planting.active && transplantable_gardens_by_owner(planting).any?
-        .dropdown-divider
-        .px-2
-          = form_tag transplant_planting_path(planting), method: :post do
-            .form-group
-              = label_tag :garden_id, 'Transplant to:'
-              = select_tag :garden_id, options_from_collection_for_select(transplantable_gardens_by_owner(planting), :id, :name), class: 'form-control form-control-sm'
-            = submit_tag 'Transplant', class: 'btn btn-sm btn-primary mt-2'
      .dropdown-divider
      = delete_button(planting, classes: 'dropdown-item text-danger')
--- a/app/views/plantings/_card.html.haml
+++ b/app/views/plantings/_card.html.haml
@@ -19,7 +19,6 @@
  
              - if planting.active
                = planting_finish_button(planting, classes: 'dropdown-item')
-                = planting_failed_button(planting, classes: 'dropdown-item')
                = planting_harvest_button(planting, classes: 'dropdown-item')
                = planting_save_seeds_button(planting, classes: 'dropdown-item')
  
--- a/app/views/plantings/_descendants.html.haml
+++ b/app/views/plantings/_descendants.html.haml
@@ -1,14 +1,13 @@
 %h2 Seeds saved

- if can?(:edit, planting) && !planting.failed?
-  %a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", role: "button"}
-    = seed_icon
-    = t('buttons.save_seeds')
-  .dropdown-menu.dropdown-secondary
-    - Seed::TRADABLE_TO_VALUES.each do |trade|
-      = link_to seeds_path(return: 'planting', seed: {crop_id: planting.crop.id, parent_planting_id: planting.id, tradable_to: trade}), method: :post, class: 'dropdown-item' do
-        Will trade:
-        = trade
+%a.btn.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-bs-toggle" => "dropdown", role: "button"}
+  = seed_icon
+  = t('buttons.save_seeds')
+.dropdown-menu.dropdown-secondary
+  - Seed::TRADABLE_TO_VALUES.each do |trade|
+    = link_to seeds_path(return: 'planting', seed: {crop_id: planting.crop.id, parent_planting_id: planting.id, tradable_to: trade}), method: :post, class: 'dropdown-item' do
+      Will trade:
+      = trade

 - if planting.child_seeds.size.positive?
  .index-cards
--- a/app/views/plantings/_facts.haml
+++ b/app/views/plantings/_facts.haml
@@ -40,7 +40,7 @@
      - if planting.quantity.to_i.positive? && planting.planted_from.present?
        = planting.planted_from.pluralize(planting.quantity.to_i)

-  - unless planting.finished? || planting.failed?
+  - unless planting.finished?
    .card.fact-card.grid-sizer
      %h3 Growing
      %strong= seedling_icon
--- a/app/views/plantings/_form.html.haml
+++ b/app/views/plantings/_form.html.haml
@@ -34,7 +34,9 @@
        .col-md-4
          = f.text_field :planted_at,
                     value: @planting.planted_at ? @planting.planted_at.to_fs(:ymd) : '',
-                     class: 'add-datepicker', label: 'When?', title: "Plan out your future plantings by forward dating, and subscribe to your iCalendar feed for reminders to plant"
+                     class: 'add-datepicker', label: 'When?'
+          %span.help-inline
+            Tip: Plan our your future plantings by forward dating, and subscribe to your iCalendar feed for reminders to plant

      .row
        .col-md-4
@@ -47,17 +49,14 @@

      .row
        .col-md-6
-          = f.check_box :finished, label: t('buttons.mark_as_finished'), title: t('.finish_helper')
-
+          = f.check_box :finished, label: 'Mark as finished'
+          %span.help-block= t('.finish_helper')
        .col-md-6
          = f.text_field :finished_at,
                     value: @planting.finished_at ? @planting.finished_at.to_fs(:ymd) : '',
                     class: 'add-datepicker',
                     label: 'Finished date',
                     placeholder: 'optional'
-      .row
-        .col-md-6
-          = f.check_box :failed, label: t('buttons.mark_as_failed'), title: t('.failed_helper')

    .card-footer
      .text-right= f.submit 'Save'
--- a/app/views/plantings/_harvests.html.haml
+++ b/app/views/plantings/_harvests.html.haml
@@ -1,9 +1,10 @@
 %h2 Harvests
- if can?(:edit, planting) && !planting.failed
+
+- if can? :edit, planting
  = render 'harvests/modal', harvest: Harvest.new(crop: planting.crop, planting: planting)
 - if planting.harvests.empty?
  %p No harvests recorded
-  - if planting.finished? && can?(:edit, planting) && can?(:create, Harvest)
+  - if !planting.finished? && can?(:edit, planting) && can?(:create, Harvest)
    %p Record your harvests here to improve crop predictions, and you'll be able to compare with your garden next season.
 - else
  .index-cards
--- a/app/views/plantings/_timeline.html.haml
+++ b/app/views/plantings/_timeline.html.haml
@@ -8,8 +8,6 @@
      %p.small #{harvest_icon} First harvest expected #{I18n.l planting.first_harvest_predicted_at}
    - if planting.finished_at.present?
      %p.small #{finished_icon} Finished #{I18n.l planting.finished_at}
-    - elsif planting.failed?
-      %p.small #{finished_icon} Failed
    - elsif planting.finish_predicted_at.present?
      %p.small #{finished_icon} Finish expected #{I18n.l planting.finish_predicted_at}
  - if planting.planted_at.present? && planting.expected_lifespan.present?
--- a/app/views/plantings/show.html.haml
+++ b/app/views/plantings/show.html.haml
@@ -32,10 +32,8 @@
            %strong= @planting.crop.name.titleize
            %small.text-muted= @planting.crop.default_scientific_name
          %tt
-            - if @planting.failed?
-              %span.badge.badge-danger Failed
-            - elsif @planting.finished?
-              %span.badge.badge-success Finished
+            - if @planting.finished?
+              Finished
            - elsif @planting.percentage_grown.present?
              #{@planting.percentage_grown.to_i}%
              - if @planting.finish_is_predicatable?
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -1,11 +1,12 @@
 %a{ name: "comments" }
- if commentable.comments
+- if post.comments
  %hr/
  %h2
    = comment_icon
-    = localize_plural(commentable.comments, Comment)
-  - commentable.comments.post_order.each do |comment|
+    = localize_plural(post.comments, Comment)
+  - post.comments.post_order.each do |comment|
    = render "comments/single", comment: comment

 - else
  %h2 There are no comments yet
+
--- a/app/views/posts/_single.html.haml
+++ b/app/views/posts/_single.html.haml
@@ -1,4 +1,3 @@
- @post ||= post if defined?(post)
 %p
  Posted by
  - if @post.author
@@ -14,7 +13,7 @@
    and edited at
    = @post.updated_at.to_fs(:default)

-= link_to "Permalink", @post
+= link_to "Permalink", post

 :markdown
  #{ strip_tags markdownify(@post.body) }
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -24,7 +24,7 @@

 - content_for :buttonbar do
  - if @post.comments.count > 10 && can?(:create, Comment)
-    = link_to 'Comment', new_comment_path(comment: { commentable_type: 'Post', commentable_id: @post.id }), class: 'btn'
+    = link_to 'Comment', new_comment_path(post_id: @post.id), class: 'btn'

 - content_for :breadcrumbs do
  %li.breadcrumb-item= link_to @post.author, @post.author
@@ -48,12 +48,12 @@
        = render 'likes/likes', object: @post
        .float-right
          - if can? :create, Comment
-            = link_to new_comment_path(comment: { commentable_type: 'Post', commentable_id: @post.id }), class: 'btn' do
+            = link_to new_comment_path(post_id: @post.id), class: 'btn' do
              = icon 'fas', 'comment'
              Comment

    %section.comments
-      = render "comments/comments", commentable: @post
+      = render "comments", post: @post

  .col-md-4.col-12
    = render @post.author
--- a/app/views/seeds/_form.html.haml
+++ b/app/views/seeds/_form.html.haml
@@ -38,7 +38,7 @@

      .row
        .col-12.col-md-4
-          = f.check_box :finished, label: t('buttons.mark_as_finished')
+          = f.check_box :finished, label: 'Mark as finished'
        .col-12.col-md-4
          = f.text_field :finished_at, class: 'add-datepicker', value: @seed.finished_at ? @seed.finished_at.to_fs(:ymd) : ''
        .col-12.col-md-4
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true

 Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :twitter, ENV.fetch('GROWSTUFF_TWITTER_KEY', nil), ENV.fetch('GROWSTUFF_TWITTER_SECRET', nil)
  provider :flickr, ENV.fetch('GROWSTUFF_FLICKR_KEY', nil), ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil), scope: 'read'
 end
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -78,7 +78,6 @@ en:
    harvest_crop: Harvest %{crop_name}
    mark_as_active: Mark as active
    mark_as_finished: Mark as finished
-    mark_as_failed: Mark as failed
    mark_as_inactive: Mark as inactive
    my_gardens: My Gardens
    new_seeds: New saved seed
@@ -308,8 +307,6 @@ en:
      finish_helper: >
        A planting is finished when you've harvested all of the crop, or it dies, or it's otherwise
        no longer growing in your garden.
-      failed_helper: >
-        Mark this planting as failed if it died or was removed without any harvest.
    index:
      title:
        crop_plantings: Everyone's %{crop} plantings
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,9 +40,6 @@ Rails.application.routes.draw do
    collection do
      get 'crop/:crop' => 'plantings#index', as: 'plantings_by_crop'
    end
-    member do
-      post :transplant
-    end
  end

  resources :seeds, concerns: :has_photos, param: :slug do
--- a/db/migrate/20240810160507_add_language_to_alternate_names.rb
+++ b/db/migrate/20240810160507_add_language_to_alternate_names.rb
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddLanguageToAlternateNames < ActiveRecord::Migration[7.2]
-  def change
-    add_column :alternate_names, :language, :string, null: false
-  end
-end
--- a/db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb
+++ b/db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class SetDefaultLanguageForExistingAlternateNames < ActiveRecord::Migration[7.2]
-  def up
-    AlternateName.update_all(language: 'en')
-  end
-
-  def down
-    AlternateName.update_all(language: nil)
-  end
-end
--- a/db/migrate/20250810120000_make_notifications_polymorphic.rb
+++ b/db/migrate/20250810120000_make_notifications_polymorphic.rb
@@ -1,14 +0,0 @@
-class MakeNotificationsPolymorphic < ActiveRecord::Migration[6.1]
-  def change
-    add_column :notifications, :notifiable_type, :string
-    rename_column :notifications, :post_id, :notifiable_id
-
-    reversible do |dir|
-      dir.up do
-        ActiveRecord::Base.connection.execute("UPDATE notifications SET notifiable_type = 'Post' WHERE notifiable_type IS NULL")
-      end
-    end
-
-    add_index :notifications, %i(notifiable_type notifiable_id)
-  end
-end
--- a/db/migrate/20250824081313_change_comments_polymorphic.rb
+++ b/db/migrate/20250824081313_change_comments_polymorphic.rb
@@ -1,14 +0,0 @@
-class ChangeCommentsPolymorphic < ActiveRecord::Migration[7.2]
-  def change
-    add_column :comments, :commentable_type, :string
-    rename_column :comments, :post_id, :commentable_id
-
-    add_index :comments, %i(commentable_type commentable_id)
-
-    reversible do |dir|
-      dir.up do
-        ActiveRecord::Base.connection.execute("UPDATE comments SET commentable_type = 'Post' WHERE commentable_type IS NULL")
-      end
-    end
-  end
-end
--- a/db/migrate/20250824085224_add_photos_comment_count.rb
+++ b/db/migrate/20250824085224_add_photos_comment_count.rb
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
-  def change
-    change_table :photos do |t|
-      t.integer :comments_count, default: 0
-    end
-    reversible do |dir|
-      dir.up { set_counter_value }
-    end
-  end
-
-  def set_counter_value
-    execute <<-SQL.squish
-      UPDATE photos
-         SET comments_count = (
-           SELECT count(1)
-             FROM comments
-            WHERE comments.commentable_id = comments.id
-            AND comments.commentable_type = 'Photo'
-          )
-    SQL
-  end
-end
--- a/db/migrate/20250824162600_add_failed_to_plantings.rb
+++ b/db/migrate/20250824162600_add_failed_to_plantings.rb
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class AddFailedToPlantings < ActiveRecord::Migration[6.0]
-  def change
-    add_column :plantings, :failed, :boolean, default: false, null: false
-  end
-end
--- a/db/schema.rb
+++ b/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: 2025_08_24_162600) do
+ActiveRecord::Schema[7.2].define(version: 2024_09_29_041435) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"

@@ -67,7 +67,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_08_24_162600) do
    t.integer "creator_id", null: false
    t.datetime "created_at", precision: nil
    t.datetime "updated_at", precision: nil
-    t.string "language"
  end

  create_table "authentications", id: :serial, force: :cascade do |t|
@@ -203,12 +202,11 @@ ActiveRecord::Schema[7.2].define(version: 2025_08_24_162600) do
  end

  create_table "comments", id: :serial, force: :cascade do |t|
-    t.integer "commentable_id", null: false
+    t.integer "post_id", null: false
    t.integer "author_id", null: false
    t.text "body", null: false
    t.datetime "created_at", precision: nil
    t.datetime "updated_at", precision: nil
-    t.string "commentable_type"
  end

  create_table "crop_companions", force: :cascade do |t|
@@ -472,11 +470,9 @@ ActiveRecord::Schema[7.2].define(version: 2025_08_24_162600) do
    t.string "subject"
    t.text "body"
    t.boolean "read", default: false
-    t.integer "notifiable_id"
+    t.integer "post_id"
    t.datetime "created_at", precision: nil
    t.datetime "updated_at", precision: nil
-    t.string "notifiable_type"
-    t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id"
  end

  create_table "orders_products", id: false, force: :cascade do |t|
@@ -509,7 +505,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_08_24_162600) do
    t.datetime "date_taken", precision: nil
    t.integer "likes_count", default: 0
    t.string "source"
-    t.integer "comments_count", default: 0
    t.index ["fullsize_url"], name: "index_photos_on_fullsize_url", unique: true
    t.index ["thumbnail_url"], name: "index_photos_on_thumbnail_url", unique: true
  end
@@ -553,7 +548,6 @@ ActiveRecord::Schema[7.2].define(version: 2025_08_24_162600) do
    t.integer "parent_seed_id"
    t.integer "harvests_count", default: 0
    t.integer "likes_count", default: 0
-    t.boolean "failed", default: false, null: false
    t.index ["slug"], name: "index_plantings_on_slug", unique: true
  end

--- a/5
+++ b/5
@@ -40,6 +40,11 @@ GROWSTUFF_SITE_NAME="Growstuff (dev)"
 GROWSTUFF_MAILCHIMP_APIKEY=""
 GROWSTUFF_MAILCHIMP_NEWSLETTER_ID=""

+# Used for connecting member accounts to Twitter
+# Get Twitter key from https://dev.twitter.com/apps
+GROWSTUFF_TWITTER_KEY=""
+GROWSTUFF_TWITTER_SECRET=""
+
 # Used for connecting member accounts to Flickr
 # Get Flickr key from http://www.flickr.com/services/apps/create/apply/
 GROWSTUFF_FLICKR_KEY=""
--- a/lib/actions/oauth_signup_action.rb
+++ b/lib/actions/oauth_signup_action.rb
@@ -61,6 +61,8 @@ class Growstuff::OauthSignupAction

  def determine_name(auth)
    case auth['provider']
+    when 'twitter'
+      auth['info']['nickname']
    when 'flickr'
      auth['info']['name']
    else
--- a/lib/tasks/openfarm.rake
+++ b/lib/tasks/openfarm.rake
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+namespace :openfarm do
+  desc "Retrieve crop info from open farm"
+  # usage: rake growstuff:admin_user name=skud
+
+  task import: :environment do
+    Rails.logger = Logger.new(STDOUT)
+    OpenfarmService.new.import!
+  end
+
+  desc "Delete all pictures with source OpenFarm"
+  task delete_pictures: :environment do
+    puts "Deleting pictures with source OpenFarm..."
+    photos_to_delete = Photo.where(source: 'openfarm')
+    count = photos_to_delete.count
+    photos_to_delete.each do |photo|
+      photo.associations.each do |photo_association|
+        photo_association.delete
+      end
+      photo.delete
+    end
+    puts "Deleted #{count} pictures."
+  end
+end
--- a/lib/tasks/photos.rake
+++ b/lib/tasks/photos.rake
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-namespace :photos do
-  desc 'Removes references to photos that dont exist anymore (404)'
-  task prune_404s: :environment do
-    puts 'Checking for broken photo links...'
-    Photo.find_each do |photo|
-      puts "Checking #{photo.fullsize_url}..."
-      uri = URI.parse(photo.fullsize_url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = (uri.scheme == 'https')
-      request = Net::HTTP::Head.new(uri.request_uri)
-      response = http.request(request)
-      if response.code == '404'
-        puts "Photo #{photo.id} is broken, deleting."
-        photo.destroy
-      end
-    end
-    puts 'Done.'
-  end
-end
--- a/lib/tasks/wikidata.rake
+++ b/lib/tasks/wikidata.rake
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'net/http'
-require 'json'
-
-namespace :wikidata do
-  desc "Imports alternate names from Wikidata"
-  task import_alternate_names: :environment do
-    creator = Member.find_by(admin: true)
-    unless creator
-      puts "Could not find an admin member to assign as creator."
-      return
-    end
-
-    Crop.all.each do |crop|
-      next unless crop.en_wikipedia_url.present?
-
-      begin
-        title = crop.en_wikipedia_url.split('/').last
-        puts "Processing crop: #{crop.name} (Wikipedia title: #{title})"
-
-        # Get Wikidata ID from Wikipedia API
-        wiki_uri = URI("https://en.wikipedia.org/w/api.php?action=query&prop=pageprops&titles=#{title}&format=json")
-        wiki_response = Net::HTTP.get(wiki_uri)
-        wiki_data = JSON.parse(wiki_response)
-        page_id = wiki_data['query']['pages'].keys.first
-        wikidata_id = wiki_data['query']['pages'][page_id]['pageprops']['wikibase_item']
-
-        if wikidata_id
-          puts "  Found Wikidata ID: #{wikidata_id}"
-          # Get aliases from Wikidata API
-          wikidata_uri = URI("https://www.wikidata.org/w/api.php?action=wbgetentities&ids=#{wikidata_id}&props=aliases&format=json")
-          wikidata_response = Net::HTTP.get(wikidata_uri)
-          wikidata_data = JSON.parse(wikidata_response)
-
-          aliases = wikidata_data['entities'][wikidata_id]['aliases']
-          aliases.each do |lang, values|
-            values.each do |value|
-              unless AlternateName.exists?(name: value['value'], language: lang, crop: crop)
-                AlternateName.create!(
-                  name: value['value'],
-                  language: lang,
-                  crop: crop,
-                  creator: creator
-                )
-                puts "    Added alternate name: #{value['value']} (#{lang})"
-              end
-            end
-          end
-        else
-          puts "  Could not find Wikidata ID for #{crop.name}"
-        end
-      rescue => e
-        puts "  Error processing crop #{crop.name}: #{e.message}"
-      end
-    end
-  end
-end
--- a/spec/controllers/api/v1/plantings_controller_spec.rb
+++ b/spec/controllers/api/v1/plantings_controller_spec.rb
@@ -20,7 +20,6 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
            'description'         => my_planting.description,
            'expected-lifespan'   => nil,
            'finish-predicted-at' => nil,
-            'failed'              => my_planting.failed,
            'finished'            => my_planting.finished,
            'finished-at'         => my_planting.finished_at,
            'first-harvest-date'  => nil,
@@ -55,7 +54,6 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
            'description'         => my_planting.description,
            'expected-lifespan'   => nil,
            'finish-predicted-at' => nil,
-            'failed'              => my_planting.failed,
            'finished'            => my_planting.finished,
            'finished-at'         => my_planting.finished_at,
            'first-harvest-date'  => nil,
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -35,16 +35,12 @@ describe CommentsController do
    let(:post) { FactoryBot.create(:post) }

    describe "with valid params" do
-      before do
-        get :new, params: {
-          comment: { commentable_id: post.id, commentable_type: "Post" }
-        }
-      end
+      before { get :new, params: { post_id: post.id } }

-      let(:old_comment) { FactoryBot.create(:comment, commentable: post) }
+      let(:old_comment) { FactoryBot.create(:comment, post:) }

      it "picks up post from params" do
-        expect(assigns(:commentable)).to eq(post)
+        expect(assigns(:post)).to eq(post)
      end

      it "assigns the old comments as @comments" do
@@ -64,8 +60,8 @@ describe CommentsController do
    before { get :edit, params: { id: comment.to_param } }

    describe "my comment" do
-      let!(:comment)     { FactoryBot.create(:comment, author: member, commentable: post) }
-      let!(:old_comment) { FactoryBot.create(:comment, commentable: post, created_at: Time.zone.yesterday) }
+      let!(:comment)     { FactoryBot.create(:comment, author: member, post:) }
+      let!(:old_comment) { FactoryBot.create(:comment, post:, created_at: Time.zone.yesterday) }

      it "assigns previous comments as @comments" do
        expect(assigns(:comments)).to eq([comment, old_comment])
@@ -73,7 +69,7 @@ describe CommentsController do
    end

    describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment, commentable: post) }
+      let(:comment) { FactoryBot.create(:comment, post:) }

      it { expect(response).not_to be_successful }
    end
@@ -86,7 +82,7 @@ describe CommentsController do
      let(:comment) { FactoryBot.create(:comment, author: member) }

      it "redirects to the comment's post" do
-        expect(response).to redirect_to(comment.commentable)
+        expect(response).to redirect_to(comment.post)
      end
    end

@@ -99,12 +95,12 @@ describe CommentsController do
    describe "attempting to change post_id" do
      let(:post)             { FactoryBot.create(:post, subject: 'our post')           }
      let(:other_post)       { FactoryBot.create(:post, subject: 'the other post')     }
-      let(:valid_attributes) { { commentable_type: "Post", commentable_id: other_post.id, body: "kōrero" } }
-      let(:comment)          { FactoryBot.create(:comment, author: member, commentable: post) }
+      let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } }
+      let(:comment)          { FactoryBot.create(:comment, author: member, post:) }

      it "does not change post_id" do
        comment.reload
-        expect(comment.commentable_id).to eq(post.id)
+        expect(comment.post_id).to eq(post.id)
      end
    end
  end
@@ -116,7 +112,7 @@ describe CommentsController do
      let(:comment) { FactoryBot.create(:comment, author: member) }

      it "redirects to the post the comment was on" do
-        expect(response).to redirect_to(comment.commentable)
+        expect(response).to redirect_to(comment.post)
      end
    end

--- a/spec/controllers/member_controller_spec.rb
+++ b/spec/controllers/member_controller_spec.rb
@@ -5,6 +5,7 @@ require 'rails_helper'
 describe MembersController do
  before do
    @member = FactoryBot.create(:member)
+    @twitter_auth = FactoryBot.create(:authentication, member: @member)
    @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
  end

@@ -28,6 +29,11 @@ describe MembersController do
      expect(response).to be_successful
    end

+    it "assigns @twitter_auth" do
+      get :show, params: { slug: @member.to_param }
+      expect(assigns(:twitter_auth)).to eq(@twitter_auth)
+    end
+
    it "assigns @flickr_auth" do
      get :show, params: { slug: @member.to_param }
      expect(assigns(:flickr_auth)).to eq(@flickr_auth)
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/spec/controllers/registrations_controller_spec.rb
@@ -16,6 +16,12 @@ describe RegistrationsController do
      assigns(:member).should eq(@member)
    end

+    it "picks up the twitter auth" do
+      @auth = FactoryBot.create(:authentication, member: @member)
+      get :edit
+      assigns(:twitter_auth).should eq @auth
+    end
+
    it "picks up the flickr auth" do
      @auth = FactoryBot.create(:flickr_authentication, member: @member)
      get :edit
--- a/spec/factories/alternate_names.rb
+++ b/spec/factories/alternate_names.rb
@@ -5,7 +5,6 @@
 FactoryBot.define do
  factory :alternate_name do
    name { "alternate name" }
-    language { "EN" }
    crop
    creator

--- a/spec/factories/authentications.rb
+++ b/spec/factories/authentications.rb
@@ -5,7 +5,7 @@
 FactoryBot.define do
  factory :authentication do
    member
-    provider { 'flickr' }
+    provider { 'twitter' }
    uid { 'foo' }
    secret { 'bar' }
    name { 'baz' }
--- a/spec/factories/comments.rb
+++ b/spec/factories/comments.rb
@@ -2,7 +2,7 @@

 FactoryBot.define do
  factory :comment do
-    association :commentable, factory: :post
+    post
    author
    sequence(:body) { |n| "OMG LOL #{n}" }
    # because our commenters are more polite than YouTube's
--- a/spec/factories/notifications.rb
+++ b/spec/factories/notifications.rb
@@ -10,7 +10,7 @@ FactoryBot.define do

    body { "MyText" }
    read { false }
-    association :notifiable, factory: :post
+    post

    factory :no_email_notification do
      recipient { FactoryBot.create(:no_email_notifications_member) }
--- a/spec/features/comments/commenting_a_comment_spec.rb
+++ b/spec/features/comments/commenting_a_comment_spec.rb
@@ -7,9 +7,9 @@ describe 'Commenting on a post' do
  let(:member) { create(:member) }
  let(:post) { create(:post, author: member) }

-  before { visit new_comment_path(comment: { commentable_type: "Post", commentable_id: post.id }) }
+  before { visit new_comment_path post_id: post.id }

-  it_behaves_like 'is accessible'
+  include_examples 'is accessible'

  it "creating a comment" do
    fill_in "comment_body", with: "This is a sample test for comment"
@@ -20,13 +20,13 @@ describe 'Commenting on a post' do
  end

  context "editing a comment" do
-    let(:existing_comment) { create(:comment, commentable: post, author: member) }
+    let(:existing_comment) { create(:comment, post:, author: member) }

    before do
      visit edit_comment_path existing_comment
    end

-    it_behaves_like 'is accessible'
+    include_examples 'is accessible'

    it "saving edit" do
      fill_in "comment_body", with: "Testing edit for comment"
--- a/spec/features/members/profile_spec.rb
+++ b/spec/features/members/profile_spec.rb
@@ -76,6 +76,12 @@ describe "member profile", :js do
      end
    end

+    it "twitter link" do
+      twitter_auth = create(:authentication, member:)
+      visit member_path(member)
+      expect(page).to have_link twitter_auth.name, href: "https://twitter.com/#{twitter_auth.name}"
+    end
+
    it "flickr link" do
      flickr_auth = create(:flickr_authentication, member:)
      visit member_path(member)
@@ -155,7 +161,7 @@ describe "member profile", :js do

    context 'member has comments' do
      let(:post) { FactoryBot.create(:post) }
-      let!(:comment) { FactoryBot.create(:comment, commentable: post, author: member) }
+      let!(:comment) { FactoryBot.create(:comment, post:, author: member) }

      before { visit member_path(member) }

@@ -221,8 +227,8 @@ describe "member profile", :js do
  end

  context "not signed in" do
-    it_behaves_like 'member details'
-    it_behaves_like 'member activity'
+    include_examples 'member details'
+    include_examples 'member activity'

    it "no bio" do
      member.update! bio: nil
@@ -233,8 +239,8 @@ describe "member profile", :js do

  context "signed in member" do
    include_context 'signed in member'
-    it_behaves_like 'member details'
-    it_behaves_like 'member activity'
+    include_examples 'member details'
+    include_examples 'member activity'

    context "your own profile page" do
      before { visit member_path(member) }
--- a/Show More
+++ b/Show More