'event-id', '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', 'activity'
+ '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',
- 'attach', 'deleted', 'extid', 'post-type',
+ 'attach', 'deleted', 'extid', 'post-type', 'gravity',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'owner-link', 'contact-uid',
'signed_text', 'signature', 'signer', 'network'];
// 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',
- 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
+ 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'vid',
+ 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'psid',
'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'attach', 'inform',
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
+ // List of all verbs that don't need additional content data.
// Never reorder or remove entries from this list. Just add new ones at the end, if needed.
- // 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,
return self::selectThreadForUser($uid, $selected, $condition, $params);
}
- /**
- * returns an activity index from an activity string
- *
- * @param string $activity activity string
- * @return integer Activity index
- */
- public static function activityToIndex($activity)
- {
- $index = array_search($activity, self::ACTIVITIES);
-
- if (is_bool($index)) {
- $index = -1;
- }
-
- return $index;
- }
-
- /**
- * returns an activity string from an activity index
- *
- * @param integer $index activity index
- * @return string Activity string
- */
- private static function indexToActivity($index)
- {
- if (is_null($index) || !array_key_exists($index, self::ACTIVITIES)) {
- return '';
- }
-
- return self::ACTIVITIES[$index];
- }
-
/**
* Fetch a single item row
*
if (array_key_exists('verb', $row)) {
if (!is_null($row['internal-verb'])) {
$row['verb'] = $row['internal-verb'];
- } elseif (!is_null($row['internal-activity'])) {
- $row['verb'] = self::indexToActivity($row['internal-activity']);
}
if (in_array($row['verb'], self::ACTIVITIES)) {
}
}
+ if (array_key_exists('vid', $row) && is_null($row['vid']) && !empty($row['verb'])) {
+ $row['vid'] = Verb::getID($row['verb']);
+ }
+
if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', Activity::POST, Activity::SHARE])) {
// Build the file string out of the term entries
if (array_key_exists('file', $row) && empty($row['file'])) {
}
// Remove internal fields
- unset($row['internal-activity']);
unset($row['internal-network']);
unset($row['internal-uri-id']);
unset($row['internal-uid']);
$fields = [];
$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
- 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id',
+ 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'vid',
'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
'created', 'edited', 'commented', 'received', 'changed', 'psid',
'resource-id', 'event-id', 'attach', 'post-type', 'file',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
- 'id' => 'item_id', 'network', 'icid', 'iaid',
+ 'id' => 'item_id', 'network', 'icid',
'uri-id' => 'internal-uri-id', 'uid' => 'internal-uid',
'network' => 'internal-network', 'psid' => 'internal-psid'];
$fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
}
- $fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
-
$fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
$fields['post-delivery-data'] = array_merge(Post\DeliveryData::LEGACY_FIELD_LIST, Post\DeliveryData::FIELD_LIST);
$joins .= " LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`";
}
- if (strpos($sql_commands, "`item-activity`.") !== false) {
- $joins .= " LEFT JOIN `item-activity` ON `item-activity`.`uri-id` = `item`.`uri-id`";
- }
-
if (strpos($sql_commands, "`item-content`.") !== false) {
$joins .= " LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`";
}
}
if (in_array('verb', $selected)) {
- $selected = array_merge($selected, ['internal-activity', 'internal-verb']);
+ $selected = array_merge($selected, ['internal-verb']);
}
if (in_array('ignored', $selected)) {
// 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', 'uri-id', 'iaid', 'icid', 'uid', 'file'], $condition);
+ $items = DBA::select('item', ['id', 'origin', 'uri', 'uri-id', 'icid', 'uid', 'file'], $condition);
$content_fields = [];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
$files = null;
}
+ if (!empty($content_fields['verb'])) {
+ $fields['vid'] = Verb::getID($content_fields['verb']);
+ }
+
if (!empty($fields)) {
$success = DBA::update('item', $fields, $condition);
$notify_items = [];
while ($item = DBA::fetch($items)) {
- if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) {
- self::updateActivity($content_fields, ['uri-id' => $item['uri-id']]);
-
- if (empty($item['iaid'])) {
- $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-id' => $item['uri-id']]);
- if (DBA::isResult($item_activity)) {
- $item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
- foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
- if (self::isLegacyMode()) {
- $item_fields[$field] = null;
- } else {
- unset($item_fields[$field]);
- }
- }
- 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']]);
- }
- }
- } 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 {
+ if (empty($content_fields['verb']) || !in_array($content_fields['verb'], self::ACTIVITIES)) {
self::updateContent($content_fields, ['uri-id' => $item['uri-id']]);
if (empty($item['icid'])) {
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])) {
- if (self::isLegacyMode()) {
+ if (self::isLegacyMode()) {
+ foreach ($item_content as $field => $content) {
+ if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($content)) {
$item_fields[$field] = null;
- } else {
- unset($item_fields[$field]);
}
}
}
$fields = ['id', 'uri', 'uri-id', 'uid', 'parent', 'parent-uri', 'origin',
'deleted', 'file', 'resource-id', 'event-id', 'attach',
'verb', 'object-type', 'object', 'target', 'contact-id',
- 'icid', 'iaid', 'psid'];
+ 'icid', 'psid', 'gravity'];
$item = self::selectFirst($fields, ['id' => $item_id]);
if (!DBA::isResult($item)) {
Logger::info('Item not found.', ['id' => $item_id]);
// clean up categories and tags so they don't end up as orphans
- $matches = false;
+ $matches = [];
$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) {
}
}
- $matches = false;
+ $matches = [];
$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
Post\DeliveryData::delete($item['uri-id']);
- // We don't delete the item-activity here, since we need some of the data for ActivityPub
-
if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) {
DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
}
//}
// If it's the parent of a comment thread, kill all the kids
- if ($item['id'] == $item['parent']) {
+ if ($item['gravity'] == GRAVITY_PARENT) {
self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority);
}
}
}
- $item["parent"] = $parent['id'];
+ $item['parent'] = $parent['id'];
$item["deleted"] = $parent['deleted'];
$item["allow_cid"] = $parent['allow_cid'];
$item['allow_gid'] = $parent['allow_gid'];
// If its a post that originated here then tag the thread as "mention"
if ($item['origin'] && $item['uid']) {
- DBA::update('thread', ['mention' => true], ['iid' => $item["parent"]]);
- Logger::info('tagged thread as mention', ['parent' => $item["parent"], 'uid' => $item['uid']]);
+ DBA::update('thread', ['mention' => true], ['iid' => $item['parent']]);
+ Logger::info('tagged thread as mention', ['parent' => $item['parent'], 'uid' => $item['uid']]);
}
// Update the contact relations
// Check for hashtags in the body and repair or add hashtag links
self::setHashtags($item);
-
+
// Fill the cache field
self::putInCache($item);
$notify_type = Delivery::POST;
}
- // We are doing this outside of the transaction to avoid timing problems
- if (in_array($item['verb'], self::ACTIVITIES)) {
- $item['iaid'] = self::insertActivity($item);
- } else {
+ $like_no_comment = DI::config()->get('system', 'like_no_comment');
+
+ DBA::transaction();
+
+ if (!in_array($item['verb'], self::ACTIVITIES)) {
$item['icid'] = self::insertContent($item);
}
$body = $item['body'];
-
+
// We just remove everything that is content
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
unset($item[$field]);
}
- $like_no_comment = DI::config()->get('system', 'like_no_comment');
-
- DBA::transaction();
+ unset($item['activity']);
// Filling item related side tables
return $current_post;
}
- /**
- * Insert a new item content entry
- *
- * @param array $item The item fields that are to be inserted
- * @return bool
- * @throws \Exception
- */
- private static function insertActivity(array $item)
- {
- $activity_index = self::activityToIndex($item['verb']);
- if ($activity_index < 0) {
- // SHouldn't happen at all
- return null;
- }
-
- $fields = ['activity' => $activity_index, 'uri-hash' => (string)$item['uri-id'], 'uri-id' => $item['uri-id']];
-
- // To avoid timing problems, we are using locks.
- $locked = DI::lock()->acquire('item_insert_activity');
- if (!$locked) {
- Logger::log("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
- }
-
- // Do we already have this content?
- $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-id' => $item['uri-id']]);
- if (DBA::isResult($item_activity)) {
- $iaid = $item_activity['id'];
- Logger::log('Fetched activity for URI ' . $item['uri'] . ' (' . $iaid . ')');
- } elseif (DBA::insert('item-activity', $fields)) {
- $iaid = DBA::lastInsertId();
- Logger::log('Inserted activity for URI ' . $item['uri'] . ' (' . $iaid . ')');
- } else {
- // This shouldn't happen.
- $iaid = null;
- Logger::log('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
- }
- if ($locked) {
- DI::lock()->release('item_insert_activity');
- }
- return $iaid;
- }
-
/**
* Insert a new item content entry
*
}
}
- // To avoid timing problems, we are using locks.
- $locked = DI::lock()->acquire('item_insert_content');
- if (!$locked) {
- Logger::log("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
- }
-
- // Do we already have this content?
$item_content = DBA::selectFirst('item-content', ['id'], ['uri-id' => $item['uri-id']]);
if (DBA::isResult($item_content)) {
$icid = $item_content['id'];
- Logger::log('Fetched content for URI ' . $item['uri'] . ' (' . $icid . ')');
- } elseif (DBA::insert('item-content', $fields)) {
- $icid = DBA::lastInsertId();
- Logger::log('Inserted content for URI ' . $item['uri'] . ' (' . $icid . ')');
- } else {
- // This shouldn't happen.
- $icid = null;
- Logger::log('Could not insert content for URI ' . $item['uri'] . ' - should not happen');
- }
- if ($locked) {
- DI::lock()->release('item_insert_content');
+ Logger::info('Content found', ['icid' => $icid, 'uri' => $item['uri']]);
+ return $icid;
}
- return $icid;
- }
- /**
- * 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
- * @return bool
- * @throws \Exception
- */
- private static function updateActivity($item, $condition)
- {
- if (empty($item['verb'])) {
- return false;
+ DBA::insert('item-content', $fields, true);
+ $icid = DBA::lastInsertId();
+ if ($icid != 0) {
+ Logger::info('Content inserted', ['icid' => $icid, 'uri' => $item['uri']]);
+ return $icid;
}
- $activity_index = self::activityToIndex($item['verb']);
- if ($activity_index < 0) {
- return false;
+ // Possibly there can be timing issues. Then the same content could be inserted multiple times.
+ // Due to the indexes this doesn't happen, but "lastInsertId" will be empty in these situations.
+ // So we have to fetch the id manually. This is no bug and there is no data loss.
+ $item_content = DBA::selectFirst('item-content', ['id'], ['uri-id' => $item['uri-id']]);
+ if (DBA::isResult($item_content)) {
+ $icid = $item_content['id'];
+ Logger::notice('Content inserted with empty lastInsertId', ['icid' => $icid, 'uri' => $item['uri']]);
+ return $icid;
}
- $fields = ['activity' => $activity_index];
-
- Logger::log('Update activity for ' . json_encode($condition));
-
- DBA::update('item-activity', $fields, $condition, true);
-
- return true;
+ // This shouldn't happen.
+ Logger::error("Content wasn't inserted", $item);
+ return null;
}
/**
$fields = $condition;
}
- Logger::log('Update content for ' . json_encode($condition));
-
DBA::update('item-content', $fields, $condition, true);
+ Logger::info('Updated content', ['condition' => $condition]);
}
/**
}
// Is it a toplevel post?
- if ($item['id'] == $item['parent']) {
+ if ($item['gravity'] == GRAVITY_PARENT) {
self::addShadow($itemid);
return;
}
if (!$mention) {
if (($community_page || $prvgroup) &&
- !$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) {
+ !$item['wall'] && !$item['origin'] && ($item['gravity'] == GRAVITY_PARENT)) {
Logger::info('Delete private group/communiy top-level item without mention', ['id' => $item_id, 'guid'=> $item['guid']]);
DBA::delete('item', ['id' => $item_id]);
return true;
return;
}
- $condition = ["`uid` = ? AND NOT `deleted` AND `id` = `parent` AND `gravity` = ?",
+ $condition = ["`uid` = ? AND NOT `deleted` AND `gravity` = ?",
$uid, GRAVITY_PARENT];
/*
return false;
}
- switch ($verb) {
- case 'like':
- case 'unlike':
- $activity = Activity::LIKE;
- break;
- case 'dislike':
- case 'undislike':
- $activity = Activity::DISLIKE;
- break;
- case 'attendyes':
- case 'unattendyes':
- $activity = Activity::ATTEND;
- break;
- case 'attendno':
- case 'unattendno':
- $activity = Activity::ATTENDNO;
- break;
- case 'attendmaybe':
- case 'unattendmaybe':
- $activity = Activity::ATTENDMAYBE;
- break;
- case 'follow':
- case 'unfollow':
- $activity = Activity::FOLLOW;
- break;
- default:
- Logger::log('like: unknown verb ' . $verb . ' for item ' . $item_id);
- return false;
- }
-
- // Enable activity toggling instead of on/off
- $event_verb_flag = $activity === Activity::ATTEND || $activity === Activity::ATTENDNO || $activity === Activity::ATTENDMAYBE;
-
Logger::log('like: verb ' . $verb . ' item ' . $item_id);
$item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
}
}
+ $activity = null;
+ switch ($verb) {
+ case 'like':
+ case 'unlike':
+ $activity = Activity::LIKE;
+ break;
+ case 'dislike':
+ case 'undislike':
+ $activity = Activity::DISLIKE;
+ break;
+ case 'attendyes':
+ case 'unattendyes':
+ $activity = Activity::ATTEND;
+ break;
+ case 'attendno':
+ case 'unattendno':
+ $activity = Activity::ATTENDNO;
+ break;
+ case 'attendmaybe':
+ case 'unattendmaybe':
+ $activity = Activity::ATTENDMAYBE;
+ break;
+ case 'follow':
+ case 'unfollow':
+ $activity = Activity::FOLLOW;
+ break;
+ default:
+ Logger::log('like: unknown verb ' . $verb . ' for item ' . $item_id);
+ return false;
+ }
+
+ $mode = Strings::startsWith($verb, 'un') ? 'delete' : 'create';
+
+ // Enable activity toggling instead of on/off
+ $event_verb_flag = $activity === Activity::ATTEND || $activity === Activity::ATTENDNO || $activity === Activity::ATTENDMAYBE;
+
// Look for an existing verb row
- // event participation are essentially radio toggles. If you make a subsequent choice,
- // we need to eradicate your first choice.
+ // Event participation activities are mutually exclusive, only one of them can exist at all times.
if ($event_verb_flag) {
$verbs = [Activity::ATTEND, Activity::ATTENDNO, Activity::ATTENDMAYBE];
// Translate to the index based activity index
- $activities = [];
+ $vids = [];
foreach ($verbs as $verb) {
- $activities[] = self::activityToIndex($verb);
+ $vids[] = Verb::getID($verb);
}
} else {
- $activities = self::activityToIndex($activity);
+ $vids = Verb::getID($activity);
}
- $condition = ['activity' => $activities, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
+ $condition = ['vid' => $vids, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent' => $item_uri];
-
$like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
- // If it exists, mark it as deleted
if (DBA::isResult($like_item)) {
- self::markForDeletionById($like_item['id']);
+ /**
+ * Truth table for existing activities
+ *
+ * | Inputs || Outputs |
+ * |----------------------------||-------------------|
+ * | Mode | Event | Same verb || Delete? | Return? |
+ * |--------|-------|-----------||---------|---------|
+ * | create | Yes | Yes || No | Yes |
+ * | create | Yes | No || Yes | No |
+ * | create | No | Yes || No | Yes |
+ * | create | No | No || N/A† |
+ * | delete | Yes | Yes || Yes | N/A‡ |
+ * | delete | Yes | No || No | N/A‡ |
+ * | delete | No | Yes || Yes | N/A‡ |
+ * | delete | No | No || N/A† |
+ * |--------|-------|-----------||---------|---------|
+ * | A | B | C || A xor C | !B or C |
+ *
+ * † Can't happen: It's impossible to find an existing non-event activity without
+ * the same verb because we are only looking for this single verb.
+ *
+ * ‡ The "mode = delete" is returning early whether an existing activity was found or not.
+ */
+ if ($mode == 'create' xor $like_item['verb'] == $activity) {
+ self::markForDeletionById($like_item['id']);
+ }
if (!$event_verb_flag || $like_item['verb'] == $activity) {
return true;
}
}
- // Verb is "un-something", just trying to delete existing entries
- if (strpos($verb, 'un') === 0) {
+ // No need to go further if we aren't creating anything
+ if ($mode == 'delete') {
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',
+ '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 = self::selectFirst($fields, $condition);
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',
+ 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id', 'uri-id',
'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
return DI::l10n()->t('event');
} elseif (!empty($item['resource-id'])) {
return DI::l10n()->t('photo');
- } elseif (!empty($item['verb']) && $item['verb'] !== Activity::POST) {
+ } elseif ($item['gravity'] == GRAVITY_ACTIVITY) {
return DI::l10n()->t('activity');
- } elseif ($item['id'] != $item['parent']) {
+ } elseif ($item['gravity'] == GRAVITY_COMMENT) {
return DI::l10n()->t('comment');
}