X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=425f71822ae1ab6b717777a1568c03f02db1c35c;hb=7d6b1264ec038bc9c3917bc933ba8d02bedadcbc;hp=696860e16cffd4f5075e66a964645f2fa7346d59;hpb=3dac937f2298f5ddbd521115514a6974cde505cd;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 696860e16c..425f71822a 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -7,6 +7,7 @@ namespace Friendica\Model; use Friendica\BaseObject; +use Friendica\Content\Text; use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; @@ -22,13 +23,13 @@ use Friendica\Object\Image; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Util\DateTimeFormat; +use Friendica\Util\XML; use dba; use Text_LanguageDetect; require_once 'boot.php'; require_once 'include/items.php'; require_once 'include/text.php'; -require_once 'include/event.php'; class Item extends BaseObject { @@ -97,7 +98,7 @@ class Item extends BaseObject * @param integer $item_id Item ID that should be delete * @param integer $priority Priority for the notification * - * @return $boolean success + * @return boolean success */ public static function deleteById($item_id, $priority = PRIORITY_HIGH) { @@ -152,7 +153,7 @@ class Item extends BaseObject // If item is a link to an event, delete the event. if (intval($item['event-id'])) { - event_delete($item['event-id']); + Event::delete($item['event-id']); } // If item has attachments, drop them @@ -355,6 +356,10 @@ class Item extends BaseObject } } + if (!empty($item['thr-parent'])) { + $item['parent-uri'] = $item['thr-parent']; + } + if (x($item, 'gravity')) { $item['gravity'] = intval($item['gravity']); } elseif ($item['parent-uri'] === $item['uri']) { @@ -474,14 +479,14 @@ class Item extends BaseObject // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes $item["contact-id"] = self::contactId($item); - $item['author-id'] = defaults($item, 'author-id', Contact::getIdForURL($item["author-link"], 0)); + $item['author-id'] = defaults($item, 'author-id', Contact::getIdForURL($item["author-link"])); if (Contact::isBlocked($item["author-id"])) { logger('Contact '.$item["author-id"].' is blocked, item '.$item["uri"].' will not be stored'); return 0; } - $item['owner-id'] = defaults($item, 'owner-id', Contact::getIdForURL($item["owner-link"], 0)); + $item['owner-id'] = defaults($item, 'owner-id', Contact::getIdForURL($item["owner-link"])); if (Contact::isBlocked($item["owner-id"])) { logger('Contact '.$item["owner-id"].' is blocked, item '.$item["uri"].' will not be stored'); @@ -834,6 +839,109 @@ class Item extends BaseObject return $current_post; } + /** + * @brief Distributes public items to the receivers + * + * @param integer $itemid Item ID that should be added + */ + public static function distribute($itemid) + { + $condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid]; + $parent = dba::selectFirst('item', ['owner-id'], $condition); + if (!DBM::is_result($parent)) { + return; + } + + // Only distribute public items from native networks + $condition = ['id' => $itemid, 'uid' => 0, + 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""], + 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false]; + $item = dba::selectFirst('item', [], ['id' => $itemid]); + if (!DBM::is_result($item)) { + return; + } + + unset($item['id']); + unset($item['parent']); + unset($item['mention']); + unset($item['wall']); + unset($item['origin']); + unset($item['starred']); + unset($item['rendered-hash']); + unset($item['rendered-html']); + + $users = []; + + $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)", + $parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; + $contacts = dba::select('contact', ['uid'], $condition); + while ($contact = dba::fetch($contacts)) { + $users[$contact['uid']] = $contact['uid']; + } + + if ($item['uri'] != $item['parent-uri']) { + $parents = dba::select('item', ['uid'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]); + while ($parent = dba::fetch($parents)) { + $users[$parent['uid']] = $parent['uid']; + } + } + + foreach ($users as $uid) { + self::storeForUser($itemid, $item, $uid); + } + } + + /** + * @brief Store public items for the receivers + * + * @param integer $itemid Item ID that should be added + * @param array $item The item entry that will be stored + * @param integer $uid The user that will receive the item entry + */ + private static function storeForUser($itemid, $item, $uid) + { + $item['uid'] = $uid; + $item['origin'] = 0; + $item['wall'] = 0; + if ($item['uri'] == $item['parent-uri']) { + $item['contact-id'] = Contact::getIdForURL($item['owner-link'], $uid); + } else { + $item['contact-id'] = Contact::getIdForURL($item['author-link'], $uid); + } + + if (empty($item['contact-id'])) { + $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]); + if (!DBM::is_result($self)) { + return; + } + $item['contact-id'] = $self['id']; + } + + if (in_array($item['type'], ["net-comment", "wall-comment"])) { + $item['type'] = 'remote-comment'; + } elseif ($item['type'] == 'wall') { + $item['type'] = 'remote'; + } + + /// @todo Handling of "event-id" + + $notify = false; + if ($item['uri'] == $item['parent-uri']) { + $contact = dba::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]); + if (DBM::is_result($contact)) { + $notify = self::isRemoteSelf($contact, $item); + } + } + + $distributed = self::insert($item, false, $notify, true); + + if (!$distributed) { + logger("Distributed public item " . $itemid . " for user " . $uid . " wasn't stored", LOGGER_DEBUG); + } else { + logger("Distributed public item " . $itemid . " for user " . $uid . " with id " . $distributed, LOGGER_DEBUG); + } + } + /** * @brief Add a shadow entry for a given item id that is a thread starter * @@ -845,8 +953,8 @@ class Item extends BaseObject */ public static function addShadow($itemid) { - $fields = ['uid', 'wall', 'private', 'moderated', 'visible', 'contact-id', 'deleted', 'network', 'author-id', 'owner-id']; - $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid]; + $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network']; + $condition = ['id' => $itemid, 'parent' => [0, $itemid]]; $item = dba::selectFirst('item', $fields, $condition); if (!DBM::is_result($item)) { @@ -868,36 +976,27 @@ class Item extends BaseObject return; } - // Only do these checks if the post isn't a wall post - if (!$item["wall"]) { - // Check, if hide-friends is activated - then don't do a shadow entry - if (dba::exists('profile', ['is-default' => true, 'uid' => $item['uid'], 'hide-friends' => true])) { - return; - } - - // Check if the contact is hidden or blocked - if (!dba::exists('contact', ['hidden' => false, 'blocked' => false, 'id' => $item['contact-id']])) { - return; - } - } - - // Only add a shadow, if the profile isn't hidden - if (dba::exists('user', ['uid' => $item['uid'], 'hidewall' => true])) { - return; - } - $item = dba::selectFirst('item', [], ['id' => $itemid]); - if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') && + if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') && ($item["deny_cid"] == '') && ($item["deny_gid"] == '')) { if (!dba::exists('item', ['uri' => $item['uri'], 'uid' => 0])) { // Preparing public shadow (removing user specific data) - unset($item['id']); $item['uid'] = 0; - $item['origin'] = 0; - $item['wall'] = 0; - $item['contact-id'] = Contact::getIdForURL($item['author-link'], 0); + unset($item['id']); + unset($item['parent']); + unset($item['wall']); + unset($item['mention']); + unset($item['origin']); + unset($item['starred']); + unset($item['rendered-hash']); + unset($item['rendered-html']); + if ($item['uri'] == $item['parent-uri']) { + $item['contact-id'] = Contact::getIdForURL($item['owner-link']); + } else { + $item['contact-id'] = Contact::getIdForURL($item['author-link']); + } if (in_array($item['type'], ["net-comment", "wall-comment"])) { $item['type'] = 'remote-comment'; @@ -946,12 +1045,21 @@ class Item extends BaseObject return; } + // Save "origin" and "parent" state + $origin = $item['origin']; + $parent = $item['parent']; + // Preparing public shadow (removing user specific data) - unset($item['id']); $item['uid'] = 0; - $item['origin'] = 0; - $item['wall'] = 0; - $item['contact-id'] = Contact::getIdForURL($item['author-link'], 0); + unset($item['id']); + unset($item['parent']); + unset($item['wall']); + unset($item['mention']); + unset($item['origin']); + unset($item['starred']); + unset($item['rendered-hash']); + unset($item['rendered-html']); + $item['contact-id'] = Contact::getIdForURL($item['author-link']); if (in_array($item['type'], ["net-comment", "wall-comment"])) { $item['type'] = 'remote-comment'; @@ -962,6 +1070,14 @@ class Item extends BaseObject $public_shadow = self::insert($item, false, false, true); logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG); + + // If this was a comment to a Diaspora post we don't get our comment back. + // This means that we have to distribute the comment by ourselves. + if ($origin) { + if (dba::exists('item', ['id' => $parent, 'network' => NETWORK_DIASPORA])) { + self::distribute($public_shadow); + } + } } /** @@ -969,35 +1085,35 @@ class Item extends BaseObject * if possible and not already present. * Expects "body" element to exist in $arr. */ - private static function addLanguageInPostopts(&$arr) + private static function addLanguageInPostopts(&$item) { - if (x($arr, 'postopts')) { - if (strstr($arr['postopts'], 'lang=')) { + if (!empty($item['postopts'])) { + if (strstr($item['postopts'], 'lang=')) { // do not override return; } - $postopts = $arr['postopts']; + $postopts = $item['postopts']; } else { $postopts = ""; } - $naked_body = preg_replace('/\[(.+?)\]/','', $arr['body']); - $l = new Text_LanguageDetect(); - $lng = $l->detect($naked_body, 3); + $naked_body = Text\BBCode::toPlaintext($item['body'], false); - if (sizeof($lng) > 0) { - if ($postopts != "") { + $languages = (new Text_LanguageDetect())->detect($naked_body, 3); + + if (sizeof($languages) > 0) { + if ($postopts != '') { $postopts .= '&'; // arbitrary separator, to be reviewed } $postopts .= 'lang='; $sep = ""; - foreach ($lng as $language => $score) { + foreach ($languages as $language => $score) { $postopts .= $sep . $language . ";" . $score; $sep = ':'; } - $arr['postopts'] = $postopts; + $item['postopts'] = $postopts; } } @@ -1264,21 +1380,23 @@ class Item extends BaseObject } // now change this copy of the post to a forum head message and deliver to all the tgroup members - $self = dba::selectFirst('contact', ['name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]); + $self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]); if (!DBM::is_result($self)) { return; } + $owner_id = Contact::getIdForURL($self['url']); + // also reset all the privacy bits to the forum default permissions $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0; $forum_mode = ($prvgroup ? 2 : 1); - $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, - 'owner-name' => $self['name'], 'owner-link' => $self['url'], 'owner-avatar' => $self['thumb'], - 'private' => $private, 'allow_cid' => $user['allow_cid'], 'allow_gid' => $user['allow_gid'], - 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']]; + $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'], + 'owner-id' => $owner_id, 'owner-name' => $self['name'], 'owner-link' => $self['url'], + 'owner-avatar' => $self['thumb'], 'private' => $private, 'allow_cid' => $user['allow_cid'], + 'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']]; dba::update('item', $fields, ['id' => $item_id]); self::updateThread($item_id); @@ -1296,20 +1414,24 @@ class Item extends BaseObject // Prevent the forwarding of posts that are forwarded if ($datarray["extid"] == NETWORK_DFRN) { + logger('Already forwarded', LOGGER_DEBUG); return false; } // Prevent to forward already forwarded posts if ($datarray["app"] == $a->get_hostname()) { + logger('Already forwarded (second test)', LOGGER_DEBUG); return false; } // Only forward posts if ($datarray["verb"] != ACTIVITY_POST) { + logger('No post', LOGGER_DEBUG); return false; } if (($contact['network'] != NETWORK_FEED) && $datarray['private']) { + logger('Not public', LOGGER_DEBUG); return false; } @@ -1331,6 +1453,10 @@ class Item extends BaseObject unset($datarray['created']); unset($datarray['edited']); + + unset($datarray['network']); + unset($datarray['owner-id']); + unset($datarray['author-id']); } if ($contact['network'] != NETWORK_FEED) { @@ -1338,7 +1464,8 @@ class Item extends BaseObject unset($datarray["plink"]); $datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; - $datarray["extid"] = $contact['network']; + $datarray["thr-parent"] = $datarray["uri"]; + $datarray["extid"] = NETWORK_DFRN; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; } else { @@ -1348,10 +1475,11 @@ class Item extends BaseObject if ($contact['network'] != NETWORK_FEED) { // Store the original post - $r = self::insert($datarray2, false, false); - logger('remote-self post original item - Contact '.$contact['url'].' return '.$r.' Item '.print_r($datarray2, true), LOGGER_DEBUG); + $result = self::insert($datarray2, false, false); + logger('remote-self post original item - Contact '.$contact['url'].' return '.$result.' Item '.print_r($datarray2, true), LOGGER_DEBUG); } else { $datarray["app"] = "Feed"; + $result = true; } // Trigger automatic reactions for addons @@ -1361,7 +1489,7 @@ class Item extends BaseObject $_SESSION["authenticated"] = true; $_SESSION["uid"] = $contact['uid']; - return true; + return $result; } /** @@ -1723,7 +1851,7 @@ class Item extends BaseObject $item_contact_id = $owner_self_contact['id']; $item_contact = $owner_self_contact; } else { - $item_contact_id = Contact::getIdForURL($author_contact['url'], $uid); + $item_contact_id = Contact::getIdForURL($author_contact['url'], $uid, true); $item_contact = dba::selectFirst('contact', [], ['id' => $item_contact_id]); if (!DBM::is_result($item_contact)) { logger('like: unknown item contact ' . $item_contact_id);