Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

filter approvals

Browse source
This commit is contained in:
Mike Macgirvin 2022-12-23 08:04:43 +11:00
parent 7971740e9c
commit 8a30580279
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Code/Lib/Enotify.php
View file

@ -103,6 +103,10 @@ class Enotify
$additional_mail_header = "";
if (array_key_exists('item', $params)) {
if (in_array($params['item']['verb'], ['Approve', 'Reject'])) {
pop_lang();
return;
}
require_once('include/conversation.php');
// if it's a normal item...
if (array_key_exists('verb', $params['item'])) {

10
Code/Module/Ping.php
View file

@ -60,6 +60,8 @@ class Ping extends Controller
$item_normal = item_normal();
$approvals = " AND NOT verb in ('Accept','Reject') ";
if (local_channel()) {
$vnotify = get_pconfig(local_channel(), 'system', 'vnotify');
$evdays = intval(get_pconfig(local_channel(), 'system', 'evdays'));
@ -169,6 +171,7 @@ class Ping extends Controller
WHERE uid = %d
AND created > '%s'
$seenstr
$approvals
$item_normal
$sql_extra",
intval($sys['channel_id']),
@ -195,6 +198,7 @@ class Ping extends Controller
AND author_xchan != '%s'
AND created > '%s'
$seenstr
$approvals
$item_normal
$sql_extra
ORDER BY created DESC
@ -353,6 +357,7 @@ class Ping extends Controller
AND author_xchan != '%s'
AND edited > '%s'
$seenstr
$approvals
$item_normal_moderate
$sql_extra
ORDER BY created DESC
@ -390,6 +395,7 @@ class Ping extends Controller
AND author_xchan != '%s'
AND edited > '%s'
$seenstr
$approvals
$item_normal_moderate
$sql_extra
ORDER BY created DESC
@ -604,6 +610,7 @@ class Ping extends Controller
"SELECT id, author_xchan FROM item
WHERE uid = %d and edited > '%s'
$seenstr
$approvals
$item_normal
$sql_extra ",
intval(local_channel()),
@ -632,7 +639,8 @@ class Ping extends Controller
$r = q(
"SELECT id, author_xchan FROM item
WHERE item_wall = 1 and uid = %d and edited > '%s'
$seenstr
$seenstr
$approvals
$item_normal
$sql_extra ",
intval(local_channel()),