keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commenting on community timelines is now possible

Browse source
This commit is contained in:
Michael 2018-01-04 10:02:56 +00:00
parent 11cdb25aeb
commit 174a1bb54b
2 changed files with 67 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
include/conversation.php
View file

@ -490,7 +490,6 @@ function item_condition() {
*
*/
function conversation(App $a, $items, $mode, $update, $preview = false) {
require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
@ -575,6 +574,9 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
. " var profile_page = 1; </script>";
}
} elseif ($mode === 'community') {
if (!$community_readonly) {
$items = community_add_items($items);
}
$profile_owner = 0;
// Currently deactivated. Will be activated when we can comment on the community page
// if (!$update) {
@ -614,14 +616,21 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$page_template = get_markup_template("conversation.tpl");
if ($items && count($items)) {
$community_readonly = ($mode === 'community');
// Currently behind a config value. This allows the commenting and sharing of every public item.
if (Config::get('system', 'comment_public') && local_user()) {
$writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA));
if ($mode === 'community') {
$community_readonly = false;
$writable = true;
} else {
$writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA));
}
} else {
$writable = false;
}
if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
if ($mode === 'network-new' || $mode === 'search' || $community_readonly) {
/*
* "New Item View" on network page or search page results
@ -892,6 +901,55 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
return $o;
}
/**
* @brief Add comments to top level entries that had been fetched before
*
* The system will fetch the comments for the local user whenever possible.
* This behaviour is currently needed to allow commenting on Friendica posts.
*
* @param array $parents Parent items
*
* @return array items with parents and comments
*/
function community_add_items($parents) {
$max_comments = Config::get("system", "max_comments", 100);
$items = array();
foreach ($parents AS $parent) {
$thread_items = dba::p(item_query()." AND `item`.`uid` = ?
AND `item`.`parent-uri` = ?
ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
local_user(),
$parent['uri']
);
$comments = dba::inArray($thread_items);
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);
}
if (count($comments) != 0) {
$items = array_merge($items, $comments);
}
}
foreach ($items as $index => $item) {
if ($item['uid'] == 0) {
$items[$index]['writable'] = in_array($item['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS]);
}
}
$items = conv_sort($items, "`commented`");
return $items;
}
function best_link_url($item, &$sparkle, $url = '') {
$best_url = '';

12
src/Object/Post.php
View file

@ -285,6 +285,12 @@ class Post extends BaseObject
if ($shareable) {
$buttons['share'] = array(t('Share this'), t('share'));
}
// If a contact isn't writable, we cannot send a like or dislike to it
if (!$item['writable']) {
unset($buttons["like"]);
unset($buttons["dislike"]);
}
}
$comment = $this->getCommentBox($indent);
@ -322,12 +328,6 @@ class Post extends BaseObject
unset($buttons["like"]);
}
// If a contact isn't writable, we cannot send a like or dislike to it
if (!$item['writable']) {
unset($buttons["like"]);
unset($buttons["dislike"]);
}
$tmp_item = array(
'template' => $this->getTemplate(),
'type' => implode("", array_slice(explode("/", $item['verb']), -1)),