clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved similarity to ostatus group feeds

This commit is contained in:
Michael 2018-03-18 11:18:25 +00:00
parent 3ff6520ed5
commit d8824cc3bc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Protocol/OStatus.php
View File

@ -2023,12 +2023,10 @@ class OStatus
$mentioned = $newmentions; $mentioned = $newmentions;
foreach ($mentioned as $mention) { foreach ($mentioned as $mention) {
$r = q( $condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
"SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", $contact = dba::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
intval($owner["uid"]), if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == ACCOUNT_TYPE_COMMUNITY) ||
dbesc(normalise_link($mention)) ($contact['self'] && ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY))) {
);
if ($r[0]["forum"] || $r[0]["prv"]) {
XML::addElement($doc, $entry, "link", "", XML::addElement($doc, $entry, "link", "",
[ [
"rel" => "mentioned", "rel" => "mentioned",
@ -2045,6 +2043,12 @@ class OStatus
} }
} }
if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
"href" => $owner['url']]);
}
if (!$item["private"]) { if (!$item["private"]) {
XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention", XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
"href" => "http://activityschema.org/collection/public"]); "href" => "http://activityschema.org/collection/public"]);