namespace Friendica\Model;
+use dba;
use Friendica\BaseObject;
use Friendica\Content\Text;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Lock;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
-use Friendica\Model\Group;
-use Friendica\Model\Term;
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';
'attach', 'tag', 'bookmark', 'deleted', 'extid',
'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',
// 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',
+ 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid',
'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'author-name', 'author-avatar',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
+ // 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];
+
+ private static $legacy_mode = null;
+
+ public static function isLegacyMode()
+ {
+ if (is_null(self::$legacy_mode)) {
+ self::$legacy_mode = (Config::get("system", "post_update_version") < 1276);
+ }
+
+ return self::$legacy_mode;
+ }
+
+ /**
+ * @brief returns an activity index from an activity string
+ *
+ * @param string $activity activity string
+ * @return integer Activity index
+ */
+ private static function activityToIndex($activity)
+ {
+ $index = array_search($activity, self::ACTIVITIES);
+
+ if (is_bool($index)) {
+ $index = -1;
+ }
+
+ return $index;
+ }
+
+ /**
+ * @brief 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];
+ }
+
/**
* @brief Fetch a single item row
*
{
$row = dba::fetch($stmt);
- // 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['item-' . $field])) {
- $row[$field] = $row['item-' . $field];
- }
- unset($row['item-' . $field]);
+ if (is_bool($row)) {
+ return $row;
}
+ // ---------------------- Transform item structure data ----------------------
+
// 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'])) {
}
}
- // Build the tag string out of the term entries
- if (isset($row['id']) && array_key_exists('tag', $row)) {
- $row['tag'] = Term::tagTextFromItemId($row['id']);
+ // 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])) {
+ $row['writable'] = true;
}
- // Build the file string out of the term entries
- if (isset($row['id']) && array_key_exists('file', $row)) {
- $row['file'] = Term::fileTextFromItemId($row['id']);
+ // ---------------------- Transform item content data ----------------------
+
+ // Fetch data from the item-content table whenever there is content there
+ if (self::isLegacyMode()) {
+ foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
+ if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
+ $row[$field] = $row['internal-item-' . $field];
+ }
+ unset($row['internal-item-' . $field]);
+ }
}
- // We can always comment on posts from these networks
- if (isset($row['writable']) && !empty($row['network']) &&
- in_array($row['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
- $row['writable'] = true;
+ if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) {
+ $row['verb'] = self::indexToActivity($row['internal-activity']);
+ if (array_key_exists('title', $row)) {
+ $row['title'] = '';
+ }
+ if (array_key_exists('body', $row)) {
+ $row['body'] = $row['verb'];
+ }
+ if (array_key_exists('object', $row)) {
+ $row['object'] = '';
+ }
+ if (array_key_exists('object-type', $row)) {
+ $row['object-type'] = ACTIVITY_OBJ_NOTE;
+ }
+ } 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.
+ if (array_key_exists('object', $row)) {
+ $row['object'] = '';
+ }
+ 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) && 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) && empty($row['file'])) {
+ $row['file'] = Term::fileTextFromItemId($row['internal-iid']);
+ }
}
+ // Remove internal fields
+ unset($row['internal-activity']);
+ unset($row['internal-network']);
+ unset($row['internal-iid']);
+ unset($row['internal-iaid']);
+ unset($row['internal-icid']);
+
return $row;
}
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
- 'id' => 'item_id', 'network', 'icid'];
+ 'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
+ 'network' => 'internal-network', 'icid' => 'internal-icid',
+ 'iaid' => 'internal-iaid'];
+
+ $fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
$fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
$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_IS_SHARING, CONTACT_IS_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`";
}
}
$joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
}
+ if (strpos($sql_commands, "`item-activity`.") !== false) {
+ $joins .= " LEFT JOIN `item-activity` ON `item-activity`.`id` = `item`.`iaid`";
+ }
+
if (strpos($sql_commands, "`item-content`.") !== false) {
$joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
}
*/
private static function constructSelectFields($fields, $selected)
{
- // To be able to fetch the tags we need the item id
- if (in_array('tag', $selected) && !in_array('id', $selected)) {
- $selected[] = 'id';
+ if (!empty($selected)) {
+ $selected[] = 'internal-iid';
+ $selected[] = 'internal-iaid';
+ $selected[] = 'internal-icid';
+ $selected[] = 'internal-network';
}
- // To be able to fetch the files we need the item id
- if (in_array('file', $selected) && !in_array('id', $selected)) {
- $selected[] = 'id';
+ if (in_array('verb', $selected)) {
+ $selected[] = 'internal-activity';
}
$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)) {
- $selection[] = "`item`.`".$select."` AS `item-" . $select . "`";
+ if (self::isLegacyMode() && in_array($select, self::MIXED_CONTENT_FIELDLIST)) {
+ $selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
}
if (is_int($field)) {
$selection[] = "`" . $table . "`.`" . $select . "`";
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
*
// 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', '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;
+ }
+ }
+ }
+
+ $author_owner_fields = ['author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
+ foreach ($author_owner_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 = '';
}
$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']]);
-
- if (empty($item['icid'])) {
- $item_content = dba::selectFirst('item-content', [], ['uri' => $item['uri']]);
- if (DBM::is_result($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] = '';
+ // 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 (DBM::is_result($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 (!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-hash' => $item['uri-hash']]);
+ if (DBM::is_result($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($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-plink-hash' => $item['uri-hash']]);
+ if (DBM::is_result($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()) {
+ $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::updateThread($item['id']);
// 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
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) {
} 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;
}
}
+ // Ensure to always have the same creation date.
+ $existing = dba::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]);
+ if (DBM::is_result($existing)) {
+ $item['created'] = $existing['created'];
+ $item['uri-hash'] = $existing['uri-hash'];
+ }
+
self::addLanguageToItemArray($item);
$item['wall'] = intval(defaults($item, 'wall', 0));
$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.');
$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
if ($item['network'] == NETWORK_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'] = NETWORK_DFRN;
logger("Set network to " . $item["network"] . " for " . $item["uri"], LOGGER_DEBUG);
}
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);
}
}
// We are doing this outside of the transaction to avoid timing problems
- self::insertContent($item);
+ if (!self::insertActivity($item)) {
+ self::insertContent($item);
+ }
dba::transaction();
$ret = dba::insert('item', $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 insertActivity(&$item)
+ {
+ $activity_index = self::activityToIndex($item['verb']);
+
+ if ($activity_index < 0) {
+ return false;
+ }
+
+ $fields = ['uri' => $item['uri'], 'activity' => $activity_index,
+ 'uri-hash' => $item['uri-hash']];
+
+ // We just remove everything that is content
+ foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+ unset($item[$field]);
+ }
+
+ // To avoid timing problems, we are using locks.
+ $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-hash' => $item['uri-hash']]);
+ if (DBM::is_result($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();
+ logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
+ } else {
+ // This shouldn't happen.
+ logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
+ return false;
+ }
+ if ($locked) {
+ Lock::release('item_insert_activity');
+ }
+ return true;
+ }
+
/**
* @brief Insert a new item content entry
*
*/
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']];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($item[$field])) {
}
// 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']]);
+ $item_content = dba::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]);
if (DBM::is_result($item_content)) {
$item['icid'] = $item_content['id'];
logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
$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');
+ Lock::release('item_insert_content');
}
}
/**
- * @brief Set the item content id for a given URI
+ * @brief Update existing item content entries
*
- * @param string $uri The item URI
+ * @param array $item The item fields that are to be changed
+ * @param array $condition The condition for finding the item content entries
*/
- public static function setICIDforURI($uri)
+ private static function updateActivity($item, $condition)
{
- $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);
+ if (empty($item['verb'])) {
+ return false;
+ }
+ $activity_index = self::activityToIndex($item['verb']);
+
+ if ($activity_index < 0) {
+ return false;
}
+
+ $fields = ['activity' => $activity_index];
+
+ logger('Update activity for ' . json_encode($condition));
+
+ dba::update('item-activity', $fields, $condition, true);
+
+ return true;
}
/**
}
if (empty($fields)) {
- return;
- }
-
- 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']);
+ // when there are no fields at all, just use the condition
+ // This is to ensure that we always store content.
+ $fields = $condition;
}
- logger('Update content for URI ' . $condition['uri']);
+ logger('Update content for ' . json_encode($condition));
dba::update('item-content', $fields, $condition, true);
}
return;
}
+ $origin = $item['origin'];
+
unset($item['id']);
unset($item['parent']);
unset($item['mention']);
$parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
while ($parent = dba::fetch($parents)) {
$users[$parent['uid']] = $parent['uid'];
- if ($parent['origin'] && !$item['origin']) {
+ if ($parent['origin'] && !$origin) {
$origin_uid = $parent['uid'];
}
}
public static function newURI($uid, $guid = "")
{
if ($guid == "") {
- $guid = get_guid(32);
+ $guid = System::createGUID(32);
}
$hostname = self::getApp()->get_hostname();
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"])) {
}
// Prevent the forwarding of posts that are forwarded
- if ($datarray["extid"] == NETWORK_DFRN) {
+ if (!empty($datarray["extid"]) && ($datarray["extid"] == NETWORK_DFRN)) {
logger('Already forwarded', LOGGER_DEBUG);
return false;
}
}
if ($contact['network'] != NETWORK_FEED) {
- $datarray["guid"] = get_guid(32);
+ $datarray["guid"] = System::createGUID(32);
unset($datarray["plink"]);
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
$datarray["parent-uri"] = $datarray["uri"];
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:
return false;
}
+ $item_uri = $item['uri'];
+
$uid = $item['uid'];
if (($uid == 0) && local_user()) {
$uid = local_user();
// Retrieve the current logged in user's public contact
$author_id = public_contact();
- $author_contact = dba::selectFirst('contact', [], ['id' => $author_id]);
+ $author_contact = dba::selectFirst('contact', ['url'], ['id' => $author_id]);
if (!DBM::is_result($author_contact)) {
logger('like: unknown author ' . $author_id);
return false;
// 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
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);
+ Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item['id']);
if (!$event_verb_flag || $like_item['verb'] == $activity) {
return true;
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('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
- $body = $item['body'];
-
- $obj = <<< EOT
-
- <object>
- <type>$objtype</type>
- <local>1</local>
- <id>{$item['uri']}</id>
- <link>$link</link>
- <title></title>
- <content>$body</content>
- </object>
-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' => NETWORK_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'],
projects / friendica.git / blobdiff