bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Limit the number of feed entries (Can solve resub problems)

Browse source
This commit is contained in:
Michael 2017-08-23 23:01:37 +00:00
parent 2293757a36
commit 6998897a34
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/ostatus.php
View file

@ -2227,10 +2227,11 @@ class ostatus {
* @param App $a The application class * @param App $a The application class
* @param string $owner_nick Nickname of the feed owner * @param string $owner_nick Nickname of the feed owner
* @param string $last_update Date of the last update * @param string $last_update Date of the last update
* @param integer $max_items Number of maximum items to fetch
* *
* @return string XML feed * @return string XML feed
*/ */
public static function feed(App $a, $owner_nick, &$last_update) { public static function feed(App $a, $owner_nick, &$last_update, $max_items = 300) {
$stamp = microtime(true); $stamp = microtime(true);
$cachekey = "ostatus:feed:".$owner_nick.":".$last_update; $cachekey = "ostatus:feed:".$owner_nick.":".$last_update;
@ -2267,10 +2268,10 @@ class ostatus {
`item`.`author-id` = %d AND `item`.`created` > '%s' AND `item`.`author-id` = %d AND `item`.`created` > '%s' AND
NOT `item`.`deleted` AND NOT `item`.`private` AND NOT `item`.`deleted` AND NOT `item`.`private` AND
`thread`.`network` IN ('%s', '%s') `thread`.`network` IN ('%s', '%s')
ORDER BY `item`.`created` DESC LIMIT 300", ORDER BY `item`.`created` DESC LIMIT %d",
intval($owner["uid"]), intval($owner["id"]), intval($owner["uid"]), intval($owner["id"]),
intval($authorid), dbesc($check_date), intval($authorid), dbesc($check_date),
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN)); dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), intval($max_items));
$doc = new DOMDocument('1.0', 'utf-8'); $doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true; $doc->formatOutput = true;

2
mod/dfrn_poll.php
View file

@ -22,7 +22,7 @@ function dfrn_poll_init(App $a) {
if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) { if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
$nickname = $a->argv[1]; $nickname = $a->argv[1];
header("Content-type: application/atom+xml"); header("Content-type: application/atom+xml");
echo ostatus::feed($a, $nickname, $last_update); echo ostatus::feed($a, $nickname, $last_update, 10);
killme(); killme();
} }