Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use "contact-type" instead of "account-type" to avoid notices

Browse source
This commit is contained in:
Michael 2020-07-17 06:58:39 +00:00
parent 0b93bcbbf9
commit c987785146
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/OStatus.php
View file

@ -1332,7 +1332,7 @@ class OStatus
$attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"]; $attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"];
XML::addElement($doc, $root, "link", "", $attributes); XML::addElement($doc, $root, "link", "", $attributes);
if ($owner['account-type'] == Contact::TYPE_COMMUNITY) { if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
$condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false, $condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
'archive' => false, 'hidden' => false, 'blocked' => false]; 'archive' => false, 'hidden' => false, 'blocked' => false];
$members = DBA::count('contact', $condition); $members = DBA::count('contact', $condition);
@ -1445,7 +1445,7 @@ class OStatus
$profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid']]); $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid']]);
$author = $doc->createElement("author"); $author = $doc->createElement("author");
XML::addElement($doc, $author, "id", $owner["url"]); XML::addElement($doc, $author, "id", $owner["url"]);
if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP); XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::GROUP);
} else { } else {
XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::PERSON); XML::addElement($doc, $author, "activity:object-type", Activity\ObjectType::PERSON);
@ -1876,7 +1876,7 @@ class OStatus
if (!$toplevel) { if (!$toplevel) {
$entry = $doc->createElement("entry"); $entry = $doc->createElement("entry");
if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
$contact = Contact::getByURL($item['author-link']) ?: $owner; $contact = Contact::getByURL($item['author-link']) ?: $owner;
$author = self::addAuthor($doc, $contact, false); $author = self::addAuthor($doc, $contact, false);
$entry->appendChild($author); $entry->appendChild($author);
@ -2046,7 +2046,7 @@ class OStatus
} }
} }
if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { if ($owner['contact-type'] == Contact::TYPE_COMMUNITY) {
XML::addElement($doc, $entry, "link", "", [ XML::addElement($doc, $entry, "link", "", [
"rel" => "mentioned", "rel" => "mentioned",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group", "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
@ -2151,7 +2151,7 @@ class OStatus
$condition[] = Activity\ObjectType::COMMENT; $condition[] = Activity\ObjectType::COMMENT;
} }
if ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY) { if ($owner['contact-type'] != Contact::TYPE_COMMUNITY) {
$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?"; $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
$condition[] = $owner["id"]; $condition[] = $owner["id"];
$condition[] = $authorid; $condition[] = $authorid;