'writable', 'self', 'cid', 'alias',
'event-created', 'event-edited', 'event-start', 'event-finish',
'event-summary', 'event-desc', 'event-location', 'event-type',
- 'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
+ 'event-nofinish', 'event-ignore', 'event-id',
'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed'
];
'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'];
+ 'event-nofinish', 'event-ignore', 'event-id'];
// All fields in the item table
const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
return true;
}
- private static function guid($item, $notify)
+ public static function guid($item, $notify)
{
if (!empty($item['guid'])) {
- return Strings::escapeTags(trim($item['guid']));
+ return trim($item['guid']);
}
if ($notify) {
// We use "microtime" to keep the arrival order and "mt_rand" to avoid duplicates
$file = 'item-' . round(microtime(true) * 10000) . '-' . mt_rand() . '.msg';
- $spoolpath = get_spoolpath();
+ $spoolpath = System::getSpoolPath();
if ($spoolpath != "") {
$spool = $spoolpath . '/' . $file;
$params = ['order' => ['id' => false]];
$parent = Post::selectFirst($fields, $condition, $params);
+ if (!DBA::isResult($parent) && $item['origin']) {
+ $stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid']);
+ Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]);
+ $parent = Post::selectFirst($fields, $condition, $params);
+ }
+
if (!DBA::isResult($parent)) {
Logger::notice('item parent was not found - ignoring item', ['thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
return [];
'uid' => $parent['uid']];
$params = ['order' => ['id' => false]];
$toplevel_parent = Post::selectFirst($fields, $condition, $params);
+
+ if (!DBA::isResult($toplevel_parent) && $item['origin']) {
+ $stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid']);
+ Logger::info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]);
+ $toplevel_parent = Post::selectFirst($fields, $condition, $params);
+ }
+
if (!DBA::isResult($toplevel_parent)) {
Logger::notice('item top level parent was not found - ignoring item', ['parent-uri-id' => $parent['parent-uri-id'], 'uid' => $parent['uid']]);
return [];
return GRAVITY_UNKNOWN; // Should not happen
}
- public static function insert($item, $notify = false, $dontcache = false)
+ public static function insert(array $item, bool $notify = false, bool $post_local = true)
{
$orig_item = $item;
$item["private"] = self::PRIVATE;
}
- if ($notify) {
+ if ($notify && $post_local) {
$item['edit'] = false;
$item['parent'] = $parent_id;
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
}
- } else {
+ } elseif (!$notify) {
Hook::callAll('post_remote', $item);
}
if (!empty($item['cancel'])) {
- Logger::log('post cancelled by addon.');
+ Logger::notice('post cancelled by addon.');
return 0;
}
}
// Creates or assigns the permission set
- $item['psid'] = PermissionSet::getIdFromACL(
- $item['uid'],
- $item['allow_cid'],
- $item['allow_gid'],
- $item['deny_cid'],
- $item['deny_gid']
- );
+ $item['psid'] = DI::permissionSet()->selectOrCreate(
+ DI::permissionSetFactory()->createFromString(
+ $item['uid'],
+ $item['allow_cid'],
+ $item['allow_gid'],
+ $item['deny_cid'],
+ $item['deny_gid']
+ ))->id;
if (!empty($item['extid'])) {
$item['external-id'] = ItemURI::getIdByURI($item['extid']);
}
$event_id = Event::store($ev);
- $item = Event::getItemArrayForId($event_id, $item);
+ $item = Event::getItemArrayForImportedId($event_id, $item);
Logger::info('Event was stored', ['id' => $event_id]);
}
// Create Diaspora signature
if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
- $signed = Diaspora::createCommentSignature($uid, $item);
+ $signed = Diaspora::createCommentSignature($item);
if (!empty($signed)) {
$item['diaspora_signed_text'] = json_encode($signed);
}
return 0;
}
- if (!$dontcache) {
- if ($notify) {
- Hook::callAll('post_local_end', $posted_item);
- } else {
- Hook::callAll('post_remote_end', $posted_item);
+ if ($notify) {
+ if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) {
+ Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']);
}
+ Hook::callAll('post_local_end', $posted_item);
+ } else {
+ Hook::callAll('post_remote_end', $posted_item);
}
if ($posted_item['gravity'] === GRAVITY_PARENT) {
Post\UserNotification::setNotification($posted_item['uri-id'], $posted_item['uid']);
- check_user_notification($posted_item['uri-id'], $posted_item['uid']);
-
// Distribute items to users who subscribed to their tags
self::distributeByTags($posted_item);
}
}
- $distributed = self::insert($item, $notify, true);
+ $distributed = self::insert($item, $notify);
if (!$distributed) {
Logger::info("Distributed item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
$item['contact-id'] = $item['author-id'];
}
- $public_shadow = self::insert($item, false, true);
+ $public_shadow = self::insert($item);
Logger::info('Stored public shadow', ['thread' => $itemid, 'id' => $public_shadow]);
}
unset($item['post-reason']);
$item['contact-id'] = Contact::getIdForURL($item['author-link']);
- $public_shadow = self::insert($item, false, true);
+ $public_shadow = self::insert($item);
Logger::info('Stored public shadow', ['uri-id' => $item['uri-id'], 'id' => $public_shadow]);
} else {
$condition = ['id' => $arr['contact-id'], 'self' => false];
}
- DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
+ Contact::update(['failed' => false, '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) {
- DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+ Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['owner-id']]);
if ($arr['owner-id'] != $arr['author-id']) {
- DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
+ Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']],
['id' => $arr['author-id']]);
}
}
foreach ($matches as $mtch) {
if (Strings::compareLink($link, $mtch[1]) || Strings::compareLink($dlink, $mtch[1])) {
$mention = true;
- Logger::log('mention found: ' . $mtch[2]);
+ Logger::notice('mention found', ['mention' => $mtch[2]]);
}
}
}
$private = self::PUBLIC;
}
- $psid = PermissionSet::getIdFromACL(
- $user['uid'],
- $user['allow_cid'],
- $user['allow_gid'],
- $user['deny_cid'],
- $user['deny_gid']
- );
+ $permissionSet = DI::permissionSet()->selectOrCreate(
+ DI::permissionSetFactory()->createFromString(
+ $user['uid'],
+ $user['allow_cid'],
+ $user['allow_gid'],
+ $user['deny_cid'],
+ $user['deny_gid']
+ ));
$forum_mode = ($prvgroup ? 2 : 1);
$fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'],
- 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid];
+ 'owner-id' => $owner_id, 'private' => $private, 'psid' => $permissionSet->id];
self::update($fields, ['id' => $item['id']]);
Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, (int)$item['uri-id'], (int)$item['uid']);
++$expired;
}
DBA::close($items);
- Logger::log('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
+ Logger::notice('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
}
public static function firstPostDate($uid, $wall = false)
$item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
if (!DBA::isResult($item)) {
- Logger::log('like: unknown item ' . $item_id);
+ Logger::notice('like: unknown item', ['id' => $item_id]);
return false;
}
$condition = [];
} elseif ($remote_user) {
// Authenticated visitor - fetch the matching permissionsets
- $set = PermissionSet::get($owner_id, $remote_user);
+ $permissionSets = DI::permissionSet()->selectByContactId($remote_user, $owner_id);
if (!empty($set)) {
$condition = ["(`private` != ? OR (`private` = ? AND `wall`
AND `psid` IN (" . implode(', ', array_fill(0, count($set), '?')) . ")))",
self::PRIVATE, self::PRIVATE];
- $condition = array_merge($condition, $set);
+ $condition = array_merge($condition, $permissionSets->column('id'));
}
}
* If pre-verified, the caller is expected to have already
* done this and passed the groups into this function.
*/
- $set = PermissionSet::get($owner_id, $remote_user);
+ $permissionSets = DI::permissionSet()->selectByContactId($remote_user, $owner_id);
if (!empty($set)) {
- $sql_set = sprintf(" OR (" . $table . "`private` = %d AND " . $table . "`wall` AND " . $table . "`psid` IN (", self::PRIVATE) . implode(',', $set) . "))";
+ $sql_set = sprintf(" OR (" . $table . "`private` = %d AND " . $table . "`wall` AND " . $table . "`psid` IN (", self::PRIVATE) . implode(',', $permissionSets->column('id')) . "))";
} else {
$sql_set = '';
}
continue;
}
- if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->contact_id) && ($item['network'] == Protocol::DFRN)) {
+ if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->getContactId()) && ($item['network'] == Protocol::DFRN)) {
$img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]);
$item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
}
$item['hashtags'] = $tags['hashtags'];
$item['mentions'] = $tags['mentions'];
- // Compile eventual content filter reasons
- $filter_reasons = [];
- if (!$is_preview && public_contact() != $item['author-id']) {
- if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) {
- $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
- }
-
- $hook_data = [
- 'item' => $item,
- 'filter_reasons' => $filter_reasons
- ];
- Hook::callAll('prepare_body_content_filter', $hook_data);
- $filter_reasons = $hook_data['filter_reasons'];
- unset($hook_data);
- }
-
$body = $item['body'] ?? '';
$shared = BBCode::fetchShareAttributes($body);
if (!empty($shared['guid'])) {
$item['body'] = $body;
$s = $item["rendered-html"];
+ // Compile eventual content filter reasons
+ $filter_reasons = [];
+ if (!$is_preview && public_contact() != $item['author-id']) {
+ if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) {
+ $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
+ }
+
+ $item['attachments'] = $attachments;
+
+ $hook_data = [
+ 'item' => $item,
+ 'filter_reasons' => $filter_reasons
+ ];
+ Hook::callAll('prepare_body_content_filter', $hook_data);
+ $filter_reasons = $hook_data['filter_reasons'];
+ unset($hook_data);
+ }
+
$hook_data = [
'item' => $item,
'html' => $s,
}
// Replace friendica image url size with theme preference.
- if (!empty($a->theme_info['item_image_size'])) {
- $ps = $a->theme_info['item_image_size'];
+ if (!empty($a->getThemeInfoValue('item_image_size'))) {
+ $ps = $a->getThemeInfoValue('item_image_size');
$s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
}
*/
private static function replaceVisualAttachments(array $attachments, string $body)
{
- $stamp1 = microtime(true);
+ DI::profiler()->startRecording('rendering');
foreach ($attachments['visual'] as $attachment) {
if (!empty($attachment['preview'])) {
$body = str_replace($attachment['url'], Post\Media::getUrlForId($attachment['id']), $body);
}
}
- DI::profiler()->saveTimestamp($stamp1, 'rendering');
+ DI::profiler()->stopRecording();
return $body;
}
*/
private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared)
{
- $stamp1 = microtime(true);
+ DI::profiler()->startRecording('rendering');
$leading = '';
$trailing = '';
}
}
- DI::profiler()->saveTimestamp($stamp1, 'rendering');
+ DI::profiler()->stopRecording();
return $content;
}
*/
private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links)
{
- $stamp1 = microtime(true);
+ DI::profiler()->startRecording('rendering');
// @ToDo Check only for audio and video
$preview = empty($attachments['visual']);
} elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
$data = BBCode::getAttachmentData($match[1]);
}
- DI::profiler()->saveTimestamp($stamp1, 'rendering');
+ DI::profiler()->stopRecording();
if (isset($data['url']) && !in_array($data['url'], $ignore_links)) {
if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview'])) {
*/
private static function addNonVisualAttachments(array $attachments, array $item, string $content)
{
- $stamp1 = microtime(true);
+ DI::profiler()->startRecording('rendering');
$trailing = '';
foreach ($attachments['additional'] as $attachment) {
if (strpos($item['body'], $attachment['url'])) {
$content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
}
- DI::profiler()->saveTimestamp($stamp1, 'rendering');
+ DI::profiler()->stopRecording();
return $content;
}
projects / friendica.git / blobdiff