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;
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'];
}
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']);
self::updateContact($id, $uid, $ret['url'], $ret);
+ if (Contact\Relation::isDiscoverable($ret['url'])) {
+ Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
+ }
+
return true;
}
{
$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