*/
namespace Friendica\Protocol;
-use dba;
use DOMDocument;
use DOMXPath;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\Lock;
use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\GContact;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\XML;
require_once 'include/dba.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';
require_once 'include/api.php';
-require_once 'mod/proxy.php';
/**
* @brief This class contain functions for the OStatus protocol
*
* @return array Array of author related entries for the item
*/
- private static function fetchAuthor($xpath, $context, $importer, &$contact, $onlyfetch)
+ private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
{
$author = [];
$author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
if ($aliaslink != '') {
$condition = ["`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], $aliaslink, NETWORK_STATUSNET,
- CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
- $contact = dba::selectFirst('contact', [], $condition);
+ Contact::SHARING, Contact::FRIEND];
+ $contact = DBA::selectFirst('contact', [], $condition);
}
- if (!DBM::is_result($contact) && $author["author-link"] != '') {
+ if (!DBA::isResult($contact) && $author["author-link"] != '') {
if ($aliaslink == "") {
$aliaslink = $author["author-link"];
}
$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
- NETWORK_STATUSNET, CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
- $contact = dba::selectFirst('contact', [], $condition);
+ NETWORK_STATUSNET, Contact::SHARING, Contact::FRIEND];
+ $contact = DBA::selectFirst('contact', [], $condition);
}
- if (!DBM::is_result($contact) && ($addr != '')) {
+ if (!DBA::isResult($contact) && ($addr != '')) {
$condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
$importer["uid"], $addr, NETWORK_STATUSNET,
- CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
- $contact = dba::selectFirst('contact', [], $condition);
+ Contact::SHARING, Contact::FRIEND];
+ $contact = DBA::selectFirst('contact', [], $condition);
}
- if (DBM::is_result($contact)) {
+ if (DBA::isResult($contact)) {
if ($contact['blocked']) {
$contact['id'] = -1;
}
$author["owner-id"] = $author["author-id"];
// Only update the contacts if it is an OStatus contact
- if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
+ if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
// Update contact data
$current = $contact;
$contact['name-date'] = DateTimeFormat::utcNow();
- dba::update('contact', $contact, ['id' => $contact["id"]], $current);
+ DBA::update('contact', $contact, ['id' => $contact["id"]], $current);
if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
if ($cid) {
$fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'];
- $old_contact = dba::selectFirst('contact', $fields, ['id' => $cid]);
+ $old_contact = DBA::selectFirst('contact', $fields, ['id' => $cid]);
// Update it with the current values
$fields = ['url' => $author["author-link"], 'name' => $contact["name"],
'about' => $contact["about"], 'location' => $contact["location"],
'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
- dba::update('contact', $fields, ['id' => $cid], $old_contact);
+ DBA::update('contact', $fields, ['id' => $cid], $old_contact);
// Update the avatar
if (!empty($author["author-avatar"])) {
$gcid = GContact::update($contact);
GContact::link($gcid, $contact["uid"], $contact["id"]);
+ } else {
+ $contact = null;
}
return $author;
*
* @return array Array of author related entries for the item
*/
- public static function salmonAuthor($xml, $importer)
+ public static function salmonAuthor($xml, array $importer)
{
if ($xml == "") {
return;
* @param string $hub Called by reference, returns the fetched hub data
* @return void
*/
- public static function import($xml, $importer, &$contact, &$hub)
+ public static function import($xml, array $importer, array &$contact = null, &$hub)
{
self::process($xml, $importer, $contact, $hub);
}
*
* @return boolean Could the XML be processed?
*/
- private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true)
+ private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true)
{
if ($initialize) {
self::$itemlist = [];
$header = [];
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_OSTATUS;
- $header["type"] = "remote-comment";
$header["wall"] = 0;
$header["origin"] = 0;
$header["gravity"] = GRAVITY_COMMENT;
+ if (!is_object($doc->firstChild)) {
+ return false;
+ }
+
$first_child = $doc->firstChild->tagName;
if ($first_child == "feed") {
$orig_uri = $xpath->query("activity:object/atom:id", $entry)->item(0)->nodeValue;
logger("Favorite ".$orig_uri." ".print_r($item, true));
- $item["type"] = "activity";
$item["verb"] = ACTIVITY_LIKE;
$item["parent-uri"] = $orig_uri;
$item["gravity"] = GRAVITY_ACTIVITY;
}
/**
- * @param object $item item
+ * Removes notice item from database
+ * @param array $item item
* @return void
*/
- private static function deleteNotice($item)
+ private static function deleteNotice(array $item)
{
$condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'uri' => $item['uri']];
if (!Item::exists($condition)) {
* @param array $importer user record of the importing user
* @return void
*/
- private static function processPost($xpath, $entry, &$item, $importer)
+ private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer)
{
$item["body"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $entry);
} else {
$item["parent-uri"] = $item["uri"];
$item["gravity"] = GRAVITY_PARENT;
- $item["type"] = "remote";
}
if (($item['author-link'] != '') && !empty($item['protocol'])) {
$conv_data['source'] = $doc2->saveXML();
$condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED];
- if (dba::exists('conversation', $condition)) {
+ if (DBA::exists('conversation', $condition)) {
logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG);
- dba::delete('conversation', ['item-uri' => $conv_data['uri']]);
+ DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
}
logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG);
* @param array $item The item array
* @return void
*/
- private static function fetchSelf($self, &$item)
+ private static function fetchSelf($self, array &$item)
{
$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
- if (dba::exists('conversation', $condition)) {
+ if (DBA::exists('conversation', $condition)) {
logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
return;
}
private static function fetchRelated($related, $related_uri, $importer)
{
$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
- $conversation = dba::selectFirst('conversation', ['source', 'protocol'], $condition);
- if (DBM::is_result($conversation)) {
+ $conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition);
+ if (DBA::isResult($conversation)) {
$stored = true;
$xml = $conversation['source'];
if (self::process($xml, $importer, $contact, $hub, $stored, false)) {
}
if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
- dba::delete('conversation', ['item-uri' => $related_uri]);
+ DBA::delete('conversation', ['item-uri' => $related_uri]);
}
}
// Finally we take the data that we fetched from "ostatus:conversation"
if ($xml == '') {
$condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV];
- $conversation = dba::selectFirst('conversation', ['source'], $condition);
- if (DBM::is_result($conversation)) {
+ $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+ if (DBA::isResult($conversation)) {
$stored = true;
logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG);
$xml = $conversation['source'];
*
* @return array with data from links
*/
- private static function processRepeatedItem($xpath, $entry, &$item, $importer)
+ private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
{
- $activityobjects = $xpath->query('activity:object', $entry)->item(0);
+ $activityobject = $xpath->query('activity:object', $entry)->item(0);
- if (!is_object($activityobjects)) {
+ if (!is_object($activityobject)) {
return [];
}
$link_data = [];
- $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobjects);
+ $orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobject);
- $links = $xpath->query("atom:link", $activityobjects);
+ $links = $xpath->query("atom:link", $activityobject);
if ($links) {
$link_data = self::processLinks($links, $item);
}
- $orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobjects);
- $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobjects);
- $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobjects);
+ $orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobject);
+ $orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobject);
+ $orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobject);
- $orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
+ $orig_author = self::fetchAuthor($xpath, $activityobject, $importer, $dummy, false);
$item["author-name"] = $orig_author["author-name"];
$item["author-link"] = $orig_author["author-link"];
$item["uri"] = $orig_uri;
- $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobjects);
+ $item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject);
- $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobjects);
+ $item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject);
- $inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
+ // Mastodon Content Warning
+ if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) {
+ $clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $activityobject);
+ if (!empty($clear_text)) {
+ $item['content-warning'] = HTML::toBBCode($clear_text);
+ }
+ }
+
+ $inreplyto = $xpath->query('thr:in-reply-to', $activityobject);
if (is_object($inreplyto->item(0))) {
foreach ($inreplyto->item(0)->attributes as $attributes) {
if ($attributes->name == "ref") {
*
* @return array with data from the links
*/
- private static function processLinks($links, &$item)
+ private static function processLinks($links, array &$item)
{
$link_data = ['add_body' => '', 'self' => ''];
*
* @return string The guid if the post is a reshare
*/
- private static function getResharedGuid($item)
+ private static function getResharedGuid(array $item)
{
$body = trim($item["body"]);
}
// Is it a remote picture? Then make a smaller preview here
- $preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
+ $preview = ProxyUtils::proxifyUrl($preview, false, ProxyUtils::SIZE_SMALL);
// Is it a local picture? Then make it smaller here
$preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview);
*
* @return object header root element
*/
- private static function addHeader($doc, $owner, $filter)
+ private static function addHeader(DOMDocument $doc, array $owner, $filter)
{
$a = get_app();
"rel" => "self", "type" => "application/atom+xml"];
XML::addElement($doc, $root, "link", "", $attributes);
- if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
$condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
'archive' => false, 'hidden' => false, 'blocked' => false];
- $members = dba::count('contact', $condition);
+ $members = DBA::count('contact', $condition);
XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]);
}
* @param object $nick nick
* @return void
*/
- public static function hublinks($doc, $root, $nick)
+ public static function hublinks(DOMDocument $doc, $root, $nick)
{
$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]);
* @param array $item Data of the item that is to be posted
* @return void
*/
- private static function getAttachment($doc, $root, $item)
+ private static function getAttachment(DOMDocument $doc, $root, $item)
{
$o = "";
$siteinfo = BBCode::getAttachedData($item["body"]);
"href" => $siteinfo["url"],
"type" => "text/html; charset=UTF-8",
"length" => "",
- "title" => $siteinfo["title"]];
+ "title" => defaults($siteinfo, "title", $siteinfo["url"])];
XML::addElement($doc, $root, "link", "", $attributes);
break;
default:
*
* @param object $doc XML document
* @param array $owner Contact data of the poster
+ * @param bool $show_profile Whether to show profile
*
* @return object author element
*/
- private static function addAuthor($doc, $owner, $show_profile = true)
+ private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
{
- $profile = dba::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
+ $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
$author = $doc->createElement("author");
XML::addElement($doc, $author, "id", $owner["url"]);
- if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP);
} else {
XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
}
}
- if (DBM::is_result($profile) && !$show_profile) {
+ if (DBA::isResult($profile) && !$show_profile) {
if (trim($profile["homepage"]) != "") {
$urls = $doc->createElement("poco:urls");
XML::addElement($doc, $urls, "poco:type", "homepage");
*
* @return string activity
*/
- private static function constructVerb($item)
+ private static function constructVerb(array $item)
{
- if ($item['verb']) {
+ if (!empty($item['verb'])) {
return $item['verb'];
}
*
* @return string Object type
*/
- private static function constructObjecttype($item)
+ private static function constructObjecttype(array $item)
{
if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT]))
return $item['object-type'];
*
* @return object Entry element
*/
- private static function entry($doc, $item, $owner, $toplevel = false)
+ private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
{
$xml = null;
*
* @return object Source element
*/
- private static function sourceEntry($doc, $contact)
+ private static function sourceEntry(DOMDocument $doc, array $contact)
{
$source = $doc->createElement("source");
XML::addElement($doc, $source, "id", $contact["poll"]);
*
* @return array Contact array
*/
- private static function contactEntry($url, $owner)
+ private static function contactEntry($url, array $owner)
{
$r = q(
"SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
- dbesc(normalise_link($url)),
+ DBA::escape(normalise_link($url)),
intval($owner["uid"])
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$contact = $r[0];
$contact["uid"] = -1;
}
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$r = q(
"SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- dbesc(normalise_link($url))
+ DBA::escape(normalise_link($url))
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$contact = $r[0];
$contact["uid"] = -1;
$contact["success_update"] = $contact["updated"];
}
}
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
$contact = owner;
}
$contact["alias"] = $contact["url"];
}
+ $contact['account-type'] = $owner['account-type'];
+
return $contact;
}
*
* @return object Entry element
*/
- private static function reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel)
+ private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]];
$repeated_item = Item::selectFirst([], $condition);
- if (!DBM::is_result($repeated_item)) {
+ if (!DBA::isResult($repeated_item)) {
return false;
}
$contact = self::contactEntry($repeated_item['author-link'], $owner);
- $contact['account-type'] = $contact['contact-type'];
$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
*
* @return object Entry element with "like"
*/
- private static function likeEntry($doc, $item, $owner, $toplevel)
+ private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
+ if (!$parent) {
+ $parent = [];
+ }
+
XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
self::entryContent($doc, $as_object, $parent, $owner, "New entry");
*
* @return object author element
*/
- private static function addPersonObject($doc, $owner, $contact)
+ private static function addPersonObject(DOMDocument $doc, array $owner, array $contact)
{
$object = $doc->createElement("activity:object");
XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
*
* @return object Entry element
*/
- private static function followEntry($doc, $item, $owner, $toplevel)
+ private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
$item["id"] = $item["parent"] = 0;
$item["created"] = $item["edited"] = date("c");
$r = q(
"SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner['uid']),
- dbesc(normalise_link($contact["url"]))
+ DBA::escape(normalise_link($contact["url"]))
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$connect_id = $r[0]['id'];
} else {
$connect_id = 0;
*
* @return object Entry element
*/
- private static function noteEntry($doc, $item, $owner, $toplevel)
+ private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
{
if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
*
* @return string The title for the element
*/
- private static function entryHeader($doc, &$entry, $owner, $item, $toplevel)
+ private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel)
{
/// @todo Check if this title stuff is really needed (I guess not)
if (!$toplevel) {
$entry = $doc->createElement("entry");
$title = sprintf("New note by %s", $owner["nick"]);
- if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
$contact = self::contactEntry($item['author-link'], $owner);
$author = self::addAuthor($doc, $contact, false);
$entry->appendChild($author);
* @param bool $complete Add the "status_net" element?
* @return void
*/
- private static function entryContent($doc, $entry, $item, $owner, $title, $verb = "", $complete = true)
+ private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true)
{
if ($verb == "") {
$verb = self::constructVerb($item);
* @param bool $complete default true
* @return void
*/
- private static function entryFooter($doc, $entry, array $item, array $owner, $complete = true)
+ private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true)
{
$mentioned = [];
$thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
- if (DBM::is_result($thrparent)) {
+ if (DBA::isResult($thrparent)) {
$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
$mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
$parent_plink = $thrparent["plink"];
$conversation_uri = $conversation_href;
if (isset($parent_item)) {
- $conversation = dba::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
- if (DBM::is_result($conversation)) {
+ $conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
+ if (DBA::isResult($conversation)) {
if ($conversation['conversation-uri'] != '') {
$conversation_uri = $conversation['conversation-uri'];
}
foreach ($mentioned as $mention) {
$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
- $contact = dba::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
- if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == ACCOUNT_TYPE_COMMUNITY) ||
- ($contact['self'] && ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY))) {
+ $contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
+ if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) ||
+ ($contact['self'] && ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY))) {
XML::addElement($doc, $entry, "link", "",
[
"rel" => "mentioned",
}
}
- if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
XML::addElement($doc, $entry, "link", "", [
"rel" => "mentioned",
"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
$condition[] = ACTIVITY_OBJ_COMMENT;
}
- if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
+ if ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
$condition[] = $owner["id"];
$condition[] = $authorid;
*
* @return string XML for the salmon
*/
- public static function salmon($item, $owner)
+ public static function salmon(array $item, array $owner)
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
projects / friendica.git / blobdiff