Browse Source

API: Seesmic is now working. Optimizing text export.

pull/184/head
Michael Vogel 9 years ago
parent
commit
6f10142b2e
4 changed files with 164 additions and 59 deletions
  1. +140
    -43
      include/api.php
  2. +18
    -11
      include/html2plain.php
  3. +5
    -4
      view/api_ratelimit_xml.tpl
  4. +1
    -1
      view/api_user_xml.tpl

+ 140
- 43
include/api.php View File

@ -3,6 +3,7 @@
require_once("datetime.php");
require_once("conversation.php");
require_once("oauth.php");
require_once("html2plain.php");
/*
* Twitter-Like API
*
@ -306,10 +307,10 @@
}
$ret = Array(
'id' => intval($uinfo[0]['cid']),
'self' => intval($uinfo[0]['self']),
'uid' => intval($uinfo[0]['uid']),
'id' => intval($uinfo[0]['cid']),
'name' => $uinfo[0]['name'],
'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
'location' => ($usr) ? $usr[0]['default-location'] : '',
'profile_image_url' => $uinfo[0]['micro'],
@ -347,6 +348,8 @@
}
function api_item_get_user(&$a, $item) {
global $usercache;
// The author is our direct contact, in a conversation with us.
if(link_compare($item['url'],$item['author-link'])) {
return api_get_user($a,$item['cid']);
@ -362,27 +365,40 @@
list($nick, $name) = array_map("trim",explode("(",$item['author-name']));
$name=str_replace(")","",$name);
if ($name == '')
$name = $nick;
if ($nick == '')
$nick = $name;
// Generating a random ID
if (!array_key_exists($nick, $usercache))
$usercache[$nick] = mt_rand(2000000, 2100000);
$ret = array(
'uid' => 0,
'id' => 0,
'id' => $usercache[$nick],
'name' => $name,
'screen_name' => $nick,
'location' => '', //$uinfo[0]['default-location'],
'description' => '',
'profile_image_url' => $item['author-avatar'],
'url' => $item['author-link'],
'contact_url' => 0,
'protected' => false, #
'followers_count' => 0,
'friends_count' => 0,
'created_at' => '',
'favourites_count' => 0,
'utc_offset' => 0, #XXX: fix me
'time_zone' => '', //$uinfo[0]['timezone'],
'geo_enabled' => false,
'statuses_count' => 0,
'following' => 1,
'statusnet_blocking' => false,
'notifications' => false,
'uid' => 0,
'contact_url' => 0,
'geo_enabled' => false,
'lang' => 'en', #XXX: fix me
'description' => '',
'followers_count' => 0,
'favourites_count' => 0,
'contributors_enabled' => false,
'follow_request_sent' => false,
'profile_background_color' => 'cfe8f6',
@ -393,7 +409,6 @@
'profile_background_image_url' => '',
'profile_background_tile' => false,
'profile_use_background_image' => false,
'notifications' => false,
'verified' => true, #XXX: fix me
'followers' => '', #XXX: fix me
'status' => array()
@ -591,16 +606,16 @@
$in_reply_to_screen_name = $lastwall['reply_author'];
}
$status_info = array(
'created_at' => api_date($lastwall['created']),
'id' => $lastwall['contact-id'],
'text' => strip_tags(bbcode($lastwall['body'])),
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'text' => html2plain(bbcode($lastwall['body']), 0),
'truncated' => false,
'created_at' => api_date($lastwall['created']),
'in_reply_to_status_id' => $in_reply_to_status_id,
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'id' => $lastwall['contact-id'],
'in_reply_to_user_id' => $in_reply_to_user_id,
'favorited' => false,
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => '',
'favorited' => false,
'coordinates' => $lastwall['coord'],
'place' => $lastwall['location'],
'contributors' => ''
@ -650,7 +665,7 @@
$user_info['status'] = array(
'created_at' => api_date($lastwall['created']),
'id' => $lastwall['contact-id'],
'text' => strip_tags(bbcode($lastwall['body'])),
'text' => html2plain(bbcode($lastwall['body']), 0),
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
'truncated' => false,
'in_reply_to_status_id' => $in_reply_to_status_id,
@ -686,10 +701,13 @@
$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
if ($page<0) $page=0;
$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_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);
$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`,
@ -722,6 +740,47 @@
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
/**
*
* http://developer.twitter.com/doc/get/statuses/show
*
*/
function api_statuses_show(&$a, $type){
if (local_user()===false) return false;
$user_info = api_get_user($a);
// params
$id = intval($a->argv[3]);
logger('API: api_statuses_show: '.$id);
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
$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 `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
$sql_extra
AND `item`.`id`=%d",
intval($id)
);
$ret = api_format_items($r,$user_info);
$data = array('$status' => $ret[0]);
/*switch($type){
case "atom":
case "rss":
$data = api_rss_extra($a, $data, $user_info);
}*/
return api_apply_template("status", $type, $data);
}
api_register_func('api/statuses/show','api_statuses_show', true);
function api_statuses_user_timeline(&$a, $type){
@ -740,7 +799,8 @@
$count = (x($_REQUEST,'count')?$_REQUEST['count']:20);
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
if ($page<0) $page=0;
$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$start = $page*$count;
@ -846,33 +906,56 @@
foreach($r as $item) {
localize_item($item);
$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
if ($item['parent']!=$item['id']) {
$r = q("select `item`.`contact-id`, `contact`.nick from item, contact
where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($item['parent']));
$in_reply_to_screen_name = $r[0]['nick'];
$in_reply_to_user_id = $r[0]['contact-id'];
} else {
$in_reply_to_screen_name = '';
$in_reply_to_user_id = 0;
}
$status = array(
'created_at'=> api_date($item['created']),
'published' => api_date($item['created']),
'updated' => api_date($item['edited']),
'id' => intval($item['id']),
'message_id' => $item['uri'],
'text' => strip_tags(bbcode($item['body'])),
'statusnet_html' => bbcode($item['body']),
'source' => (($item['app']) ? $item['app'] : 'web'),
'url' => ($item['plink']!=''?$item['plink']:$item['author-link']),
'text' => html2plain(bbcode($item['body']), 0),
'truncated' => False,
'created_at'=> api_date($item['created']),
'in_reply_to_status_id' => ($item['parent']!=$item['id']? intval($item['parent']):''),
'in_reply_to_user_id' => '',
'favorited' => $item['starred'] ? true : false,
'in_reply_to_screen_name' => '',
'source' => (($item['app']) ? $item['app'] : 'web'),
'id' => intval($item['id']),
'in_reply_to_user_id' => $in_reply_to_user_id,
'in_reply_to_screen_name' => $in_reply_to_screen_name,
'geo' => '',
'coordinates' => $item['coord'],
'place' => $item['location'],
'contributors' => '',
'annotations' => '',
'entities' => '',
'favorited' => $item['starred'] ? true : false,
'user' => $status_user ,
'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE),
'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST),
'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
'statusnet_html' => bbcode($item['body']),
'statusnet_conversation_id' => 0,
);
// Seesmic doesn't like the following content
if ($_SERVER['HTTP_USER_AGENT'] != 'Seesmic') {
$status2 = array(
'updated' => api_date($item['edited']),
'published' => api_date($item['created']),
'message_id' => $item['uri'],
'url' => ($item['plink']!=''?$item['plink']:$item['author-link']),
'coordinates' => $item['coord'],
'place' => $item['location'],
'contributors' => '',
'annotations' => '',
'entities' => '',
'objecttype' => (($item['object-type']) ? $item['object-type'] : ACTIVITY_OBJ_NOTE),
'verb' => (($item['verb']) ? $item['verb'] : ACTIVITY_POST),
'self' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
'edit' => $a->get_baseurl()."/api/statuses/show/".$item['id'].".".$type,
);
$status = array_merge($status, $status2);
}
$ret[]=$status;
};
return $ret;
@ -882,17 +965,31 @@
function api_account_rate_limit_status(&$a,$type) {
$hash = array(
'reset_time_in_seconds' => strtotime('now + 1 hour'),
'remaining_hits' => (string) 150,
'hourly_limit' => (string) 150,
'reset_time' => datetime_convert('UTC','UTC','now + 1 hour',ATOM_TIME),
'reset_time_in_seconds' => strtotime('now + 1 hour')
);
if ($type == "xml")
$hash['resettime_in_seconds'] = $hash['reset_time_in_seconds'];
return api_apply_template('ratelimit', $type, array('$hash' => $hash));
}
api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
function api_help_test(&$a,$type) {
if ($type == 'xml')
$ok = "true";
else
$ok = "ok";
return api_apply_template('test', $type, array('$ok' => $ok));
}
api_register_func('api/help/test','api_help_test',true);
/**
* https://dev.twitter.com/docs/api/1/get/statuses/friends
* This function is deprecated by Twitter
@ -1075,7 +1172,7 @@
'recipient_screen_name'=> $recipient['screen_name'],
'recipient'=> $recipient,
'text'=> $item['title']."\n".strip_tags(bbcode($item['body'])) ,
'text'=> $item['title']."\n".html2plain(bbcode($item['body']), 0) ,
);
@ -1144,7 +1241,7 @@
'recipient_screen_name'=> $recipient['screen_name'],
'recipient'=> $recipient,
'text'=> $item['title']."\n".strip_tags(bbcode($item['body'])) ,
'text'=> $item['title']."\n".html2plain(bbcode($item['body']), 0) ,
);


+ 18
- 11
include/html2plain.php View File

@ -1,9 +1,13 @@
<?php
require_once "html2bbcode.php";
function breaklines($line, $level)
function breaklines($line, $level, $wraplength = 75)
{
$wraplen = 75-$level;
if ($wraplength == 0)
return($line);
$wraplen = $wraplength-$level;
$newlines = array();
@ -37,7 +41,7 @@ function breaklines($line, $level)
return(implode($newlines, "\n"));
}
function quotelevel($message)
function quotelevel($message, $wraplength = 75)
{
$lines = explode("\n", $message);
@ -65,12 +69,12 @@ function quotelevel($message)
}
if (!$startquote or ($line != ''))
$newlines[] = breaklines($line, $currlevel);
$newlines[] = breaklines($line, $currlevel, $wraplength);
}
return(implode($newlines, "\n"));
}
function html2plain($html)
function html2plain($html, $wraplength = 75)
{
global $lang;
@ -99,7 +103,7 @@ function html2plain($html)
foreach ($result as $treffer) {
if ($treffer[1] == $treffer[2]) {
$search = '<a href="'.$treffer[1].'" target="_blank">'.$treffer[1].'</a>';
$search = '<a href="'.$treffer[1].'" target="external-link">'.$treffer[1].'</a>';
$message = str_replace($search, $treffer[1], $message);
}
}
@ -109,6 +113,7 @@ function html2plain($html)
node2bbcode($doc, 'body', array(), '', '');
// MyBB-Auszeichnungen
/*
node2bbcode($doc, 'span', array('style'=>'text-decoration: underline;'), '_', '_');
node2bbcode($doc, 'span', array('style'=>'font-style: italic;'), '/', '/');
node2bbcode($doc, 'span', array('style'=>'font-weight: bold;'), '*', '*');
@ -117,6 +122,7 @@ function html2plain($html)
node2bbcode($doc, 'b', array(), '*', '*');
node2bbcode($doc, 'i', array(), '/', '/');
node2bbcode($doc, 'u', array(), '_', '_');
*/
node2bbcode($doc, 'blockquote', array(), '[quote]', "[/quote]\n");
@ -143,10 +149,11 @@ function html2plain($html)
node2bbcode($doc, 'h5', array(), "\n\n*", "*\n");
node2bbcode($doc, 'h6', array(), "\n\n*", "*\n");
node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1', '', true);
node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
node2bbcode($doc, 'img', array(), '', '');
// Problem: there is no reliable way to detect if it is a link to a tag or profile
//node2bbcode($doc, 'a', array('href'=>'/(.+)/'), ' $1 ', '', true);
//node2bbcode($doc, 'img', array('alt'=>'/(.+)/'), '$1', '');
//node2bbcode($doc, 'img', array('title'=>'/(.+)/'), '$1', '');
//node2bbcode($doc, 'img', array(), '', '');
node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');
$message = $doc->saveHTML();
@ -173,7 +180,7 @@ function html2plain($html)
$message = str_replace("\n\n\n", "\n\n", $message);
} while ($oldmessage != $message);
$message = quotelevel(trim($message));
$message = quotelevel(trim($message), $wraplength);
return(trim($message));
}


+ 5
- 4
view/api_ratelimit_xml.tpl View File

@ -1,5 +1,6 @@
<hash>
<remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
<hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
<reset-time type="datetime">$hash.reset_time</reset-time>
</hash>
<remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
<hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
<reset-time type="datetime">$hash.reset_time</reset-time>
<reset_time_in_seconds type="integer">$hash.resettime_in_seconds</reset_time_in_seconds>
</hash>

+ 1
- 1
view/api_user_xml.tpl View File

@ -43,4 +43,4 @@
<place>$user.status.place</place>
<contributors>$user.status.contributors</contributors>
{{ endif }}</status>
</user>
</user>

Loading…
Cancel
Save