wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[OStatus] Add TheFreeNetwork module's support in handling profile insertion

Browse Source 
Ostatus_profile:
- Update createActivityObjectProfile to trigger TFN's assistance in inserting the profile
This commit is contained in:
tenma 2020-04-03 02:47:55 +01:00 committed by Diogo Cordeiro
parent 134b6f6478
commit cfba91ea43
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -1206,15 +1206,40 @@ class Ostatus_profile extends Managed_DataObject
$oprofile->created = common_sql_now(); $oprofile->created = common_sql_now();
$oprofile->modified = common_sql_now(); $oprofile->modified = common_sql_now();
if ($object->type == ActivityObject::PERSON) { $tfn = false;
$profile = new Profile();
$profile->created = common_sql_now();
self::updateProfile($profile, $object, $hints);
$oprofile->profile_id = $profile->insert(); if ($object->type == ActivityObject::PERSON) {
if ($oprofile->profile_id === false) {
// TRANS: Server exception. // Does any other protocol have this remote entity we're about to add ?
throw new ServerException(_m('Cannot save local profile.')); if (!Event::handle('StartTFNLookup', [$oprofile->uri, get_called_class(), &$profile_id])) {
$tfn = true; // been here!
// Yes! Avoid creating a new profile
$oprofile->profile_id = $profile_id;
if ($profile->insert() === false) {
// TRANS: Server exception.
throw new ServerException(_m('Cannot save OStatus profile.'));
}
// Update existing profile with received data
$profile = Profile::getKV('id', $profile_id);
$profile->modified = common_sql_now();
self::updateProfile($profile, $object, $hints);
// Ask TFN to handle profile duplication
Event::handle('EndTFNLookup', [get_called_class(), $profile_id]);
} else {
// No, create both a new profile and remote profile
$profile = new Profile();
$profile->created = common_sql_now();
self::updateProfile($profile, $object, $hints);
$oprofile->profile_id = $profile->insert();
if ($oprofile->profile_id === false) {
// TRANS: Server exception.
throw new ServerException(_m('Cannot save local profile.'));
}
} }
} else if ($object->type == ActivityObject::GROUP) { } else if ($object->type == ActivityObject::GROUP) {
$profile = new Profile(); $profile = new Profile();
@ -1270,11 +1295,13 @@ class Ostatus_profile extends Managed_DataObject
} }
} }
$ok = $oprofile->insert(); if (!$tfn) {
$ok = $oprofile->insert();
if ($ok === false) { if ($ok === false) {
// TRANS: Server exception. // TRANS: Server exception.
throw new ServerException(_m('Cannot save OStatus profile.')); throw new ServerException(_m('Cannot save OStatus profile.'));
}
} }
$avatar = self::getActivityObjectAvatar($object, $hints); $avatar = self::getActivityObjectAvatar($object, $hints);