friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

You can now comment on the community page

This commit is contained in:
Michael 2017-12-23 07:33:51 +00:00
parent a8529779c7
commit 5afedb28d4
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/conversation.php
View File

@ -574,10 +574,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
} }
} elseif ($mode === 'community') { } elseif ($mode === 'community') {
$profile_owner = 0; $profile_owner = 0;
if (!$update) { // if (!$update) {
$live_update_div = '<div id="live-community"></div>' . "\r\n" // $live_update_div = '<div id="live-community"></div>' . "\r\n"
. "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; // . "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
} // }
} elseif ($mode === 'search') { } elseif ($mode === 'search') {
$live_update_div = '<div id="live-search"></div>' . "\r\n"; $live_update_div = '<div id="live-search"></div>' . "\r\n";
} }
@ -617,8 +617,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
} else { } else {
$writable = false; $writable = false;
} }
$writable = true;
if ($mode === 'network-new' || $mode === 'search' || $mode === 'community') { if ($mode === 'network-new' || $mode === 'search') {
// || $mode === 'community') {
/* /*
* "New Item View" on network page or search page results * "New Item View" on network page or search page results

29
mod/community.php
View File

@ -114,9 +114,34 @@ function community_getpublicitems($start, $itemspage) {
$r = dba::p("SELECT ".item_fieldlists()." FROM `thread` $r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins(). INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
"WHERE `thread`.`uid` = 0 AND `verb` = ? "WHERE `thread`.`uid` = 0 AND `verb` = ?
ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage), ORDER BY `thread`.`commented` DESC LIMIT ".intval($start).", ".intval($itemspage),
ACTIVITY_POST ACTIVITY_POST
); );
return dba::inArray($r); while ($rr = dba::fetch($r)) {
if (!in_array($rr['item_id'], $parents_arr)) {
$parents_arr[] = $rr['item_id'];
}
}
dba::close();
$max_comments = Config::get("system", "max_comments", 100);
$items = array();
foreach ($parents_arr AS $parents) {
$thread_items = dba::p(item_query()." AND `item`.`uid` = 0
AND `item`.`parent` = ?
ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
$parents
);
if (DBM::is_result($thread_items)) {
$items = array_merge($items, dba::inArray($thread_items));
}
}
$items = conv_sort($items, "`commented`");
return $items;
} }

4
src/Object/Thread.php
View File

@ -66,6 +66,10 @@ class Thread extends BaseObject
$this->profile_owner = $a->profile['uid']; $this->profile_owner = $a->profile['uid'];
$this->writable = can_write_wall($a, $this->profile_owner) || $writable; $this->writable = can_write_wall($a, $this->profile_owner) || $writable;
break; break;
case 'community':
$this->profile_owner = local_user();
$this->writable = $writable;
break;
default: default:
logger('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').', LOGGER_DEBUG); logger('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
return false; return false;