keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"MIRROR_FORWARDED" is removed

Browse source
This commit is contained in:
Michael 2022-11-23 14:00:34 +00:00
parent 25992b063a
commit 352b7a0ac3
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Core/Protocol.php
View file

@ -205,6 +205,7 @@ class Protocol
$slap = OStatus::salmon($item, $user); $slap = OStatus::salmon($item, $user);
if (empty($contact['notify'])) { if (empty($contact['notify'])) {
return true;
throw new \InvalidArgumentException('Missing expected "notify" key in OStatus/DFRN contact'); throw new \InvalidArgumentException('Missing expected "notify" key in OStatus/DFRN contact');
} }

2
src/Model/Contact.php
View file

@ -106,7 +106,7 @@ class Contact
*/ */
const MIRROR_DEACTIVATED = 0; const MIRROR_DEACTIVATED = 0;
const MIRROR_FORWARDED = 1; const MIRROR_FORWARDED = 1; // Deprecated, now does the same like MIRROR_OWN_POST
const MIRROR_OWN_POST = 2; const MIRROR_OWN_POST = 2;
const MIRROR_NATIVE_RESHARE = 3; const MIRROR_NATIVE_RESHARE = 3;

25
src/Model/Item.php
View file

@ -823,19 +823,38 @@ class Item
$item['protocol'] = Conversation::PARCEL_DIRECT; $item['protocol'] = Conversation::PARCEL_DIRECT;
$item['direction'] = Conversation::PUSH; $item['direction'] = Conversation::PUSH;
if (!empty($item['author-link']) && !empty($item['author-id'])) { $owner = User::getOwnerDataById($item['uid']);
$owner = User::getOwnerDataById($item['uid']);
if (empty($item['contact-id'])) {
$item['contact-id'] = $owner['id'];
}
if (empty($item['author-link']) && empty($item['author-id'])) {
$item['author-link'] = $owner['url']; $item['author-link'] = $owner['url'];
$item['author-name'] = $owner['name']; $item['author-name'] = $owner['name'];
$item['author-avatar'] = $owner['thumb']; $item['author-avatar'] = $owner['thumb'];
} }
if (!empty($item['owner-link']) && !empty($item['owner-id'])) { if (empty($item['owner-link']) && empty($item['owner-id'])) {
$item['owner-link'] = $item['author-link']; $item['owner-link'] = $item['author-link'];
$item['owner-name'] = $item['author-name']; $item['owner-name'] = $item['author-name'];
$item['owner-avatar'] = $item['author-avatar']; $item['owner-avatar'] = $item['author-avatar'];
} }
// Setting the object type if not defined before
if (empty($item['object-type'])) {
$item['object-type'] = Activity\ObjectType::NOTE; // Default value
$objectdata = BBCode::getAttachedData($item['body']);
if ($objectdata['type'] == 'link') {
$item['object-type'] = Activity\ObjectType::BOOKMARK;
} elseif ($objectdata['type'] == 'video') {
$item['object-type'] = Activity\ObjectType::VIDEO;
} elseif ($objectdata['type'] == 'photo') {
$item['object-type'] = Activity\ObjectType::IMAGE;
}
}
return $item; return $item;
} }

1
src/Module/Contact/Profile.php
View file

@ -285,7 +285,6 @@ class Profile extends BaseModule
if ($contact['network'] == Protocol::FEED) { if ($contact['network'] == Protocol::FEED) {
$remote_self_options = [ $remote_self_options = [
Contact::MIRROR_DEACTIVATED => $this->t('No mirroring'), Contact::MIRROR_DEACTIVATED => $this->t('No mirroring'),
Contact::MIRROR_FORWARDED => $this->t('Mirror as forwarded posting'),
Contact::MIRROR_OWN_POST => $this->t('Mirror as my own posting') Contact::MIRROR_OWN_POST => $this->t('Mirror as my own posting')
]; ];
} elseif ($contact['network'] == Protocol::ACTIVITYPUB) { } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {