mirror of
https://github.com/friendica/friendica
synced 2025-04-29 14:24:22 +02:00
GlobalContact created
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
This commit is contained in:
parent
5f25ef55d2
commit
47db624105
26 changed files with 2715 additions and 2610 deletions
|
@ -12,6 +12,7 @@ use Friendica\App;
|
|||
use Friendica\Core\Config;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
|
@ -1675,9 +1676,9 @@ class DFRN
|
|||
$poco["photo"] = $author["avatar"];
|
||||
$poco["hide"] = $hide;
|
||||
$poco["contact-type"] = $contact["contact-type"];
|
||||
$gcid = update_gcontact($poco);
|
||||
$gcid = GlobalContact::update($poco);
|
||||
|
||||
link_gcontact($gcid, $importer["uid"], $contact["id"]);
|
||||
GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
|
||||
}
|
||||
|
||||
return($author);
|
||||
|
|
|
@ -16,6 +16,7 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\GlobalContact;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Util\XML;
|
||||
|
||||
|
@ -2246,9 +2247,9 @@ class Diaspora
|
|||
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
|
||||
"hide" => !$searchable, "nsfw" => $nsfw);
|
||||
|
||||
$gcid = update_gcontact($gcontact);
|
||||
$gcid = GlobalContact::update($gcontact);
|
||||
|
||||
link_gcontact($gcid, $importer["uid"], $contact["id"]);
|
||||
GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
|
||||
|
||||
logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
|
||||
|
||||
|
|
1572
src/Protocol/PortableContact.php
Normal file
1572
src/Protocol/PortableContact.php
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue