Merge pull request #2255 from mroderick/remove-twitter

chore: remove twitter

Author: olleolleolle

app/assets/images/twitter-summary-card-image.png renamed to app/assets/images/social-summary-card-image.png

@@ -58,7 +58,7 @@ def members
   private
 
   def chapter_params
-    params.require(:chapter).permit(:name, :email, :city, :time_zone, :twitter, :description, :image)
+    params.require(:chapter).permit(:name, :email, :city, :time_zone, :description, :image)
   end
 
   def set_chapter

app/controllers/admin/chapters_controller.rb

@@ -32,7 +32,6 @@ def create
 
         member.name    ||= omnihash[:info][:name]&.split(' ')&.first || ''
         member.surname ||= omnihash[:info][:name]&.split(' ')&.drop(1)&.join(' ') || ''
-        member.twitter ||= omnihash[:info][:nickname]
 
         member_service = member.auth_services.build(
           provider: omnihash[:provider],

app/controllers/auth_services_controller.rb

@@ -10,7 +10,7 @@ module InstanceMethods
 
     def member_params
       params.require(:member).permit(
-        :pronouns, :name, :surname, :email, :mobile, :twitter, :about_you, :skill_list, :newsletter
+        :pronouns, :name, :surname, :email, :mobile, :about_you, :skill_list, :newsletter
       )
     end
 

app/controllers/concerns/member_concerns.rb

@@ -32,14 +32,6 @@ def member_token(member)
     Verifier.new(id: member.id).access_token
   end
 
-  def twitter
-    Rails.application.config.twitter
-  end
-
-  def twitter_id
-    Rails.application.config.twitter_id
-  end
-
   def contact_email(workshop: nil)
     @contact_email ||= workshop.present? ? workshop.chapter.email : '[email protected]'
   end
@@ -48,10 +40,6 @@ def active_link_class(link_path)
     current_page?(link_path) ? 'active' : ''
   end
 
-  def twitter_url_for(username)
-    "http://twitter.com/#{username}"
-  end
-
   def page_year?(year)
     (!year_param && year.eql?(Time.zone.now.year)) || year_param == year.to_s
   end

app/helpers/application_helper.rb

@@ -1,12 +1,4 @@
 class ChapterPresenter < BasePresenter
-  def twitter_id
-    model.twitter_id || Rails.application.config.twitter_id
-  end
-
-  def twitter_handle
-    model.twitter || Rails.application.config.twitter
-  end
-
   def upcoming_workshops
     model.workshops_upcoming
   end

app/presenters/chapter_presenter.rb

@@ -10,7 +10,6 @@
         = f.input :email, placeholder: 'e.g. [email protected]', required: true
         = f.input :city, required: true
         = f.input :description, required: false, input_html: { rows: 3 }, hint: 'Optionally, specify a custom welcome message for the chapter, to be displayed on the chapter page. Max. 280 characters.'
-        = f.input :twitter, placeholder: '@codebarCam', required: false
         = f.input :time_zone, required: true
         = f.input :image, as: :file
         = f.hidden_field :image_cache

app/views/admin/chapters/edit.html.haml

@@ -33,5 +33,4 @@
       - if event.organisers.any?
         .d-md-flex.align-items-md-center
           - event.organisers.each do |organiser|
-            = link_to twitter_url_for(organiser.twitter), class: 'border-0 d-inline-block mx-1' do
-              = image_tag(organiser.avatar(26), class: 'rounded-circle', title: organiser.full_name, alt: organiser.full_name)
+            = image_tag(organiser.avatar(26), class: 'rounded-circle', title: organiser.full_name, alt: organiser.full_name)

app/views/admin/events/_event.html.haml

@@ -4,16 +4,14 @@
       - coaches.each do |coach|
         .col-sm-6.col-md-3.coach.mb-4
           .text-center.mb-4
-            = link_to twitter_url_for(coach.twitter), class: 'border-0' do
-              = image_tag(coach.avatar(50), class: 'rounded-circle', title: coach.full_name, alt: coach.full_name)
+            = image_tag(coach.avatar(50), class: 'rounded-circle', title: coach.full_name, alt: coach.full_name)
 
-          = link_to twitter_url_for(coach.twitter) do
-            = coach.full_name
+          = coach.full_name
           %p.small.mt-3= coach.about_you
           - if coach.skills.any?
             %p.small
               Skills:
               - coach.skills.each do |skill|
                 = skill.name
 
-    = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'coach' }
+    = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'coach' }

app/views/coach/_coach.html.haml

@@ -32,8 +32,7 @@
         - if event.organisers.any?
           .mb-3.mb-md-0
             - event.organisers.each do |organiser|
-              = link_to twitter_url_for(organiser.twitter), class: 'd-inline-block mx-1' do
-                = image_tag(organiser.avatar(26), class: 'rounded-circle', title: organiser.full_name, alt: organiser.full_name)
+              = image_tag(organiser.avatar(26), class: 'rounded-circle', title: organiser.full_name, alt: organiser.full_name)
         - if event.sponsors.any?
           .ms-auto
             - event.sponsors.each do |sponsor|