diff options
| -rw-r--r-- | actions/twitapifriendships.php | 83 | ||||
| -rw-r--r-- | config.php.sample | 2 | ||||
| -rw-r--r-- | lib/router.php | 2 | ||||
| -rw-r--r-- | lib/twitterapi.php | 61 | ||||
| -rw-r--r-- | theme/default/css/display.css | 6 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 6 |
6 files changed, 153 insertions, 7 deletions
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php index 29eb4cc0f..5fb55e9ff 100644 --- a/actions/twitapifriendships.php +++ b/actions/twitapifriendships.php @@ -160,4 +160,85 @@ class TwitapifriendshipsAction extends TwitterapiAction } -}
\ No newline at end of file + function show($args, $apidata) + { + parent::handle($args); + + if (!in_array($apidata['content-type'], array('xml', 'json'))) { + $this->clientError(_('API method not found!'), $code = 404); + return; + } + + $source_id = (int)$this->trimmed('source_id'); + $source_screen_name = $this->trimmed('source_screen_name'); + + // If the source is not specified for an unauthenticated request, + // the method will return an HTTP 403. + + if (empty($source_id) && empty($source_screen_name)) { + if (empty($apidata['user'])) { + $this->clientError(_('Could not determine source user.'), + $code = 403); + return; + } + } + + $source = null; + + if (!empty($source_id)) { + $source = User::staticGet($source_id); + } elseif (!empty($source_screen_name)) { + $source = User::staticGet('nickname', $source_screen_name); + } else { + $source = $apidata['user']; + } + + // If a source or target is specified but does not exist, + // the method will return an HTTP 404. + + if (empty($source)) { + $this->clientError(_('Could not determine source user.'), + $code = 404); + return; + } + + $target_id = (int)$this->trimmed('target_id'); + $target_screen_name = $this->trimmed('target_screen_name'); + + $target = null; + + if (!empty($target_id)) { + $target = User::staticGet($target_id); + } elseif (!empty($target_screen_name)) { + $target = User::staticGet('nickname', $target_screen_name); + } else { + $this->clientError(_('Target user not specified.'), + $code = 403); + return; + } + + if (empty($target)) { + $this->clientError(_('Could not find target user.'), + $code = 404); + return; + } + + $result = $this->twitter_relationship_array($source, $target); + + switch ($apidata['content-type']) { + case 'xml': + $this->init_document('xml'); + $this->show_twitter_xml_relationship($result[relationship]); + $this->end_document('xml'); + break; + case 'json': + $this->init_document('json'); + print json_encode($result); + $this->end_document('json'); + break; + default: + break; + } + } + +} diff --git a/config.php.sample b/config.php.sample index 4f8f715be..57aa6a6c8 100644 --- a/config.php.sample +++ b/config.php.sample @@ -36,7 +36,7 @@ $config['site']['path'] = 'laconica'; // If you want logging sent to a file instead of syslog // $config['site']['logfile'] = '/tmp/laconica.log'; -// Change the syslog facility that Laconica logs to +// Change the syslog facility that Laconica logs to (default is LOG_USER) // $config['syslog']['facility'] = LOG_LOCAL7; // Enables extra log information, for example full details of PEAR DB errors diff --git a/lib/router.php b/lib/router.php index 784ea9882..50b733453 100644 --- a/lib/router.php +++ b/lib/router.php @@ -317,7 +317,7 @@ class Router $m->connect('api/friendships/:method', array('action' => 'api', 'apiaction' => 'friendships'), - array('method' => 'exists(\.(xml|json))')); + array('method' => '(show|exists)(\.(xml|json))')); // Social graph diff --git a/lib/twitterapi.php b/lib/twitterapi.php index f538a0298..40e5b5067 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -278,6 +278,67 @@ class TwitterapiAction extends Action return $twitter_dm; } + function twitter_relationship_array($source, $target) + { + $relationship = array(); + + $relationship['source'] = + $this->relationship_details_array($source, $target); + $relationship['target'] = + $this->relationship_details_array($target, $source); + + return array('relationship' => $relationship); + } + + function relationship_details_array($source, $target) + { + $details = array(); + + $details['screen_name'] = $source->nickname; + $details['followed_by'] = $target->isSubscribed($source); + $details['following'] = $source->isSubscribed($target); + + $notifications = false; + + if ($source->isSubscribed($target)) { + + $sub = Subscription::pkeyGet(array('subscriber' => + $source->id, 'subscribed' => $target->id)); + + if (!empty($sub)) { + $notifications = ($sub->jabber || $sub->sms); + } + } + + $details['notifications_enabled'] = $notifications; + $details['blocking'] = $source->hasBlocked($target); + $details['id'] = $source->id; + + return $details; + } + + function show_twitter_xml_relationship($relationship) + { + $this->elementStart('relationship'); + + foreach($relationship as $element => $value) { + if ($element == 'source' || $element == 'target') { + $this->elementStart($element); + $this->show_xml_relationship_details($value); + $this->elementEnd($element); + } + } + + $this->elementEnd('relationship'); + } + + function show_xml_relationship_details($details) + { + foreach($details as $element => $value) { + $this->element($element, null, $value); + } + } + function show_twitter_xml_status($twitter_status) { $this->elementStart('status'); diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 89197bddb..251d6706b 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -115,12 +115,14 @@ border-color:transparent; background-color:#FFFFFF; } -#site_nav_local_views a { -background-color:rgba(194, 194, 194, 0.5); +#site_nav_local_views li { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); } +#site_nav_local_views a { +background-color:rgba(194, 194, 194, 0.5); +} #site_nav_local_views a:hover { background-color:rgba(255, 255, 255, 0.7); } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 025debf34..42a4573a7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -115,12 +115,14 @@ border-color:transparent; background-color:#FFFFFF; } -#site_nav_local_views a { -background-color:rgba(194, 194, 194, 0.5); +#site_nav_local_views li { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); -webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5); } +#site_nav_local_views a { +background-color:rgba(194, 194, 194, 0.5); +} #site_nav_local_views a:hover { background-color:rgba(255, 255, 255, 0.7); } |