X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=b9c88bca8650111f6703a8c6762ea70ac9270aaf;hb=060e887a31cea31c5cafb99c1684ad2d0d71dc27;hp=be317b2882d49bd0cd654b6e844981f2d853ca48;hpb=9e262e6157b068175349428325fe24a8fa9c2187;p=friendica.git
diff --git a/src/Model/Item.php b/src/Model/Item.php
index be317b2882..b9c88bca86 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -7,25 +7,23 @@
namespace Friendica\Model;
use Friendica\BaseObject;
-use Friendica\Content\Text;
+use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Lock;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
-use Friendica\Model\Group;
-use Friendica\Model\Term;
+use Friendica\Model\PermissionSet;
+use Friendica\Model\ItemURI;
use Friendica\Object\Image;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\XML;
-use Friendica\Util\Lock;
-use dba;
use Text_LanguageDetect;
require_once 'boot.php';
@@ -34,6 +32,17 @@ require_once 'include/text.php';
class Item extends BaseObject
{
+ // Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
+ const PT_ARTICLE = 0;
+ const PT_NOTE = 1;
+ const PT_PAGE = 2;
+ const PT_IMAGE = 16;
+ const PT_AUDIO = 17;
+ const PT_VIDEO = 18;
+ const PT_DOCUMENT = 19;
+ const PT_EVENT = 32;
+ const PT_PERSONAL_NOTE = 128;
+
// Field list that is used to display the items
const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
@@ -52,10 +61,10 @@ class Item extends BaseObject
const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
'created', 'edited', 'verb', 'object-type', 'object', 'target',
'private', 'title', 'body', 'location', 'coord', 'app',
- 'attach', 'tag', 'bookmark', 'deleted', 'extid',
+ 'attach', 'tag', 'deleted', 'extid', 'post-type',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'owner-link', 'contact-uid',
- 'signed_text', 'signature', 'signer'];
+ 'signed_text', 'signature', 'signer', 'network'];
// Field list for "item-content" table that is mixed with the item table
const MIXED_CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location',
@@ -65,12 +74,15 @@ class Item extends BaseObject
// Field list for "item-content" table that is not present in the "item" table
const CONTENT_FIELDLIST = ['language'];
+ // Field list for additional delivery data
+ const DELIVERY_DATA_FIELDLIST = ['postopts', 'inform'];
+
// All fields in the item table
const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
- 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid',
- 'created', 'edited', 'commented', 'received', 'changed', 'verb',
+ 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
+ 'uri-hash', 'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
- 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+ 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
'title', 'content-warning', 'body', 'location', 'coord', 'app',
@@ -82,6 +94,17 @@ class Item extends BaseObject
// The item-activity table only stores the index and needs this array to know the matching activity.
const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+ private static $legacy_mode = null;
+
+ public static function isLegacyMode()
+ {
+ if (is_null(self::$legacy_mode)) {
+ self::$legacy_mode = (Config::get("system", "post_update_version") < 1279);
+ }
+
+ return self::$legacy_mode;
+ }
+
/**
* @brief returns an activity index from an activity string
*
@@ -107,7 +130,7 @@ class Item extends BaseObject
*/
private static function indexToActivity($index)
{
- if (!isset(self::ACTIVITIES[$index])) {
+ if (is_null($index) || !array_key_exists($index, self::ACTIVITIES)) {
return '';
}
@@ -122,7 +145,7 @@ class Item extends BaseObject
*/
public static function fetch($stmt)
{
- $row = dba::fetch($stmt);
+ $row = DBA::fetch($stmt);
if (is_bool($row)) {
return $row;
@@ -153,18 +176,21 @@ class Item extends BaseObject
// We can always comment on posts from these networks
if (array_key_exists('writable', $row) &&
- in_array($row['internal-network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+ in_array($row['internal-network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
$row['writable'] = true;
}
// ---------------------- Transform item content data ----------------------
// Fetch data from the item-content table whenever there is content there
- foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
- if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
- $row[$field] = $row['internal-item-' . $field];
+ if (self::isLegacyMode()) {
+ $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+ foreach ($legacy_fields as $field) {
+ if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
+ $row[$field] = $row['internal-item-' . $field];
+ }
+ unset($row['internal-item-' . $field]);
}
- unset($row['internal-item-' . $field]);
}
if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) {
@@ -181,7 +207,7 @@ class Item extends BaseObject
if (array_key_exists('object-type', $row)) {
$row['object-type'] = ACTIVITY_OBJ_NOTE;
}
- } elseif (in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
+ } elseif (array_key_exists('verb', $row) && in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
// Posts don't have an object or target - but having tags or files.
// We safe some performance by building tag and file strings only here.
// We remove object and target since they aren't used for this type.
@@ -191,23 +217,31 @@ class Item extends BaseObject
if (array_key_exists('target', $row)) {
$row['target'] = '';
}
+ }
+
+ if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
// Build the tag string out of the term entries
- if (array_key_exists('tag', $row)) {
+ if (array_key_exists('tag', $row) && empty($row['tag'])) {
$row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
}
// Build the file string out of the term entries
- if (array_key_exists('file', $row)) {
+ if (array_key_exists('file', $row) && empty($row['file'])) {
$row['file'] = Term::fileTextFromItemId($row['internal-iid']);
}
}
+ if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) {
+ $row['ignored'] = $row['internal-user-ignored'];
+ }
+
// Remove internal fields
unset($row['internal-activity']);
unset($row['internal-network']);
unset($row['internal-iid']);
unset($row['internal-iaid']);
unset($row['internal-icid']);
+ unset($row['internal-user-ignored']);
return $row;
}
@@ -228,7 +262,7 @@ class Item extends BaseObject
$data[] = $row;
}
if ($do_close) {
- dba::close($stmt);
+ DBA::close($stmt);
}
return $data;
}
@@ -246,10 +280,10 @@ class Item extends BaseObject
if (is_bool($stmt)) {
$retval = $stmt;
} else {
- $retval = (dba::num_rows($stmt) > 0);
+ $retval = (DBA::numRows($stmt) > 0);
}
- dba::close($stmt);
+ DBA::close($stmt);
return $retval;
}
@@ -263,7 +297,7 @@ class Item extends BaseObject
* @param array $condition
* @param array $params
* @return bool|array
- * @see dba::select
+ * @see DBA::select
*/
public static function selectFirstForUser($uid, array $selected = [], array $condition = [], $params = [])
{
@@ -305,7 +339,7 @@ class Item extends BaseObject
* @param array $condition
* @param array $params
* @return bool|array
- * @see dba::select
+ * @see DBA::select
*/
public static function selectFirst(array $fields = [], array $condition = [], $params = [])
{
@@ -317,7 +351,7 @@ class Item extends BaseObject
return $result;
} else {
$row = self::fetch($result);
- dba::close($result);
+ DBA::close($result);
return $row;
}
}
@@ -341,11 +375,11 @@ class Item extends BaseObject
$usermode = true;
}
- $fields = self::fieldlist($selected);
+ $fields = self::fieldlist($selected, $usermode);
$select_fields = self::constructSelectFields($fields, $selected);
- $condition_string = dba::buildCondition($condition);
+ $condition_string = DBA::buildCondition($condition);
$condition_string = self::addTablesToFields($condition_string, $fields);
@@ -353,13 +387,13 @@ class Item extends BaseObject
$condition_string = $condition_string . ' AND ' . self::condition(false);
}
- $param_string = self::addTablesToFields(dba::buildParameter($params), $fields);
+ $param_string = self::addTablesToFields(DBA::buildParameter($params), $fields);
$table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false, $usermode);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
- return dba::p($sql, $condition);
+ return DBA::p($sql, $condition);
}
/**
@@ -392,7 +426,7 @@ class Item extends BaseObject
* @param array $condition
* @param array $params
* @return bool|array
- * @see dba::select
+ * @see DBA::select
*/
public static function selectFirstThreadForUser($uid, array $selected = [], array $condition = [], $params = [])
{
@@ -413,7 +447,7 @@ class Item extends BaseObject
* @param array $condition
* @param array $params
* @return bool|array
- * @see dba::select
+ * @see DBA::select
*/
public static function selectFirstThread(array $fields = [], array $condition = [], $params = [])
{
@@ -424,7 +458,7 @@ class Item extends BaseObject
return $result;
} else {
$row = self::fetch($result);
- dba::close($result);
+ DBA::close($result);
return $row;
}
}
@@ -448,16 +482,18 @@ class Item extends BaseObject
$usermode = true;
}
- $fields = self::fieldlist($selected);
+ $fields = self::fieldlist($selected, $usermode);
+
+ $fields['thread'] = ['mention', 'ignored', 'iid'];
$threadfields = ['thread' => ['iid', 'uid', 'contact-id', 'owner-id', 'author-id',
'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private',
- 'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'bookmark',
+ 'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'post-type',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'network']];
$select_fields = self::constructSelectFields($fields, $selected);
- $condition_string = dba::buildCondition($condition);
+ $condition_string = DBA::buildCondition($condition);
$condition_string = self::addTablesToFields($condition_string, $threadfields);
$condition_string = self::addTablesToFields($condition_string, $fields);
@@ -466,7 +502,7 @@ class Item extends BaseObject
$condition_string = $condition_string . ' AND ' . self::condition(true);
}
- $param_string = dba::buildParameter($params);
+ $param_string = DBA::buildParameter($params);
$param_string = self::addTablesToFields($param_string, $threadfields);
$param_string = self::addTablesToFields($param_string, $fields);
@@ -474,7 +510,7 @@ class Item extends BaseObject
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
- return dba::p($sql, $condition);
+ return DBA::p($sql, $condition);
}
/**
@@ -482,25 +518,32 @@ class Item extends BaseObject
*
* @return array field list
*/
- private static function fieldlist($selected)
+ private static function fieldlist($selected, $usermode)
{
$fields = [];
$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
- 'created', 'edited', 'commented', 'received', 'changed', 'postopts',
- 'resource-id', 'event-id', 'tag', 'attach', 'inform',
- 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+ 'created', 'edited', 'commented', 'received', 'changed', 'psid', 'uri-hash',
+ 'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
'network' => 'internal-network', 'icid' => 'internal-icid',
'iaid' => 'internal-iaid'];
- $fields['item-activity'] = ['activity' => 'internal-activity'];
+ if ($usermode) {
+ $fields['user-item'] = ['ignored' => 'internal-user-ignored'];
+ }
+
+ $fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
$fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+ $fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST;
+
+ $fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+
$fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];
@@ -569,20 +612,20 @@ class Item extends BaseObject
$joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
AND NOT `contact`.`blocked`
AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
- OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0)
+ OR `contact`.`self` OR `item`.`gravity` != %d OR `contact`.`uid` = 0)
STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked`
STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked`
LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d",
- CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid));
+ Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, intval($uid));
} else {
if (strpos($sql_commands, "`contact`.") !== false) {
- $joins .= "STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
+ $joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
}
if (strpos($sql_commands, "`author`.") !== false) {
- $joins .= " STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`";
+ $joins .= " LEFT JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`";
}
if (strpos($sql_commands, "`owner`.") !== false) {
- $joins .= " STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`";
+ $joins .= " LEFT JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`";
}
}
@@ -610,6 +653,14 @@ class Item extends BaseObject
$joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
}
+ if (strpos($sql_commands, "`item-delivery-data`.") !== false) {
+ $joins .= " LEFT JOIN `item-delivery-data` ON `item-delivery-data`.`iid` = `item`.`id`";
+ }
+
+ if (strpos($sql_commands, "`permissionset`.") !== false) {
+ $joins .= " LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`";
+ }
+
if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) {
$joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`";
}
@@ -642,11 +693,16 @@ class Item extends BaseObject
$selected[] = 'internal-activity';
}
+ if (in_array('ignored', $selected)) {
+ $selected[] = 'internal-user-ignored';
+ }
+
$selection = [];
foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $field => $select) {
if (empty($selected) || in_array($select, $selected)) {
- if (in_array($select, self::MIXED_CONTENT_FIELDLIST)) {
+ $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+ if (self::isLegacyMode() && in_array($select, $legacy_fields)) {
$selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
}
if (is_int($field)) {
@@ -686,6 +742,19 @@ class Item extends BaseObject
return $query;
}
+ /**
+ * @brief Generate a server unique item hash for linking between the item tables
+ *
+ * @param string $uri Item URI
+ * @param date $created Item creation date
+ *
+ * @return string the item hash
+ */
+ private static function itemHash($uri, $created)
+ {
+ return round(strtotime($created) / 100) . hash('ripemd128', $uri);
+ }
+
/**
* @brief Update existing item entries
*
@@ -706,93 +775,159 @@ class Item extends BaseObject
}
// To ensure the data integrity we do it in an transaction
- dba::transaction();
+ DBA::transaction();
// We cannot simply expand the condition to check for origin entries
// The condition needn't to be a simple array but could be a complex condition.
// And we have to execute this query before the update to ensure to fetch the same data.
- $items = dba::select('item', ['id', 'origin', 'uri', 'plink', 'iaid', 'icid'], $condition);
+ $items = DBA::select('item', ['id', 'origin', 'uri', 'created', 'uri-hash', 'iaid', 'icid', 'tag', 'file'], $condition);
$content_fields = [];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($fields[$field])) {
$content_fields[$field] = $fields[$field];
- unset($fields[$field]);
+ if (in_array($field, self::CONTENT_FIELDLIST) || !self::isLegacyMode()) {
+ unset($fields[$field]);
+ } else {
+ $fields[$field] = null;
+ }
+ }
+ }
+
+ $clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
+ foreach ($clear_fields as $field) {
+ if (array_key_exists($field, $fields)) {
+ $fields[$field] = null;
}
}
if (array_key_exists('tag', $fields)) {
$tags = $fields['tag'];
- unset($fields['tag']);
+ $fields['tag'] = null;
} else {
$tags = '';
}
if (array_key_exists('file', $fields)) {
$files = $fields['file'];
- unset($fields['file']);
+ $fields['file'] = null;
} else {
$files = '';
}
+ $delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
+ 'inform' => defaults($fields, 'inform', '')];
+
+ $fields['postopts'] = null;
+ $fields['inform'] = null;
+
if (!empty($fields)) {
- $success = dba::update('item', $fields, $condition);
+ $success = DBA::update('item', $fields, $condition);
if (!$success) {
- dba::close($items);
- dba::rollback();
+ DBA::close($items);
+ DBA::rollback();
return false;
}
}
// When there is no content for the "old" item table, this will count the fetched items
- $rows = dba::affected_rows();
+ $rows = DBA::affectedRows();
+
+ while ($item = DBA::fetch($items)) {
- while ($item = dba::fetch($items)) {
- if (!empty($item['plink'])) {
- $content_fields['plink'] = $item['plink'];
+ // This part here can safely be removed when the legacy fields in the item had been removed
+ if (empty($item['uri-hash']) && !empty($item['uri']) && !empty($item['created'])) {
+
+ // Fetch the uri-hash from an existing item entry if there is one
+ $item_condition = ["`uri` = ? AND `uri-hash` != ''", $item['uri']];
+ $existing = DBA::selectfirst('item', ['uri-hash'], $item_condition);
+ if (DBA::isResult($existing)) {
+ $item['uri-hash'] = $existing['uri-hash'];
+ } else {
+ $item['uri-hash'] = self::itemHash($item['uri'], $item['created']);
+ }
+
+ DBA::update('item', ['uri-hash' => $item['uri-hash']], ['id' => $item['id']]);
+ DBA::update('item-activity', ['uri-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-hash` = ''", $item['uri']]);
+ DBA::update('item-content', ['uri-plink-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-plink-hash` = ''", $item['uri']]);
}
- if (self::updateActivity($content_fields, ['uri' => $item['uri']])) {
+
+ if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) {
+ if (!empty($item['iaid'])) {
+ $update_condition = ['id' => $item['iaid']];
+ } else {
+ $update_condition = ['uri-hash' => $item['uri-hash']];
+ }
+ self::updateActivity($content_fields, $update_condition);
+
if (empty($item['iaid'])) {
- $item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]);
- if (DBM::is_result($item_activity)) {
+ $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
+ if (DBA::isResult($item_activity)) {
$item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
- $item_fields[$field] = '';
+ if (self::isLegacyMode()) {
+ $item_fields[$field] = null;
+ } else {
+ unset($item_fields[$field]);
+ }
}
- dba::update('item', $item_fields, ['id' => $item['id']]);
+ DBA::update('item', $item_fields, ['id' => $item['id']]);
- if (!empty($item['icid']) && !dba::exists('item', ['icid' => $item['icid']])) {
- dba::delete('item-content', ['id' => $item['icid']]);
+ if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid']])) {
+ DBA::delete('item-content', ['id' => $item['icid']]);
}
}
+ } elseif (!empty($item['icid'])) {
+ DBA::update('item', ['icid' => null], ['id' => $item['id']]);
+
+ if (!DBA::exists('item', ['icid' => $item['icid']])) {
+ DBA::delete('item-content', ['id' => $item['icid']]);
+ }
}
} else {
- self::updateContent($content_fields, ['uri' => $item['uri']]);
+ if (!empty($item['icid'])) {
+ $update_condition = ['id' => $item['icid']];
+ } else {
+ $update_condition = ['uri-plink-hash' => $item['uri-hash']];
+ }
+ self::updateContent($content_fields, $update_condition);
if (empty($item['icid'])) {
- $item_content = dba::selectFirst('item-content', [], ['uri' => $item['uri']]);
- if (DBM::is_result($item_content)) {
+ $item_content = DBA::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]);
+ if (DBA::isResult($item_content)) {
$item_fields = ['icid' => $item_content['id']];
// Clear all fields in the item table that have a content in the item-content table
foreach ($item_content as $field => $content) {
if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) {
- $item_fields[$field] = '';
+ if (self::isLegacyMode()) {
+ $item_fields[$field] = null;
+ } else {
+ unset($item_fields[$field]);
+ }
}
}
- dba::update('item', $item_fields, ['id' => $item['id']]);
+ DBA::update('item', $item_fields, ['id' => $item['id']]);
}
}
}
if (!empty($tags)) {
Term::insertFromTagFieldByItemId($item['id'], $tags);
+ if (!empty($item['tag'])) {
+ DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
+ }
}
if (!empty($files)) {
Term::insertFromFileFieldByItemId($item['id'], $files);
+ if (!empty($item['file'])) {
+ DBA::update('item', ['file' => ''], ['id' => $item['id']]);
+ }
}
+ self::updateDeliveryData($item['id'], $delivery_data);
+
self::updateThread($item['id']);
// We only need to notfiy others when it is an original entry from us.
@@ -802,8 +937,8 @@ class Item extends BaseObject
}
}
- dba::close($items);
- dba::commit();
+ DBA::close($items);
+ DBA::commit();
return $rows;
}
@@ -815,11 +950,11 @@ class Item extends BaseObject
*/
public static function delete($condition, $priority = PRIORITY_HIGH)
{
- $items = dba::select('item', ['id'], $condition);
- while ($item = dba::fetch($items)) {
+ $items = self::select(['id'], $condition);
+ while ($item = self::fetch($items)) {
self::deleteById($item['id'], $priority);
}
- dba::close($items);
+ DBA::close($items);
}
/**
@@ -834,18 +969,18 @@ class Item extends BaseObject
return;
}
- $items = dba::select('item', ['id', 'uid'], $condition);
- while ($item = dba::fetch($items)) {
+ $items = self::select(['id', 'uid'], $condition);
+ while ($item = self::fetch($items)) {
// "Deleting" global items just means hiding them
if ($item['uid'] == 0) {
- dba::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
+ DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
} elseif ($item['uid'] == $uid) {
self::deleteById($item['id'], PRIORITY_HIGH);
} else {
logger('Wrong ownership. Not deleting item ' . $item['id']);
}
}
- dba::close($items);
+ DBA::close($items);
}
/**
@@ -861,9 +996,10 @@ class Item extends BaseObject
// locate item to be deleted
$fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
'deleted', 'file', 'resource-id', 'event-id', 'attach',
- 'verb', 'object-type', 'object', 'target', 'contact-id'];
+ 'verb', 'object-type', 'object', 'target', 'contact-id',
+ 'icid', 'iaid', 'psid'];
$item = self::selectFirst($fields, ['id' => $item_id]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG);
return false;
}
@@ -874,7 +1010,7 @@ class Item extends BaseObject
}
$parent = self::selectFirst(['origin'], ['id' => $item['parent']]);
- if (!DBM::is_result($parent)) {
+ if (!DBA::isResult($parent)) {
$parent = ['origin' => false];
}
@@ -904,7 +1040,7 @@ class Item extends BaseObject
* generate a resource-id and therefore aren't intimately linked to the item.
*/
if (strlen($item['resource-id'])) {
- dba::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
+ DBA::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
}
// If item is a link to an event, delete the event.
@@ -915,19 +1051,17 @@ class Item extends BaseObject
// If item has attachments, drop them
foreach (explode(", ", $item['attach']) as $attach) {
preg_match("|attach/(\d+)|", $attach, $matches);
- dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+ if (is_array($matches) && count($matches) > 1) {
+ DBA::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+ }
}
// Delete tags that had been attached to other items
self::deleteTagsFromItem($item);
// Set the item to "deleted"
- // This erasing of item content is superfluous for items with a matching item-content.
- // But for the next time we will still have old content in the item table.
- $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow(),
- 'body' => '', 'title' => '', 'content-warning' => '', 'rendered-hash' => '', 'rendered-html' => '',
- 'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => ''];
- dba::update('item', $item_fields, ['id' => $item['id']]);
+ $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
+ DBA::update('item', $item_fields, ['id' => $item['id']]);
Term::insertFromTagFieldByItemId($item['id'], '');
Term::insertFromFileFieldByItemId($item['id'], '');
@@ -937,6 +1071,20 @@ class Item extends BaseObject
self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
}
+ DBA::delete('item-delivery-data', ['iid' => $item['id']]);
+
+ if (!empty($item['iaid']) && !self::exists(['iaid' => $item['iaid'], 'deleted' => false])) {
+ DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
+ }
+ if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) {
+ DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
+ }
+ // When the permission set will be used in photo and events as well,
+ // this query here needs to be extended.
+ if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) {
+ DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
+ }
+
// If it's the parent of a comment thread, kill all the kids
if ($item['id'] == $item['parent']) {
self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
@@ -954,8 +1102,8 @@ class Item extends BaseObject
// When we delete just our local user copy of an item, we have to set a marker to hide it
$global_item = self::selectFirst(['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
- if (DBM::is_result($global_item)) {
- dba::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
+ if (DBA::isResult($global_item)) {
+ DBA::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
}
}
@@ -978,7 +1126,7 @@ class Item extends BaseObject
}
$i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
- if (!DBM::is_result($i)) {
+ if (!DBA::isResult($i)) {
return;
}
@@ -1004,10 +1152,8 @@ class Item extends BaseObject
private static function guid($item, $notify)
{
- $guid = notags(trim($item['guid']));
-
- if (!empty($guid)) {
- return $guid;
+ if (!empty($item['guid'])) {
+ return notags(trim($item['guid']));
}
if ($notify) {
@@ -1051,7 +1197,7 @@ class Item extends BaseObject
} elseif (!empty($item['uri'])) {
$guid = self::guidFromUri($item['uri'], $prefix_host);
} else {
- $guid = get_guid(32, hash('crc32', $prefix_host));
+ $guid = System::createGUID(32, hash('crc32', $prefix_host));
}
return $guid;
@@ -1080,8 +1226,8 @@ class Item extends BaseObject
// Still missing? Then use the "self" contact of the current user
if ($contact_id == 0) {
- $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
- if (DBM::is_result($self)) {
+ $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
+ if (DBA::isResult($self)) {
$contact_id = $self["id"];
}
}
@@ -1090,6 +1236,17 @@ class Item extends BaseObject
return $contact_id;
}
+ // This function will finally cover most of the preparation functionality in mod/item.php
+ public static function prepare(&$item)
+ {
+ $data = BBCode::getAttachmentData($item['body']);
+ if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $item['body'], $match, PREG_SET_ORDER) || isset($data["type"]))
+ && ($posttype != Item::PT_PERSONAL_NOTE)) {
+ $posttype = Item::PT_PAGE;
+ $objecttype = ACTIVITY_OBJ_BOOKMARK;
+ }
+ }
+
public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
{
$a = get_app();
@@ -1097,10 +1254,9 @@ class Item extends BaseObject
// If it is a posting where users should get notifications, then define it as wall posting
if ($notify) {
$item['wall'] = 1;
- $item['type'] = 'wall';
$item['origin'] = 1;
- $item['network'] = NETWORK_DFRN;
- $item['protocol'] = PROTOCOL_DFRN;
+ $item['network'] = Protocol::DFRN;
+ $item['protocol'] = Conversation::PARCEL_DFRN;
if (is_int($notify)) {
$priority = $notify;
@@ -1108,12 +1264,15 @@ class Item extends BaseObject
$priority = PRIORITY_HIGH;
}
} else {
- $item['network'] = trim(defaults($item, 'network', NETWORK_PHANTOM));
+ $item['network'] = trim(defaults($item, 'network', Protocol::PHANTOM));
}
$item['guid'] = self::guid($item, $notify);
$item['uri'] = notags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid']))));
+ // Store URI data
+ $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
+
// Store conversation data
$item = Conversation::insert($item);
@@ -1138,7 +1297,7 @@ class Item extends BaseObject
// Converting the plink
/// @TODO Check if this is really still needed
- if ($item['network'] == NETWORK_OSTATUS) {
+ if ($item['network'] == Protocol::OSTATUS) {
if (isset($item['plink'])) {
$item['plink'] = OStatus::convertHref($item['plink']);
} elseif (isset($item['uri'])) {
@@ -1150,19 +1309,15 @@ class Item extends BaseObject
$item['parent-uri'] = $item['thr-parent'];
}
- $item['type'] = defaults($item, 'type', 'remote');
-
if (isset($item['gravity'])) {
$item['gravity'] = intval($item['gravity']);
} elseif ($item['parent-uri'] === $item['uri']) {
$item['gravity'] = GRAVITY_PARENT;
} elseif (activity_match($item['verb'], ACTIVITY_POST)) {
$item['gravity'] = GRAVITY_COMMENT;
- } elseif ($item['type'] == 'activity') {
- $item['gravity'] = GRAVITY_ACTIVITY;
} else {
$item['gravity'] = GRAVITY_UNKNOWN; // Should not happen
- logger('Unknown gravity for verb: ' . $item['verb'] . ' - type: ' . $item['type'], LOGGER_DEBUG);
+ logger('Unknown gravity for verb: ' . $item['verb'], LOGGER_DEBUG);
}
$uid = intval($item['uid']);
@@ -1170,8 +1325,8 @@ class Item extends BaseObject
// check for create date and expire time
$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
- $user = dba::selectFirst('user', ['expire'], ['uid' => $uid]);
- if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
+ $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]);
+ if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
$expire_interval = $user['expire'];
}
@@ -1189,12 +1344,12 @@ class Item extends BaseObject
* We have to check several networks since Friendica posts could be repeated
* via OStatus (maybe Diasporsa as well)
*/
- if (in_array($item['network'], [NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""])) {
+ if (in_array($item['network'], [Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
$condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
trim($item['uri']), $item['uid'],
- NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS];
+ Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS];
$existing = self::selectFirst(['id', 'network'], $condition);
- if (DBM::is_result($existing)) {
+ if (DBA::isResult($existing)) {
// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
if ($uid != 0) {
logger("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']);
@@ -1204,7 +1359,12 @@ class Item extends BaseObject
}
}
- self::addLanguageToItemArray($item);
+ // Ensure to always have the same creation date.
+ $existing = self::selectfirst(['created', 'uri-hash'], ['uri' => $item['uri']]);
+ if (DBA::isResult($existing)) {
+ $item['created'] = $existing['created'];
+ $item['uri-hash'] = $existing['uri-hash'];
+ }
$item['wall'] = intval(defaults($item, 'wall', 0));
$item['extid'] = trim(defaults($item, 'extid', ''));
@@ -1225,6 +1385,7 @@ class Item extends BaseObject
$item['visible'] = ((x($item, 'visible') !== false) ? intval($item['visible']) : 1);
$item['deleted'] = 0;
$item['parent-uri'] = trim(defaults($item, 'parent-uri', $item['uri']));
+ $item['post-type'] = defaults($item, 'post-type', self::PT_ARTICLE);
$item['verb'] = trim(defaults($item, 'verb', ''));
$item['object-type'] = trim(defaults($item, 'object-type', ''));
$item['object'] = trim(defaults($item, 'object', ''));
@@ -1236,7 +1397,6 @@ class Item extends BaseObject
$item['deny_cid'] = trim(defaults($item, 'deny_cid', ''));
$item['deny_gid'] = trim(defaults($item, 'deny_gid', ''));
$item['private'] = intval(defaults($item, 'private', 0));
- $item['bookmark'] = intval(defaults($item, 'bookmark', 0));
$item['body'] = trim(defaults($item, 'body', ''));
$item['tag'] = trim(defaults($item, 'tag', ''));
$item['attach'] = trim(defaults($item, 'attach', ''));
@@ -1248,12 +1408,17 @@ class Item extends BaseObject
$item['inform'] = trim(defaults($item, 'inform', ''));
$item['file'] = trim(defaults($item, 'file', ''));
+ // Unique identifier to be linked against item-activities and item-content
+ $item['uri-hash'] = defaults($item, 'uri-hash', self::itemHash($item['uri'], $item['created']));
+
// When there is no content then we don't post it
if ($item['body'].$item['title'] == '') {
logger('No body, no title.');
return 0;
}
+ self::addLanguageToItemArray($item);
+
// Items cannot be stored before they happen ...
if ($item['created'] > DateTimeFormat::utcNow()) {
$item['created'] = DateTimeFormat::utcNow();
@@ -1264,10 +1429,6 @@ class Item extends BaseObject
$item['edited'] = DateTimeFormat::utcNow();
}
- if (($item['author-link'] == "") && ($item['owner-link'] == "")) {
- logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
- }
-
$item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
@@ -1302,15 +1463,10 @@ class Item extends BaseObject
unset($item['owner-name']);
unset($item['owner-avatar']);
- if ($item['network'] == NETWORK_PHANTOM) {
+ if ($item['network'] == Protocol::PHANTOM) {
logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
- $contact = Contact::getDetailsByURL($item['author-link'], $item['uid']);
- if (!empty($contact['network'])) {
- $item['network'] = $contact["network"];
- } else {
- $item['network'] = NETWORK_DFRN;
- }
+ $item['network'] = Protocol::DFRN;
logger("Set network to " . $item["network"] . " for " . $item["uri"], LOGGER_DEBUG);
}
@@ -1352,7 +1508,7 @@ class Item extends BaseObject
$params = ['order' => ['id' => false]];
$parent = self::selectFirst($fields, $condition, $params);
- if (DBM::is_result($parent)) {
+ if (DBA::isResult($parent)) {
// is the new message multi-level threaded?
// even though we don't support it now, preserve the info
// and re-attach to the conversation parent.
@@ -1366,7 +1522,7 @@ class Item extends BaseObject
$params = ['order' => ['id' => false]];
$toplevel_parent = self::selectFirst($fields, $condition, $params);
- if (DBM::is_result($toplevel_parent)) {
+ if (DBA::isResult($toplevel_parent)) {
$parent = $toplevel_parent;
}
}
@@ -1400,13 +1556,13 @@ class Item extends BaseObject
// If its a post from myself then tag the thread as "mention"
logger("Checking if parent ".$parent_id." has to be tagged as mention for user ".$item['uid'], LOGGER_DEBUG);
- $user = dba::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
- if (DBM::is_result($user)) {
+ $user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
+ if (DBA::isResult($user)) {
$self = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
$self_id = Contact::getIdForURL($self, 0, true);
logger("'myself' is ".$self_id." for parent ".$parent_id." checking against ".$item['author-id']." and ".$item['owner-id'], LOGGER_DEBUG);
if (($item['author-id'] == $self_id) || ($item['owner-id'] == $self_id)) {
- dba::update('thread', ['mention' => true], ['iid' => $parent_id]);
+ DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
logger("tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
}
}
@@ -1429,15 +1585,18 @@ class Item extends BaseObject
}
}
+ $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
+ $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
+
$condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
- $item['uri'], $item['network'], NETWORK_DFRN, $item['uid']];
+ $item['uri'], $item['network'], Protocol::DFRN, $item['uid']];
if (self::exists($condition)) {
logger('duplicated item with the same uri found. '.print_r($item,true));
return 0;
}
// On Friendica and Diaspora the GUID is unique
- if (in_array($item['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
+ if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
$condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
if (self::exists($condition)) {
logger('duplicated item with the same guid found. '.print_r($item,true));
@@ -1458,7 +1617,7 @@ class Item extends BaseObject
$item["global"] = true;
// Set the global flag on all items if this was a global item entry
- dba::update('item', ['global' => true], ['uri' => $item["uri"]]);
+ self::update(['global' => true], ['uri' => $item["uri"]]);
} else {
$item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]);
}
@@ -1481,7 +1640,11 @@ class Item extends BaseObject
put_item_in_cache($item);
if ($notify) {
+ $item['edit'] = false;
+ $item['parent'] = $parent_id;
Addon::callHooks('post_local', $item);
+ unset($item['edit']);
+ unset($item['parent']);
} else {
Addon::callHooks('post_remote', $item);
}
@@ -1523,20 +1686,29 @@ class Item extends BaseObject
$files = '';
}
+ // Creates or assigns the permission set
+ $item['psid'] = PermissionSet::fetchIDForPost($item);
+
// We are doing this outside of the transaction to avoid timing problems
if (!self::insertActivity($item)) {
self::insertContent($item);
}
- dba::transaction();
- $ret = dba::insert('item', $item);
+ $delivery_data = ['postopts' => defaults($item, 'postopts', ''),
+ 'inform' => defaults($item, 'inform', '')];
+
+ unset($item['postopts']);
+ unset($item['inform']);
+
+ DBA::transaction();
+ $ret = DBA::insert('item', $item);
// When the item was successfully stored we fetch the ID of the item.
- if (DBM::is_result($ret)) {
- $current_post = dba::lastInsertId();
+ if (DBA::isResult($ret)) {
+ $current_post = DBA::lastInsertId();
} else {
// This can happen - for example - if there are locking timeouts.
- dba::rollback();
+ DBA::rollback();
// Store the data into a spool file so that we can try again later.
@@ -1552,6 +1724,10 @@ class Item extends BaseObject
$spoolpath = get_spoolpath();
if ($spoolpath != "") {
$spool = $spoolpath.'/'.$file;
+
+ // Ensure to have the removed data from above again in the item array
+ $item = array_merge($item, $delivery_data);
+
file_put_contents($spool, json_encode($item));
logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
}
@@ -1561,26 +1737,26 @@ class Item extends BaseObject
if ($current_post == 0) {
// This is one of these error messages that never should occur.
logger("couldn't find created item - we better quit now.");
- dba::rollback();
+ DBA::rollback();
return 0;
}
// How much entries have we created?
// We wouldn't need this query when we could use an unique index - but MySQL has length problems with them.
- $entries = dba::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]);
+ $entries = DBA::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]);
if ($entries > 1) {
// There are duplicates. We delete our just created entry.
logger('Duplicated post occurred. uri = ' . $item['uri'] . ' uid = ' . $item['uid']);
// Yes, we could do a rollback here - but we are having many users with MyISAM.
- dba::delete('item', ['id' => $current_post]);
- dba::commit();
+ DBA::delete('item', ['id' => $current_post]);
+ DBA::commit();
return 0;
} elseif ($entries == 0) {
// This really should never happen since we quit earlier if there were problems.
logger("Something is terribly wrong. We haven't found our created entry.");
- dba::rollback();
+ DBA::rollback();
return 0;
}
@@ -1592,7 +1768,7 @@ class Item extends BaseObject
}
// Set parent id
- dba::update('item', ['parent' => $parent_id], ['id' => $current_post]);
+ self::update(['parent' => $parent_id], ['id' => $current_post]);
$item['id'] = $current_post;
$item['parent'] = $parent_id;
@@ -1600,9 +1776,9 @@ class Item extends BaseObject
// update the commented timestamp on the parent
// Only update "commented" if it is really a comment
if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) {
- dba::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+ self::update(['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} else {
- dba::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+ self::update(['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
}
if ($dsprsig) {
@@ -1615,14 +1791,14 @@ class Item extends BaseObject
logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
}
- dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
+ DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
}
if (!empty($diaspora_signed_text)) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
- dba::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]);
+ DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]);
}
$deleted = self::tagDeliver($item['uid'], $current_post);
@@ -1633,7 +1809,7 @@ class Item extends BaseObject
*/
if (!$deleted && !$dontcache) {
$posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]);
- if (DBM::is_result($posted_item)) {
+ if (DBA::isResult($posted_item)) {
if ($notify) {
Addon::callHooks('post_local_end', $posted_item);
} else {
@@ -1650,7 +1826,11 @@ class Item extends BaseObject
self::updateThread($parent_id);
}
- dba::commit();
+ $delivery_data['iid'] = $current_post;
+
+ self::insertDeliveryData($delivery_data);
+
+ DBA::commit();
/*
* Due to deadlock issues with the "term" table we are doing these steps after the commit.
@@ -1681,6 +1861,35 @@ class Item extends BaseObject
return $current_post;
}
+ /**
+ * @brief Insert a new item delivery data entry
+ *
+ * @param array $item The item fields that are to be inserted
+ */
+ private static function insertDeliveryData($delivery_data)
+ {
+ if (empty($delivery_data['iid']) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+ return;
+ }
+
+ DBA::insert('item-delivery-data', $delivery_data);
+ }
+
+ /**
+ * @brief Update an existing item delivery data entry
+ *
+ * @param integer $id The item id that is to be updated
+ * @param array $item The item fields that are to be inserted
+ */
+ private static function updateDeliveryData($id, $delivery_data)
+ {
+ if (empty($id) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+ return;
+ }
+
+ DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true);
+ }
+
/**
* @brief Insert a new item content entry
*
@@ -1695,9 +1904,7 @@ class Item extends BaseObject
}
$fields = ['uri' => $item['uri'], 'activity' => $activity_index,
- 'uri-hash' => hash('sha1', $item['uri']) . hash('ripemd160', $item['uri'])];
-
- $saved_item = $item;
+ 'uri-hash' => $item['uri-hash'], 'uri-id' => $item['uri-id']];
// We just remove everything that is content
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
@@ -1705,27 +1912,26 @@ class Item extends BaseObject
}
// To avoid timing problems, we are using locks.
- $locked = Lock::set('item_insert_activity');
+ $locked = Lock::acquire('item_insert_activity');
if (!$locked) {
logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
}
// Do we already have this content?
- $item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]);
- if (DBM::is_result($item_activity)) {
+ $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
+ if (DBA::isResult($item_activity)) {
$item['iaid'] = $item_activity['id'];
logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
- } elseif (dba::insert('item-activity', $fields)) {
- $item['iaid'] = dba::lastInsertId();
+ } elseif (DBA::insert('item-activity', $fields)) {
+ $item['iaid'] = DBA::lastInsertId();
logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
} else {
- // This shouldn't happen. But if it does, we simply store it in the item-content table
+ // This shouldn't happen.
logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
- $item = $saved_item;
return false;
}
if ($locked) {
- Lock::remove('item_insert_activity');
+ Lock::release('item_insert_activity');
}
return true;
}
@@ -1737,8 +1943,8 @@ class Item extends BaseObject
*/
private static function insertContent(&$item)
{
- $fields = ['uri' => $item['uri'], 'plink' => $item['plink'],
- 'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])];
+ $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash'],
+ 'uri-id' => $item['uri-id']];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($item[$field])) {
@@ -1748,43 +1954,25 @@ class Item extends BaseObject
}
// To avoid timing problems, we are using locks.
- $locked = Lock::set('item_insert_content');
+ $locked = Lock::acquire('item_insert_content');
if (!$locked) {
logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
}
// Do we already have this content?
- $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $item['uri']]);
- if (DBM::is_result($item_content)) {
+ $item_content = DBA::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]);
+ if (DBA::isResult($item_content)) {
$item['icid'] = $item_content['id'];
logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
- } elseif (dba::insert('item-content', $fields)) {
- $item['icid'] = dba::lastInsertId();
+ } elseif (DBA::insert('item-content', $fields)) {
+ $item['icid'] = DBA::lastInsertId();
logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
} else {
- // By setting the ICID value through the worker we should avoid timing problems.
- // When the locking works, this shouldn't be needed. But better be prepared.
- Worker::add(PRIORITY_HIGH, 'SetItemContentID', $item['uri']);
- logger('Could not insert content for URI ' . $item['uri'] . ' - trying asynchronously');
+ // This shouldn't happen.
+ logger('Could not insert content for URI ' . $item['uri'] . ' - should not happen');
}
if ($locked) {
- Lock::remove('item_insert_content');
- }
- }
-
- /**
- * @brief Set the item content id for a given URI
- *
- * @param string $uri The item URI
- */
- public static function setICIDforURI($uri)
- {
- $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $uri]);
- if (DBM::is_result($item_content)) {
- dba::update('item', ['icid' => $item_content['id']], ['icid' => 0, 'uri' => $uri]);
- logger('Asynchronously set item content id for URI ' . $uri . ' (' . $item_content['id'] . ') - Affected: '. (int)dba::affected_rows());
- } else {
- logger('No item-content found for URI ' . $uri);
+ Lock::release('item_insert_content');
}
}
@@ -1805,12 +1993,11 @@ class Item extends BaseObject
return false;
}
- $fields = ['activity' => $activity_index,
- 'uri-hash' => hash('sha1', $condition['uri']) . hash('ripemd160', $condition['uri'])];
+ $fields = ['activity' => $activity_index];
- logger('Update activity for URI ' . $condition['uri']);
+ logger('Update activity for ' . json_encode($condition));
- dba::update('item-activity', $fields, $condition, true);
+ DBA::update('item-activity', $fields, $condition, true);
return true;
}
@@ -1837,16 +2024,9 @@ class Item extends BaseObject
$fields = $condition;
}
- if (!empty($item['plink'])) {
- $fields['uri-plink-hash'] = hash('sha1', $item['plink']) . hash('sha1', $condition['uri']);
- } else {
- // Ensure that we don't delete the plink
- unset($fields['plink']);
- }
-
- logger('Update content for URI ' . $condition['uri']);
+ logger('Update content for ' . json_encode($condition));
- dba::update('item-content', $fields, $condition, true);
+ DBA::update('item-content', $fields, $condition, true);
}
/**
@@ -1859,19 +2039,21 @@ class Item extends BaseObject
{
$condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid];
$parent = self::selectFirst(['owner-id'], $condition);
- if (!DBM::is_result($parent)) {
+ if (!DBA::isResult($parent)) {
return;
}
// Only distribute public items from native networks
$condition = ['id' => $itemid, 'uid' => 0,
- 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""],
+ 'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
+ $origin = $item['origin'];
+
unset($item['id']);
unset($item['parent']);
unset($item['mention']);
@@ -1882,9 +2064,11 @@ class Item extends BaseObject
$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)) {
+ $parent['owner-id'], Contact::SHARING, Contact::FRIEND];
+
+ $contacts = DBA::select('contact', ['uid'], $condition);
+
+ while ($contact = DBA::fetch($contacts)) {
$users[$contact['uid']] = $contact['uid'];
}
@@ -1892,9 +2076,9 @@ class Item extends BaseObject
if ($item['uri'] != $item['parent-uri']) {
$parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
- while ($parent = dba::fetch($parents)) {
+ while ($parent = self::fetch($parents)) {
$users[$parent['uid']] = $parent['uid'];
- if ($parent['origin'] && !$item['origin']) {
+ if ($parent['origin'] && !$origin) {
$origin_uid = $parent['uid'];
}
}
@@ -1927,25 +2111,19 @@ class Item extends BaseObject
}
if (empty($item['contact-id'])) {
- $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
- if (!DBM::is_result($self)) {
+ $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
+ if (!DBA::isResult($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)) {
+ $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
+ if (DBA::isResult($contact)) {
$notify = self::isRemoteSelf($contact, $item);
}
}
@@ -1974,7 +2152,7 @@ class Item extends BaseObject
$condition = ['id' => $itemid, 'parent' => [0, $itemid]];
$item = self::selectFirst($fields, $condition);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
@@ -1989,7 +2167,7 @@ class Item extends BaseObject
}
// is it an entry from a connector? Only add an entry for natively connected networks
- if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+ if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
return;
}
@@ -1999,7 +2177,7 @@ class Item extends BaseObject
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
- if (DBM::is_result($item)) {
+ if (DBA::isResult($item)) {
// Preparing public shadow (removing user specific data)
$item['uid'] = 0;
unset($item['id']);
@@ -2008,18 +2186,14 @@ class Item extends BaseObject
unset($item['mention']);
unset($item['origin']);
unset($item['starred']);
+ unset($item['postopts']);
+ unset($item['inform']);
if ($item['uri'] == $item['parent-uri']) {
$item['contact-id'] = $item['owner-id'];
} else {
$item['contact-id'] = $item['author-id'];
}
- if (in_array($item['type'], ["net-comment", "wall-comment"])) {
- $item['type'] = 'remote-comment';
- } elseif ($item['type'] == 'wall') {
- $item['type'] = 'remote';
- }
-
$public_shadow = self::insert($item, false, false, true);
logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
@@ -2036,7 +2210,7 @@ class Item extends BaseObject
public static function addShadowPost($itemid)
{
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
@@ -2073,21 +2247,17 @@ class Item extends BaseObject
unset($item['mention']);
unset($item['origin']);
unset($item['starred']);
+ unset($item['postopts']);
+ unset($item['inform']);
$item['contact-id'] = Contact::getIdForURL($item['author-link']);
- if (in_array($item['type'], ["net-comment", "wall-comment"])) {
- $item['type'] = 'remote-comment';
- } elseif ($item['type'] == 'wall') {
- $item['type'] = 'remote';
- }
-
$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 && self::exists(['id' => $parent, 'network' => NETWORK_DIASPORA])) {
+ if ($origin && self::exists(['id' => $parent, 'network' => Protocol::DIASPORA])) {
self::distribute($public_shadow);
}
}
@@ -2098,7 +2268,7 @@ class Item extends BaseObject
*/
private static function addLanguageToItemArray(&$item)
{
- $naked_body = Text\BBCode::toPlaintext($item['body'], false);
+ $naked_body = BBCode::toPlaintext($item['body'], false);
$ld = new Text_LanguageDetect();
$ld->setNameMode(2);
@@ -2148,12 +2318,12 @@ class Item extends BaseObject
public static function newURI($uid, $guid = "")
{
if ($guid == "") {
- $guid = get_guid(32);
+ $guid = System::createGUID(32);
}
$hostname = self::getApp()->get_hostname();
- $user = dba::selectFirst('user', ['nickname'], ['uid' => $uid]);
+ $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
$uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
@@ -2172,37 +2342,37 @@ class Item extends BaseObject
private static function updateContact($arr)
{
// Unarchive the author
- $contact = dba::selectFirst('contact', [], ['id' => $arr["author-id"]]);
- if (DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', [], ['id' => $arr["author-id"]]);
+ if (DBA::isResult($contact)) {
Contact::unmarkForArchival($contact);
}
// Unarchive the contact if it's not our own contact
- $contact = dba::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
- if (DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
+ if (DBA::isResult($contact)) {
Contact::unmarkForArchival($contact);
}
- $update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
+ $update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
// Is it a forum? Then we don't care about the rules from above
- if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
- if (dba::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
+ if (!$update && ($arr["network"] == Protocol::DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
+ if (DBA::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
$update = true;
}
}
if ($update) {
- dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+ DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['contact-id']]);
}
// Now do the same for the system wide contacts with uid=0
if (!$arr['private']) {
- dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+ DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['owner-id']]);
if ($arr['owner-id'] != $arr['author-id']) {
- dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+ DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['author-id']]);
}
}
@@ -2279,7 +2449,7 @@ class Item extends BaseObject
public static function getGuidById($id)
{
$item = self::selectFirst(['guid'], ['id' => $id]);
- if (DBM::is_result($item)) {
+ if (DBA::isResult($item)) {
return $item['guid'];
} else {
return '';
@@ -2297,11 +2467,12 @@ class Item extends BaseObject
// Does the given user have this item?
if ($uid) {
- $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
+ /// @todo This query has to be abstracted for the "uri-id" changes
+ $item = DBA::fetchFirst("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid);
- if (DBM::is_result($item)) {
+ if (DBA::isResult($item)) {
$id = $item["id"];
$nick = $item["nickname"];
}
@@ -2309,12 +2480,13 @@ class Item extends BaseObject
// Or is it anywhere on the server?
if ($nick == "") {
- $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
+ /// @todo This query has to be abstracted for the "uri-id" changes
+ $item = DBA::fetchFirst("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND NOT `item`.`private` AND `item`.`wall`
AND `item`.`guid` = ?", $guid);
- if (DBM::is_result($item)) {
+ if (DBA::isResult($item)) {
$id = $item["id"];
$nick = $item["nickname"];
}
@@ -2332,16 +2504,16 @@ class Item extends BaseObject
{
$mention = false;
- $user = dba::selectFirst('user', [], ['uid' => $uid]);
- if (!DBM::is_result($user)) {
+ $user = DBA::selectFirst('user', [], ['uid' => $uid]);
+ if (!DBA::isResult($user)) {
return;
}
- $community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false);
- $prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false);
+ $community_page = (($user['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
+ $prvgroup = (($user['page-flags'] == Contact::PAGE_PRVGROUP) ? true : false);
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
@@ -2369,7 +2541,7 @@ class Item extends BaseObject
// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
// delete it!
logger("no-mention top-level post to community or private group. delete.");
- dba::delete('item', ['id' => $item_id]);
+ DBA::delete('item', ['id' => $item_id]);
return true;
}
return;
@@ -2393,8 +2565,8 @@ 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', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
- if (!DBM::is_result($self)) {
+ $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
+ if (!DBA::isResult($self)) {
return;
}
@@ -2404,12 +2576,13 @@ class Item extends BaseObject
$private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0;
+ $psid = PermissionSet::fetchIDForPost($user);
+
$forum_mode = ($prvgroup ? 2 : 1);
$fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'],
- 'owner-id' => $owner_id, 'owner-link' => $self['url'], '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]);
+ 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid];
+ self::update($fields, ['id' => $item_id]);
self::updateThread($item_id);
@@ -2425,7 +2598,7 @@ class Item extends BaseObject
}
// Prevent the forwarding of posts that are forwarded
- if ($datarray["extid"] == NETWORK_DFRN) {
+ if (!empty($datarray["extid"]) && ($datarray["extid"] == Protocol::DFRN)) {
logger('Already forwarded', LOGGER_DEBUG);
return false;
}
@@ -2442,7 +2615,7 @@ class Item extends BaseObject
return false;
}
- if (($contact['network'] != NETWORK_FEED) && $datarray['private']) {
+ if (($contact['network'] != Protocol::FEED) && $datarray['private']) {
logger('Not public', LOGGER_DEBUG);
return false;
}
@@ -2450,9 +2623,9 @@ class Item extends BaseObject
$datarray2 = $datarray;
logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
if ($contact['remote_self'] == 2) {
- $self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
+ $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
['uid' => $contact['uid'], 'self' => true]);
- if (DBM::is_result($self)) {
+ if (DBA::isResult($self)) {
$datarray['contact-id'] = $self["id"];
$datarray['owner-name'] = $self["name"];
@@ -2471,13 +2644,13 @@ class Item extends BaseObject
unset($datarray['author-id']);
}
- if ($contact['network'] != NETWORK_FEED) {
- $datarray["guid"] = get_guid(32);
+ if ($contact['network'] != Protocol::FEED) {
+ $datarray["guid"] = System::createGUID(32);
unset($datarray["plink"]);
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
$datarray["parent-uri"] = $datarray["uri"];
$datarray["thr-parent"] = $datarray["uri"];
- $datarray["extid"] = NETWORK_DFRN;
+ $datarray["extid"] = Protocol::DFRN;
$urlpart = parse_url($datarray2['author-link']);
$datarray["app"] = $urlpart["host"];
} else {
@@ -2485,7 +2658,7 @@ class Item extends BaseObject
}
}
- if ($contact['network'] != NETWORK_FEED) {
+ if ($contact['network'] != Protocol::FEED) {
// Store the original post
$result = self::insert($datarray2, false, false);
logger('remote-self post original item - Contact '.$contact['url'].' return '.$result.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
@@ -2545,8 +2718,8 @@ class Item extends BaseObject
$res = substr($i, $x + 1);
$i = substr($i, 0, $x);
$fields = ['data', 'type', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
- $photo = dba::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
- if (DBM::is_result($photo)) {
+ $photo = DBA::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
+ if (DBA::isResult($photo)) {
/*
* Check to see if we should replace this photo link with an embedded image
* 1. No need to do so if the photo is public
@@ -2709,9 +2882,9 @@ class Item extends BaseObject
$condition[] = $days;
}
- $items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition);
+ $items = self::select(['file', 'resource-id', 'starred', 'type', 'id', 'post-type'], $condition);
- if (!DBM::is_result($items)) {
+ if (!DBA::isResult($items)) {
return;
}
@@ -2741,9 +2914,9 @@ class Item extends BaseObject
continue;
} elseif (!$expire_starred && intval($item['starred'])) {
continue;
- } elseif (!$expire_notes && $item['type'] == 'note') {
+ } elseif (!$expire_notes && (($item['type'] == 'note') || ($item['post-type'] == Item::PT_PERSONAL_NOTE))) {
continue;
- } elseif (!$expire_items && $item['type'] != 'note') {
+ } elseif (!$expire_items && ($item['type'] != 'note') && ($item['post-type'] != Item::PT_PERSONAL_NOTE)) {
continue;
}
@@ -2751,7 +2924,7 @@ class Item extends BaseObject
++$expired;
}
- dba::close($items);
+ DBA::close($items);
logger('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
}
@@ -2759,8 +2932,8 @@ class Item extends BaseObject
{
$condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false];
$params = ['order' => ['created' => false]];
- $thread = dba::selectFirst('thread', ['created'], $condition, $params);
- if (DBM::is_result($thread)) {
+ $thread = DBA::selectFirst('thread', ['created'], $condition, $params);
+ if (DBA::isResult($thread)) {
return substr(DateTimeFormat::local($thread['created']), 0, 10);
}
return false;
@@ -2789,27 +2962,22 @@ class Item extends BaseObject
switch ($verb) {
case 'like':
case 'unlike':
- $bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
$activity = ACTIVITY_LIKE;
break;
case 'dislike':
case 'undislike':
- $bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
$activity = ACTIVITY_DISLIKE;
break;
case 'attendyes':
case 'unattendyes':
- $bodyverb = L10n::t('%1$s is attending %2$s\'s %3$s');
$activity = ACTIVITY_ATTEND;
break;
case 'attendno':
case 'unattendno':
- $bodyverb = L10n::t('%1$s is not attending %2$s\'s %3$s');
$activity = ACTIVITY_ATTENDNO;
break;
case 'attendmaybe':
case 'unattendmaybe':
- $bodyverb = L10n::t('%1$s may attend %2$s\'s %3$s');
$activity = ACTIVITY_ATTENDMAYBE;
break;
default:
@@ -2823,11 +2991,13 @@ class Item extends BaseObject
logger('like: verb ' . $verb . ' item ' . $item_id);
$item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
logger('like: unknown item ' . $item_id);
return false;
}
+ $item_uri = $item['uri'];
+
$uid = $item['uid'];
if (($uid == 0) && local_user()) {
$uid = local_user();
@@ -2839,8 +3009,8 @@ class Item extends BaseObject
}
// Retrieves the local post owner
- $owner_self_contact = dba::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
- if (!DBM::is_result($owner_self_contact)) {
+ $owner_self_contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
+ if (!DBA::isResult($owner_self_contact)) {
logger('like: unknown owner ' . $uid);
return false;
}
@@ -2848,8 +3018,8 @@ class Item extends BaseObject
// Retrieve the current logged in user's public contact
$author_id = public_contact();
- $author_contact = dba::selectFirst('contact', [], ['id' => $author_id]);
- if (!DBM::is_result($author_contact)) {
+ $author_contact = DBA::selectFirst('contact', ['url'], ['id' => $author_id]);
+ if (!DBA::isResult($author_contact)) {
logger('like: unknown author ' . $author_id);
return false;
}
@@ -2860,8 +3030,8 @@ class Item extends BaseObject
$item_contact = $owner_self_contact;
} else {
$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)) {
+ $item_contact = DBA::selectFirst('contact', [], ['id' => $item_contact_id]);
+ if (!DBA::isResult($item_contact)) {
logger('like: unknown item contact ' . $item_contact_id);
return false;
}
@@ -2872,40 +3042,24 @@ class Item extends BaseObject
// we need to eradicate your first choice.
if ($event_verb_flag) {
$verbs = [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+
+ // Translate to the index based activity index
+ $activities = [];
+ foreach ($verbs as $verb) {
+ $activities[] = self::activityToIndex($verb);
+ }
} else {
- $verbs = $activity;
+ $activities = self::activityToIndex($activity);
}
- $base_condition = ['verb' => $verbs, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
- 'author-id' => $author_contact['id'], 'uid' => $item['uid']];
+ $condition = ['activity' => $activities, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
+ 'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent' => $item_uri];
- $condition = array_merge($base_condition, ['parent' => $item_id]);
$like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
- if (!DBM::is_result($like_item)) {
- $condition = array_merge($base_condition, ['parent-uri' => $item_id]);
- $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
- }
-
- if (!DBM::is_result($like_item)) {
- $condition = array_merge($base_condition, ['thr-parent' => $item_id]);
- $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
- }
-
// If it exists, mark it as deleted
- if (DBM::is_result($like_item)) {
- // Already voted, undo it
- $fields = ['deleted' => true, 'unseen' => true, 'changed' => DateTimeFormat::utcNow()];
- /// @todo Consider using self::update - but before doing so, check the side effects
- dba::update('item', $fields, ['id' => $like_item['id']]);
-
- // Clean up the Diaspora signatures for this like
- // Go ahead and do it even if Diaspora support is disabled. We still want to clean up
- // if it had been enabled in the past
- dba::delete('sign', ['iid' => $like_item['id']]);
-
- $like_item_id = $like_item['id'];
- Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item_id);
+ if (DBA::isResult($like_item)) {
+ self::deleteById($like_item['id']);
if (!$event_verb_flag || $like_item['verb'] == $activity) {
return true;
@@ -2917,55 +3071,25 @@ class Item extends BaseObject
return true;
}
- // Else or if event verb different from existing row, create a new item row
- $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
- if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
- $post_type = L10n::t('event');
- }
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
- $link = xmlify('' . "\n") ;
- $body = $item['body'];
-
- $obj = <<< EOT
-
-
-EOT;
-
- $ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
- $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
- $plink = '[url=' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
$new_item = [
- 'guid' => get_guid(32),
+ 'guid' => System::createGUID(32),
'uri' => self::newURI($item['uid']),
'uid' => $item['uid'],
'contact-id' => $item_contact_id,
- 'type' => 'activity',
'wall' => $item['wall'],
'origin' => 1,
+ 'network' => Protocol::DFRN,
'gravity' => GRAVITY_ACTIVITY,
'parent' => $item['id'],
'parent-uri' => $item['uri'],
'thr-parent' => $item['uri'],
'owner-id' => $item['owner-id'],
- 'owner-name' => $item['owner-name'],
- 'owner-link' => $item['owner-link'],
- 'owner-avatar' => $item['owner-avatar'],
- 'author-id' => $author_contact['id'],
- 'author-name' => $author_contact['name'],
- 'author-link' => $author_contact['url'],
- 'author-avatar' => $author_contact['thumb'],
- 'body' => sprintf($bodyverb, $ulink, $alink, $plink),
+ 'author-id' => $author_id,
+ 'body' => $activity,
'verb' => $activity,
'object-type' => $objtype,
- 'object' => $obj,
'allow_cid' => $item['allow_cid'],
'allow_gid' => $item['allow_gid'],
'deny_cid' => $item['deny_cid'],
@@ -2996,19 +3120,19 @@ EOT;
private static function addThread($itemid, $onlyshadow = false)
{
$fields = ['uid', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', 'pubmail',
- 'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
+ 'moderated', 'visible', 'starred', 'contact-id', 'post-type',
'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
$item = self::selectFirst($fields, $condition);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
$item['iid'] = $itemid;
if (!$onlyshadow) {
- $result = dba::insert('thread', $item);
+ $result = DBA::insert('thread', $item);
logger("Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
}
@@ -3016,13 +3140,13 @@ EOT;
private static function updateThread($itemid, $setmention = false)
{
- $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed',
- 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
+ $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
+ 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id',
'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
$item = self::selectFirst($fields, $condition);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
@@ -3040,28 +3164,28 @@ EOT;
}
}
- $result = dba::update('thread', $fields, ['iid' => $itemid]);
+ $result = DBA::update('thread', $fields, ['iid' => $itemid]);
logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".(int)$result, LOGGER_DEBUG);
}
private static function deleteThread($itemid, $itemuri = "")
{
- $item = dba::selectFirst('thread', ['uid'], ['iid' => $itemid]);
- if (!DBM::is_result($item)) {
+ $item = DBA::selectFirst('thread', ['uid'], ['iid' => $itemid]);
+ if (!DBA::isResult($item)) {
logger('No thread found for id '.$itemid, LOGGER_DEBUG);
return;
}
// Using dba::delete at this time could delete the associated item entries
- $result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
+ $result = DBA::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
logger("deleteThread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
if ($itemuri != "") {
$condition = ["`uri` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $itemuri, $item["uid"]];
if (!self::exists($condition)) {
- dba::delete('item', ['uri' => $itemuri, 'uid' => 0]);
+ DBA::delete('item', ['uri' => $itemuri, 'uid' => 0]);
logger("deleteThread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
}
}