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

Some more invalid feed elements

Browse source
This commit is contained in:
Michael 2020-07-11 19:11:35 +00:00
parent e5a336ff77
commit 0100e0df84
1 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/Protocol/OStatus.php
View file

@ -2095,48 +2095,50 @@ class OStatus
$mentioned[$tag['url']] = $tag['url']; $mentioned[$tag['url']] = $tag['url'];
} }
// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS) if (!$feed_mode) {
$newmentions = []; // Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
foreach ($mentioned as $mention) { $newmentions = [];
$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention); foreach ($mentioned as $mention) {
$newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention); $newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
} $newmentions[str_replace("https://", "http://", $mention)] = str_replace("https://", "http://", $mention);
$mentioned = $newmentions;
foreach ($mentioned as $mention) {
$contact = Contact::getByURL($mention, 0, ['contact-type']);
if (!empty($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
XML::addElement($doc, $entry, "link", "",
[
"rel" => "mentioned",
"ostatus:object-type" => Activity\ObjectType::GROUP,
"href" => $mention]
);
} else {
XML::addElement($doc, $entry, "link", "",
[
"rel" => "mentioned",
"ostatus:object-type" => Activity\ObjectType::PERSON,
"href" => $mention]
);
} }
} $mentioned = $newmentions;
if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) { foreach ($mentioned as $mention) {
XML::addElement($doc, $entry, "link", "", [ $contact = Contact::getByURL($mention, 0, ['contact-type']);
"rel" => "mentioned", if (!empty($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group", XML::addElement($doc, $entry, "link", "",
"href" => $owner['url'] [
]); "rel" => "mentioned",
} "ostatus:object-type" => Activity\ObjectType::GROUP,
"href" => $mention]
);
} else {
XML::addElement($doc, $entry, "link", "",
[
"rel" => "mentioned",
"ostatus:object-type" => Activity\ObjectType::PERSON,
"href" => $mention]
);
}
}
if (($item['private'] != Item::PRIVATE) && !$feed_mode) { if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention", XML::addElement($doc, $entry, "link", "", [
"href" => "http://activityschema.org/collection/public"]); "rel" => "mentioned",
XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned", "ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection", "href" => $owner['url']
"href" => "http://activityschema.org/collection/public"]); ]);
XML::addElement($doc, $entry, "mastodon:scope", "public"); }
if ($item['private'] != Item::PRIVATE) {
XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
"href" => "http://activityschema.org/collection/public"]);
XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/collection",
"href" => "http://activityschema.org/collection/public"]);
XML::addElement($doc, $entry, "mastodon:scope", "public");
}
} }
foreach ($tags as $tag) { foreach ($tags as $tag) {
@ -2147,7 +2149,7 @@ class OStatus
self::getAttachment($doc, $entry, $item); self::getAttachment($doc, $entry, $item);
if ($complete && ($item["id"] > 0)) { if (!$feed_mode && $complete && ($item["id"] > 0)) {
$app = $item["app"]; $app = $item["app"];
if ($app == "") { if ($app == "") {
$app = "web"; $app = "web";
@ -2163,9 +2165,7 @@ class OStatus
XML::addElement($doc, $entry, "georss:point", $item["coord"]); XML::addElement($doc, $entry, "georss:point", $item["coord"]);
} }
if (!$feed_mode) { XML::addElement($doc, $entry, "statusnet:notice_info", "", $attributes);
XML::addElement($doc, $entry, "statusnet:notice_info", "", $attributes);
}
} }
} }