]> git.mxchange.org Git - friendica.git/commitdiff
API: Seesmic is now working. Optimizing text export.
authorMichael Vogel <icarus@dabo.de>
Sun, 18 Mar 2012 16:52:51 +0000 (17:52 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 18 Mar 2012 16:52:51 +0000 (17:52 +0100)
include/api.php
include/html2plain.php
view/api_ratelimit_xml.tpl
view/api_user_xml.tpl

index 013f4b97aebf4a4b289cf4aa43f9a31890cf10e0..8a84ed1de2ae8fb6aef4c0be206552dbaa845945 100755 (executable)
@@ -3,6 +3,7 @@
        require_once("datetime.php");
        require_once("conversation.php");
        require_once("oauth.php");
+       require_once("html2plain.php");
        /* 
         * Twitter-Like API
         *  
                }
 
                $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'],
        }
 
        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']);
                
                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',
                        '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()
                                $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' => ''                                    
                        $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,
                $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`,
        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){
                $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;
 
                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;
        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
                                        '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) ,
                                        
                        );
                
                                '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) ,
                                
                        );
                        
index 2a4cf663913720caeac1bd041c3b6b99f993c3ab..d367d7c1f646e54e1674e554dd47c2fecae04693 100644 (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));
 }
index 42439f8b5f9a3e58d0c82f2e5bd4fa7205923aa9..36ec1993df454bcea5da5e87577b5ff421160226 100755 (executable)
@@ -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>
\ No newline at end of file
+ <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>
index 78cc1f53062440fddb29920453a56b6174898cac..f1e122f3e8a096c5dfc1ef4901e995f2cc5fe454 100755 (executable)
@@ -43,4 +43,4 @@
     <place>$user.status.place</place>
     <contributors>$user.status.contributors</contributors>
   {{ endif }}</status>
-</user>
\ No newline at end of file
+</user>