break up monolithic xmppdaemon into multiple queue handlers

[quix0rs-gnu-social.git] / lib / twitterapi.php

diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 30d5bba237f34dd98a3cc26d923b1102a71db2d0..096dee2696060d1f25b7e32e2697a4065cecc233 100644 (file)
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -150,26 +150,6 @@ class TwitterapiAction extends Action {
        function show_twitter_json_users($twitter_users) {
                print(json_encode($twitter_users));
        }
-
-       function show($args, $apidata) {
-               parent::handle($args);
-               
-               $id = $apidata['api_arg'];              
-               $notice = Notice::staticGet($id);
-
-               if ($notice) {
-
-                       if ($apidata['content-type'] == 'xml') { 
-                               $this->show_single_xml_status($notice);
-                       } elseif ($apidata['content-type'] == 'json') {
-                               $this->show_single_json_status($notice);
-                       }
-               } else {
-                       header('HTTP/1.1 404 Not Found');
-               }
-               
-               exit();
-       }
                
        function show_single_xml_status($notice) {
                $this->init_document('xml');
@@ -243,7 +223,7 @@ class TwitterapiAction extends Action {
                        $this->init_twitter_atom();
                        break;
                 default:
-                       $this->client_error(_('Unsupported type'));
+                       $this->client_error(_('Not a supported data format.'));
                        break;
                }
                
@@ -264,7 +244,7 @@ class TwitterapiAction extends Action {
                        $this->end_twitter_rss();
                        break;
                 default:
-                       $this->client_error(_('Unsupported type'));
+                       $this->client_error(_('Not a supported data format.'));
                        break;
                }
                return;
@@ -349,7 +329,7 @@ class TwitterapiAction extends Action {
                        $this->show_twitter_json_users($profile_array);
                        break;
                 default:
-                       $this->client_error(_('not a supported data format'));
+                       $this->client_error(_('Not a supported data format.'));
                        return;
                }
                return;