X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2FContact.php;h=920ec3c2b406f91054815e6927a09734a5c1106d;hb=af5da5bece626f0a8b42055fa4fae465e4cd7a23;hp=63393602567b291ea1209f9381b0ff5684d145ab;hpb=c3f3a239f4a4075f919c1f83829c9c9c3ddf849f;p=friendica.git diff --git a/include/Contact.php b/include/Contact.php index 6339360256..920ec3c2b4 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -113,7 +113,7 @@ function terminate_friendship($user,$self,$contact) { '$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(), + '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32), '$title' => '', '$type' => 'text', '$content' => t('stopped following'), @@ -267,7 +267,12 @@ function contact_photo_menu($contact) { function random_profile() { - $r = q("select url from gcontact where url like '%%://%%/profile/%%' order by rand() limit 1"); + $r = q("SELECT `url` FROM `gcontact` WHERE `network` = '%s' + AND `last_contact` >= `last_failure` + AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH + ORDER BY rand() LIMIT 1", + dbesc(NETWORK_DFRN)); + if(count($r)) return dirname($r[0]['url']); return ''; @@ -330,7 +335,8 @@ function get_contact($url, $uid = 0) { if (!$update_photo) return($contactid); - } + } elseif ($uid != 0) + return 0; if (!count($data)) $data = probe_url($url);