strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improved option to suppress message flooding by some users.

Browse source
This commit is contained in:
Michael Vogel 2014-07-10 23:13:50 +02:00
parent 6f5bc8d9a7
commit 58c3ac09a3
1 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
mod/community.php
View file

@ -65,25 +65,7 @@ function community_content(&$a, $update = 0) {
} }
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, $r = community_getitems($a->pager['start'], $a->pager['itemspage']);
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
`user`.`nickname`, `user`.`hidewall`
FROM `thread` FORCE INDEX (`wall_private_received`)
INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND `user`.`hidewall` = 0
INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self`
WHERE `thread`.`visible` = 1 AND `thread`.`deleted` = 0 and `thread`.`moderated` = 0
AND `thread`.`private` = 0 AND `thread`.`wall` = 1
ORDER BY `thread`.`received` DESC LIMIT %d, %d ",
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
if(! count($r)) { if(! count($r)) {
info( t('No results.') . EOL); info( t('No results.') . EOL);
@ -93,21 +75,27 @@ function community_content(&$a, $update = 0) {
$maxpostperauthor = get_config('system','max_author_posts_community_page'); $maxpostperauthor = get_config('system','max_author_posts_community_page');
if ($maxpostperauthor != 0) { if ($maxpostperauthor != 0) {
$count = 1;
$previousauthor = ""; $previousauthor = "";
$numposts = 0; $numposts = 0;
$s = array(); $s = array();
foreach ($r AS $row=>$item) { do {
if ($previousauthor == $item["author-link"]) foreach ($r AS $row=>$item) {
++$numposts; if ($previousauthor == $item["author-link"])
else ++$numposts;
$numposts = 0; else
$numposts = 0;
$previousauthor = $item["author-link"]; $previousauthor = $item["author-link"];
if ($numposts < $maxpostperauthor) if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage']))
$s[] = $item; $s[] = $item;
} }
if ((sizeof($s) < $a->pager['itemspage']))
$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
} while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
} else } else
$s = $r; $s = $r;
@ -125,3 +113,26 @@ function community_content(&$a, $update = 0) {
return $o; return $o;
} }
function community_getitems($start, $itemspage) {
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
`user`.`nickname`, `user`.`hidewall`
FROM `thread` FORCE INDEX (`wall_private_received`)
INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND `user`.`hidewall` = 0
INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self`
WHERE `thread`.`visible` = 1 AND `thread`.`deleted` = 0 and `thread`.`moderated` = 0
AND `thread`.`private` = 0 AND `thread`.`wall` = 1
ORDER BY `thread`.`received` DESC LIMIT %d, %d ",
intval($start),
intval($itemspage)
);
return($r);
}