clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed type to filter in OStatus::feed

This commit is contained in:
Hypolite Petovan 2017-12-30 00:34:50 -05:00
parent 62391d321b
commit a25d07e5e8
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Protocol/OStatus.php
View File

@ -1237,10 +1237,11 @@ class OStatus
* *
* @param object $doc XML document * @param object $doc XML document
* @param array $owner Contact data of the poster * @param array $owner Contact data of the poster
* @param string $filter The related feed filter (activity, posts or comments)
* *
* @return object header root element * @return object header root element
*/ */
private static function addHeader($doc, $owner, $type) private static function addHeader($doc, $owner, $filter)
{ {
$a = get_app(); $a = get_app();
@ -1256,7 +1257,7 @@ class OStatus
$root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET); $root->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
$root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON); $root->setAttribute("xmlns:mastodon", NAMESPACE_MASTODON);
switch ($type) { switch ($filter) {
case 'activity': $title = t('%s\'s timeline', $owner['name']); break; case 'activity': $title = t('%s\'s timeline', $owner['name']); break;
case 'posts' : $title = t('%s\'s posts' , $owner['name']); break; case 'posts' : $title = t('%s\'s posts' , $owner['name']); break;
case 'comments': $title = t('%s\'s comments', $owner['name']); break; case 'comments': $title = t('%s\'s comments', $owner['name']); break;
@ -2088,22 +2089,22 @@ class OStatus
* @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 * @param integer $max_items Number of maximum items to fetch
* @param string $type Type of feed (posts, comments or activity) * @param string $filter Feed items filter (activity, posts or comments)
* @param boolean $nocache Wether to bypass the cache * @param boolean $nocache Wether to bypass caching
* *
* @return string XML feed * @return string XML feed
*/ */
public static function feed($owner_nick, &$last_update, $max_items = 300, $type = 'activity', $nocache = false) public static function feed($owner_nick, &$last_update, $max_items = 300, $filter = 'activity', $nocache = false)
{ {
$stamp = microtime(true); $stamp = microtime(true);
$cachekey = "ostatus:feed:" . $owner_nick . ":" . $type . ":" . $last_update; $cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
$previous_created = $last_update; $previous_created = $last_update;
$result = Cache::get($cachekey); $result = Cache::get($cachekey);
if (!$nocache && !is_null($result)) { if (!$nocache && !is_null($result)) {
logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $type . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG); logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG);
$last_update = $result['last_update']; $last_update = $result['last_update'];
return $result['feed']; return $result['feed'];
} }
@ -2126,11 +2127,11 @@ class OStatus
$authorid = Contact::getIdForURL($owner["url"], 0); $authorid = Contact::getIdForURL($owner["url"], 0);
$sql_extra = ''; $sql_extra = '';
if ($type === 'posts') { if ($filter === 'posts') {
$sql_extra .= ' AND `item`.`id` = `item`.`parent` '; $sql_extra .= ' AND `item`.`id` = `item`.`parent` ';
} }
if ($type === 'comments') { if ($filter === 'comments') {
$sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT));
} }
@ -2158,7 +2159,7 @@ class OStatus
$doc = new DOMDocument('1.0', 'utf-8'); $doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true; $doc->formatOutput = true;
$root = self::addHeader($doc, $owner, $type); $root = self::addHeader($doc, $owner, $filter);
foreach ($items as $item) { foreach ($items as $item) {
if (Config::get('system', 'ostatus_debug')) { if (Config::get('system', 'ostatus_debug')) {
@ -2177,7 +2178,7 @@ class OStatus
$msg = array('feed' => $feeddata, 'last_update' => $last_update); $msg = array('feed' => $feeddata, 'last_update' => $last_update);
Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR); Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $type . ' - ' . $previous_created, LOGGER_DEBUG); logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created, LOGGER_DEBUG);
return $feeddata; return $feeddata;
} }