provide a broken feed for services which require a broken feed
This commit is contained in:
zotlabs
parent
195eb71200
commit
b88be137ca
@ -1,15 +1,15 @@
|
||||
<?php
|
||||
|
||||
namespace Zotlabs\Module;
|
||||
|
||||
|
||||
require_once('include/items.php');
|
||||
|
||||
|
||||
class Feed extends \Zotlabs\Web\Controller {
|
||||
|
||||
function init() {
|
||||
|
||||
$params = array();
|
||||
$params = [];
|
||||
|
||||
$params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE);
|
||||
$params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : '');
|
||||
@ -20,21 +20,22 @@ class Feed extends \Zotlabs\Web\Controller {
|
||||
$params['records'] = ((x($params,'records')) ? intval($params['records']) : 40);
|
||||
$params['direction'] = ((x($params,'direction')) ? dbesc($params['direction']) : 'desc');
|
||||
$params['cat'] = ((x($_REQUEST,'cat')) ? escape_tags($_REQUEST['cat']) : '');
|
||||
$params['compat'] = ((x($_REQUEST,'compat')) ? intval($_REQUEST['compat']) : 0);
|
||||
|
||||
|
||||
$channel = '';
|
||||
if(argc() > 1) {
|
||||
$r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1",
|
||||
dbesc(argv(1))
|
||||
);
|
||||
if(!($r && count($r)))
|
||||
|
||||
if(observer_prohibited(true)) {
|
||||
killme();
|
||||
}
|
||||
|
||||
$channel = $r[0];
|
||||
|
||||
if(observer_prohibited(true))
|
||||
$channel = channelx_by_nick(argv(1));
|
||||
if(! $channel) {
|
||||
killme();
|
||||
}
|
||||
|
||||
logger('mod_feed: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
|
||||
|
||||
logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
|
||||
|
||||
echo get_public_feed($channel,$params);
|
||||
|
||||
@ -43,6 +44,4 @@ class Feed extends \Zotlabs\Web\Controller {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -104,6 +104,12 @@ class Wfinger extends \Zotlabs\Web\Controller {
|
||||
'href' => z_root() . '/profile/' . $r[0]['channel_address'],
|
||||
],
|
||||
|
||||
[
|
||||
'rel' => 'http://schemas.google.com/g/2010#updates-from',
|
||||
'type' => 'application/atom+xml',
|
||||
'href' => z_root() . '/feed/' . $r[0]['channel_address'] . '?f=&compat=1'
|
||||
],
|
||||
|
||||
[
|
||||
'rel' => 'http://webfinger.net/rel/blog',
|
||||
'href' => z_root() . '/channel/' . $r[0]['channel_address'],
|
||||
|
||||
@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
|
||||
'$aliases' => $aliases,
|
||||
'$profile_url' => z_root() . '/channel/' . $r[0]['channel_address'],
|
||||
'$hcard_url' => z_root() . '/hcard/' . $r[0]['channel_address'],
|
||||
'$atom' => z_root() . '/feed/' . $r[0]['channel_address'],
|
||||
'$atom' => z_root() . '/feed/' . $r[0]['channel_address'] . '?f=&compat=1',
|
||||
'$zot_post' => z_root() . '/post/' . $r[0]['channel_address'],
|
||||
'$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'],
|
||||
'$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
|
||||
|
||||
@ -22,24 +22,20 @@ function get_public_feed($channel, $params) {
|
||||
*/
|
||||
|
||||
if(! $params)
|
||||
$params = array();
|
||||
$params = [];
|
||||
|
||||
$params['type'] = ((x($params,'type')) ? $params['type'] : 'xml');
|
||||
$params['begin'] = ((x($params,'begin')) ? $params['begin'] : NULL_DATE);
|
||||
$params['end'] = ((x($params,'end')) ? $params['end'] : datetime_convert('UTC','UTC','now'));
|
||||
$params['start'] = ((x($params,'start')) ? $params['start'] : 0);
|
||||
$params['records'] = ((x($params,'records')) ? $params['records'] : 40);
|
||||
$params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc');
|
||||
$params['direction'] = ((x($params,'direction'))? $params['direction'] : 'desc');
|
||||
$params['pages'] = ((x($params,'pages')) ? intval($params['pages']) : 0);
|
||||
$params['top'] = ((x($params,'top')) ? intval($params['top']) : 0);
|
||||
$params['cat'] = ((x($params,'cat')) ? $params['cat'] : '');
|
||||
$params['compat'] = ((x($params,'compat')) ? intval($params['compat']) : 0);
|
||||
|
||||
|
||||
// put a sane lower limit on feed requests if not specified
|
||||
|
||||
// if($params['begin'] <= NULL_DATE)
|
||||
// $params['begin'] = datetime_convert('UTC','UTC','now - 1 month');
|
||||
|
||||
switch($params['type']) {
|
||||
case 'json':
|
||||
header("Content-type: application/atom+json");
|
||||
@ -61,6 +57,7 @@ function get_public_feed($channel, $params) {
|
||||
* @param array $params
|
||||
* @return string with an atom feed
|
||||
*/
|
||||
|
||||
function get_feed_for($channel, $observer_hash, $params) {
|
||||
|
||||
if(! $channel)
|
||||
@ -74,18 +71,24 @@ function get_feed_for($channel, $observer_hash, $params) {
|
||||
http_status_exit(403);
|
||||
}
|
||||
|
||||
// logger('params: ' . print_r($params,true));
|
||||
|
||||
$feed_template = get_markup_template('atom_feed.tpl');
|
||||
|
||||
$atom = '';
|
||||
|
||||
$feed_author = '';
|
||||
if(intval($params['compat']) === 1) {
|
||||
$feed_author = atom_author('author',$channel['channel_address'],$channel['xchan_url'],300,300,$channel['xchan_photo_mimetype'],$channel['xchan_photo_l']);
|
||||
}
|
||||
|
||||
$atom .= replace_macros($feed_template, array(
|
||||
'$version' => xmlify(Zotlabs\Lib\System::get_project_version()),
|
||||
'$red' => xmlify(Zotlabs\Lib\System::get_platform_name()),
|
||||
'$feed_id' => xmlify($channel['xchan_url']),
|
||||
'$feed_title' => xmlify($channel['channel_name']),
|
||||
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
|
||||
'$hub' => '', // feed_hublinks(),
|
||||
'$salmon' => '', // feed_salmonlinks($channel['channel_address']),
|
||||
'$author' => $feed_author,
|
||||
'$name' => xmlify($channel['channel_name']),
|
||||
'$profile_page' => xmlify($channel['xchan_url']),
|
||||
'$mimephoto' => xmlify($channel['xchan_photo_mimetype']),
|
||||
@ -107,18 +110,21 @@ function get_feed_for($channel, $observer_hash, $params) {
|
||||
// a much simpler interface
|
||||
call_hooks('atom_feed', $atom);
|
||||
|
||||
$items = items_fetch(array(
|
||||
$items = items_fetch(
|
||||
[
|
||||
'wall' => '1',
|
||||
'datequery' => $params['end'],
|
||||
'datequery2' => $params['begin'],
|
||||
'start' => $params['start'], // FIXME
|
||||
'records' => $params['records'], // FIXME
|
||||
'direction' => $params['direction'], // FIXME
|
||||
'start' => intval($params['start']),
|
||||
'records' => intval($params['records']),
|
||||
'direction' => dbesc($params['direction']),
|
||||
'pages' => $params['pages'],
|
||||
'order' => 'post',
|
||||
'order' => dbesc('post'),
|
||||
'top' => $params['top'],
|
||||
'cat' => $params['cat']
|
||||
), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
|
||||
'cat' => $params['cat'],
|
||||
'compat' => $params['compat']
|
||||
], $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module
|
||||
);
|
||||
|
||||
if($items) {
|
||||
$type = 'html';
|
||||
@ -1247,10 +1253,11 @@ function atom_author($tag, $name, $uri, $h, $w, $type, $photo) {
|
||||
$photo = xmlify($photo);
|
||||
|
||||
$o .= "<$tag>\r\n";
|
||||
$o .= "<name>$name</name>\r\n";
|
||||
$o .= "<uri>$uri</uri>\r\n";
|
||||
$o .= '<link rel="photo" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
|
||||
$o .= '<link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
|
||||
$o .= " <id>$uri</id>\r\n";
|
||||
$o .= " <name>$name</name>\r\n";
|
||||
$o .= " <uri>$uri</uri>\r\n";
|
||||
$o .= ' <link rel="photo" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
|
||||
$o .= ' <link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
|
||||
|
||||
call_hooks('atom_author', $o);
|
||||
|
||||
|
||||
@ -3885,6 +3885,10 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
|
||||
}
|
||||
}
|
||||
|
||||
if(intval($arr['compat']) === 1) {
|
||||
$sql_extra = " AND author_xchan = owner_xchan and item_wall = 1 and item_private = 0 ";
|
||||
}
|
||||
|
||||
if ($arr['datequery']) {
|
||||
$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('UTC','UTC',$arr['datequery']))));
|
||||
}
|
||||
|
||||
@ -16,11 +16,8 @@
|
||||
<generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
|
||||
<link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
|
||||
<link rel="alternate" type="text/html" href="{{$profile_page}}" />
|
||||
{{if $hub}}
|
||||
{{$hub}}
|
||||
{{/if}}
|
||||
{{if $salmon}}
|
||||
{{$salmon}}
|
||||
{{if $author}}
|
||||
{{$author}}
|
||||
{{/if}}
|
||||
|
||||
<updated>{{$feed_updated}}</updated>
|
||||
|
||||
Reference in New Issue
Block a user