*/
public static function updateSelfFromUserID($uid, $update_avatar = false)
{
- $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey',
+ $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'prvkey', 'pubkey', 'manually-approve',
'xmpp', 'matrix', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
'photo', 'thumb', 'micro', 'header', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco', 'network'];
$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
$fields['unsearchable'] = !$profile['net-publish'];
+ $fields['manually-approve'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
$update = false;
*
* The function can be called with either the user or the contact array
*
- * @param array $contact contact or user array
+ * @param int $type type of contact or account
* @return string
*/
- public static function getAccountType(array $contact)
- {
- // There are several fields that indicate that the contact or user is a forum
- // "page-flags" is a field in the user table,
- // "forum" and "prv" are used in the contact table. They stand for User::PAGE_FLAGS_COMMUNITY and User::PAGE_FLAGS_PRVGROUP.
- if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_COMMUNITY))
- || (isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_PRVGROUP))
- || (isset($contact['forum']) && intval($contact['forum']))
- || (isset($contact['prv']) && intval($contact['prv']))
- || (isset($contact['community']) && intval($contact['community']))
- ) {
- $type = self::TYPE_COMMUNITY;
- } else {
- $type = self::TYPE_PERSON;
- }
-
- // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
- if (isset($contact["contact-type"])) {
- $type = $contact["contact-type"];
- }
-
- if (isset($contact["account-type"])) {
- $type = $contact["account-type"];
- }
-
+ public static function getAccountType(int $type)
+ {
switch ($type) {
case self::TYPE_ORGANISATION:
$account_type = DI::l10n()->t("Organisation");
*/
public static function getDefaultHeader(array $contact): string
{
- if (!empty($contact['header']) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::TWITTER])) {
- return DI::baseUrl() . '/images/blank.png';
+ if (!empty($contact['header'])) {
+ return $contact['header'];
}
if (!empty($contact['gsid'])) {
break;
default:
/**
- * Use random pictures for networks that don't provide banners.
+ * Use a random picture.
* The service provides random pictures from Unsplash.
* @license https://unsplash.com/license
*/
$avatar = self::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
}
- if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || DI::config()->get('system', 'cache_contact_avatar')) {
+ $cache_avatar = DI::config()->get('system', 'cache_contact_avatar');
+
+ // Local contact avatars don't need to be cached
+ if ($cache_avatar && Network::isLocalLink($contact['url'])) {
+ $cache_avatar = !DBA::exists('contact', ['nurl' => $contact['nurl'], 'self' => true]);
+ }
+
+ if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) || $cache_avatar) {
if ($default_avatar && Proxy::isLocalImage($avatar)) {
$fields = ['avatar' => $avatar, 'avatar-date' => DateTimeFormat::utcNow(),
'photo' => $avatar,
// These fields aren't updated by this routine:
// 'sensitive'
- $fields = ['uid', 'uri-id', 'gsid', 'avatar', 'header', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe',
+ $fields = ['uid', 'uri-id', 'avatar', 'header', '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', 'xmpp', 'matrix'];
$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
$uriid = $contact['uri-id'];
unset($contact['uri-id']);
- $gsid = $contact['gsid'];
- unset($contact['gsid']);
-
$pubkey = $contact['pubkey'];
unset($contact['pubkey']);
*/
public static function isForum($contactid)
{
- $fields = ['forum', 'prv'];
+ $fields = ['contact-type'];
$condition = ['id' => $contactid];
$contact = DBA::selectFirst('contact', $fields, $condition);
if (!DBA::isResult($contact)) {
}
// Is it a forum?
- return ($contact['forum'] || $contact['prv']);
+ return ($contact['contact-type'] == self::TYPE_COMMUNITY);
}
/**