if (strpos($a->query_string, ".json")>0) $type="json";
if (strpos($a->query_string, ".rss")>0) $type="rss";
if (strpos($a->query_string, ".atom")>0) $type="atom";
+ if (strpos($a->query_string, ".as")>0) $type="as";
$r = call_user_func($info['func'], $a, $type);
if ($r===false) return;
header ("Content-Type: application/atom+xml");
return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
break;
+ case "as":
+ //header ("Content-Type: application/json");
+ //foreach($r as $rr)
+ // return json_encode($rr);
+ return json_encode($r);
+ break;
}
//echo "<pre>"; var_dump($r); die();
case "atom":
case "rss":
$data = api_rss_extra($a, $data, $user_info);
+ break;
+ case "as":
+ $as = api_format_as($a, $ret, $user_info);
+ $as['title'] = $a->config['sitename']." Home Timeline";
+ $as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+ return($as);
+ break;
}
return api_apply_template("timeline", $type, $data);
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
+ function api_statuses_public_timeline(&$a, $type){
+ if (local_user()===false) return false;
+
+ $user_info = api_get_user($a);
+ // get last newtork messages
+
+
+ // params
+ $count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
+ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
+ if ($page<0) $page=0;
+ $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+ $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
+ //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
+
+ $start = $page*$count;
+
+ //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
+
+ if ($max_id > 0)
+ $sql_extra = 'AND `item`.`id` <= '.intval($max_id);
+
+ /*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+ FROM `item`, `contact`
+ WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+ AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+ AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+ AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
+ AND `contact`.`id` = `item`.`contact-id`
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ $sql_extra
+ AND `item`.`id`>%d
+ ORDER BY `item`.`received` DESC LIMIT %d ,%d ",
+ intval($since_id),
+ intval($start), intval($count)
+ );*/
+ $r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+ `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
+ `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+ `user`.`nickname`, `user`.`hidewall`
+ FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+ WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+ AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
+ AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
+ AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
+ AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ $sql_extra
+ AND `item`.`id`>%d
+ ORDER BY `received` DESC LIMIT %d, %d ",
+ intval($since_id),
+ intval($start),
+ intval($count));
+
+ $ret = api_format_items($r,$user_info);
+
+
+ $data = array('$statuses' => $ret);
+ switch($type){
+ case "atom":
+ case "rss":
+ $data = api_rss_extra($a, $data, $user_info);
+ break;
+ case "as":
+ $as = api_format_as($a, $ret, $user_info);
+ $as['title'] = $a->config['sitename']." Public Timeline";
+ $as['link']['url'] = $a->get_baseurl()."/";
+ return($as);
+ break;
+ }
+
+ return api_apply_template("timeline", $type, $data);
+ }
+ api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
+
/**
*
*/
case "atom":
case "rss":
$data = api_rss_extra($a, $data, $user_info);
+ break;
+ case "as":
+ $as = api_format_as($a, $ret, $user_info);
+ $as["title"] = $a->config['sitename']." Mentions";
+ $as['link']['url'] = $a->get_baseurl()."/";
+ return($as);
+ break;
}
return api_apply_template("timeline", $type, $data);
api_register_func('api/favorites','api_favorites', true);
+ function api_format_as($a, $ret, $user_info) {
+
+ $as = array();
+ $as['title'] = $a->config['sitename']." Public Timeline";
+ $items = array();
+ foreach ($ret as $item) {
+ $singleitem["actor"]["displayName"] = $item["user"]["name"];
+ $singleitem["actor"]["id"] = $item["user"]["contact_url"];
+ $avatar[0]["url"] = $item["user"]["profile_image_url"];
+ $avatar[0]["rel"] = "avatar";
+ $avatar[0]["type"] = "";
+ $avatar[0]["width"] = 96;
+ $avatar[0]["height"] = 96;
+ $avatar[1]["url"] = $item["user"]["profile_image_url"];
+ $avatar[1]["rel"] = "avatar";
+ $avatar[1]["type"] = "";
+ $avatar[1]["width"] = 48;
+ $avatar[1]["height"] = 48;
+ $avatar[2]["url"] = $item["user"]["profile_image_url"];
+ $avatar[2]["rel"] = "avatar";
+ $avatar[2]["type"] = "";
+ $avatar[2]["width"] = 24;
+ $avatar[2]["height"] = 24;
+ $singleitem["actor"]["avatarLinks"] = $avatar;
+
+ $singleitem["actor"]["image"]["url"] = $item["user"]["profile_image_url"];
+ $singleitem["actor"]["image"]["rel"] = "avatar";
+ $singleitem["actor"]["image"]["type"] = "";
+ $singleitem["actor"]["image"]["width"] = 96;
+ $singleitem["actor"]["image"]["height"] = 96;
+ $singleitem["actor"]["type"] = "person";
+ $singleitem["actor"]["url"] = $item["person"]["contact_url"];
+ $singleitem["actor"]["statusnet:profile_info"]["local_id"] = $item["user"]["id"];
+ $singleitem["actor"]["statusnet:profile_info"]["following"] = $item["user"]["following"] ? "true" : "false";
+ $singleitem["actor"]["statusnet:profile_info"]["blocking"] = "false";
+ $singleitem["actor"]["contact"]["preferredUsername"] = $item["user"]["screen_name"];
+ $singleitem["actor"]["contact"]["displayName"] = $item["user"]["name"];
+ $singleitem["actor"]["contact"]["addresses"] = "";
+
+ $singleitem["body"] = $item["text"];
+ $singleitem["object"]["displayName"] = $item["text"];
+ $singleitem["object"]["id"] = $item["url"];
+ $singleitem["object"]["type"] = "note";
+ $singleitem["object"]["url"] = $item["url"];
+ //$singleitem["context"] =;
+ $singleitem["postedTime"] = date("c", strtotime($item["published"]));
+ $singleitem["provider"]["objectType"] = "service";
+ $singleitem["provider"]["displayName"] = "Test";
+ $singleitem["provider"]["url"] = "http://test.tld";
+ $singleitem["title"] = $item["text"];
+ $singleitem["verb"] = "post";
+ $singleitem["statusnet:notice_info"]["local_id"] = $item["id"];
+ $singleitem["statusnet:notice_info"]["source"] = $item["source"];
+ $singleitem["statusnet:notice_info"]["favorite"] = "false";
+ $singleitem["statusnet:notice_info"]["repeated"] = "false";
+ //$singleitem["original"] = $item;
+ $items[] = $singleitem;
+ }
+ $as['items'] = $items;
+ $as['link']['url'] = $a->get_baseurl()."/".$user_info["screen_name"]."/all";
+ $as['link']['rel'] = "alternate";
+ $as['link']['type'] = "text/html";
+ return($as);
+ }
function api_format_items($r,$user_info) {
$in_reply_to_status_id = 0;
}
+ // Workaround for ostatus messages where the title is identically to the body
+ $statusbody = trim(html2plain(bbcode($item['body']), 0));
+ $statustitle = trim($item['title']);
+
+ if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
+ $statustext = trim($statusbody);
+ else
+ $statustext = trim($statustitle."\n\n".$statusbody);
+
$status = array(
- 'text' => trim($item['title']." \n".html2plain(bbcode($item['body']), 0)),
+ 'text' => $statustext,
'truncated' => False,
'created_at'=> api_date($item['created']),
'in_reply_to_status_id' => $in_reply_to_status_id,
'geo' => '',
'favorited' => $item['starred'] ? true : false,
'user' => $status_user ,
- 'statusnet_html' => bbcode($item['body']),
- 'statusnet_conversation_id' => 0,
+ 'statusnet_html' => trim(bbcode($item['body'])),
+ 'statusnet_conversation_id' => $item['parent'],
);
// Seesmic doesn't like the following content
favorites
favorites/create
favorites/destroy
-statuses/public_timeline
statuses/retweets_of_me
friendships/create
friendships/destroy
$mesg = '';
+<<<<<<< HEAD:include/dba.php
+ // If dbfail.out exists, we will write any failed calls directly to it,
+ // regardless of any logging that may or may nor be in effect.
+ // These usually indicate SQL syntax errors that need to be resolved.
+ if(file_exists('dbfail.out')) {
+ file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
+ }
+ logger('dba: ' . $str );
+ if(FALSE===$result) {
+ $this->throwOrLog(new RuntimeException('dba: ' . $str));
+ return;
+ }
+=======
if($this->mysqli) {
if($this->db->errno)
logger('dba: ' . $this->db->error);
+>>>>>>> upstream/master:include/dba.php
}
elseif(mysql_errno($this->db))
logger('dba: ' . mysql_error($this->db));
$result->free_result();
}
}
+<<<<<<< HEAD:include/dba.php
+
+ /**
+ * starts a transaction. Transactions need to be finished with
+ * commit() or rollback(). Please mind that the db table engine may
+ * not support this.
+ */
+ public function beginTransaction() {
+ if($this->mysqli) {
+ return $this->db->autocommit(false);
+ } else {
+ //no transaction support in mysql module...
+ mysql_query('SET AUTOCOMMIT = 0;', $db);
+ }
+ }
+
+ /**
+ * rollback a transaction. So, rollback anything that was done since the last call
+ * to beginTransaction().
+ */
+ public function rollback() {
+ if($this->mysqli) {
+ return $this->db->rollback();
+ } else {
+ //no transaction support in mysql module...
+ mysql_query('ROLLBACK;', $db);
+ }
+ $this->stopTransaction();
+ }
+
+ /**
+ * commit a transaction. So, write any query to the database.
+ */
+ public function commit() {
+ if($this->mysqli) {
+ return $this->db->commit();
+ } else {
+ //no transaction support in mysql module...
+ mysql_query('COMMIT;', $db);
+ }
+ $this->stopTransaction();
+ }
+
+ private function stopTransaction() {
+ if($this->mysqli) {
+ return $this->db->autocommit(true);
+ } else {
+ //no transaction support in mysql module...
+ mysql_query('SET AUTOCOMMIT = 1;', $db);
+ }
+ }
+
+ public function dbg($dbg) {
+ $this->debug = $dbg;
+ }
+=======
else {
if(mysql_num_rows($result)) {
while($x = mysql_fetch_array($result, MYSQL_ASSOC))
logger('dba: ' . printable(print_r($r, true)));
return($r);
}
+>>>>>>> upstream/master:include/dba.php
public function dbg($dbg) {
$this->debug = $dbg;
-<user>
- <id>$user.id</id>
- <name>$user.name</name>
- <screen_name>$user.screen_name</screen_name>
- <location>$user.location</location>
- <description>$user.description</description>
- <profile_image_url>$user.profile_image_url</profile_image_url>
- <url>$user.url</url>
- <protected>$user.protected</protected>
- <followers_count>$user.followers_count</followers_count>
- <profile_background_color>$user.profile_background_color</profile_background_color>
- <profile_text_color>$user.profile_text_color</profile_text_color>
- <profile_link_color>$user.profile_link_color</profile_link_color>
- <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
- <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
- <friends_count>$user.friends_count</friends_count>
- <created_at>$user.created_at</created_at>
- <favourites_count>$user.favourites_count</favourites_count>
- <utc_offset>$user.utc_offset</utc_offset>
- <time_zone>$user.time_zone</time_zone>
- <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
- <profile_background_tile>$user.profile_background_tile</profile_background_tile>
- <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
- <notifications>$user.notifications</notifications>
- <geo_enabled>$user.geo_enabled</geo_enabled>
- <verified>$user.verified</verified>
- <following>$user.following</following>
- <statuses_count>$user.statuses_count</statuses_count>
- <lang>$user.lang</lang>
- <contributors_enabled>$user.contributors_enabled</contributors_enabled>
- <status>{{ if $user.status }}
+ <user>
+ <id>$user.id</id>
+ <name>$user.name</name>
+ <screen_name>$user.screen_name</screen_name>
+ <location>$user.location</location>
+ <description>$user.description</description>
+ <profile_image_url>$user.profile_image_url</profile_image_url>
+ <url>$user.url</url>
+ <protected>$user.protected</protected>
+ <followers_count>$user.followers_count</followers_count>
+ <friends_count>$user.friends_count</friends_count>
+ <created_at>$user.created_at</created_at>
+ <favourites_count>$user.favourites_count</favourites_count>
+ <utc_offset>$user.utc_offset</utc_offset>
+ <time_zone>$user.time_zone</time_zone>
+ <statuses_count>$user.statuses_count</statuses_count>
+ <following>$user.following</following>
+ <profile_background_color>$user.profile_background_color</profile_background_color>
+ <profile_text_color>$user.profile_text_color</profile_text_color>
+ <profile_link_color>$user.profile_link_color</profile_link_color>
+ <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
+ <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
+ <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
+ <profile_background_tile>$user.profile_background_tile</profile_background_tile>
+ <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
+ <notifications>$user.notifications</notifications>
+ <geo_enabled>$user.geo_enabled</geo_enabled>
+ <verified>$user.verified</verified>
+ <lang>$user.lang</lang>
+ <contributors_enabled>$user.contributors_enabled</contributors_enabled>
+ <status>{{ if $user.status }}
<created_at>$user.status.created_at</created_at>
<id>$user.status.id</id>
<text>$user.status.text</text>
<place>$user.status.place</place>
<contributors>$user.status.contributors</contributors>
{{ endif }}</status>
-</user>
+ </user>