*/
if ($aliaslink != '') {
$contact = DBA::selectFirst('contact', [], [
- "`uid` = ? AND `alias` = ? AND `network` != ? AND `rel` IN (?, ?)",
+ "`uid` = ? AND `alias` = ? AND `rel` IN (?, ?)",
$importer['uid'],
- $aliaslink, Protocol::STATUSNET,
+ $aliaslink,
Contact::SHARING, Contact::FRIEND,
]);
}
}
$contact = DBA::selectFirst('contact', [], [
- "`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
+ "`uid` = ? AND `nurl` IN (?, ?) AND `rel` IN (?, ?)",
$importer['uid'],
Strings::normaliseLink($author['author-link']),
Strings::normaliseLink($aliaslink),
- Protocol::STATUSNET,
Contact::SHARING,
Contact::FRIEND,
]);
if (!DBA::isResult($contact) && ($addr != '')) {
$contact = DBA::selectFirst('contact', [], [
- "`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
+ "`uid` = ? AND `addr` = ? AND `rel` IN (?, ?)",
$importer['uid'],
$addr,
- Protocol::STATUSNET,
Contact::SHARING,
Contact::FRIEND,
]);
$header['network'] = Protocol::OSTATUS;
$header['wall'] = 0;
$header['origin'] = 0;
- $header['gravity'] = GRAVITY_COMMENT;
+ $header['gravity'] = Item::GRAVITY_COMMENT;
if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
return false;
$item['verb'] = Activity::LIKE;
$item['thr-parent'] = $orig_uri;
- $item['gravity'] = GRAVITY_ACTIVITY;
+ $item['gravity'] = Item::GRAVITY_ACTIVITY;
$item['object-type'] = Activity\ObjectType::NOTE;
}
}
} else {
$item['thr-parent'] = $item['uri'];
- $item['gravity'] = GRAVITY_PARENT;
+ $item['gravity'] = Item::GRAVITY_PARENT;
}
self::$itemlist[] = $item;
}
}
- foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
+ foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT]) as $attachment) {
$attributes = ['rel' => 'enclosure',
'href' => $attachment['url'],
'type' => $attachment['mimetype']];
*/
private static function likeEntry(DOMDocument $doc, array $item, array $owner, bool $toplevel): DOMElement
{
- if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
+ if (($item['gravity'] != Item::GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
Logger::info('OStatus entry is from author ' . $owner['url'] . ' - not from ' . $item['author-link'] . '. Quitting.');
}
*/
private static function noteEntry(DOMDocument $doc, array $item, array $owner, bool $toplevel): DOMElement
{
- if (($item['gravity'] != GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
+ if (($item['gravity'] != Item::GRAVITY_PARENT) && (Strings::normaliseLink($item['author-link']) != Strings::normaliseLink($owner['url']))) {
Logger::info('OStatus entry is from author ' . $owner['url'] . ' - not from ' . $item['author-link'] . '. Quitting.');
}
XML::addElement($doc, $entry, 'id', $item['uri']);
XML::addElement($doc, $entry, 'title', html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
- $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
$body = self::formatPicturePost($body, $item['uri-id']);
if (!empty($item['title'])) {
{
$mentioned = [];
- if ($item['gravity'] != GRAVITY_PARENT) {
+ if ($item['gravity'] != Item::GRAVITY_PARENT) {
$parent = Post::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item['parent']]);
$thrparent = Post::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner['uid'], 'uri' => $item['thr-parent']]);