Merge remote-tracking branch 'upstream/develop' into contact-tabs

src/Model/Contact.php

@@ -3096,7 +3096,7 @@ class Contact
 	 * @param array $urls
 	 * @return array result "count", "added" and "updated"
 	 */
-	public static function addContactsByArray(array $urls)
+	public static function addByUrls(array $urls)
 	{
 		$added = 0;
 		$updated = 0;

src/Worker/PullDirectory.php

@@ -60,7 +60,7 @@ class PullDirectory
 			return;
 		}
 
-		$result = Contact::addContactsByArray($contacts['results']);
+		$result = Contact::addByUrls($contacts['results']);
 
 		$now = $contacts['now'] ?? 0;
 		DI::config()->set('system', 'last-directory-sync', $now);

src/Worker/UpdateServerDirectory.php

@@ -71,7 +71,7 @@ class UpdateServerDirectory
 			}
 		}
 
-		$result = Contact::addContactsByArray($urls);
+		$result = Contact::addByUrls($urls);
 
 		Logger::info('PoCo discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'poco' => $gserver['poco']]);
 	}
@@ -99,7 +99,7 @@ class UpdateServerDirectory
 			}
 		}
 
-		$result = Contact::addContactsByArray($urls);
+		$result = Contact::addByUrls($urls);
 
 		Logger::info('Account discovery ended', ['count' => $result['count'], 'added' => $result['added'], 'updated' => $result['updated'], 'url' => $gserver['url']]);
 	}