'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',
+ 'photo' => User::getAvatarUrl($user),
+ 'thumb' => User::getAvatarUrl($user, Proxy::SIZE_THUMB),
+ 'micro' => User::getAvatarUrl($user, Proxy::SIZE_MICRO),
'blocked' => 0,
'pending' => 0,
'url' => DI::baseUrl() . '/profile/' . $user['nickname'],
return false;
}
- $fields = ['nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
+ $fields = ['uid', 'nickname', 'page-flags', 'account-type', 'prvkey', 'pubkey'];
$user = DBA::selectFirst('user', $fields, ['uid' => $uid, 'account_expired' => false]);
if (!DBA::isResult($user)) {
return false;
$fields['micro'] = self::getDefaultAvatar($fields, Proxy::SIZE_MICRO);
}
- $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
+ $fields['avatar'] = User::getAvatarUrl($user);
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
$fields['unsearchable'] = !$profile['net-publish'];
self::update($fields, ['uid' => 0, 'nurl' => $self['nurl']]);
// Update the profile
- $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
- 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+ $fields = [
+ 'photo' => User::getAvatarUrl($user),
+ 'thumb' => User::getAvatarUrl($user, Proxy::SIZE_THUMB)
+ ];
+
DBA::update('profile', $fields, ['uid' => $uid]);
}
* Marks a contact for removal
*
* @param int $id contact id
- * @return null
* @throws HTTPException\InternalServerErrorException
*/
public static function remove($id)
}
/**
- * Sends an unfriend message. Does not remove the contact
+ * Sends an unfriend message. Removes the contact for two-way unfriending or sharing only protocols (feed an mail)
+ *
+ * @param array $user User unfriending
+ * @param array $contact Contact (uid != 0) unfriended
+ * @param boolean $two_way Revoke eventual inbound follow as well
+ * @return bool|null true if successful, false if not, null if no remote action was performed
+ * @throws HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ public static function terminateFriendship(array $user, array $contact): ?bool
+ {
+ $result = Protocol::terminateFriendship($user, $contact);
+
+ if ($contact['rel'] == Contact::SHARING || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+ self::remove($contact['id']);
+ } else {
+ self::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Revoke follow privileges of the remote user contact
*
- * @param array $user User unfriending
* @param array $contact Contact unfriended
- * @param boolean $dissolve Remove the contact on the remote side
- * @return void
+ * @return bool|null Whether the remote operation is successful or null if no remote operation was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function terminateFriendship(array $user, array $contact, $dissolve = false)
+ public static function revokeFollow(array $contact): bool
{
if (empty($contact['network'])) {
- return;
+ throw new \InvalidArgumentException('Empty network in contact array');
}
- $protocol = $contact['network'];
- if (($protocol == Protocol::DFRN) && !empty($contact['protocol'])) {
- $protocol = $contact['protocol'];
+ if (empty($contact['uid'])) {
+ throw new \InvalidArgumentException('Unexpected public contact record');
}
- if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
- // create an unfollow slap
- $item = [];
- $item['verb'] = Activity::O_UNFOLLOW;
- $item['gravity'] = GRAVITY_ACTIVITY;
- $item['follow'] = $contact["url"];
- $item['body'] = '';
- $item['title'] = '';
- $item['guid'] = '';
- $item['uri-id'] = 0;
- $slap = OStatus::salmon($item, $user);
+ $result = Protocol::revokeFollow($contact);
- if (!empty($contact['notify'])) {
- Salmon::slapper($user, $contact['notify'], $slap);
- }
- } elseif ($protocol == Protocol::DIASPORA) {
- Diaspora::sendUnshare($user, $contact);
- } elseif ($protocol == Protocol::ACTIVITYPUB) {
- ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
-
- if ($dissolve) {
- ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
+ // A null value here means the remote network doesn't support explicit follow revocation, we can still
+ // break the locally recorded relationship
+ if ($result !== false) {
+ if ($contact['rel'] == self::FRIEND) {
+ self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
+ } else {
+ self::remove($contact['id']);
}
}
+
+ return $result;
}
+
/**
* Marks a contact for archival after a communication issue delay
*
$pm_url = '';
$status_link = '';
$photos_link = '';
- $contact_drop_link = '';
$poke_link = '';
if ($uid == 0) {
$posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
- if (!$contact['self']) {
- $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
- }
-
$follow_link = '';
$unfollow_link = '';
- if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+ if (!$contact['self'] && Protocol::supportsFollow($contact['network'])) {
if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
$unfollow_link = 'unfollow?url=' . urlencode($contact['url']) . '&auto=1';
} elseif(!$contact['pending']) {
}
}
- if (!empty($follow_link) || !empty($unfollow_link)) {
- $contact_drop_link = '';
- }
-
/**
* Menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
'photos' => [DI::l10n()->t('View Photos') , $photos_link , true],
'network' => [DI::l10n()->t('Network Posts') , $posts_link , false],
'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
- 'drop' => [DI::l10n()->t('Drop Contact') , $contact_drop_link, false],
'pm' => [DI::l10n()->t('Send PM') , $pm_url , false],
'poke' => [DI::l10n()->t('Poke') , $poke_link , false],
'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
* @param bool $thread_mode
* @param int $update Update mode
* @param int $parent Item parent ID for the update mode
+ * @param bool $only_media Only display media content
* @return string posts in HTML
* @throws \Exception
*/
- public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0)
+ public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0, $parent = 0, bool $only_media = false)
{
- return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent);
+ return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update, $parent, $only_media);
}
/**
* @param int $cid Contact ID
* @param bool $thread_mode
* @param int $update Update mode
- * @param int $parent Item parent ID for the update mode
+ * @param int $parent Item parent ID for the update mode
+ * @param bool $only_media Only display media content
* @return string posts in HTML
* @throws \Exception
*/
- public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0)
+ public static function getPostsFromId($cid, $thread_mode = false, $update = 0, $parent = 0, bool $only_media = false)
{
- $a = DI::app();
-
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
if (!DBA::isResult($contact)) {
return '';
}
}
+ if ($only_media) {
+ $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-media` WHERE `type` IN (?, ?, ?))",
+ Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]);
+ }
+
if (DI::mode()->isMobile()) {
$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
DI::config()->get('system', 'itemspage_network_mobile'));
if ($thread_mode) {
$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());
+ $o .= DI::conversation()->create($items, 'contacts', $update, false, 'commented', local_user());
} else {
$items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
- $o .= conversation($a, $items, 'contact-posts', $update);
+ $o .= DI::conversation()->create($items, 'contact-posts', $update);
}
if (!$update) {
* Get avatar link for given contact id
*
* @param integer $cid contact id
- * @param string $size One of the ProxyUtils::SIZE_* constants
+ * @param string $size One of the Proxy::SIZE_* constants
* @param string $updated Contact update date
* @return string avatar link
*/
- public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = ''):string
+ public static function getAvatarUrlForId(int $cid, string $size = '', string $updated = '', string $guid = ''):string
{
// We have to fetch the "updated" variable when it wasn't provided
// The parameter can be provided to improve performance
- if (empty($updated)) {
- $contact = self::getById($cid, ['updated']);
- $updated = $contact['updated'] ?? '';
+ if (empty($updated) || empty($guid)) {
+ $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]);
+ $updated = $account['updated'] ?? '';
+ $guid = $account['guid'] ?? '';
}
+ $guid = urlencode($guid);
+
$url = DI::baseUrl() . '/photo/contact/';
switch ($size) {
case Proxy::SIZE_MICRO:
$url .= Proxy::PIXEL_LARGE . '/';
break;
}
- return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : '');
+ return $url . ($guid ?: $cid) . ($updated ? '?ts=' . strtotime($updated) : '');
}
/**
*
* @param string $url contact url
* @param integer $uid user id
- * @param string $size One of the ProxyUtils::SIZE_* constants
+ * @param string $size One of the Proxy::SIZE_* constants
* @return string avatar link
*/
public static function getAvatarUrlForUrl(string $url, int $uid, string $size = ''):string
* Get header link for given contact id
*
* @param integer $cid contact id
- * @param string $size One of the ProxyUtils::SIZE_* constants
+ * @param string $size One of the Proxy::SIZE_* constants
* @param string $updated Contact update date
* @return string header link
*/
- public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = ''):string
+ public static function getHeaderUrlForId(int $cid, string $size = '', string $updated = '', string $guid = ''):string
{
// We have to fetch the "updated" variable when it wasn't provided
// The parameter can be provided to improve performance
- if (empty($updated)) {
- $contact = self::getById($cid, ['updated']);
- $updated = $contact['updated'] ?? '';
+ if (empty($updated) || empty($guid)) {
+ $account = DBA::selectFirst('account-user-view', ['updated', 'guid'], ['id' => $cid]);
+ $updated = $account['updated'] ?? '';
+ $guid = $account['guid'] ?? '';
}
+ $guid = urlencode($guid);
+
$url = DI::baseUrl() . '/photo/header/';
switch ($size) {
case Proxy::SIZE_MICRO:
break;
}
- return $url . $cid . ($updated ? '?ts=' . strtotime($updated) : '');
+ return $url . ($guid ?: $cid) . ($updated ? '?ts=' . strtotime($updated) : '');
}
/**
}
$update = false;
- $guid = $ret['guid'] ?? '';
+ $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], parse_url($ret['url'], PHP_URL_HOST));
// make sure to not overwrite existing values with blank entries except some technical fields
$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
self::updateAvatar($id, $ret['photo'], $update);
}
+ $uriid = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
+
if (!$update) {
self::updateContact($id, $uid, $contact['url'], $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
return true;
}
- if (empty($guid)) {
- $ret['uri-id'] = ItemURI::getIdByURI($ret['url']);
- } else {
- $ret['uri-id'] = ItemURI::insert(['uri' => $ret['url'], 'guid' => $guid]);
- }
-
+ $ret['uri-id'] = $uriid;
$ret['nurl'] = Strings::normaliseLink($ret['url']);
$ret['updated'] = $updated;
$ret['failed'] = false;
// Ensure to always have the correct network type, independent from the connection request method
self::updateFromProbe($contact['id']);
- Post\UserNotification::insertNotication($contact['id'], Verb::getID(Activity::FOLLOW), $importer['uid']);
+ Post\UserNotification::insertNotification($contact['id'], Activity::FOLLOW, $importer['uid']);
return true;
} else {
self::updateAvatar($contact_id, $photo, true);
- Post\UserNotification::insertNotication($contact_id, Verb::getID(Activity::FOLLOW), $importer['uid']);
+ Post\UserNotification::insertNotification($contact_id, Activity::FOLLOW, $importer['uid']);
$contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
return null;
}
- public static function removeFollower($importer, $contact)
+ public static function removeFollower(array $contact)
{
- if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
- self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
- } else {
+ if (in_array($contact['rel'] ?? [], [self::FRIEND, self::SHARING])) {
+ DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
+ } elseif (!empty($contact['id'])) {
self::remove($contact['id']);
+ } else {
+ DI::logger()->info('Couldn\'t remove follower because of invalid contact array', ['contact' => $contact, 'callstack' => System::callstack()]);
}
}
projects / friendica.git / blobdiff