diff options
| -rw-r--r-- | include/api.php | 180 | ||||
| -rw-r--r-- | include/conversation.php | 5 | ||||
| -rw-r--r-- | include/dba.php | 4 | ||||
| -rw-r--r-- | include/html2plain.php | 2 | ||||
| -rw-r--r-- | mod/photo.php | 29 | ||||
| -rw-r--r-- | view/api_timeline_xml.tpl | 42 | ||||
| -rw-r--r-- | view/api_user_xml.tpl | 64 |
7 files changed, 259 insertions, 67 deletions
diff --git a/include/api.php b/include/api.php index 968a64a6d..0885a1434 100644 --- a/include/api.php +++ b/include/api.php @@ -121,6 +121,7 @@ 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; @@ -144,6 +145,12 @@ 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(); @@ -737,6 +744,13 @@ 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); @@ -744,6 +758,85 @@ 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); + /** * */ @@ -917,6 +1010,13 @@ 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); @@ -1035,6 +1135,70 @@ 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) { @@ -1069,8 +1233,17 @@ $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, @@ -1081,8 +1254,8 @@ '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 @@ -1449,7 +1622,6 @@ Not implemented by now: favorites favorites/create favorites/destroy -statuses/public_timeline statuses/retweets_of_me friendships/create friendships/destroy diff --git a/include/conversation.php b/include/conversation.php index 5396a125d..f4a564742 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb); - - - - $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : ''); @@ -1089,4 +1085,3 @@ function render_location_google($item) { } return $location; } - diff --git a/include/dba.php b/include/dba.php index 76cc0bc7b..44a663eac 100644 --- a/include/dba.php +++ b/include/dba.php @@ -260,6 +260,4 @@ function dbesc_array(&$arr) { if(is_array($arr) && count($arr)) { array_walk($arr,'dbesc_array_cb'); } -}} - - +}} diff --git a/include/html2plain.php b/include/html2plain.php index 7aa20500a..21261327d 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -157,7 +157,7 @@ function html2plain($html, $wraplength = 75, $compact = false) //node2bbcode($doc, 'ol', array(), "\n[list=1]", "[/list]\n"); node2bbcode($doc, 'li', array(), "\n* ", "\n"); - node2bbcode($doc, 'hr', array(), str_repeat("-", 70), ""); + node2bbcode($doc, 'hr', array(), "\n".str_repeat("-", 70)."\n", ""); node2bbcode($doc, 'tr', array(), "\n", ""); node2bbcode($doc, 'td', array(), "\t", ""); diff --git a/mod/photo.php b/mod/photo.php index 3a7025120..ec53af899 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -4,6 +4,30 @@ require_once('include/security.php'); function photo_init(&$a) { + // To-Do: + // - checking with realpath + // - checking permissions + /* + $cache = get_config('system','itemcache'); + if (($cache != '') and is_dir($cache)) { + $cachefile = $cache."/".$a->argc."-".$a->argv[1]."-".$a->argv[2]."-".$a->argv[3]; + if (file_exists($cachefile)) { + $data = file_get_contents($cachefile); + + if(function_exists('header_remove')) { + header_remove('Pragma'); + header_remove('pragma'); + } + + header("Content-type: image/jpeg"); + header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT"); + header("Cache-Control: max-age=" . (3600*24)); + echo $data; + killme(); + // NOTREACHED + } + }*/ + switch($a->argc) { case 4: $person = $a->argv[3]; @@ -27,6 +51,7 @@ function photo_init(&$a) { if(isset($type)) { + /** * Profile photos */ @@ -144,6 +169,10 @@ function photo_init(&$a) { } } + // Writing in cachefile + if ($cachefile != '') + file_put_contents($cachefile, $data); + if(function_exists('header_remove')) { header_remove('Pragma'); header_remove('pragma'); diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl index 17860ca61..4a32b411b 100644 --- a/view/api_timeline_xml.tpl +++ b/view/api_timeline_xml.tpl @@ -1,22 +1,20 @@ -<statuses type="array"> - {{ for $statuses as $status }} - <status> - <created_at>$status.created_at</created_at> - <id>$status.id</id> - <text>$status.text</text> - <statusnet_html>$status.statusnet_html</statusnet_html> - <source>$status.source</source> - <truncated>$status.truncated</truncated> - <url>$status.url</url> - <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> - <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> - <favorited>$status.favorited</favorited> - <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> - <geo>$status.geo</geo> - <coordinates>$status.coordinates</coordinates> - <place>$status.place</place> - <contributors>$status.contributors</contributors> - {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} - </status> - {{ endfor }} -</statuses>
\ No newline at end of file +<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/"> +{{ for $statuses as $status }} <status> + <text>$status.text</text> + <truncated>$status.truncated</truncated> + <created_at>$status.created_at</created_at> + <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id> + <source>$status.source</source> + <id>$status.id</id> + <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id> + <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name> + <geo>$status.geo</geo> + <favorited>$status.favorited</favorited> +{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} <statusnet:html>$status.statusnet_html</statusnet:html> + <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id> + <url>$status.url</url> + <coordinates>$status.coordinates</coordinates> + <place>$status.place</place> + <contributors>$status.contributors</contributors> + </status> +{{ endfor }}</statuses> diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl index f1e122f3e..d286652c0 100644 --- a/view/api_user_xml.tpl +++ b/view/api_user_xml.tpl @@ -1,34 +1,34 @@ -<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> @@ -43,4 +43,4 @@ <place>$user.status.place</place> <contributors>$user.status.contributors</contributors> {{ endif }}</status> -</user> + </user> |