'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',
$fields['vid'] = Verb::getID($fields['verb']);
}
+ if (!empty($fields['edited'])) {
+ $previous = Post::selectFirst(['edited'], $condition);
+ }
+
$rows = Post::update($fields, $condition);
if (is_bool($rows)) {
return $rows;
if (!empty($fields['body'])) {
Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']);
- if ($item['author-network'] != Protocol::DFRN) {
- Post\Media::insertFromRelevantUrl($item['uri-id'], $fields['body']);
- }
-
$content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])];
// Remove all media attachments from the body and store them in the post-media table
// @todo On shared postings (Diaspora style and commented reshare) don't fetch content from the shared part
$content_fields['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $content_fields['raw-body']);
$content_fields['raw-body'] = self::setHashtags($content_fields['raw-body']);
+
+ if ($item['author-network'] != Protocol::DFRN) {
+ Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']);
+ }
+
+ Post\Content::update($item['uri-id'], $content_fields);
}
if (!empty($fields['file'])) {
}
// We only need to notfiy others when it is an original entry from us.
- // Only call the notifier when the item has some content relevant change.
- if ($item['origin'] && in_array('edited', array_keys($fields))) {
+ // Only call the notifier when the item had been edited and records had been changed.
+ if ($item['origin'] && !empty($fields['edited']) && ($previous['edited'] != $fields['edited'])) {
$notify_items[] = $item['id'];
}
}
return true;
}
- private static function guid($item, $notify)
+ public static function guid($item, $notify)
{
if (!empty($item['guid'])) {
return Strings::escapeTags(trim($item['guid']));
// Checking if there is already an item with the same guid
$condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
if (Post::exists($condition)) {
- Logger::notice('Found already existing item', [
- 'guid' => $item['guid'],
- 'uid' => $item['uid'],
- 'network' => $item['network']
- ]);
+ Logger::notice('Found already existing item', $condition);
return true;
}
$condition = ['uri-id' => $item['uri-id'], 'uid' => $item['uid'],
'network' => [$item['network'], Protocol::DFRN]];
if (Post::exists($condition)) {
- Logger::notice('duplicated item with the same uri found.', $item);
+ Logger::notice('duplicated item with the same uri found.', $condition);
return true;
}
if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
$condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
if (Post::exists($condition)) {
- Logger::notice('duplicated item with the same guid found.', $item);
+ Logger::notice('duplicated item with the same guid found.', $condition);
return true;
}
} elseif ($item['network'] == Protocol::OSTATUS) {
public static function isValid(array $item)
{
// When there is no content then we don't post it
- if (($item['body'] . $item['title'] == '') && !Post\Media::existsByURIId($item['uri-id'])) {
+ if (($item['body'] . $item['title'] == '') && (empty($item['uri-id']) || !Post\Media::existsByURIId($item['uri-id']))) {
Logger::notice('No body, no title.');
return false;
}
$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;
+
+ // Trigger automatic reactions for addons
+ $item['api_source'] = true;
+
+ // We have to tell the hooks who we are - this really should be improved
+ if (!local_user()) {
+ $_SESSION['authenticated'] = true;
+ $_SESSION['uid'] = $uid;
+ $dummy_session = true;
+ } else {
+ $dummy_session = false;
+ }
+
Hook::callAll('post_local', $item);
- } else {
+
+ if ($dummy_session) {
+ unset($_SESSION['authenticated']);
+ unset($_SESSION['uid']);
+ }
+ } elseif (!$notify) {
Hook::callAll('post_remote', $item);
}
}
// 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']);
Post\Media::insertFromAttachmentData($item['uri-id'], $item['body']);
- if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) {
- Post\Media::insertFromRelevantUrl($item['uri-id'], $item['body']);
- }
-
// Remove all media attachments from the body and store them in the post-media table
$item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
$item['raw-body'] = self::setHashtags($item['raw-body']);
+ if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) {
+ Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']);
+ }
+
// Check for hashtags in the body and repair or add hashtag links
$item['body'] = self::setHashtags($item['body']);
- // Fill the cache field
- self::putInCache($item);
-
if (stristr($item['verb'], Activity::POKE)) {
$notify_type = Delivery::POKE;
} else {
if (empty($item['event-id'])) {
unset($item['event-id']);
+
+ $ev = Event::fromBBCode($item['body']);
+ if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
+ Logger::info('Event found.');
+ $ev['cid'] = $item['contact-id'];
+ $ev['uid'] = $item['uid'];
+ $ev['uri'] = $item['uri'];
+ $ev['edited'] = $item['edited'];
+ $ev['private'] = $item['private'];
+ $ev['guid'] = $item['guid'];
+ $ev['plink'] = $item['plink'];
+ $ev['network'] = $item['network'];
+ $ev['protocol'] = $item['protocol'] ?? Conversation::PARCEL_UNKNOWN;
+ $ev['direction'] = $item['direction'] ?? Conversation::UNKNOWN;
+ $ev['source'] = $item['source'] ?? '';
+
+ $event = DBA::selectFirst('event', ['id'], ['uri' => $item['uri'], 'uid' => $item['uid']]);
+ if (DBA::isResult($event)) {
+ $ev['id'] = $event['id'];
+ }
+
+ $event_id = Event::store($ev);
+ $item = Event::getItemArrayForImportedId($event_id, $item);
+
+ Logger::info('Event was stored', ['id' => $event_id]);
+ }
}
if (empty($item['causer-id'])) {
Post\Content::insert($item['uri-id'], $item);
}
- // Diaspora signature
+ // Create Diaspora signature
+ if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) {
+ $signed = Diaspora::createCommentSignature($item);
+ if (!empty($signed)) {
+ $item['diaspora_signed_text'] = json_encode($signed);
+ }
+ }
+
if (!empty($item['diaspora_signed_text'])) {
DBA::replace('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $item['diaspora_signed_text']]);
}
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);
Logger::info('The resharer is no forum: quit', ['resharer' => $item['author-id'], 'owner' => $parent['owner-id'], 'author' => $parent['author-id'], 'uid' => $item['uid']]);
return;
}
- self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]);
- Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
- return;
}
- self::update(['owner-id' => $item['author-id'], 'contact-id' => $cid], ['id' => $parent['id']]);
- Logger::info('Change owner of the parent', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'owner-id' => $item['author-id'], 'contact-id' => $cid]);
+ self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]);
+ Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
}
/**
/**
* Store a public item defined by their URI-ID for the given users
*
- * @param integer $uri_id URI-ID of the given item
- * @param integer $uid The user that will receive the item entry
- * @param array $fields Additional fields to be stored
+ * @param integer $uri_id URI-ID of the given item
+ * @param integer $uid The user that will receive the item entry
+ * @param array $fields Additional fields to be stored
+ * @param integer $source_uid User id of the source post
* @return integer stored item id
*/
- public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [])
+ public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [], int $source_uid = 0)
{
- $item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => 0]);
+ if ($uid == $source_uid) {
+ Logger::warning('target UID must not be be equal to the source UID', ['uri-id' => $uri_id, 'uid' => $uid]);
+ return 0;
+ }
+
+ $item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => $source_uid]);
if (!DBA::isResult($item)) {
+ Logger::warning('Item could not be fetched', ['uri-id' => $uri_id, 'uid' => $source_uid]);
return 0;
}
- if (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED)) {
+ if (($source_uid == 0) && (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED))) {
Logger::notice('Item is private or not from a federated network. It will not be stored for the user.', ['uri-id' => $uri_id, 'uid' => $uid, 'private' => $item['private'], 'network' => $item['network']]);
return 0;
}
$item = array_merge($item, $fields);
+ $is_reshare = ($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE);
+
+ if ((($item['gravity'] == GRAVITY_PARENT) || $is_reshare) &&
+ DI::pConfig()->get($uid, 'system', 'accept_only_sharer') &&
+ !Contact::isSharingByURL($item['author-link'], $uid) &&
+ !Contact::isSharingByURL($item['owner-link'], $uid)) {
+ Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid]);
+ return 0;
+ }
+
+ if ((($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) {
+ // Only do an auto complete with the source uid "0" to prevent privavy problems
+ $causer = $item['causer-id'] ?: $item['author-id'];
+ $result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED]);
+ Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]);
+ }
+
$stored = self::storeForUser($item, $uid);
- Logger::info('Public item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]);
+ Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'source-uid' => $source_uid, 'stored' => $stored]);
return $stored;
}
}
unset($item['id']);
- unset($item['parent']);
unset($item['mention']);
unset($item['starred']);
unset($item['unseen']);
unset($item['psid']);
+ unset($item['pinned']);
+ unset($item['ignored']);
+ unset($item['pubmail']);
+ unset($item['forum_mode']);
+
+ unset($item['event-id']);
+ unset($item['hidden']);
+ unset($item['notification-type']);
$item['uid'] = $uid;
$item['origin'] = 0;
$item['contact-id'] = $self['id'];
}
- /// @todo Handling of "event-id"
-
$notify = false;
if ($item['gravity'] == GRAVITY_PARENT) {
$contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
}
}
- $distributed = self::insert($item, $notify, true);
+ $distributed = self::insert($item, $notify);
if (!$distributed) {
- Logger::info("Distributed public item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
+ Logger::info("Distributed item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]);
} else {
- Logger::info('Distributed public item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]);
+ Logger::info('Distributed item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]);
}
return $distributed;
}
$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]);
return '';
}
- $ld = new Language(DI::l10n()->getAvailableLanguages());
+ $availableLanguages = DI::l10n()->getAvailableLanguages();
+ // See https://github.com/friendica/friendica/issues/10511
+ // Persian is manually added to language detection until a persian translation is provided for the interface, at
+ // which point it will be automatically available through `getAvailableLanguages()` and this should be removed.
+ $availableLanguages['fa'] = 'fa';
+
+ $ld = new Language($availableLanguages);
$languages = $ld->detect($naked_body)->limit(0, 3)->close();
if (is_array($languages)) {
return json_encode($languages);
} 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']]);
}
}
return false;
}
+ self::performActivity($item['id'], 'announce', $uid);
+
+ /**
+ * All the following lines are only needed for private forums and compatibility to older systems without AP support.
+ * A possible way would be that the followers list of a forum would always be readable by all followers.
+ * So this would mean that the comment distribution could be done exactly for the intended audience.
+ * Or possibly we could store the receivers that had been in the "announce" message above and use this.
+ */
+
// now change this copy of the post to a forum head message and deliver to all the tgroup members
$self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
if (!DBA::isResult($self)) {
$owner_id = Contact::getIdForURL($self['url']);
// also reset all the privacy bits to the forum default permissions
+ if ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) {
+ $private = self::PRIVATE;
+ } elseif (DI::pConfig()->get($user['uid'], 'system', 'unlisted')) {
+ $private = self::UNLISTED;
+ } else {
+ $private = self::PUBLIC;
+ }
- $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? self::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']);
- self::performActivity($item['id'], 'announce', $uid);
-
return false;
}
$result = true;
}
- // Trigger automatic reactions for addons
- $datarray['api_source'] = true;
-
- // We have to tell the hooks who we are - this really should be improved
- $_SESSION['authenticated'] = true;
- $_SESSION['uid'] = $contact['uid'];
-
return (bool)$result;
}
$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 = '';
}
) {
self::addRedirToImageTags($item);
- $item['rendered-html'] = BBCode::convert($item['body']);
+ $item['rendered-html'] = BBCode::convertForUriId($item['uri-id'], $item['body']);
$item['rendered-hash'] = hash('md5', BBCode::VERSION . '::' . $body);
$hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
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'];
+ $body = $item['body'] ?? '';
+ $shared = BBCode::fetchShareAttributes($body);
+ if (!empty($shared['guid'])) {
+ $shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]);
+ $shared_uri_id = $shared_item['uri-id'] ?? 0;
+ $shared_links = [strtolower($shared_item['plink'] ?? '')];
+ $shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid']);
+ $shared_links = array_merge($shared_links, array_column($shared_attachments['visual'], 'url'));
+ $shared_links = array_merge($shared_links, array_column($shared_attachments['link'], 'url'));
+ $shared_links = array_merge($shared_links, array_column($shared_attachments['additional'], 'url'));
+ $item['body'] = self::replaceVisualAttachments($shared_attachments, $item['body']);
+ } else {
+ $shared_uri_id = 0;
+ $shared_links = [];
+ }
+ $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links);
+ $item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? '');
+
+ $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
+ self::putInCache($item);
+ $item['body'] = $body;
+ $s = $item["rendered-html"];
+
// Compile eventual content filter reasons
$filter_reasons = [];
if (!$is_preview && public_contact() != $item['author-id']) {
$filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']);
}
+ $item['attachments'] = $attachments;
+
$hook_data = [
'item' => $item,
'filter_reasons' => $filter_reasons
unset($hook_data);
}
- $body = $item['body'] ?? '';
- $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
- self::putInCache($item);
- $item['body'] = $body;
- $s = $item["rendered-html"];
-
$hook_data = [
'item' => $item,
'html' => $s,
return $s;
}
- $shared = BBCode::fetchShareAttributes($item['body']);
- if (!empty($shared['guid'])) {
- $shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]);
- $shared_uri_id = $shared_item['uri-id'] ?? 0;
- $shared_links = [strtolower($shared_item['plink'] ?? '')];
- $attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid']);
- $s = self::addVisualAttachments($attachments, $item, $s, true);
- $s = self::addLinkAttachment($attachments, $body, $s, true, []);
- $s = self::addNonVisualAttachments($attachments, $item, $s, true);
- $shared_links = array_merge($shared_links, array_column($attachments['visual'], 'url'));
- $shared_links = array_merge($shared_links, array_column($attachments['link'], 'url'));
- $shared_links = array_merge($shared_links, array_column($attachments['additional'], 'url'));
+ if (!empty($shared_attachments)) {
+ $s = self::addVisualAttachments($shared_attachments, $item, $s, true);
+ $s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, []);
+ $s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
$body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
- } else {
- $shared_uri_id = 0;
- $shared_links = [];
}
- $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'], $shared_links);
$s = self::addVisualAttachments($attachments, $item, $s, false);
- $s = self::addLinkAttachment($attachments, $body, $s, false, $shared_links);
+ $s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links);
$s = self::addNonVisualAttachments($attachments, $item, $s, false);
// Map.
}
// 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);
}
*
* @param string $body
* @param string $url
+ * @param int $type
* @return bool
*/
- public static function containsLink(string $body, string $url)
+ public static function containsLink(string $body, string $url, int $type = 0)
{
// Make sure that for example site parameters aren't used when testing if the link is contained in the body
$urlparts = parse_url($url);
unset($urlparts['fragment']);
$url = Network::unparseURL($urlparts);
+ // Remove media links to only search in embedded content
+ // @todo Check images for image link, audio for audio links, ...
+ if (in_array($type, [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE])) {
+ $body = preg_replace("/\[url=[^\[\]]*\](.*)\[\/url\]/Usi", ' $1 ', $body);
+ }
+
if (strpos($body, $url)) {
return true;
}
return false;
}
+ /**
+ * Replace visual attachments in the body
+ *
+ * @param array $attachments
+ * @param string $body
+ * @return string modified body
+ */
+ private static function replaceVisualAttachments(array $attachments, string $body)
+ {
+ DI::profiler()->startRecording('rendering');
+
+ foreach ($attachments['visual'] as $attachment) {
+ if (!empty($attachment['preview'])) {
+ $body = str_replace($attachment['preview'], Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE), $body);
+ } elseif ($attachment['filetype'] == 'image') {
+ $body = str_replace($attachment['url'], Post\Media::getUrlForId($attachment['id']), $body);
+ }
+ }
+ DI::profiler()->stopRecording();
+ return $body;
+ }
+
/**
* Add visual attachments to the content
*
*/
private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared)
{
- $stamp1 = microtime(true);
+ DI::profiler()->startRecording('rendering');
$leading = '';
$trailing = '';
// @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty.
foreach ($attachments['visual'] as $attachment) {
- if (self::containsLink($item['body'], $attachment['url'])) {
+ if (self::containsLink($item['body'], $attachment['preview'] ?? $attachment['url'], $attachment['type'])) {
continue;
}
- $author = ['uid' => 0, 'id' => $item['author-id'],
- 'network' => $item['author-network'], 'url' => $item['author-link']];
- $the_url = Contact::magicLinkByContact($author, $attachment['url']);
-
if (!empty($attachment['preview'])) {
- $preview_url = Proxy::proxifyUrl(Contact::magicLinkByContact($author, $attachment['preview']));
+ $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE);
} else {
$preview_url = '';
}
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [
'$video' => [
'id' => $attachment['id'],
- 'src' => $the_url,
+ 'src' => $attachment['url'],
'name' => $attachment['name'] ?: $attachment['url'],
'preview' => $preview_url,
'mime' => $attachment['mimetype'],
],
]);
- if ($item['post-type'] == Item::PT_VIDEO) {
+ if (($item['post-type'] ?? null) == Item::PT_VIDEO) {
$leading .= $media;
} else {
$trailing .= $media;
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/audio.tpl'), [
'$audio' => [
'id' => $attachment['id'],
- 'src' => $the_url,
- 'name' => $attachment['name'] ?: $attachment['url'],
+ 'src' => $attachment['url'],
+ 'name' => $attachment['name'] ?: $attachment['url'],
'mime' => $attachment['mimetype'],
],
]);
- if ($item['post-type'] == Item::PT_AUDIO) {
+ if (($item['post-type'] ?? null) == Item::PT_AUDIO) {
$leading .= $media;
} else {
$trailing .= $media;
}
} elseif ($attachment['filetype'] == 'image') {
- if (empty($preview_url) && (max($attachment['width'], $attachment['height']) > 600)) {
- $preview_url = Proxy::proxifyUrl($the_url, false, ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
- }
$media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
'$image' => [
- 'src' => Proxy::proxifyUrl($the_url),
- 'preview' => $preview_url,
- 'attachment' => $attachment,
+ 'src' => Post\Media::getUrlForId($attachment['id']),
+ 'preview' => Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE),
+ 'attachment' => $attachment,
],
]);
// On Diaspora posts the attached pictures are leading
}
}
- DI::profiler()->saveTimestamp($stamp1, 'rendering');
+ DI::profiler()->stopRecording();
return $content;
}
* @param array $ignore_links A list of URLs to ignore
* @return string modified content
*/
- private static function addLinkAttachment(array $attachments, string $body, string $content, bool $shared, array $ignore_links)
+ 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']);
'type' => 'link',
'url' => $attachment['url']];
- if ($preview) {
+ if ($preview && !empty($attachment['preview'])) {
if ($attachment['preview-width'] >= 500) {
- $data['image'] = $attachment['preview'] ?? '';
+ $data['image'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
} else {
- $data['preview'] = $attachment['preview'] ?? '';
+ $data['preview'] = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_MEDIUM);
}
}
$data['author_name'] = '';
}
- if (($data['author_url'] ?? '') && ($data['provider_url'] ?? '')) {
+ if (($data['author_url'] ?? '') == ($data['provider_url'] ?? '')) {
$data['author_url'] = '';
}
} 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'])) {
}
// @todo Use a template
- $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data);
- } elseif (!self::containsLink($content, $data['url'])) {
+ $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid);
+ } elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
$rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [
'$url' => $data['url'],
'$title' => $data['title'],
*/
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;
}
{
$shared = BBCode::fetchShareAttributes($item['body']);
if (empty($shared['link'])) {
- return $item['body'];
+ return $item['body'];
}
-
+
$id = self::fetchByLink($shared['link']);
Logger::info('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'callstack' => System::callstack()]);
if (!$id) {
- return $item['body'];
+ return $item['body'];
}
$shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]);
if (!DBA::isResult($shared_item)) {
- return $item['body'];
+ return $item['body'];
}
$shared_content = BBCode::getShareOpeningTag($shared_item['author-name'], $shared_item['author-link'], $shared_item['author-avatar'], $shared_item['plink'], $shared_item['created'], $shared_item['guid']);
projects / friendica.git / blobdiff