clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4514 from annando/update-network 

After a post or "like" only the single thread is now updated
This commit is contained in:
Hypolite Petovan 2018-02-28 07:55:32 -05:00 committed by GitHub
parent 99bea7f4c4 60d00087f0
commit 90f91dcbd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 778 additions and 788 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/network.php
View File

@ -358,7 +358,7 @@ function networkConversation($a, $items, $mode, $update, $ordering = '')
return $o; return $o;
} }
function network_content(App $a, $update = 0) function network_content(App $a, $update = 0, $parent = 0)
{ {
if (!local_user()) { if (!local_user()) {
return Login::form(); return Login::form();
@ -385,7 +385,7 @@ function network_content(App $a, $update = 0)
if ($nouveau) { if ($nouveau) {
$o = networkFlatView($a, $update); $o = networkFlatView($a, $update);
} else { } else {
$o = networkThreadedView($a, $update); $o = networkThreadedView($a, $update, $parent);
} }
return $o; return $o;
@ -476,7 +476,7 @@ function networkFlatView(App $a, $update = 0)
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string HTML of the network content in flat view * @return string HTML of the network content in flat view
*/ */
function networkThreadedView(App $a, $update = 0) function networkThreadedView(App $a, $update, $parent)
{ {
// Rawmode is used for fetching new content at the end of the page // Rawmode is used for fetching new content at the end of the page
$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw')); $rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
@ -759,17 +759,27 @@ function networkThreadedView(App $a, $update = 0)
// Fetch a page full of parent items for this page // Fetch a page full of parent items for this page
if ($update) { if ($update) {
if (Config::get('system', 'like_no_comment')) { if (!empty($parent)) {
$sql_extra4 = " AND `item`.`verb` = '" . ACTIVITY_POST . "'"; // Load only a single thread
$sql_extra4 = "`item`.`id` = ".intval($parent);
} else { } else {
$sql_extra4 = ''; // Load all unseen items
$sql_extra4 = "`item`.`unseen`";
if (Config::get("system", "like_no_comment")) {
$sql_extra4 .= " AND `item`.`verb` = '".ACTIVITY_POST."'";
}
if ($order === 'post') {
// Only show toplevel posts when updating posts in this order mode
$sql_extra4 .= " AND `item`.`id` = `item`.`parent`";
}
} }
$r = q("SELECT `item`.`parent-uri` AS `uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date` $r = q("SELECT `item`.`parent-uri` AS `uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
FROM `item` $sql_post_table FROM `item` $sql_post_table
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`) AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4 WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted`
AND NOT `item`.`moderated` AND `item`.`unseen` AND NOT `item`.`moderated` AND $sql_extra4
$sql_extra3 $sql_extra $sql_range $sql_nets $sql_extra3 $sql_extra $sql_range $sql_nets
ORDER BY `order_date` DESC LIMIT 100", ORDER BY `order_date` DESC LIMIT 100",
intval(local_user()) intval(local_user())

5
mod/update_network.php
View File

@ -12,14 +12,15 @@ require_once "mod/network.php";
function update_network_content(App $a) function update_network_content(App $a)
{ {
$profile_uid = intval($_GET["p"]); $profile_uid = intval($_GET['p']);
$parent = intval($_GET['item']);
header("Content-type: text/html"); header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo "<section>";
if (!PConfig::get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) { if (!PConfig::get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) {
$text = network_content($a, $profile_uid); $text = network_content($a, $profile_uid, $parent);
} else { } else {
$text = ""; $text = "";
} }

1534
view/js/main.js
View File

File diff suppressed because it is too large Load Diff

1
view/theme/frio/js/theme.js
View File

@ -752,6 +752,7 @@ function doLikeAction(ident, verb) {
$.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate ); $.get('like/' + ident.toString() + '?verb=' + verb, NavUpdate );
liking = 1; liking = 1;
force_update = true; force_update = true;
update_item = ident.toString();
} }
// Decodes a hexadecimally encoded binary string // Decodes a hexadecimally encoded binary string