return DBA::toArray($statement);
}
+ /**
+ * @param array $fields Array of selected fields, empty for all
+ * @param array $condition Array of fields for condition
+ * @param array $params Array of several parameters
+ * @return array
+ * @throws \Exception
+ */
+ public static function selectFirst(array $fields = [], array $condition = [], array $params = [])
+ {
+ $contact = DBA::selectFirst('contact', $fields, $condition, $params);
+
+ return $contact;
+ }
+
/**
* @param integer $id Contact ID
* @param array $fields Array of selected fields, empty for all
return;
}
+ $file_suffix = 'jpg';
+
$fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile),
'about' => $profile['about'], 'keywords' => $profile['pub_keywords'],
- 'gender' => $profile['gender'], 'avatar' => $profile['photo'],
- 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
+ 'gender' => $profile['gender'], 'contact-type' => $user['account-type'],
+ 'xmpp' => $profile['xmpp']];
$avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
if (DBA::isResult($avatar)) {
$types = Image::supportedTypes();
if (isset($types[$avatar['type']])) {
$file_suffix = $types[$avatar['type']];
- } else {
- $file_suffix = 'jpg';
}
// We are adding a timestamp value so that other systems won't use cached content
$fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
}
+ $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
// Update the profile
- $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg',
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg'];
+ $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
+ 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
}
}
// If there is more than one entry we filter out the connector networks
if (count($r) > 1) {
foreach ($r as $id => $result) {
- if ($result["network"] == Protocol::STATUSNET) {
+ if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) {
unset($r[$id]);
}
}
$profile_link = $profile_link . '?tab=profile';
}
- if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
+ if (self::canReceivePrivateMessages($contact)) {
$pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
}
return $contact_id;
}
- $updated = ['addr' => $data['addr'],
+ $updated = [
+ 'addr' => $data['addr'] ?? '',
'alias' => defaults($data, 'alias', ''),
'url' => $data['url'],
'nurl' => Strings::normaliseLink($data['url']),
'name' => $data['name'],
- 'nick' => $data['nick']];
+ 'nick' => $data['nick']
+ ];
if (!empty($data['keywords'])) {
$updated['keywords'] = $data['keywords'];
$updated['pubkey'] = $data['pubkey'];
}
- if (($data['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
+ if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
$updated['uri-date'] = DateTimeFormat::utcNow();
}
if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
*/
public static function updateAvatar($avatar, $uid, $cid, $force = false)
{
- $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
+ $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
if (!DBA::isResult($contact)) {
return false;
} else {
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
if ($photos) {
- DBA::update(
- 'contact',
- ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
- ['id' => $cid]
- );
+ $fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
+ DBA::update('contact', $fields, ['id' => $cid]);
// Update the public contact (contact id = 0)
if ($uid != 0) {
$pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
if (DBA::isResult($pcontact)) {
- self::updateAvatar($avatar, 0, $pcontact['id'], $force);
+ DBA::update('contact', $fields, ['id' => $pcontact['id']]);
}
}
return false;
}
- $fields = ['url', 'name', 'nick', 'photo', 'network', 'blocked'];
+ $fields = ['url', 'name', 'nick', 'avatar', 'photo', 'network', 'blocked'];
$pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
if (!DBA::isResult($pub_contact)) {
// Should never happen
$url = defaults($datarray, 'author-link', $pub_contact['url']);
$name = $pub_contact['name'];
- $photo = $pub_contact['photo'];
+ $photo = defaults($pub_contact, 'avatar', $pub_contact["photo"]);
$nick = $pub_contact['nick'];
$network = $pub_contact['network'];
if (!empty($contact)) {
- // Contact is blocked at user-level
- if (self::isBlockedByUser($contact['id'], $importer['id'])) {
- return false;
- }
+ // Contact is blocked at user-level
+ if (!empty($contact['id']) && !empty($importer['id']) &&
+ self::isBlockedByUser($contact['id'], $importer['id'])) {
+ return false;
+ }
// Make sure that the existing contact isn't archived
self::unmarkForArchival($contact);
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
}
+ // Prevents endless loop in case only a non-public contact exists for the contact URL
+ unset($data['uid']);
+
return self::magicLinkByContact($data, $contact_url);
}
// Is it a forum?
return ($contact['forum'] || $contact['prv']);
}
+
+ /**
+ * Can the remote contact receive private messages?
+ *
+ * @param array $contact
+ * @return bool
+ */
+ public static function canReceivePrivateMessages(array $contact)
+ {
+ $protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM;
+ $self = $contact['self'] ?? false;
+
+ return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self;
+ }
}
https://reisub.nsupdate.info/git / friendica.git / .git / blobdiff