use Friendica\Util\XML;
use Friendica\Worker\Delivery;
use Text_LanguageDetect;
+use Friendica\Repository\PermissionSet as RepPermissionSet;
class Item
{
const CONTENT_FIELDLIST = ['language'];
// All fields in the item table
- const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+ 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',
'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
}
$pinned = [];
- while ($useritem = self::fetch($useritems)) {
+ while ($useritem = DBA::fetch($useritems)) {
$pinned[] = $useritem['iid'];
}
DBA::close($useritems);
}
}
- if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) {
- $row['signed_text'] = $row['interaction'];
+ if ($row['internal-psid'] == RepPermissionSet::PUBLIC) {
+ if (array_key_exists('allow_cid', $row)) {
+ $row['allow_cid'] = '';
+ }
+ if (array_key_exists('allow_gid', $row)) {
+ $row['allow_gid'] = '';
+ }
+ if (array_key_exists('deny_cid', $row)) {
+ $row['deny_cid'] = '';
+ }
+ if (array_key_exists('deny_gid', $row)) {
+ $row['deny_gid'] = '';
+ }
}
if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) {
unset($row['internal-activity']);
unset($row['internal-network']);
unset($row['internal-iid']);
+ unset($row['internal-psid']);
unset($row['internal-iaid']);
- unset($row['internal-icid']);
unset($row['internal-user-ignored']);
unset($row['interaction']);
{
$fields = [];
- $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+ $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
+ 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id',
'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
'created', 'edited', 'commented', 'received', 'changed', 'psid',
'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'];
+ 'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
if ($usermode) {
$fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
'nofinish' => 'event-nofinish','adjust' => 'event-adjust',
'ignore' => 'event-ignore', 'id' => 'event-id'];
- $fields['sign'] = ['signed_text', 'signature', 'signer'];
-
- $fields['diaspora-interaction'] = ['interaction'];
+ $fields['diaspora-interaction'] = ['interaction', 'interaction' => 'signed_text'];
return $fields;
}
$joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`";
}
- if (strpos($sql_commands, "`sign`.") !== false) {
- $joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
- }
-
if (strpos($sql_commands, "`diaspora-interaction`.") !== false) {
$joins .= " LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`";
}
*
* @return string The field list
*/
- private static function constructSelectFields($fields, $selected)
+ private static function constructSelectFields(array $fields, array $selected)
{
if (!empty($selected)) {
- $selected[] = 'internal-iid';
- $selected[] = 'internal-iaid';
- $selected[] = 'internal-icid';
- $selected[] = 'internal-network';
+ $selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']);
}
if (in_array('verb', $selected)) {
$selected[] = 'internal-user-ignored';
}
- if (in_array('signed_text', $selected)) {
- $selected[] = 'interaction';
- }
-
$legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
$selection = [];
* @param integer $priority Priority for the notification
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function delete($condition, $priority = PRIORITY_HIGH)
+ public static function markForDeletion($condition, $priority = PRIORITY_HIGH)
{
$items = self::select(['id'], $condition);
while ($item = self::fetch($items)) {
- self::deleteById($item['id'], $priority);
+ self::markForDeletionById($item['id'], $priority);
}
DBA::close($items);
}
// Delete notifications
DBA::delete('notify', ['iid' => $item['id'], 'uid' => $uid]);
} elseif ($item['uid'] == $uid) {
- self::deleteById($item['id'], PRIORITY_HIGH);
+ self::markForDeletionById($item['id'], PRIORITY_HIGH);
} else {
Logger::log('Wrong ownership. Not deleting item ' . $item['id']);
}
}
/**
- * Delete an item and notify others about it - if it was ours
+ * Mark an item for deletion, delete related data and notify others about it - if it was ours
*
- * @param integer $item_id Item ID that should be delete
+ * @param integer $item_id
* @param integer $priority Priority for the notification
*
* @return boolean success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function deleteById($item_id, $priority = PRIORITY_HIGH)
+ public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH)
{
+ Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]);
// locate item to be deleted
$fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
'deleted', 'file', 'resource-id', 'event-id', 'attach',
'icid', 'iaid', 'psid'];
$item = self::selectFirst($fields, ['id' => $item_id]);
if (!DBA::isResult($item)) {
- Logger::log('Item with ID ' . $item_id . " hasn't been found.", Logger::DEBUG);
+ Logger::info('Item not found.', ['id' => $item_id]);
return false;
}
if ($item['deleted']) {
- Logger::log('Item with ID ' . $item_id . ' has already been deleted.', Logger::DEBUG);
+ Logger::info('Item has already been marked for deletion.', ['id' => $item_id]);
return false;
}
self::deleteThread($item['id'], $item['parent-uri']);
if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
- self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
+ self::markForDeletion(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
}
ItemDeliveryData::delete($item['id']);
// 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);
+ self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority);
}
// Is it our comment and/or our thread?
if ($item['origin'] || $parent['origin']) {
-
// When we delete the original post we will delete all existing copies on the server as well
- self::delete(['uri' => $item['uri'], 'deleted' => false], $priority);
+ self::markForDeletion(['uri' => $item['uri'], 'deleted' => false], $priority);
// send the notification upstream/downstream
Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id']));
}
}
- Logger::log('Item with ID ' . $item_id . " has been deleted.", Logger::DEBUG);
+ Logger::info('Item has been marked for deletion.', ['id' => $item_id]);
return true;
}
return;
}
- $xo = XML::parseString($item["object"], false);
- $xt = XML::parseString($item["target"], false);
+ $xo = XML::parseString($item["object"]);
+ $xt = XML::parseString($item["target"]);
if ($xt->type != Activity\ObjectType::NOTE) {
return;
}
$item['guid'] = self::guid($item, $notify);
- $item['uri'] = Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid'])));
+ $item['uri'] = substr(Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']))), 0, 255);
// Store URI data
$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
$item['edited'] = (isset($item['edited']) ? DateTimeFormat::utc($item['edited']) : $item['created']);
$item['changed'] = (isset($item['changed']) ? DateTimeFormat::utc($item['changed']) : $item['created']);
$item['commented'] = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
- $item['title'] = trim($item['title'] ?? '');
+ $item['title'] = substr(trim($item['title'] ?? ''), 0, 255);
$item['location'] = trim($item['location'] ?? '');
$item['coord'] = trim($item['coord'] ?? '');
$item['visible'] = (isset($item['visible']) ? intval($item['visible']) : 1);
$item['object'] = trim($item['object'] ?? '');
$item['target-type'] = trim($item['target-type'] ?? '');
$item['target'] = trim($item['target'] ?? '');
- $item['plink'] = trim($item['plink'] ?? '');
+ $item['plink'] = substr(trim($item['plink'] ?? ''), 0, 255);
$item['allow_cid'] = trim($item['allow_cid'] ?? '');
$item['allow_gid'] = trim($item['allow_gid'] ?? '');
$item['deny_cid'] = trim($item['deny_cid'] ?? '');
$fields = ['uri', 'parent-uri', 'id', 'deleted',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
- 'wall', 'private', 'forum_mode', 'origin'];
+ 'wall', 'private', 'forum_mode', 'origin', 'author-id'];
$condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
$params = ['order' => ['id' => false]];
$parent = self::selectFirst($fields, $condition, $params);
DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
Logger::log('tagged thread ' . $parent_id . ' as mention for user ' . $item['uid'], Logger::DEBUG);
}
+
+ // Update the contact relations
+ if ($item['author-id'] != $parent['author-id']) {
+ DBA::update('contact-relation', ['last-interaction' => $item['created']], ['cid' => $parent['author-id'], 'relation-cid' => $item['author-id']], true);
+ }
} else {
/*
* Allow one to see reply tweets from status.net even when
if ($entries > 1) {
// There are duplicates. We delete our just created entry.
- Logger::log('Duplicated post occurred. uri = ' . $item['uri'] . ' uid = ' . $item['uid']);
+ Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]);
- // Yes, we could do a rollback here - but we are having many users with MyISAM.
+ // Yes, we could do a rollback here - but we possibly are still having users with MyISAM.
DBA::delete('item', ['id' => $current_post]);
DBA::commit();
return 0;
if (!empty($dsprsig->signed_text) && empty($dsprsig->signature) && empty($dsprsig->signer)) {
DBA::insert('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $dsprsig->signed_text], true);
- } else {
- // The other fields are used by very old Friendica servers, so we currently store them differently
- DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
- 'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
}
}
Contact::unmarkForArchival($contact);
}
- $update = (($arr['private'] != self::PRIVATE) && ((($arr['author-link'] ?? '') === ($arr['owner-link'] ?? '')) || ($arr["parent-uri"] === $arr["uri"])));
+ /// @todo On private posts we could obfuscate the date
+ $update = ($arr['private'] != self::PRIVATE);
// Is it a forum? Then we don't care about the rules from above
if (!$update && in_array($arr["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN]) && ($arr["parent-uri"] === $arr["uri"])) {
}
if ($update) {
- DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
- ['id' => $arr['contact-id']]);
+ // The "self" contact id is used (for example in the connectors) when the contact is unknown
+ // So we have to ensure to only update the last item when it had been our own post,
+ // or it had been done by a "regular" contact.
+ if (!empty($arr['wall'])) {
+ $condition = ['id' => $arr['contact-id']];
+ } else {
+ $condition = ['id' => $arr['contact-id'], 'self' => false];
+ }
+ DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
}
// Now do the same for the system wide contacts with uid=0
if ($arr['private'] != self::PRIVATE) {
// This sorting is important when there are hashtags that are part of other hashtags
// Otherwise there could be problems with hashtags like #test and #test2
- rsort($tags);
+ // Because of this we are sorting from the longest to the shortest tag.
+ usort($tags, function($a, $b) {
+ return strlen($b) <=> strlen($a);
+ });
$URLSearchString = "^\[\]";
if (!$mention) {
if (($community_page || $prvgroup) &&
!$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) {
- // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
- // delete it!
- Logger::log("no-mention top-level post to community or private group. delete.");
+ 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;
}
continue;
}
- self::deleteById($item['id'], PRIORITY_LOW);
+ self::markForDeletionById($item['id'], PRIORITY_LOW);
++$expired;
}
* array $arr
* 'post_id' => ID of posted item
*/
- public static function performLike($item_id, $verb)
+ public static function performActivity($item_id, $verb)
{
if (!Session::isAuthenticated()) {
return false;
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;
// If it exists, mark it as deleted
if (DBA::isResult($like_item)) {
- self::deleteById($like_item['id']);
+ self::markForDeletionById($like_item['id']);
if (!$event_verb_flag || $like_item['verb'] == $activity) {
return true;
$condition = ["`uri` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $itemuri, $item["uid"]];
if (!self::exists($condition)) {
DBA::delete('item', ['uri' => $itemuri, 'uid' => 0]);
- Logger::log("deleteThread: Deleted shadow for item ".$itemuri, Logger::DEBUG);
+ Logger::debug('Deleted shadow item', ['id' => $itemid, 'uri' => $itemuri]);
}
}
}
$title .= ' ' . $mtch[2] . ' ' . DI::l10n()->t('bytes');
$icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
- $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" >' . $icon . '</a>';
+ $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>';
}
if ($as != '') {
// first try to fetch the item via the GUID. This will work for all reshares that had been created on this system
$shared_item = self::selectFirst(['title', 'body', 'attach'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]);
if (!DBA::isResult($shared_item)) {
+ if (empty($shared['link'])) {
+ return $item;
+ }
+
// Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts
$id = self::fetchByLink($shared['link'], $uid);
if (empty($id)) {
projects / friendica.git / blobdiff