X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=ecc271a8e0bf6242b99c33fbb613b8fe3ac6673a;hb=d98974572b1beaa3d7d34c5c6c8109a41e428bc4;hp=9ba1e8ae5cbde3b9d068018a0d6ba9d3ce7cc599;hpb=041f74dc775424f686a1cd95c00e0d63bfc4b99c;p=friendica.git diff --git a/include/Contact.php b/include/Contact.php index 9ba1e8ae5c..ecc271a8e0 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -51,6 +51,21 @@ function user_remove($uid) { function contact_remove($id) { + + $r = q("select uid from contact where id = %d limit 1", + intval($id) + ); + if((! count($r)) || (! intval($r[0]['uid']))) + return; + + $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts'); + if($archive) { + q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1", + intval($id) + ); + return; + } + q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1", intval($id) ); @@ -73,6 +88,49 @@ function contact_remove($id) { } +// sends an unfriend message. Does not remove the contact + +function terminate_friendship($user,$self,$contact) { + + + $a = get_app(); + + require_once('include/datetime.php'); + + if($contact['network'] === NETWORK_OSTATUS) { + + $slap = replace_macros(get_markup_template('follow_slap.tpl'), array( + '$name' => $user['username'], + '$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'], + '$photo' => $self['photo'], + '$thumb' => $self['thumb'], + '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME), + '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(), + '$title' => '', + '$type' => 'text', + '$content' => t('stopped following'), + '$nick' => $user['nickname'], + '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW, + '$ostat_follow' => '' // 'http://ostatus.org/schema/1.0/unfollow' . "\r\n" + )); + + if((x($contact,'notify')) && (strlen($contact['notify']))) { + require_once('include/salmon.php'); + slapper($user,$contact['notify'],$slap); + } + } + elseif($contact['network'] === NETWORK_DIASPORA) { + require_once('include/diaspora.php'); + diaspora_unshare($user,$contact); + } + elseif($contact['network'] === NETWORK_DFRN) { + require_once('include/items.php'); + dfrn_deliver($user,$contact,'placeholder', 1); + } + +} + + // Contact has refused to recognise us as a friend. We will start a countdown. // If they still don't recognise us in 32 days, the relationship is over, // and we won't waste any more time trying to communicate with them. @@ -81,6 +139,10 @@ function contact_remove($id) { if(! function_exists('mark_for_death')) { function mark_for_death($contact) { + + if($contact['archive']) + return; + if($contact['term-date'] == '0000-00-00 00:00:00') { q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), @@ -88,12 +150,23 @@ function mark_for_death($contact) { ); } else { + + // TODO: We really should send a notification to the owner after 2-3 weeks + // so they won't be surprised when the contact vanishes and can take + // remedial action if this was a serious mistake or glitch + $expiry = $contact['term-date'] . ' + 32 days '; if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) { // relationship is really truly dead. + // archive them rather than delete + // though if the owner tries to unarchive them we'll start the whole process over again + + q("update contact set `archive` = 1 where id = %d limit 1", + intval($contact['id']) + ); - contact_remove($contact['id']); + //contact_remove($contact['id']); } } @@ -119,6 +192,7 @@ function contact_photo_menu($contact) { $status_link=""; $photos_link=""; $posts_link=""; + $poke_link=""; $sparkle = false; if($contact['network'] === NETWORK_DFRN) { @@ -138,10 +212,12 @@ function contact_photo_menu($contact) { $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id']; } + $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id']; $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id']; $posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id']; $menu = Array( + t("Poke") => $poke_link, t("View Status") => $status_link, t("View Profile") => $profile_link, t("View Photos") => $photos_link, @@ -151,7 +227,7 @@ function contact_photo_menu($contact) { ); - $args = array('contact' => $contact, 'menu' => $menu); + $args = array('contact' => $contact, 'menu' => &$menu); call_hooks('contact_photo_menu', $args);