use Friendica\App\BaseURL;
use Friendica\Content\Pager;
+use Friendica\Content\Text\HTML;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Core\Worker;
* Relationship types
* @{
*/
+ const NOTHING = 0;
const FOLLOWER = 1;
const SHARING = 2;
const FRIEND = 3;
// Add internal fields
$removal = [];
if (!empty($fields)) {
- foreach (['id', 'avatar', 'updated', 'last-update', 'success_update', 'failure_update', 'network'] as $internal) {
+ foreach (['id', 'avatar', 'created', 'updated', 'last-update', 'success_update', 'failure_update', 'network'] as $internal) {
if (!in_array($internal, $fields)) {
$fields[] = $internal;
$removal[] = $internal;
}
// Update the contact in the background if needed
- $updated = max($contact['success_update'], $contact['updated'], $contact['last-update'], $contact['failure_update']);
- if ((($updated < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) &&
- in_array($contact['network'], Protocol::FEDERATED)) {
+ $updated = max($contact['success_update'], $contact['created'], $contact['updated'], $contact['last-update'], $contact['failure_update']);
+ if (($updated < DateTimeFormat::utc('now -7 days')) && in_array($contact['network'], Protocol::FEDERATED)) {
Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']);
}
return true;
}
- $user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
+ $user = DBA::selectFirst('user', ['uid', 'username', 'nickname', 'pubkey', 'prvkey'], ['uid' => $uid]);
if (!DBA::isResult($user)) {
return false;
}
'self' => 1,
'name' => $user['username'],
'nick' => $user['nickname'],
+ 'pubkey' => $user['pubkey'],
+ 'prvkey' => $user['prvkey'],
'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
*/
public static function updateSelfFromUserID($uid, $update_avatar = false)
{
- $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar',
+ $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
return;
}
- $fields = ['nickname', 'page-flags', 'account-type'];
+ $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
if (!DBA::isResult($user)) {
return;
$fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
- 'contact-type' => $user['account-type'],
- 'xmpp' => $profile['xmpp']];
+ 'contact-type' => $user['account-type'], 'prvkey' => $user['prvkey'],
+ 'pubkey' => $user['pubkey'], 'xmpp' => $profile['xmpp']];
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
if (DBA::isResult($avatar)) {
}
if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
- $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
+ $sql = "`item`.`uid` IN (0, ?)";
} else {
$sql = "`item`.`uid` = ?";
}
$contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id');
if ($thread_mode) {
- $condition = ["`$contact_field` = ? AND (`gravity` = ? OR (`gravity` = ? AND `vid` = ?)) AND " . $sql,
- $cid, GRAVITY_PARENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), local_user()];
+ $condition = ["(`$contact_field` = ? OR (`causer-id` = ? AND `post-type` = ?)) AND `gravity` = ? AND " . $sql,
+ $cid, $cid, Item::PT_ANNOUNCEMENT, GRAVITY_PARENT, local_user()];
} else {
$condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
}
+ $last_received = isset($_GET['last_received']) ? DateTimeFormat::utc($_GET['last_received']) : '';
+ if (!empty($last_received)) {
+ $condition = DBA::mergeConditions($condition, ["`received` < ?", $last_received]);
+ }
+
if (DI::mode()->isMobile()) {
$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
- $params = ['order' => ['received' => true],
+ $params = ['order' => ['received' => true], 'group_by' => ['uri-id'],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
- if ($thread_mode) {
+ if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+ $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
+ $o = Renderer::replaceMacros($tpl, ['$reload_uri' => DI::args()->getQueryString()]);
+ } else {
+ $o = '';
+ }
+
+ if ($thread_mode) {
$r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri'], $condition, $params);
$items = [];
while ($item = DBA::fetch($r)) {
}
DBA::close($r);
- $o = conversation($a, $items, 'contacts', $update, false, 'commented', local_user());
+ $o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user());
} else {
$r = Item::selectForUser(local_user(), [], $condition, $params);
$items = Item::inArray($r);
- $o = conversation($a, $items, 'contact-posts', false);
+ $o .= conversation($a, $items, 'contact-posts', false);
}
if (!$update) {
- $o .= $pager->renderMinimal(count($items));
+ if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
+ $o .= HTML::scrollLoader();
+ } else {
+ $o .= $pager->renderMinimal(count($items));
+ }
}
return $o;
/**
* Updates the avatar links in a contact only if needed
*
- * @param int $cid Contact id
- * @param string $avatar Link to avatar picture
- * @param bool $force force picture update
+ * @param int $cid Contact id
+ * @param string $avatar Link to avatar picture
+ * @param bool $force force picture update
+ * @param bool $create_cache Enforces the creation of cached avatar fields
*
* @return void
* @throws HTTPException\InternalServerErrorException
* @throws HTTPException\NotFoundException
* @throws \ImagickException
*/
- public static function updateAvatar(int $cid, string $avatar, bool $force = false)
+ public static function updateAvatar(int $cid, string $avatar, bool $force = false, bool $create_cache = false)
{
- $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl', 'url'], ['id' => $cid, 'self' => false]);
+ $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl', 'url', 'network'], ['id' => $cid, 'self' => false]);
if (!DBA::isResult($contact)) {
return;
}
$uid = $contact['uid'];
// Only update the cached photo links of public contacts when they already are cached
- if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro'])) {
+ if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro']) && !$create_cache) {
if ($contact['avatar'] != $avatar) {
DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
return;
}
- $local_uid = User::getIdForURL($contact['url']);
- if (!empty($local_uid)) {
- $fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
+ // User contacts use are updated through the public contacts
+ if (($uid != 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+ $pcid = self::getIdForURL($contact['url'], false);
+ if (!empty($pcid)) {
+ Logger::debug('Update the private contact via the public contact', ['id' => $cid, 'uid' => $uid, 'public' => $pcid]);
+ self::updateAvatar($pcid, $avatar, $force, true);
+ return;
+ }
}
-
+
// Replace cached avatar pictures from the default avatar with the default avatars in different sizes
if (strpos($avatar, self::DEFAULT_AVATAR_PHOTO)) {
$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
'photo' => DI::baseUrl() . self::DEFAULT_AVATAR_PHOTO,
'thumb' => DI::baseUrl() . self::DEFAULT_AVATAR_THUMB,
'micro' => DI::baseUrl() . self::DEFAULT_AVATAR_MICRO];
+ Logger::debug('Use default avatar', ['id' => $cid, 'uid' => $uid]);
}
- if (!empty($fields)) {
- if ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) {
- DBA::update('contact', $fields, ['id' => $cid]);
- Photo::delete(['uid' => $uid, 'contact-id' => $cid, 'album' => Photo::CONTACT_PHOTOS]);
+ // Use the data from the self account
+ if (empty($fields)) {
+ $local_uid = User::getIdForURL($contact['url']);
+ if (!empty($local_uid)) {
+ $fields = self::selectFirst(['avatar', 'avatar-date', 'photo', 'thumb', 'micro'], ['self' => true, 'uid' => $local_uid]);
+ Logger::debug('Use owner data', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
}
- return;
}
- $data = [
- $contact['photo'] ?? '',
- $contact['thumb'] ?? '',
- $contact['micro'] ?? '',
- ];
-
- $update = ($contact['avatar'] != $avatar) || $force;
+ if (empty($fields)) {
+ $update = ($contact['avatar'] != $avatar) || $force;
+
+ if (!$update) {
+ $data = [
+ $contact['photo'] ?? '',
+ $contact['thumb'] ?? '',
+ $contact['micro'] ?? '',
+ ];
+
+ foreach ($data as $image_uri) {
+ $image_rid = Photo::ridFromURI($image_uri);
+ if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+ Logger::debug('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+ $update = true;
+ }
+ }
+ }
- if (!$update) {
- foreach ($data as $image_uri) {
- $image_rid = Photo::ridFromURI($image_uri);
- if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
- Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
- $update = true;
+ if ($update) {
+ $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
+ if ($photos) {
+ $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
+ $update = !empty($fields);
+ Logger::debug('Created new cached avatars', ['id' => $cid, 'uid' => $uid, 'owner-uid' => $local_uid]);
+ } else {
+ $update = false;
}
}
+ } else {
+ $update = ($fields['photo'] . $fields['thumb'] . $fields['micro'] != $contact['photo'] . $contact['thumb'] . $contact['micro']) || $force;
}
- if ($update) {
- $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
- if ($photos) {
- $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
- DBA::update('contact', $fields, ['id' => $cid]);
- } elseif (empty($contact['avatar'])) {
- // Ensure that the avatar field is set
- DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
- Logger::info('Failed profile import', ['id' => $cid, 'force' => $force, 'avatar' => $avatar, 'contact' => $contact]);
+ if (!$update) {
+ return;
+ }
+
+ $cids = [];
+ $uids = [];
+ if (($uid == 0) && !in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+ // Collect all user contacts of the given public contact
+ $personal_contacts = DBA::select('contact', ['id', 'uid'],
+ ["`nurl` = ? AND `id` != ? AND NOT `self`", $contact['nurl'], $cid]);
+ while ($personal_contact = DBA::fetch($personal_contacts)) {
+ $cids[] = $personal_contact['id'];
+ $uids[] = $personal_contact['uid'];
+ }
+ DBA::close($personal_contacts);
+
+ if (!empty($cids)) {
+ // Delete possibly existing cached user contact avatars
+ Photo::delete(['uid' => $uids, 'contact-id' => $cids, 'album' => Photo::CONTACT_PHOTOS]);
}
}
+
+ $cids[] = $cid;
+ $uids[] = $uid;
+ Logger::info('Updating cached contact avatars', ['cid' => $cids, 'uid' => $uids, 'fields' => $fields]);
+ DBA::update('contact', $fields, ['id' => $cids]);
}
/**
// These fields aren't updated by this routine:
// 'xmpp', 'sensitive'
- $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
+ $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', 'manually-approve',
'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco',
'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey', 'last-item'];
$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
return false;
}
- if (Contact\Relation::isDiscoverable($ret['url'])) {
- Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
- }
-
if (isset($ret['hide']) && is_bool($ret['hide'])) {
$ret['unsearchable'] = $ret['hide'];
}
$ret['forum'] = false;
$ret['prv'] = false;
$ret['contact-type'] = $ret['account-type'];
- if ($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
- $apcontact = APContact::getByURL($ret['url'], false);
- if (isset($apcontact['manually-approve'])) {
- $ret['forum'] = (bool)!$apcontact['manually-approve'];
- $ret['prv'] = (bool)!$ret['forum'];
- }
+ if (($ret['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && isset($ret['manually-approve'])) {
+ $ret['forum'] = (bool)!$ret['manually-approve'];
+ $ret['prv'] = (bool)!$ret['forum'];
}
}
if (!$update) {
self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
+ if (Contact\Relation::isDiscoverable($ret['url'])) {
+ Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
+ }
+
// Update the public contact
if ($uid != 0) {
$contact = self::getByURL($ret['url'], false, ['id']);
$ret['pubkey'] = $new_pubkey;
}
- if (($ret['addr'] != $contact['addr']) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
+ if ((!empty($ret['addr']) && ($ret['addr'] != $contact['addr'])) || (!empty($ret['alias']) && ($ret['alias'] != $contact['alias']))) {
$ret['uri-date'] = DateTimeFormat::utcNow();
}
self::updateContact($id, $uid, $ret['url'], $ret);
+ if (Contact\Relation::isDiscoverable($ret['url'])) {
+ Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
+ }
+
return true;
}
}
// do we have enough information?
- if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) {
+ if (empty($protocol) || ($protocol == Protocol::PHANTOM) || (empty($ret['url']) && empty($ret['addr']))) {
$result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL;
if (empty($ret['poll'])) {
$result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
$hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
$pending = false;
- if ($protocol == Protocol::ACTIVITYPUB) {
- $apcontact = APContact::getByURL($ret['url'], false);
- if (isset($apcontact['manually-approve'])) {
- $pending = (bool)$apcontact['manually-approve'];
- }
+ if (($protocol == Protocol::ACTIVITYPUB) && isset($ret['manually-approve'])) {
+ $pending = (bool)$ret['manually-approve'];
}
if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
{
$destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
- if (!Session::isAuthenticated() || ($contact['network'] != Protocol::DFRN)) {
+ if (!Session::isAuthenticated()) {
return $destination;
}
return $url;
}
+ if (DI::pConfig()->get(local_user(), 'system', 'stay_local') && ($url == '')) {
+ return 'contact/' . $contact['id'] . '/conversations';
+ }
+
+ if ($contact['network'] != Protocol::DFRN) {
+ return $destination;
+ }
+
if (!empty($contact['uid'])) {
return self::magicLink($contact['url'], $url);
}
{
$added = 0;
$updated = 0;
+ $unchanged = 0;
$count = 0;
foreach ($urls as $url) {
- $contact = Contact::getByURL($url, false, ['id']);
+ $contact = Contact::getByURL($url, false, ['id', 'updated']);
if (empty($contact['id'])) {
Worker::add(PRIORITY_LOW, 'AddContact', 0, $url);
++$added;
- } else {
+ } elseif ($contact['updated'] < DateTimeFormat::utc('now -7 days')) {
Worker::add(PRIORITY_LOW, 'UpdateContact', $contact['id']);
++$updated;
+ } else {
+ ++$unchanged;
}
++$count;
}
- return ['count' => $count, 'added' => $added, 'updated' => $updated];
+ return ['count' => $count, 'added' => $added, 'updated' => $updated, 'unchanged' => $unchanged];
}
/**
projects / friendica.git / blobdiff