From 4a45092e27607f37843edbabbeda67919049e11b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 17 Jun 2021 22:33:05 +0100
Subject: [PATCH 1/1] Remove the Yahoo OpenID link as they no longer support
 OpenID

---
 .rubocop_todo.yml                | 2 +-
 app/assets/images/yahoo.svg      | 1 -
 app/views/sessions/new.html.erb  | 1 -
 config/locales/en.yml            | 3 ---
 test/helpers/user_helper_test.rb | 4 ++--
 5 files changed, 3 insertions(+), 8 deletions(-)
 delete mode 100644 app/assets/images/yahoo.svg

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 3059d5773..f7ee886c9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -19,7 +19,7 @@ require:
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 254
+  Max: 270
 
 # Offense count: 36
 # Configuration parameters: AllowSafeAssignment.
diff --git a/app/assets/images/yahoo.svg b/app/assets/images/yahoo.svg
deleted file mode 100644
index b0bbdef73..000000000
--- a/app/assets/images/yahoo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="36" height="36" viewBox="0 0 36 36"><defs><style>.a{fill:#6001d2;}.b{fill:#fff;fill-rule:evenodd;}</style></defs><rect class="a" width="36" height="36"/><path class="b" d="M16.55,12.38l-3,7.22-3-7.22h-5l5.53,12.4-2,4.47H14l7.36-16.87ZM22.37,19a3,3,0,0,0-3.12,2.9,2.89,2.89,0,0,0,3,2.8,3,3,0,0,0,3.12-2.9,2.87,2.87,0,0,0-3-2.8M25.86,6.85,20.93,17.91h5.51L31.37,6.85Z"/></svg>
\ No newline at end of file
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 69ea7d8fd..fa0747c9c 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -44,7 +44,6 @@
         <% if Settings.key?(:wikipedia_auth_id) -%>
         <li><%= auth_button "wikipedia", "wikipedia" %></li>
         <% end -%>
-        <li><%= auth_button "yahoo", "openid", :openid_url => "yahoo.com" %></li>
         <li><%= auth_button "wordpress", "openid", :openid_url => "wordpress.com" %></li>
         <li><%= auth_button "aol", "openid", :openid_url => "aol.com" %></li>
       </ul>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93d9fb61d..25464bdcf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1666,9 +1666,6 @@ en:
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account
-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index a378ad5b0..758baa1cb 100644
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -75,8 +75,8 @@ class UserHelperTest < ActionView::TestCase
     button = auth_button("google", "google")
     assert_equal("<a class=\"auth_button\" title=\"Login with Google\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/google\"><img alt=\"Login with a Google OpenID\" class=\"rounded-lg\" src=\"/images/google.svg\" /></a>", button)
 
-    button = auth_button("yahoo", "openid", :openid_url => "yahoo.com")
-    assert_equal("<a class=\"auth_button\" title=\"Login with Yahoo\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/openid?openid_url=yahoo\.com\"><img alt=\"Login with a Yahoo OpenID\" class=\"rounded-lg\" src=\"/images/yahoo.svg\" /></a>", button)
+    button = auth_button("wordpress", "openid", :openid_url => "wordpress.com")
+    assert_equal("<a class=\"auth_button\" title=\"Login with Wordpress\" rel=\"nofollow\" data-method=\"post\" href=\"/auth/openid?openid_url=wordpress\.com\"><img alt=\"Login with a Wordpress OpenID\" class=\"rounded-lg\" src=\"/images/wordpress.svg\" /></a>", button)
   end
 
   private
-- 
2.43.2