]
];
$database["item"] = [
- "comment" => "All posts",
+ "comment" => "Structure for all posts",
"fields" => [
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this item"],
"author-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name of the author of this item"],
"author-link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the profile page of the author of this item"],
"author-avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Link to the avatar picture of the author of this item"],
+ "icid" => ["type" => "int unsigned", "relation" => ["item-content" => "id"], "comment" => "Id of the item-content table entry that contains the whole item content"],
"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"],
"content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"body" => ["type" => "mediumtext", "comment" => "item body content"],
"deleted_changed" => ["deleted","changed"],
"uid_wall_changed" => ["uid","wall","changed"],
"uid_eventid" => ["uid","event-id"],
- "uid_authorlink" => ["uid","author-link(190)"],
- "uid_ownerlink" => ["uid","owner-link(190)"],
+ "icid" => ["icid"],
+ ]
+ ];
+ $database["item-content"] = [
+ "comment" => "Content for all posts",
+ "fields" => [
+ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
+ "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "uri-plink-hash" => ["type" => "char(80)", "not null" => "1", "default" => "", "comment" => "SHA-1 hash from uri and plink"],
+ "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "item title"],
+ "content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "body" => ["type" => "mediumtext", "comment" => "item body content"],
+ "location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "text location where this item originated"],
+ "coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "longitude/latitude pair representing location where this item originated"],
+ "app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "application which generated this item"],
+ "rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
+ "rendered-html" => ["type" => "mediumtext", "comment" => "item.body converted to html"],
+ "object-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams object type"],
+ "object" => ["type" => "text", "comment" => "JSON encoded object structure unless it is an implied object (normal post)"],
+ "target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"],
+ "target" => ["type" => "text", "comment" => "JSON encoded target structure if used"],
+ "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"],
+ ],
+ "indexes" => [
+ "PRIMARY" => ["id"],
+ "uri-plink-hash" => ["UNIQUE", "uri-plink-hash"],
+ "uri" => ["uri(191)"],
]
];
$database["locks"] = [
'author-id', 'author-link', 'owner-link', 'contact-uid',
'signed_text', 'signature', 'signer'];
+ // Field list for "item-content" table that is mixed with the item table
+ const CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location',
+ 'coord', 'app', 'rendered-hash', 'rendered-html',
+ 'object-type', 'object', 'target-type', 'target'];
+
+ // 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',
+ 'created', 'edited', 'commented', 'received', 'changed', 'verb',
+ 'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
+ 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+ 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
+ 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
+ 'title', 'content-warning', 'body', 'location', 'coord', 'app',
+ 'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target',
+ 'author-id', 'author-link', 'author-name', 'author-avatar',
+ 'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
+
/**
* @brief Fetch a single item row
*
{
$row = dba::fetch($stmt);
+ // Fetch data from the item-content table whenever there is content there
+ foreach (self::CONTENT_FIELDLIST as $field) {
+ if (is_null($row[$field]) && !is_null($row['item-' . $field])) {
+ $row[$field] = $row['item-' . $field];
+ }
+ unset($row['item-' . $field]);
+ }
+
// We prefer the data from the user's contact over the public one
if (!empty($row['author-link']) && !empty($row['contact-link']) &&
($row['author-link'] == $row['contact-link'])) {
$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',
- 'title', 'body', 'app', 'verb', 'object-type', 'object', 'target-type', 'target',
+ 'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
- 'file', 'location', 'coord', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+ 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
- 'unseen', 'deleted', 'origin', 'forum_mode', 'mention',
- 'rendered-hash', 'rendered-html', 'global', 'content-warning',
+ 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
'id' => 'item_id', 'network'];
+ $fields['item-content'] = self::CONTENT_FIELDLIST;
+
$fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
'thumb' => 'author-avatar', 'nick' => 'author-nick'];
$joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
}
+ if (strpos($sql_commands, "`item-content`.") !== false) {
+ $joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
+ }
+
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`";
}
foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $field => $select) {
if (empty($selected) || in_array($select, $selected)) {
+ if (in_array($select, self::CONTENT_FIELDLIST)) {
+ $selection[] = "`item`.`".$select."` AS `item-" . $select . "`";
+ }
if (is_int($field)) {
- $selection[] = "`" . $table . "`.`".$select."`";
+ $selection[] = "`" . $table . "`.`" . $select . "`";
} else {
- $selection[] = "`" . $table . "`.`" . $field . "` AS `".$select ."`";
+ $selection[] = "`" . $table . "`.`" . $field . "` AS `" . $select . "`";
}
}
}
// 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'], $condition);
+ $items = dba::select('item', ['id', 'origin', 'uri', 'plink'], $condition);
- $success = dba::update('item', $fields, $condition);
+ $content_fields = [];
+ foreach (self::CONTENT_FIELDLIST as $field) {
+ if (isset($fields[$field])) {
+ $content_fields[$field] = $fields[$field];
+ unset($fields[$field]);
+ }
+ }
- if (!$success) {
- dba::close($items);
- dba::rollback();
- return false;
+ if (!empty($fields)) {
+ $success = dba::update('item', $fields, $condition);
+
+ if (!$success) {
+ 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();
while ($item = dba::fetch($items)) {
+ if (!empty($item['plink'])) {
+ $content_fields['plink'] = $item['plink'];
+ }
+ self::updateContent($content_fields, ['uri' => $item['uri']]);
Term::insertFromTagFieldByItemId($item['id']);
Term::insertFromFileFieldByItemId($item['id']);
self::updateThread($item['id']);
// When there is no content then we don't post it
if ($item['body'].$item['title'] == '') {
+ logger('No body, no title.');
return 0;
}
return 0;
}
- //unset($item['author-link']);
+ // These fields aren't stored anymore in the item table, they are fetched upon request
+ unset($item['author-link']);
unset($item['author-name']);
unset($item['author-avatar']);
- //unset($item['owner-link']);
+ unset($item['owner-link']);
unset($item['owner-name']);
unset($item['owner-avatar']);
logger('' . print_r($item,true), LOGGER_DATA);
dba::transaction();
+ self::insertContent($item);
$ret = dba::insert('item', $item);
// When the item was successfully stored we fetch the ID of the item.
return $current_post;
}
+ /**
+ * @brief Insert a new item content entry
+ *
+ * @param array $item The item fields that are to be inserted
+ */
+ private static function insertContent(&$item)
+ {
+ $fields = ['uri' => $item['uri'], 'plink' => $item['plink'],
+ 'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])];
+
+ unset($item['plink']);
+
+ foreach (self::CONTENT_FIELDLIST as $field) {
+ if (isset($item[$field])) {
+ $fields[$field] = $item[$field];
+ unset($item[$field]);
+ }
+ }
+
+ // Do we already have this content?
+ if (!dba::exists('item-content', ['uri' => $item['uri']])) {
+ dba::insert('item-content', $fields, true);
+ }
+
+ $item_content = dba::selectFirst('item-content', ['id'], ['uri' => $item['uri']]);
+ if (DBM::is_result($item_content)) {
+ $item['icid'] = $item_content['id'];
+ logger('Insert content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
+ }
+ }
+
+ /**
+ * @brief Update existing item content entries
+ *
+ * @param array $item The item fields that are to be changed
+ * @param array $condition The condition for finding the item content entries
+ */
+ private static function updateContent($item, $condition)
+ {
+ // We have to select only the fields from the "item-content" table
+ $fields = [];
+ foreach (self::CONTENT_FIELDLIST as $field) {
+ if (isset($item[$field])) {
+ $fields[$field] = $item[$field];
+ }
+ }
+
+ if (empty($fields)) {
+ return;
+ }
+
+ if (!empty($item['plink'])) {
+ $fields['plink'] = $item['plink'];
+ $fields['uri-plink-hash'] = hash('sha1', $item['plink']) . hash('sha1', $condition['uri']);
+ }
+
+ logger('Update content for URI ' . $condition['uri']);
+
+ dba::update('item-content', $fields, $condition, true);
+ }
+
/**
* @brief Distributes public items to the receivers
*
$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]);
+ $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (!DBM::is_result($item)) {
return;
}
unset($item['wall']);
unset($item['origin']);
unset($item['starred']);
- unset($item['rendered-hash']);
- unset($item['rendered-html']);
$users = [];
return;
}
- $item = dba::selectFirst('item', [], ['id' => $itemid]);
+ $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') &&
($item["deny_cid"] == '') && ($item["deny_gid"] == '')) {
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']);
+ $item['contact-id'] = $item['owner-id'];
} else {
- $item['contact-id'] = Contact::getIdForURL($item['author-link']);
+ $item['contact-id'] = $item['author-id'];
}
if (in_array($item['type'], ["net-comment", "wall-comment"])) {
*/
public static function addShadowPost($itemid)
{
- $item = dba::selectFirst('item', [], ['id' => $itemid]);
+ $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (!DBM::is_result($item)) {
return;
}
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"])) {
private static function updateThread($itemid, $setmention = false)
{
- $fields = ['uid', 'guid', 'title', 'body', 'created', 'edited', 'commented', 'received', 'changed',
+ $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed',
'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
- 'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id', 'rendered-html', 'rendered-hash'];
+ 'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
$item = dba::selectFirst('item', $fields, $condition);
$fields = [];
foreach ($item as $field => $data) {
- if (!in_array($field, ["guid", "title", "body", "rendered-html", "rendered-hash"])) {
+ if (!in_array($field, ["guid"])) {
$fields[$field] = $data;
}
}
$result = dba::update('thread', $fields, ['iid' => $itemid]);
logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".(int)$result, LOGGER_DEBUG);
-
- // Updating a shadow item entry
- $items = dba::selectFirst('item', ['id'], ['guid' => $item['guid'], 'uid' => 0]);
-
- if (!DBM::is_result($items)) {
- return;
- }
-
- $fields = ['title' => $item['title'], 'body' => $item['body'],
- 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
- $result = dba::update('item', $fields, ['id' => $items['id']]);
-
- logger("Updating public shadow for post ".$items["id"]." - guid ".$item["guid"]." Result: ".print_r($result, true), LOGGER_DEBUG);
}
private static function deleteThread($itemid, $itemuri = "")
projects / friendica.git / commitdiff