From e88734e218fe4ac34b87ed04817f9ac278a4d608 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 5 Jan 2019 22:04:32 +0000
Subject: [PATCH 1/2] Periodically update contacts / update the contact type

---
 src/Model/APContact.php | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index bbaf6dad6..b33d6cc66 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -61,7 +61,7 @@ class APContact extends BaseObject
 	 * Fetches a profile from a given url
 	 *
 	 * @param string  $url    profile url
-	 * @param boolean $update true = always update, false = never update, null = update when not found
+	 * @param boolean $update true = always update, false = never update, null = update when not found or outdated
 	 * @return array profile array
 	 */
 	public static function getByURL($url, $update = null)
@@ -71,18 +71,22 @@ class APContact extends BaseObject
 		}
 
 		if (empty($update)) {
+			if (is_null($update)) {
+				$ref_update = DateTimeFormat::utc('now - 1 month');
+			} else {
+				$ref_update = DBA::NULL_DATETIME;
+			}
+
 			$apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
+			if (!DBA::isResult($apcontact)) {
+				$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
 			}
 
-			$apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
-			if (DBA::isResult($apcontact)) {
-				return $apcontact;
+			if (!DBA::isResult($apcontact)) {
+				$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
 			}
 
-			$apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
-			if (DBA::isResult($apcontact)) {
+			if (DBA::isResult($apcontact) && ($apcontact['updated'] > $ref_update)) {
 				return $apcontact;
 			}
 
@@ -185,6 +189,16 @@ class APContact extends BaseObject
 
 		// Update some data in the contact table with various ways to catch them all
 		$contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about']];
+
+		// Fetch the type and match it with the contact type
+		$contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
+		if (!empty($contact_types)) {
+			$contact_type = array_pop($contact_types);
+			if (is_int($contact_type)) {
+				$contact_fields['contact-type'] = $contact_type;
+			}
+		}
+
 		DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
 
 		$contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);

From 3022abe74c69bbbef83418fa178e9c637dee1d83 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 5 Jan 2019 23:02:58 +0000
Subject: [PATCH 2/2] Reset the "forum" and "prv" field

---
 src/Model/APContact.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index b33d6cc66..5f47313dc 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -196,6 +196,12 @@ class APContact extends BaseObject
 			$contact_type = array_pop($contact_types);
 			if (is_int($contact_type)) {
 				$contact_fields['contact-type'] = $contact_type;
+
+				// Resetting the 'forum' and 'prv' field when it isn't a forum
+				if ($contact_fields['contact-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
+					$contact_fields['forum'] = false;
+					$contact_fields['prv'] = false;
+				}
 			}
 		}
 
@@ -208,6 +214,9 @@ class APContact extends BaseObject
 		DBA::close($contacts);
 
 		// Update the gcontact table
+		// These two fields don't exist in the gcontact table
+		unset($contact_fields['forum']);
+		unset($contact_fields['prv']);
 		DBA::update('gcontact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
 
 		Logger::log('Updated profile for ' . $url, Logger::DEBUG);