aboutsummaryrefslogtreecommitdiffstats
path: root/mod/zotfeed.php
diff options
context:
space:
mode:
Diffstat (limited to 'mod/zotfeed.php')
-rw-r--r--mod/zotfeed.php17
1 files changed, 14 insertions, 3 deletions
diff --git a/mod/zotfeed.php b/mod/zotfeed.php
index 6519481d2..480e886cd 100644
--- a/mod/zotfeed.php
+++ b/mod/zotfeed.php
@@ -9,24 +9,35 @@ function zotfeed_init(&$a) {
$mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : '');
if(! $mindate)
- $mindate = '0000-00-00 00:00:00';
+ $mindate = datetime_convert('UTC','UTC', 'now - 1 month');
if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
$result['message'] = 'Public access denied';
json_return_and_die($result);
}
+ $observer = $a->get_observer();
+
+
$channel_address = ((argc() > 1) ? argv(1) : '');
if($channel_address) {
- $r = q("select channel_id from channel where channel_address = '%s' limit 1",
- dbesc(argv(1))
+ $r = q("select channel_id, channel_name from channel where channel_address = '%s' and not (channel_pageflags & %d) limit 1",
+ dbesc(argv(1)),
+ intval(PAGE_REMOVED)
);
}
+ else {
+ $x = get_sys_channel();
+ if($x)
+ $r = array($x);
+ }
if(! $r) {
$result['message'] = 'Channel not found.';
json_return_and_die($result);
}
+ logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG);
+
$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],$mindate);
$result['success'] = true;
json_return_and_die($result);