wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.8.x' into cachenonexistent

Browse Source
This commit is contained in:
Evan Prodromou 2009-07-05 11:53:39 -04:00
commit e21d2cfdb5
9 changed files with 166 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
actions/twitapifriendships.php
View File

@ -160,4 +160,85 @@ class TwitapifriendshipsAction extends TwitterapiAction
}
}
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;
}
}
}

2
classes/Fave.php
View File

@ -42,7 +42,7 @@ class Fave extends Memcached_DataObject
$ids = Notice::stream(array('Fave', '_streamDirect'),
array($user_id, $own),
($own) ? 'fave:ids_by_user_own:'.$user_id :
'fave:by_user:'.$user_id,
'fave:ids_by_user:'.$user_id,
$offset, $limit);
return $ids;
}

2
classes/User.php
View File

@ -491,6 +491,8 @@ class User extends Memcached_DataObject
// ;last cache, too
$cache->delete(common_cache_key('fave:ids_by_user:'.$this->id));
$cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last'));
$cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id));
$cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id.';last'));
}
}

2
config.php.sample
View File

@ -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

20
lib/profilelist.php
View File

@ -243,20 +243,20 @@ class ProfileListItem extends Widget
$user = common_current_user();
if (!empty($user) && $this->profile->id != $user->id) {
// Is it a local user? can't remote sub from a list
// XXX: make that possible!
$other = User::staticGet('id', $this->profile->id);
if (!empty($other)) {
$this->out->elementStart('li', 'entity_subscribe');
if ($user->isSubscribed($this->profile)) {
$usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show();
} else {
$this->out->elementStart('li', 'entity_subscribe');
if ($user->isSubscribed($this->profile)) {
$usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show();
} else {
// Is it a local user? can't remote sub from a list
// XXX: make that possible!
$other = User::staticGet('id', $this->profile->id);
if (!empty($other)) {
$sf = new SubscribeForm($this->out, $this->profile);
$sf->show();
}
$this->out->elementEnd('li');
}
$this->out->elementEnd('li');
}
}

2
lib/router.php
View File

@ -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

61
lib/twitterapi.php
View File

@ -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');

6
theme/default/css/display.css
View File

@ -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);
}

6
theme/identica/css/display.css
View File

@ -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);
}