bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4500 from annando/improve-network

Browse source 
Loading of the network page should be faster now
This commit is contained in:
Hypolite Petovan 2018-02-26 09:35:23 -05:00 committed by GitHub
parent b8114f4e9d a700b3a729
commit a64e7a988c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 64 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -39,7 +39,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus'); define('FRIENDICA_CODENAME', 'Asparagus');
define('FRIENDICA_VERSION', '3.6-dev'); define('FRIENDICA_VERSION', '3.6-dev');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1254); define('DB_UPDATE_VERSION', 1255);
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/** /**

3
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 3.6-dev (Asparagus) -- Friendica 3.6-dev (Asparagus)
-- DB_UPDATE_VERSION 1254 -- DB_UPDATE_VERSION 1255
-- ------------------------------------------ -- ------------------------------------------
@ -512,6 +512,7 @@ CREATE TABLE IF NOT EXISTS `item` (
INDEX `uid_id` (`uid`,`id`), INDEX `uid_id` (`uid`,`id`),
INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`), INDEX `uid_contactid_id` (`uid`,`contact-id`,`id`),
INDEX `uid_created` (`uid`,`created`), INDEX `uid_created` (`uid`,`created`),
INDEX `uid_commented` (`uid`,`commented`),
INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`), INDEX `uid_unseen_contactid` (`uid`,`unseen`,`contact-id`),
INDEX `uid_network_received` (`uid`,`network`,`received`), INDEX `uid_network_received` (`uid`,`network`,`received`),
INDEX `uid_network_commented` (`uid`,`network`,`commented`), INDEX `uid_network_commented` (`uid`,`network`,`commented`),

14
include/conversation.php
View file

@ -496,7 +496,7 @@ function item_condition() {
* that are based on unique features of the calling module. * that are based on unique features of the calling module.
* *
*/ */
function conversation(App $a, $items, $mode, $update, $preview = false) { function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented') {
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false); $ssl_state = ((local_user()) ? true : false);
@ -520,6 +520,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$previewing = (($preview) ? ' preview ' : ''); $previewing = (($preview) ? ' preview ' : '');
if ($mode === 'network') { if ($mode === 'network') {
$items = conversation_add_children($items, false, $order);
$profile_owner = local_user(); $profile_owner = local_user();
if (!$update) { if (!$update) {
/* /*
@ -580,7 +581,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
. " var profile_page = 1; </script>"; . " var profile_page = 1; </script>";
} }
} elseif ($mode === 'community') { } elseif ($mode === 'community') {
$items = community_add_items($items); $items = conversation_add_children($items, true, $order);
$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"
@ -899,15 +900,16 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
* *
* @return array items with parents and comments * @return array items with parents and comments
*/ */
function community_add_items($parents) { function conversation_add_children($parents, $block_authors, $order) {
$max_comments = Config::get("system", "max_comments", 100); $max_comments = Config::get("system", "max_comments", 100);
$items = []; $items = [];
$block_sql = $block_authors ? "AND NOT `author`.`hidden` AND NOT `author`.`blocked`" : "";
foreach ($parents AS $parent) { foreach ($parents AS $parent) {
$thread_items = dba::p(item_query()." AND `item`.`uid` = ? $thread_items = dba::p(item_query()." AND `item`.`uid` = ?
AND `item`.`parent-uri` = ? AND `item`.`parent-uri` = ? $block_sql
AND NOT `author`.`hidden` AND NOT `author`.`blocked`
ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1), ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
local_user(), local_user(),
$parent['uri'] $parent['uri']
@ -949,7 +951,7 @@ function community_add_items($parents) {
} }
} }
$items = conv_sort($items, "`commented`"); $items = conv_sort($items, $order);
return $items; return $items;
} }

101
mod/network.php
View file

@ -340,12 +340,12 @@ function networkSetSeen($condition)
* @param integer $update Used for the automatic reloading * @param integer $update Used for the automatic reloading
* @return string HTML of the conversation * @return string HTML of the conversation
*/ */
function networkConversation($a, $items, $mode, $update) function networkConversation($a, $items, $mode, $update, $ordering = '')
{ {
// Set this so that the conversation function can find out contact info for our wall-wall items // Set this so that the conversation function can find out contact info for our wall-wall items
$a->page_contact = $a->contact; $a->page_contact = $a->contact;
$o = conversation($a, $items, $mode, $update); $o = conversation($a, $items, $mode, $update, $ordering);
if (!$update) { if (!$update) {
if (PConfig::get(local_user(), 'system', 'infinite_scroll')) { if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
@ -764,9 +764,10 @@ function networkThreadedView(App $a, $update = 0)
} else { } else {
$sql_extra4 = ''; $sql_extra4 = '';
} }
$r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date` $r = q("SELECT `item`.`uri`, `item`.`parent` AS `item_id`, $sql_order AS `order_date`
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` $sql_post_table
AND (NOT `contact`.`blocked` OR `contact`.`pending`) STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
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` $sql_extra4
AND NOT `item`.`moderated` AND `item`.`unseen` AND NOT `item`.`moderated` AND `item`.`unseen`
$sql_extra3 $sql_extra $sql_range $sql_nets $sql_extra3 $sql_extra $sql_range $sql_nets
@ -774,13 +775,15 @@ function networkThreadedView(App $a, $update = 0)
intval(local_user()) intval(local_user())
); );
} else { } else {
$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`, $sql_order AS `order_date` $r = q("SELECT `item`.`uri`, `thread`.`iid` AS `item_id`, $sql_order AS `order_date`
FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id` FROM `thread` $sql_post_table
AND (NOT `contact`.`blocked` OR `contact`.`pending`) STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted` WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated` AND NOT `thread`.`moderated`
$sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets $sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets
ORDER BY $sql_order DESC $pager_sql", ORDER BY `order_date` DESC $pager_sql",
intval(local_user()) intval(local_user())
); );
} }
@ -790,16 +793,24 @@ function networkThreadedView(App $a, $update = 0)
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$top_limit = current($r)['order_date']; $top_limit = current($r)['order_date'];
$bottom_limit = end($r)['order_date']; $bottom_limit = end($r)['order_date'];
if (empty($_SESSION['network_last_top_limit']) || ($_SESSION['network_last_top_limit'] < $top_limit)) {
$_SESSION['network_last_top_limit'] = $top_limit;
}
} else { } else {
$top_limit = DateTimeFormat::utcNow(); $top_limit = $bottom_limit = DateTimeFormat::utcNow();
$bottom_limit = DateTimeFormat::utcNow();
} }
// When checking for updates we need to fetch from the newest date to the newest date before // When checking for updates we need to fetch from the newest date to the newest date before
if ($update && !empty($_SESSION['network_last_date']) && ($bottom_limit > $_SESSION['network_last_date'])) { // Only do this, when the last stored date isn't too long ago (10 times the update interval)
$browser_update = PConfig::get(local_user(), 'system', 'update_interval', 40000) / 1000;
if (($browser_update > 0) && $update && !empty($_SESSION['network_last_date']) &&
(($bottom_limit < $_SESSION['network_last_date']) || ($top_limit == $bottom_limit)) &&
((time() - $_SESSION['network_last_date_timestamp']) < ($browser_update * 10))) {
$bottom_limit = $_SESSION['network_last_date']; $bottom_limit = $_SESSION['network_last_date'];
} }
$_SESSION['network_last_date'] = $top_limit; $_SESSION['network_last_date'] = defaults($_SESSION, 'network_last_top_limit', $top_limit);
$_SESSION['network_last_date_timestamp'] = time();
if ($last_date > $top_limit) { if ($last_date > $top_limit) {
$top_limit = $last_date; $top_limit = $last_date;
@ -808,58 +819,50 @@ function networkThreadedView(App $a, $update = 0)
$top_limit = DateTimeFormat::utcNow(); $top_limit = DateTimeFormat::utcNow();
} }
$items = dba::p("SELECT `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid` FROM `item` $items = dba::p("SELECT `item`.`uri`, `item`.`id` AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
INNER JOIN (SELECT `oid` FROM `term` WHERE `term` IN STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term` (SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
ON `item`.`id` = `term`.`oid` ON `item`.`id` = `term`.`oid`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ? WHERE `item`.`uid` = 0 AND `item`.$ordering < ? AND `item`.$ordering > ?
AND NOT `author`.`hidden` AND NOT `author`.`blocked`" . $sql_tag_nets, AND NOT `contact`.`hidden` AND NOT `contact`.`blocked`" . $sql_tag_nets,
local_user(), TERM_OBJ_POST, TERM_HASHTAG, $top_limit, $bottom_limit); local_user(), TERM_OBJ_POST, TERM_HASHTAG, $top_limit, $bottom_limit);
$data = dba::inArray($items); $data = dba::inArray($items);
if (count($data) > 0) { if (count($data) > 0) {
logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user()); //$last_date); $tag_top_limit = current($data)['order_date'];
$r = array_merge($data, $r); if ($_SESSION['network_last_date'] < $tag_top_limit) {
$_SESSION['network_last_date'] = $tag_top_limit;
}
logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user().' - '.(int)$update);
$s = [];
foreach ($r as $item) {
$s[$item['uri']] = $item;
}
foreach ($data as $item) {
$s[$item['uri']] = $item;
}
$r = $s;
} }
} }
// Then fetch all the children of the parents that are on this page
$parents_arr = [];
$parents_str = ''; $parents_str = '';
$date_offset = ''; $date_offset = '';
$items = []; $items = $r;
if (DBM::is_result($r)) {
foreach ($r as $rr) { if (DBM::is_result($items)) {
if (!in_array($rr['item_id'], $parents_arr)) { $parents_arr = [];
$parents_arr[] = $rr['item_id'];
foreach ($items as $item) {
if (!in_array($item['item_id'], $parents_arr)) {
$parents_arr[] = $item['item_id'];
} }
} }
$parents_str = implode(', ', $parents_arr); $parents_str = implode(', ', $parents_arr);
// splitted into separate queries to avoid the problem with very long threads
// so always the last X comments are loaded
// This problem can occur expecially with imported facebook posts
$max_comments = Config::get('system', 'max_comments');
if ($max_comments == 0) {
$max_comments = 100;
}
foreach ($parents_arr AS $parents) {
$thread_items = dba::p(item_query() . " 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, $ordering);
} }
if (x($_GET, 'offset')) { if (x($_GET, 'offset')) {
@ -886,7 +889,7 @@ function networkThreadedView(App $a, $update = 0)
$mode = 'network'; $mode = 'network';
$o .= networkConversation($a, $items, $mode, $update); $o .= networkConversation($a, $items, $mode, $update, $ordering);
return $o; return $o;
} }

1
src/Database/DBStructure.php
View file

@ -1191,6 +1191,7 @@ class DBStructure
"uid_id" => ["uid","id"], "uid_id" => ["uid","id"],
"uid_contactid_id" => ["uid","contact-id","id"], "uid_contactid_id" => ["uid","contact-id","id"],
"uid_created" => ["uid","created"], "uid_created" => ["uid","created"],
"uid_commented" => ["uid","commented"],
"uid_unseen_contactid" => ["uid","unseen","contact-id"], "uid_unseen_contactid" => ["uid","unseen","contact-id"],
"uid_network_received" => ["uid","network","received"], "uid_network_received" => ["uid","network","received"],
"uid_network_commented" => ["uid","network","commented"], "uid_network_commented" => ["uid","network","commented"],