use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\DI;
-use Friendica\Model\Notify\Type;
use Friendica\Network\HTTPException;
use Friendica\Network\Probe;
use Friendica\Protocol\Activity;
{
// We want just to make sure that we don't delete our "self" contact
$contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
- if (!DBA::isResult($contact) || !intval($contact['uid'])) {
+ if (!DBA::isResult($contact)) {
return;
}
Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]);
}
- Logger::info('Contact is marked for archival', ['id' => $contact['id']]);
+ Logger::info('Contact is marked for archival', ['id' => $contact['id'], 'term-date' => $contact['term-date']]);
// Contact already archived or "self" contact? => nothing to do
if ($contact['archive'] || $contact['self']) {
return;
}
- Logger::info('Contact is marked as vital again', ['id' => $contact['id']]);
+ Logger::info('Contact is marked as vital again', ['id' => $contact['id'], 'term-date' => $contact['term-date']]);
if (!isset($contact['url']) && !empty($contact['id'])) {
$fields = ['id', 'url', 'batch'];
if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
if ($uid == 0) {
- $profile_link = self::magicLink($contact['url']);
+ $profile_link = self::magicLinkByContact($contact);
$menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
return $menu;
}
if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
- $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
+ $sql = "(`uid` = 0 OR (`uid` = ? AND NOT `global`))";
} else {
- $sql = "`item`.`uid` = ?";
+ $sql = "`uid` = ?";
}
$contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id');
}
if ($thread_mode) {
- $r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri', 'thr-parent-id', 'author-id'], $condition, $params);
- $items = [];
- while ($item = DBA::fetch($r)) {
- $items[] = $item;
- }
- DBA::close($r);
+ $items = Post::toArray(Post::selectForUser(local_user(), ['uri-id', 'gravity', 'parent-uri-id', 'thr-parent-id', 'author-id'], $condition, $params));
$o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user());
} else {
- $r = Item::selectForUser(local_user(), [], $condition, $params);
-
- $items = Item::inArray($r);
+ $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
$o .= conversation($a, $items, 'contact-posts', $update);
}
}
}
- $default_avatar = empty($avatar) || ($avatar == DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO);
+ $default_avatar = empty($avatar) || strpos($avatar, self::DEFAULT_AVATAR_PHOTO);
if ($default_avatar) {
$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
DBA::update('contact', $fields, ['id' => $cids]);
}
+ public static function deleteContactByUrl(string $url)
+ {
+ // Update contact data for all users
+ $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
+ $contacts = DBA::select('contact', ['id', 'uid'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ Logger::info('Deleting contact', ['id' => $contact['id'], 'uid' => $contact['uid'], 'url' => $url]);
+ self::remove($contact['id']);
+ }
+ }
+
/**
* Helper function for "updateFromProbe". Updates personal and public contact
*
return false;
}
+ if (!empty($ret['account-type']) && $ret['account-type'] == User::ACCOUNT_TYPE_DELETED) {
+ Logger::info('Deleted account', ['id' => $id, 'url' => $ret['url'], 'ret' => $ret]);
+ self::remove($id);
+
+ // Delete all contacts with the same URL
+ self::deleteContactByUrl($ret['url']);
+ return true;
+ }
+
$uid = $contact['uid'];
unset($contact['uid']);
Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
- if (($user['notify-flags'] & Type::INTRO) &&
+ if (($user['notify-flags'] & Notification\Type::INTRO) &&
in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
notification([
- 'type' => Type::INTRO,
- 'otype' => Notify\ObjectType::INTRO,
+ 'type' => Notification\Type::INTRO,
+ 'otype' => Notification\ObjectType::INTRO,
'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
'uid' => $user['uid'],
'cid' => $contact_record['id'],
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function magicLinkbyId($cid, $url = '')
+ public static function magicLinkById($cid, $url = '')
{
$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
return 'contact/' . $contact['id'] . '/conversations';
}
- if ($contact['network'] != Protocol::DFRN) {
+ if (!empty($contact['network']) && $contact['network'] != Protocol::DFRN) {
return $destination;
}
- if (!empty($contact['uid'])) {
+ if (!empty($contact['uid']) || empty($contact['network'])) {
return self::magicLink($contact['url'], $url);
}
}
/**
- * Returns a random, global contact of the current node
+ * Returns a random, global contact array of the current node
*
- * @return string The profile URL
+ * @return array The profile array
* @throws Exception
*/
- public static function getRandomUrl()
+ public static function getRandomContact()
{
- $r = DBA::selectFirst('contact', ['url'], [
+ $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], [
"`uid` = ? AND `network` = ? AND NOT `failed` AND `last-item` > ?",
0, Protocol::DFRN, DateTimeFormat::utc('now - 1 month'),
], ['order' => ['RAND()']]);
- if (DBA::isResult($r)) {
- return $r['url'];
+ if (DBA::isResult($contact)) {
+ return $contact;
}
- return '';
+ return [];
}
}