From bac60164e759141144d6d39431dc3f65c61854e8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 24 Mar 2018 06:15:18 +0000
Subject: [PATCH] New function to keep the self contact updated
---
mod/profile_photo.php | 23 +++-------------
mod/profiles.php | 30 ++++++--------------
mod/settings.php | 13 ++-------
src/Model/Contact.php | 64 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 78 insertions(+), 52 deletions(-)
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 80bdfa534e..1a80b539db 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -9,6 +9,7 @@ use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
+use Friendica\Model\Contact;
use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Object\Image;
@@ -105,18 +106,11 @@ function profile_photo_post(App $a) {
// If setting for the default profile, unset the profile photo flag from any other photos I own
- if($is_default_profile) {
+ if ($is_default_profile) {
$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
dbesc($base_image['resource-id']),
intval(local_user())
);
-
- $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()),
- intval(local_user())
- );
} else {
$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
@@ -126,13 +120,7 @@ function profile_photo_post(App $a) {
);
}
- // we'll set the updated profile-photo timestamp even if it isn't the default profile,
- // so that browsers will do a cache update unconditionally
-
- $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
- dbesc(DateTimeFormat::utcNow()),
- intval(local_user())
- );
+ Contact::updateSelfFromUserID(local_user(), true);
info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
@@ -229,10 +217,7 @@ function profile_photo_content(App $a) {
dbesc($resource_id)
);
- $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
- dbesc(DateTimeFormat::utcNow()),
- intval(local_user())
- );
+ Contact::updateSelfFromUserID(local_user(), true);
// Update global directory in background
$url = $_SESSION['my_url'];
diff --git a/mod/profiles.php b/mod/profiles.php
index ce71f0c741..bec09e2d07 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -485,29 +485,15 @@ function profiles_post(App $a) {
info(L10n::t('Profile updated.') . EOL);
}
-
- if ($namechanged && $is_default) {
- $r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
- dbesc($name),
- dbesc(DateTimeFormat::utcNow()),
- intval(local_user())
- );
- $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
- dbesc($name),
- intval(local_user())
- );
- }
-
if ($is_default) {
- $location = Profile::formatLocation(["locality" => $locality, "region" => $region, "country-name" => $country_name]);
-
- q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
- dbesc($about),
- dbesc($location),
- dbesc($pub_keywords),
- dbesc($gender),
- intval(local_user())
- );
+ if ($namechanged) {
+ $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
+ dbesc($name),
+ intval(local_user())
+ );
+ }
+
+ Contact::updateSelfFromUserID(local_user());
// Update global directory in background
$url = $_SESSION['my_url'];
diff --git a/mod/settings.php b/mod/settings.php
index 5fd67afa12..3edad6945c 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -13,6 +13,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
+use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\User;
@@ -484,10 +485,7 @@ function settings_post(App $a)
$err = '';
- $name_change = false;
-
if ($username != $a->user['username']) {
- $name_change = true;
if (strlen($username) > 40) {
$err .= L10n::t(' Please use a shorter name.');
}
@@ -627,14 +625,7 @@ function settings_post(App $a)
intval(local_user())
);
-
- if ($name_change) {
- q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s' WHERE `uid` = %d AND `self`",
- dbesc($username),
- dbesc(DateTimeFormat::utcNow()),
- intval(local_user())
- );
- }
+ Contact::updateSelfFromUserID(local_user());
if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
// Update global directory in background
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index f0a1e52929..f8c80579f6 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -138,6 +138,70 @@ class Contact extends BaseObject
return $return;
}
+ /**
+ * Updates the self-contact for the provided user id
+ *
+ * @param int $uid
+ * @param boolean $update_avatar Force the avatar update
+ */
+ public static function updateSelfFromUserID($uid, $update_avatar = false)
+ {
+ $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
+ 'xmpp', 'contact-type', 'forum', 'prv'];
+ $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+ if (!DBM::is_result($self)) {
+ return;
+ }
+
+ $fields = ['nickname', 'page-flags', 'account-type'];
+ $user = dba::selectFirst('user', $fields, ['uid' => $uid]);
+ if (!DBM::is_result($user)) {
+ return;
+ }
+
+ $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
+ 'country-name', 'gender', 'pub_keywords', 'xmpp'];
+ $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+ if (!DBM::is_result($profile)) {
+ return;
+ }
+
+ $avatar_resource = dba::selectFirst('photo', ['resource-id'], ['uid' => $uid, 'profile' => true]);
+
+ $fields = ['name' => $profile['name'], 'nick' => $user['nickname'],
+ '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']];
+
+/*
+ $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
+- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
+- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()),
+- intval(local_user())
+- );
+
+*/
+ $fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
+ $fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+
+ $update = false;
+
+ foreach ($fields as $field => $content) {
+ if ($self[$field] != $content) {
+ $update = true;
+ }
+ }
+
+ if ($update) {
+ $fields['name-date'] = DateTimeFormat::utcNow();
+ dba::update('contact', $fields, ['id' => $self['id']]);
+ }
+
+ Contact::updateAvatar($fields['avatar'], $uid, $self['id'], $update_avatar);
+ }
+
/**
* @brief Marks a contact for removal
*
--
2.39.5