use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
+use Friendica\Model\Post\Category;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
// Field list that is used to display the items
const DISPLAY_FIELDLIST = [
- 'uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
+ 'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
];
// Field list that is used to deliver items via the protocols
- const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
+ 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', 'tag', 'deleted', 'extid', 'post-type',
+ 'attach', 'deleted', 'extid', 'post-type',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'owner-link', 'contact-uid',
'signed_text', 'signature', 'signer', 'network'];
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',
+ 'postopts', 'plink', 'resource-id', 'event-id', 'attach', 'inform',
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
}
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']);
+ $row['file'] = Category::getTextByURIId($row['internal-uri-id'], $row['internal-uid']);
}
}
// Remove internal fields
unset($row['internal-activity']);
unset($row['internal-network']);
- unset($row['internal-iid']);
+ unset($row['internal-uri-id']);
+ unset($row['internal-uid']);
unset($row['internal-psid']);
unset($row['internal-iaid']);
unset($row['internal-user-ignored']);
'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',
+ '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' => 'internal-iid',
+ 'id' => 'item_id', 'network', 'icid', 'iaid',
+ 'uri-id' => 'internal-uri-id', 'uid' => 'internal-uid',
'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
if ($usermode) {
'ignore' => 'event-ignore', 'id' => 'event-id'];
$fields['diaspora-interaction'] = ['interaction', 'interaction' => 'signed_text'];
-
+
return $fields;
}
private static function constructSelectFields(array $fields, array $selected)
{
if (!empty($selected)) {
- $selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']);
+ $selected = array_merge($selected, ['internal-uri-id', 'internal-uid', 'internal-psid', 'internal-iaid', 'internal-network']);
}
if (in_array('verb', $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', 'tag', 'file'], $condition);
+ $items = DBA::select('item', ['id', 'origin', 'uri', 'uri-id', 'iaid', 'icid', 'uid', 'file'], $condition);
$content_fields = [];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
}
}
- if (array_key_exists('tag', $fields)) {
- $tags = $fields['tag'];
- $fields['tag'] = null;
- } else {
- $tags = null;
- }
-
if (array_key_exists('file', $fields)) {
$files = $fields['file'];
$fields['file'] = null;
}
}
- if (!is_null($tags)) {
- Term::insertFromTagFieldByItemId($item['id'], $tags);
- if (!empty($item['tag'])) {
- DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
- }
- }
-
if (!is_null($files)) {
- Term::insertFromFileFieldByItemId($item['id'], $files);
+ Category::storeTextByURIId($item['uri-id'], $item['uid'], $files);
if (!empty($item['file'])) {
DBA::update('item', ['file' => ''], ['id' => $item['id']]);
}
{
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',
+ $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'];
}
}
- // Delete tags that had been attached to other items
- self::deleteTagsFromItem($item);
-
// Delete notifications
DBA::delete('notify', ['iid' => $item['id'], 'uid' => $item['uid']]);
$item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
DBA::update('item', $item_fields, ['id' => $item['id']]);
- Term::insertFromTagFieldByItemId($item['id'], '');
- Term::insertFromFileFieldByItemId($item['id'], '');
+ Category::storeTextByURIId($item['uri-id'], $item['uid'], '');
self::deleteThread($item['id'], $item['parent-uri']);
if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
return true;
}
- private static function deleteTagsFromItem($item)
- {
- if (($item["verb"] != Activity::TAG) || ($item["object-type"] != Activity\ObjectType::TAGTERM)) {
- return;
- }
-
- $xo = XML::parseString($item["object"], false);
- $xt = XML::parseString($item["target"], false);
-
- if ($xt->type != Activity\ObjectType::NOTE) {
- return;
- }
-
- $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
- if (!DBA::isResult($i)) {
- return;
- }
-
- // For tags, the owner cannot remove the tag on the author's copy of the post.
- $owner_remove = ($item["contact-id"] == $i["contact-id"]);
- $author_copy = $item["origin"];
-
- if (($owner_remove && $author_copy) || !$owner_remove) {
- return;
- }
-
- $tags = explode(',', $i["tag"]);
- $newtags = [];
- if (count($tags)) {
- foreach ($tags as $tag) {
- if (trim($tag) !== trim($xo->body)) {
- $newtags[] = trim($tag);
- }
- }
- }
- self::update(['tag' => implode(',', $newtags)], ['id' => $i["id"]]);
- }
private static function guid($item, $notify)
{
$item['deny_gid'] = trim($item['deny_gid'] ?? '');
$item['private'] = intval($item['private'] ?? self::PUBLIC);
$item['body'] = trim($item['body'] ?? '');
- $item['tag'] = trim($item['tag'] ?? '');
$item['attach'] = trim($item['attach'] ?? '');
$item['app'] = trim($item['app'] ?? '');
$item['origin'] = intval($item['origin'] ?? 0);
// Check for hashtags in the body and repair or add hashtag links
self::setHashtags($item);
+ // Store tags from the body if this hadn't been handled previously in the protocol classes
+ if (!Tag::existsForPost($item['uri-id'])) {
+ Tag::storeFromBody($item['uri-id'], $item['body']);
+ }
+
$item['thr-parent'] = $item['parent-uri'];
$notify_type = Delivery::POST;
Logger::log('' . print_r($item,true), Logger::DATA);
- if (array_key_exists('tag', $item)) {
- $tags = $item['tag'];
- unset($item['tag']);
- } else {
- $tags = '';
- }
-
if (array_key_exists('file', $item)) {
$files = $item['file'];
unset($item['file']);
* Due to deadlock issues with the "term" table we are doing these steps after the commit.
* This is not perfect - but a workable solution until we found the reason for the problem.
*/
- if (!empty($tags)) {
- Term::insertFromTagFieldByItemId($current_post, $tags);
- }
-
if (!empty($files)) {
- Term::insertFromFileFieldByItemId($current_post, $files);
+ Category::storeTextByURIId($item['uri-id'], $item['uid'], $files);
}
// In that function we check if this is a forum post. Additionally we delete the item under certain circumstances
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 (DI::config()->get('system', 'local_tags')) {
$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
"#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]);
-
- $item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
- "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]);
}
// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
$newtag = '#[url=' . DI::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
$item["body"] = str_replace($tag, $newtag, $item["body"]);
-
- if (!stristr($item["tag"], "/search?tag=" . $basetag . "]" . $basetag . "[/url]")) {
- if (strlen($item["tag"])) {
- $item["tag"] = ',' . $item["tag"];
- }
- $item["tag"] = $newtag . $item["tag"];
- }
}
// Convert back the masked hashtags
return $recipients;
}
- public static function getFeedTags($item)
- {
- $ret = [];
- $matches = false;
- $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches);
- if ($cnt) {
- for ($x = 0; $x < $cnt; $x ++) {
- if ($matches[1][$x]) {
- $ret[$matches[2][$x]] = ['#', $matches[1][$x], $matches[2][$x]];
- }
- }
- }
- $matches = false;
- $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|', $item['tag'], $matches);
- if ($cnt) {
- for ($x = 0; $x < $cnt; $x ++) {
- if ($matches[1][$x]) {
- $ret[] = ['@', $matches[1][$x], $matches[2][$x]];
- }
- }
- }
- return $ret;
- }
-
public static function expire($uid, $days, $network = "", $force = false)
{
if (!$uid || ($days < 1)) {
return $ev;
}
- $tags = Term::populateTagsFromItem($item);
+ $tags = Tag::populateFromItem($item);
$item['tags'] = $tags['tags'];
$item['hashtags'] = $tags['hashtags'];
projects / friendica.git / blobdiff