'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
'wall', 'private', 'starred', 'origin', 'title', 'body', 'language',
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
- 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
+ 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type',
'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar',
'writable', 'self', 'cid', 'alias',
- 'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
+ 'event-created', 'event-edited', 'event-start', 'event-finish',
'event-summary', 'event-desc', 'event-location', 'event-type',
'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed'
// Field list that is used to deliver items via the protocols
const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid',
- 'parent-guid', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
- 'private', 'title', 'body', 'location', 'coord', 'app',
- 'deleted', 'extid', 'post-type', 'gravity',
+ 'parent-guid', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target',
+ 'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app',
+ 'inform', 'deleted', 'extid', 'post-type', 'gravity',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
- 'author-id', 'author-link', 'owner-link', 'contact-uid',
- 'signed_text', 'network'];
+ 'author-id', 'author-link', 'owner-id', 'owner-link', 'contact-uid',
+ 'signed_text', 'network', 'wall', 'contact-id', 'plink', 'forum_mode', 'origin',
+ 'thr-parent-id', 'parent-uri-id', 'postopts', 'pubmail',
+ 'event-created', 'event-edited', 'event-start', 'event-finish',
+ 'event-summary', 'event-desc', 'event-location', 'event-type',
+ 'event-nofinish', 'event-adjust', 'event-ignore', 'event-id'];
// All fields in the item table
const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'vid',
- 'contact-id', 'type', 'wall', 'gravity', 'extid', 'psid',
+ 'contact-id', 'wall', 'gravity', 'extid', 'psid',
'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'inform',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
- 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
+ 'private', 'pubmail', 'visible', 'starred',
'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', 'author-network',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'causer-id'];
- // Item fiels that still are in use
+ // Item fields that still are in use
const USED_FIELDLIST = ['id', 'parent', 'guid', 'uri', 'uri-id', 'parent-uri', 'parent-uri-id',
'thr-parent', 'thr-parent-id', 'created', 'edited', 'commented', 'received', 'changed',
'gravity', 'network', 'owner-id', 'author-id', 'causer-id', 'vid', 'extid', 'post-type',
- 'global', 'private', 'visible', 'moderated', 'deleted', 'uid', 'contact-id',
+ 'global', 'private', 'visible', 'deleted', 'uid', 'contact-id',
'wall', 'origin', 'pubmail', 'starred', 'unseen', 'mention', 'forum_mode', 'psid',
- 'event-id', 'type', 'bookmark'];
+ 'event-id'];
// Legacy item fields that aren't stored any more in the item table
const LEGACY_FIELDLIST = ['uri-hash', 'iaid', 'icid', 'attach',
DBA::close($items);
foreach ($notify_items as $notify_item) {
- Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $notify_item);
+ $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $notify_item]);
+ Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$post['uri-id'], (int)$post['uid']);
}
return $rows;
while ($item = Post::fetch($items)) {
if (in_array($item['uid'], [$uid, 0])) {
Post\User::update($item['uri-id'], $uid, ['hidden' => true], true);
+ Post\ThreadUser::update($item['uri-id'], $uid, ['hidden' => true], true);
}
if ($item['uid'] == $uid) {
// Set the item to "deleted"
$item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
- DBA::update('item', $item_fields, ['id' => $item['id']]);
+ Post::update($item_fields, ['id' => $item['id']]);
Post\Category::storeTextByURIId($item['uri-id'], $item['uid'], '');
- self::deleteThread($item['id'], $item['parent-uri-id']);
if (!Post::exists(["`uri-id` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri-id']])) {
self::markForDeletion(['uri-id' => $item['uri-id'], 'uid' => 0, 'deleted' => false], $priority);
// send the notification upstream/downstream
if ($priority) {
- Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id']));
+ Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, (int)$item['uri-id'], (int)$item['uid']);
}
} elseif ($item['uid'] != 0) {
Post\User::update($item['uri-id'], $item['uid'], ['hidden' => true]);
+ Post\ThreadUser::update($item['uri-id'], $item['uid'], ['hidden' => true]);
}
Logger::info('Item has been marked for deletion.', ['id' => $item_id]);
// If its a post that originated here then tag the thread as "mention"
if ($item['origin'] && $item['uid']) {
- DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
- Logger::info('tagged thread as mention', ['parent' => $parent_id, 'uid' => $item['uid']]);
+ DBA::update('post-thread-user', ['mention' => true], ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid']]);
+ Logger::info('tagged thread as mention', ['parent' => $parent_id, 'parent-uri-id' => $item['parent-uri-id'], 'uid' => $item['uid']]);
}
// Update the contact relations
$item["global"] = true;
// Set the global flag on all items if this was a global item entry
- DBA::update('item', ['global' => true], ['uri-id' => $item['uri-id']]);
+ Post::update(['global' => true], ['uri-id' => $item['uri-id']]);
} else {
$item['global'] = Post::exists(['uid' => 0, 'uri-id' => $item['uri-id']]);
}
$item['deny_gid']
);
+ if (!empty($item['extid'])) {
+ $item['external-id'] = ItemURI::getIdByURI($item['extid']);
+ }
+
if ($item['verb'] == Activity::ANNOUNCE) {
self::setOwnerforResharedItem($item);
}
Post\Media::insertFromAttachment($item['uri-id'], $item['attach']);
}
+ if (empty($item['event-id'])) {
+ unset($item['event-id']);
+ }
+
+ Post::insert($item['uri-id'], $item);
+
+ if ($item['gravity'] == GRAVITY_PARENT) {
+ Post\Thread::insert($item['uri-id'], $item);
+ }
+
if (!in_array($item['verb'], self::ACTIVITIES)) {
Post\Content::insert($item['uri-id'], $item);
}
Tag::storeFromBody($item['uri-id'], $item['body']);
}
+ $condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid']];
+ if (Post::exists($condition)) {
+ Logger::notice('Item is already inserted - aborting', $condition);
+ return 0;
+ }
+
$id = Post\User::insert($item['uri-id'], $item['uid'], $item);
if (!$id) {
Logger::notice('Post-User is already inserted - aborting', ['uid' => $item['uid'], 'uri-id' => $item['uri-id']]);
}
if ($item['gravity'] == GRAVITY_PARENT) {
+ $item['post-user-id'] = $id;
Post\ThreadUser::insert($item['uri-id'], $item['uid'], $item);
}
- $condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network']];
- if (Post::exists($condition)) {
- Logger::notice('Item is already inserted - aborting', $condition);
- return 0;
- }
-
// Remove all fields that aren't part of the item table
$table_fields = DBStructure::getFieldsForTable('item', $item);
}
if ($update_commented) {
- DBA::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
- } else {
- DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
- }
-
- if ($item['gravity'] === GRAVITY_PARENT) {
- self::addThread($current_post);
+ Post::update(['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} else {
- self::updateThread($parent_id);
+ Post::update(['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
}
// In that function we check if this is a forum post. Additionally we delete the item under certain circumstances
self::updateContact($item);
- UserItem::setNotification($current_post);
+ Post\UserNotification::setNotification($item['uri-id'], $item['uid']);
- check_user_notification($current_post);
+ check_user_notification($item['uri-id'], $item['uid']);
+ //check_user_notification($current_post);
// Distribute items to users who subscribed to their tags
self::distributeByTags($item);
}
if ($transmit) {
- Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, $current_post);
+ Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, (int)$item['uri-id'], (int)$item['uid']);
}
return $current_post;
// Only distribute public items from native networks
$condition = ['id' => $itemid, 'uid' => 0,
'network' => array_merge(Protocol::FEDERATED ,['']),
- 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => [self::PUBLIC, self::UNLISTED]];
+ 'visible' => true, 'deleted' => false, 'private' => [self::PUBLIC, self::UNLISTED]];
$item = Post::selectFirst(self::ITEM_FIELDLIST, $condition);
if (!DBA::isResult($item)) {
return;
*/
private static function addShadow($itemid)
{
- $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network', 'uri-id'];
+ $fields = ['uid', 'private', 'visible', 'deleted', 'network', 'uri-id'];
$condition = ['id' => $itemid, 'parent' => [0, $itemid]];
$item = Post::selectFirst($fields, $condition);
}
// Is it a visible public post?
- if (!$item["visible"] || $item["deleted"] || $item["moderated"] || ($item["private"] == self::PRIVATE)) {
+ if (!$item["visible"] || $item["deleted"] || ($item["private"] == self::PRIVATE)) {
return;
}
'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid];
self::update($fields, ['id' => $item_id]);
- Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, $item_id);
+ Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, (int)$item['uri-id'], (int)$item['uid']);
self::performActivity($item_id, 'announce', $uid);
$condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
$condition[] = $days;
- $items = Post::select(['resource-id', 'starred', 'type', 'id', 'post-type', 'uid', 'uri-id'], $condition);
+ $items = Post::select(['resource-id', 'starred', 'id', 'post-type', 'uid', 'uri-id'], $condition);
if (!DBA::isResult($items)) {
return;
continue;
} elseif (!$expire_starred && intval($item['starred'])) {
continue;
- } elseif (!$expire_notes && (($item['type'] == 'note') || ($item['post-type'] == self::PT_PERSONAL_NOTE))) {
+ } elseif (!$expire_notes && ($item['post-type'] == self::PT_PERSONAL_NOTE)) {
continue;
- } elseif (!$expire_items && ($item['type'] != 'note') && ($item['post-type'] != self::PT_PERSONAL_NOTE)) {
+ } elseif (!$expire_items && ($item['post-type'] != self::PT_PERSONAL_NOTE)) {
continue;
}
public static function firstPostDate($uid, $wall = false)
{
- $condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false];
+ $condition = ['gravity' => GRAVITY_PARENT, 'uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true];
$params = ['order' => ['received' => false]];
- $thread = DBA::selectFirst('thread', ['received'], $condition, $params);
+ $thread = Post::selectFirst(['received'], $condition, $params);
if (DBA::isResult($thread)) {
return substr(DateTimeFormat::local($thread['received']), 0, 10);
}
return true;
}
- private static function addThread($itemid, $onlyshadow = false)
- {
- $fields = ['uid', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', 'pubmail',
- 'moderated', 'visible', 'starred', 'contact-id', 'post-type', 'uri-id',
- 'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
- $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
- $item = Post::selectFirst($fields, $condition);
-
- if (!DBA::isResult($item)) {
- return;
- }
-
- $item['iid'] = $itemid;
-
- if (!$onlyshadow) {
- $result = DBA::replace('thread', $item);
-
- Logger::info('Add thread', ['item' => $itemid, 'result' => $result]);
- }
- }
-
- private static function updateThread($itemid, $setmention = false)
- {
- $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
- 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id', 'uri-id',
- 'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
-
- $item = Post::selectFirst($fields, ['id' => $itemid, 'gravity' => GRAVITY_PARENT]);
- if (!DBA::isResult($item)) {
- return;
- }
-
- if ($setmention) {
- $item["mention"] = 1;
- }
-
- $fields = [];
-
- foreach ($item as $field => $data) {
- if (!in_array($field, ["guid"])) {
- $fields[$field] = $data;
- }
- }
-
- $result = DBA::update('thread', $fields, ['iid' => $itemid]);
-
- Logger::info('Update thread', ['item' => $itemid, 'guid' => $item["guid"], 'result' => $result]);
- }
-
- private static function deleteThread($itemid, $uri_id)
- {
- $item = DBA::selectFirst('thread', ['uid'], ['iid' => $itemid]);
- if (!DBA::isResult($item)) {
- Logger::info('No thread found', ['id' => $itemid]);
- return;
- }
-
- $result = DBA::delete('thread', ['iid' => $itemid], ['cascade' => false]);
-
- Logger::info('Deleted thread', ['item' => $itemid, 'result' => $result]);
-
- $condition = ["`uri-id` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $uri_id, $item["uid"]];
- if (!Post::exists($condition)) {
- DBA::delete('item', ['uri-id' => $uri_id, 'uid' => 0]);
- Post\User::delete(['uri-id' => $uri_id, 'uid' => 0]);
- Logger::debug('Deleted shadow item', ['id' => $itemid, 'uri-id' => $uri_id]);
- }
- }
-
/**
* Fetch the SQL condition for the given user id
*
projects / friendica.git / blobdiff