Remove Yahoo Messanger from user profiles. Fixes #2356 (#2389)

dreamwidth · Jan 30, 2019 · 95c112e · 95c112e
1 parent 096eefc
commit 95c112e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 25 deletions.
diff --git a/bin/upgrading/deadphrases.dat b/bin/upgrading/deadphrases.dat
@@ -1854,4 +1854,8 @@ general widget.createaccount.error.birthdate.invalid
 general /profile.bml.details.userpics
 
 general /manage/profile/index.bml.services.delicious
-general /profile.bml.service.delicious
+general /profile.bml.service.delicious
+
+general /profile.bml.im.yim
+general /profile.bml.label.yahooid
+general /manage/profile/index.bml.chat.yahooid
diff --git a/cgi-bin/DW/Logic/ProfilePage.pm b/cgi-bin/DW/Logic/ProfilePage.pm
@@ -941,17 +941,6 @@ sub external_services {
         };
     }
 
-    if ( my $yahoo = $u->prop( 'yahoo' ) ) {
-        my $eyahoo = LJ::eurl( $yahoo );
-        push @ret, {
-            type => 'yahoo',
-            text => LJ::ehtml( $yahoo ),
-            url => "http://profiles.yahoo.com/$eyahoo",
-            image => 'yahoo.gif',
-            title_ml => '.im.yim',
-        };
-    }
-
     return @ret;
 }
 

diff --git a/cgi-bin/DW/Worker/ContentImporter/LiveJournal.pm b/cgi-bin/DW/Worker/ContentImporter/LiveJournal.pm
@@ -536,7 +536,6 @@ sub get_foaf_from {
         'foaf:name' => 'name',
         'foaf:icqChatID' => 'icq',
         'foaf:jabberID' => 'jabber',
-        'foaf:yahooChatID' => 'yahoo',
         'ya:bio' => 'bio',
         'lj:journaltitle' => 'journaltitle',
         'lj:journalsubtitle' => 'journalsubtitle',

diff --git a/cgi-bin/DW/Worker/ContentImporter/Local/Bio.pm b/cgi-bin/DW/Worker/ContentImporter/Local/Bio.pm
@@ -59,7 +59,7 @@ sub merge_bio_items {
 
     $u->set_bio( $items->{'bio'} ) if defined( $items->{'bio'} );
 
-    foreach my $prop ( qw/ icq jabber yahoo journaltitle journalsubtitle / ) {
+    foreach my $prop ( qw/ icq jabber journaltitle journalsubtitle / ) {
         $u->set_prop( $prop => $items->{$prop} )
             if defined $items->{$prop};
     }

diff --git a/cgi-bin/LJ/Directory/Constraint/ContactInfo.pm b/cgi-bin/LJ/Directory/Constraint/ContactInfo.pm
@@ -50,7 +50,7 @@ sub matching_uids {
 
     my @propids;
     # FIRST: check whether we get matches based on IM services
-    foreach my $service (qw(icq yahoo jabber skype google_talk)) {
+    foreach my $service (qw(icq jabber skype google_talk)) {
         my $p = LJ::get_prop("user", $service);
         push @propids, $p->{upropid};
     }

diff --git a/cgi-bin/LJ/Feed.pm b/cgi-bin/LJ/Feed.pm
@@ -605,7 +605,7 @@ sub create_view_foaf {
 
     # setup userprops we will need
     $u->preload_props( qw{
-        icq yahoo jabber icbm url urlname country city journaltitle
+        icq jabber icbm url urlname country city journaltitle
     } );
 
     # create bare foaf document, for now
@@ -666,7 +666,6 @@ sub create_view_foaf {
     # contact type information
     my %types = (
         icq => 'icqChatID',
-        yahoo => 'yahooChatID',
         jabber => 'jabberID',
     );
     if ($u->{allow_contactshow} eq 'Y') {

diff --git a/htdocs/manage/profile/index.bml b/htdocs/manage/profile/index.bml
@@ -56,7 +56,7 @@ body<=
         opt_whatemailshow comm_theme
         ao3 deviantart diigo discord etsy ffnet github google_talk
         icq instagram jabber last_fm_user livejournal pinboard pinterest
-        plurk ravelry skype tumblr twitter yahoo
+        plurk ravelry skype tumblr twitter
         url urlname gender
         opt_hidefriendofs opt_hidememberofs
         sidx_bdate sidx_bday
@@ -423,7 +423,6 @@ body<=
                            ["skype", $ML{'.chat.skype'}, 40],
                            ["tumblr", $ML{ '.services.tumblr' }, 255],
                            ["twitter", $ML{ '.services.twitter' }, 40],
-                           ["yahoo", $ML{'.chat.yahooid'}, 33],
                           )
 
             {

diff --git a/htdocs/manage/profile/index.bml.text b/htdocs/manage/profile/index.bml.text
@@ -7,8 +7,6 @@
 
 .chat.skype=Skype
 
-.chat.yahooid=Yahoo! ID
-
 .comms2=Display communities of which you are a member or administrator.
 
 .display.title=Display Settings for [[name]]

diff --git a/htdocs/profile.bml.text b/htdocs/profile.bml.text
@@ -165,8 +165,6 @@
 
 .im.skype=Skype
 
-.im.yim=Yahoo!
-
 .label.addbuddy=Add Buddy
 
 .label.adduser=Add User
@@ -279,8 +277,6 @@
 
 .label.website=Website:
 
-.label.yahooid=Yahoo! ID:
-
 .linking.about=To link to this user, copy this code:
 
 .linking.anywhere=Elsewhere: