use Friendica\Util\Temporal;
use Friendica\Util\XML;
-require_once "include/acl_selectors.php";
-
function item_extract_images($body) {
$saved_image = [];
/**
* @brief SQL query for items
+ *
+ * @param int $uid user id
*/
-function item_query() {
+function item_query($uid = 0) {
return "SELECT " . item_fieldlists() . " FROM `item` " .
- item_joins() . " WHERE " . item_condition();
+ item_joins($uid) . " WHERE " . item_condition();
}
/**
`item`.`bookmark`,
`item`.`unseen`,
`item`.`deleted`,
-`item`.`origin`,
`item`.`forum_mode`,
`item`.`mention`,
`item`.`global`,
return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
`item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
- `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
+ `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
`item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
- `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
+ `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`origin`,
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
/**
* @brief SQL join for contacts that are needed for displaying items
+ *
+ * @param int $uid user id
*/
-function item_joins() {
- return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND
- (NOT `contact`.`blocked` OR `contact`.`pending`)
- LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
- LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`
- LEFT JOIN `event` ON `event-id` = `event`.`id`";
+function item_joins($uid = 0) {
+ return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`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)
+ INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` AND NOT `author`.`blocked`
+ INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` AND NOT `owner`.`blocked`
+ LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
+ LEFT JOIN `event` ON `event-id` = `event`.`id`",
+ CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid)
+ );
}
/**
* @brief SQL condition for items that are needed for displaying items
*/
function item_condition() {
- return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`";
+ return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) ";
}
/**
* that are based on unique features of the calling module.
*
*/
-function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented') {
+function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false);
$previewing = (($preview) ? ' preview ' : '');
if ($mode === 'network') {
- $items = conversation_add_children($items, false, $order);
+ $items = conversation_add_children($items, false, $order, $uid);
$profile_owner = local_user();
if (!$update) {
/*
$profile_name = $item['author-link'];
}
- $tags = [];
- $hashtags = [];
- $mentions = [];
-
- $searchpath = System::baseUrl()."/search?tag=";
-
- $taglist = dba::select('term', ['type', 'term', 'url'],
- ["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION],
- ['order' => ['tid']]);
-
- while ($tag = dba::fetch($taglist)) {
- if ($tag["url"] == "") {
- $tag["url"] = $searchpath . strtolower($tag["term"]);
- }
-
- $tag["url"] = best_link_url($item, $sp, $tag["url"]);
-
- if ($tag["type"] == TERM_HASHTAG) {
- $hashtags[] = "#<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
- $prefix = "#";
- } elseif ($tag["type"] == TERM_MENTION) {
- $mentions[] = "@<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
- $prefix = "@";
- }
- $tags[] = $prefix."<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
- }
- dba::close($taglist);
+ $tags = \Friendica\Model\Term::populateTagsFromItem($item);
$sp = false;
$profile_link = best_link_url($item, $sp);
list($categories, $folders) = get_cats_and_terms($item);
$profile_name_e = $profile_name;
- $item['title_e'] = $item['title'];
+
+ if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
+ $title_e = ucfirst($item['content-warning']);
+ } else {
+ $title_e = $item['title'];
+ }
+
$body_e = $body;
- $tags_e = $tags;
- $hashtags_e = $hashtags;
- $mentions_e = $mentions;
+ $tags_e = $tags['tags'];
+ $hashtags_e = $tags['hashtags'];
+ $mentions_e = $tags['mentions'];
$location_e = $location;
$owner_name_e = $owner_name;
'sparkle' => $sparkle,
'lock' => $lock,
'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
- 'title' => $item['title_e'],
+ 'title' => $title_e,
'body' => $body_e,
'tags' => $tags_e,
'hashtags' => $hashtags_e,
*
* @return array items with parents and comments
*/
-function conversation_add_children($parents, $block_authors, $order) {
+function conversation_add_children($parents, $block_authors, $order, $uid = 0) {
$max_comments = Config::get('system', 'max_comments', 100);
if ($max_comments > 0) {
$block_sql = $block_authors ? "AND NOT `author`.`hidden` AND NOT `author`.`blocked`" : "";
foreach ($parents AS $parent) {
- $thread_items = dba::p(item_query()." AND `item`.`uid` = ?
- AND `item`.`parent-uri` = ? $block_sql
- ORDER BY `item`.`commented` DESC" . $limit,
- local_user(),
- $parent['uri']
- );
- $comments = dba::inArray($thread_items);
-
- // Check if the original item is in the result.
- // When commenting from the community page there can be incomplete threads
- if (count($comments) > 0) {
- $parent_found = false;
- foreach ($comments as $comment) {
- if ($comment['uri'] == $comment['parent-uri']) {
- $parent_found = true;
- break;
- }
- }
- if (!$parent_found) {
- $comments = [];
- }
- }
+ $thread_items = dba::p(item_query(local_user())."AND `item`.`parent-uri` = ?
+ AND `item`.`uid` IN (0, ?) $block_sql
+ ORDER BY `item`.`uid` ASC, `item`.`commented` DESC" . $limit,
+ $parent['uri'], local_user());
- if (count($comments) == 0) {
- $thread_items = dba::p(item_query()." AND `item`.`uid` = 0
- AND `item`.`parent-uri` = ?
- ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
- $parent['uri']
- );
- $comments = dba::inArray($thread_items);
- }
+ $comments = dba::inArray($thread_items);
if (count($comments) != 0) {
$items = array_merge($items, $comments);
$tpl = get_markup_template("jot.tpl");
$o .= replace_macros($tpl,[
+ '$new_post' => L10n::t('New Post'),
'$return_path' => $query_str,
'$action' => 'item',
'$share' => defaults($x, 'button', L10n::t('Share')),