'nick' => $user['nickname'],
'pubkey' => $user['pubkey'],
'prvkey' => $user['prvkey'],
- 'photo' => User::getAvatarUrlForId($user['uid']),
- 'thumb' => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_THUMB),
- 'micro' => User::getAvatarUrlForId($user['uid'], Proxy::SIZE_MICRO),
+ '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'] = User::getAvatarUrlForId($uid);
+ $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'];
// Update the profile
$fields = [
- 'photo' => User::getAvatarUrlForId($uid),
- 'thumb' => User::getAvatarUrlForId($uid, Proxy::SIZE_THUMB)
+ 'photo' => User::getAvatarUrl($user),
+ 'thumb' => User::getAvatarUrl($user, Proxy::SIZE_THUMB)
];
DBA::update('profile', $fields, ['uid' => $uid]);
* 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 unfriended
+ * @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 action was performed
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function terminateFriendship(array $user, array $contact, bool $two_way = false): bool
+ public static function terminateFriendship(array $user, array $contact): bool
{
- $result = Protocol::terminateFriendship($user, $contact, $two_way);
+ $result = Protocol::terminateFriendship($user, $contact);
- if ($two_way || in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
+ 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']]);
// 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) {
- DBA::update('contact', ['rel' => $contact['rel'] == self::FRIEND ? self::SHARING : self::NOTHING], ['id' => $contact['id']]);
+ if ($contact['rel'] == self::FRIEND) {
+ self::update(['rel' => self::SHARING], ['id' => $contact['id']]);
+ } else {
+ self::remove($contact['id']);
+ }
}
return $result;