forked from GNUsocial/gnu-social
Merge branch '0.7.x' into 0.8.x
Resolved Conflicts: lib/queuehandler.php lib/util.php theme/base/css/display.css
This commit is contained in:
Sarven Capadisli
commit
d30df07908
@ -59,7 +59,7 @@ class AccesstokenAction extends Action
|
|||||||
try {
|
try {
|
||||||
common_debug('getting request from env variables', __FILE__);
|
common_debug('getting request from env variables', __FILE__);
|
||||||
common_remove_magic_from_request();
|
common_remove_magic_from_request();
|
||||||
$req = OAuthRequest::from_request('POST', common_locale_url('accesstoken'));
|
$req = OAuthRequest::from_request('POST', common_local_url('accesstoken'));
|
||||||
common_debug('getting a server', __FILE__);
|
common_debug('getting a server', __FILE__);
|
||||||
$server = omb_oauth_server();
|
$server = omb_oauth_server();
|
||||||
common_debug('fetching the access token', __FILE__);
|
common_debug('fetching the access token', __FILE__);
|
||||||
|
|||||||
@ -93,7 +93,7 @@ class AllAction extends ProfileAction
|
|||||||
if (common_logged_in()) {
|
if (common_logged_in()) {
|
||||||
$current_user = common_current_user();
|
$current_user = common_current_user();
|
||||||
if ($this->user->id === $current_user->id) {
|
if ($this->user->id === $current_user->id) {
|
||||||
$message .= _('Try subscribing to more people, [join a group](%%action.groups) or post something yourself.');
|
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
|
||||||
} else {
|
} else {
|
||||||
$message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
|
$message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -130,6 +130,7 @@ class ApiAction extends Action
|
|||||||
'statuses/friends_timeline',
|
'statuses/friends_timeline',
|
||||||
'statuses/friends',
|
'statuses/friends',
|
||||||
'statuses/replies',
|
'statuses/replies',
|
||||||
|
'statuses/mentions',
|
||||||
'statuses/followers',
|
'statuses/followers',
|
||||||
'favorites/favorites');
|
'favorites/favorites');
|
||||||
|
|
||||||
|
|||||||
@ -172,15 +172,54 @@ class NewmessageAction extends Action
|
|||||||
|
|
||||||
$this->notify($user, $this->other, $message);
|
$this->notify($user, $this->other, $message);
|
||||||
|
|
||||||
$url = common_local_url('outbox', array('nickname' => $user->nickname));
|
if ($this->boolean('ajax')) {
|
||||||
|
$this->startHTML('text/xml;charset=utf-8');
|
||||||
|
$this->elementStart('head');
|
||||||
|
$this->element('title', null, _('Message sent'));
|
||||||
|
$this->elementEnd('head');
|
||||||
|
$this->elementStart('body');
|
||||||
|
$this->element('p', array('id' => 'command_result'),
|
||||||
|
sprintf(_('Direct message to %s sent'),
|
||||||
|
$this->other->nickname));
|
||||||
|
$this->elementEnd('body');
|
||||||
|
$this->elementEnd('html');
|
||||||
|
} else {
|
||||||
|
$url = common_local_url('outbox',
|
||||||
|
array('nickname' => $user->nickname));
|
||||||
|
common_redirect($url, 303);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
common_redirect($url, 303);
|
/**
|
||||||
|
* Show an Ajax-y error message
|
||||||
|
*
|
||||||
|
* Goes back to the browser, where it's shown in a popup.
|
||||||
|
*
|
||||||
|
* @param string $msg Message to show
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
|
||||||
|
function ajaxErrorMsg($msg)
|
||||||
|
{
|
||||||
|
$this->startHTML('text/xml;charset=utf-8', true);
|
||||||
|
$this->elementStart('head');
|
||||||
|
$this->element('title', null, _('Ajax Error'));
|
||||||
|
$this->elementEnd('head');
|
||||||
|
$this->elementStart('body');
|
||||||
|
$this->element('p', array('id' => 'error'), $msg);
|
||||||
|
$this->elementEnd('body');
|
||||||
|
$this->elementEnd('html');
|
||||||
}
|
}
|
||||||
|
|
||||||
function showForm($msg = null)
|
function showForm($msg = null)
|
||||||
{
|
{
|
||||||
$this->msg = $msg;
|
if ($msg && $this->boolean('ajax')) {
|
||||||
|
$this->ajaxErrorMsg($msg);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->msg = $msg;
|
||||||
$this->showPage();
|
$this->showPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -133,11 +133,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($user_a->isSubscribed($user_b)) {
|
$result = $user_a->isSubscribed($user_b);
|
||||||
$result = 'true';
|
|
||||||
} else {
|
|
||||||
$result = 'false';
|
|
||||||
}
|
|
||||||
|
|
||||||
switch ($apidata['content-type']) {
|
switch ($apidata['content-type']) {
|
||||||
case 'xml':
|
case 'xml':
|
||||||
|
|||||||
@ -144,10 +144,10 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
break;
|
break;
|
||||||
case 'atom':
|
case 'atom':
|
||||||
if (isset($apidata['api_arg'])) {
|
if (isset($apidata['api_arg'])) {
|
||||||
$selfuri = $selfuri = common_root_url() .
|
$selfuri = common_root_url() .
|
||||||
'api/statuses/friends_timeline/' . $apidata['api_arg'] . '.atom';
|
'api/statuses/friends_timeline/' . $apidata['api_arg'] . '.atom';
|
||||||
} else {
|
} else {
|
||||||
$selfuri = $selfuri = common_root_url() .
|
$selfuri = common_root_url() .
|
||||||
'api/statuses/friends_timeline.atom';
|
'api/statuses/friends_timeline.atom';
|
||||||
}
|
}
|
||||||
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri);
|
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, null, $selfuri);
|
||||||
@ -231,10 +231,10 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
break;
|
break;
|
||||||
case 'atom':
|
case 'atom':
|
||||||
if (isset($apidata['api_arg'])) {
|
if (isset($apidata['api_arg'])) {
|
||||||
$selfuri = $selfuri = common_root_url() .
|
$selfuri = common_root_url() .
|
||||||
'api/statuses/user_timeline/' . $apidata['api_arg'] . '.atom';
|
'api/statuses/user_timeline/' . $apidata['api_arg'] . '.atom';
|
||||||
} else {
|
} else {
|
||||||
$selfuri = $selfuri = common_root_url() .
|
$selfuri = common_root_url() .
|
||||||
'api/statuses/user_timeline.atom';
|
'api/statuses/user_timeline.atom';
|
||||||
}
|
}
|
||||||
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, $suplink, $selfuri);
|
$this->show_atom_timeline($notice, $title, $id, $link, $subtitle, $suplink, $selfuri);
|
||||||
@ -344,7 +344,7 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
$this->show($args, $apidata);
|
$this->show($args, $apidata);
|
||||||
}
|
}
|
||||||
|
|
||||||
function replies($args, $apidata)
|
function mentions($args, $apidata)
|
||||||
{
|
{
|
||||||
|
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
@ -360,11 +360,13 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
$profile = $user->getProfile();
|
$profile = $user->getProfile();
|
||||||
|
|
||||||
$sitename = common_config('site', 'name');
|
$sitename = common_config('site', 'name');
|
||||||
$title = sprintf(_('%1$s / Updates replying to %2$s'), $sitename, $user->nickname);
|
$title = sprintf(_('%1$s / Updates mentioning %2$s'),
|
||||||
|
$sitename, $user->nickname);
|
||||||
$taguribase = common_config('integration', 'taguri');
|
$taguribase = common_config('integration', 'taguri');
|
||||||
$id = "tag:$taguribase:Replies:".$user->id;
|
$id = "tag:$taguribase:Mentions:".$user->id;
|
||||||
$link = common_local_url('replies', array('nickname' => $user->nickname));
|
$link = common_local_url('replies', array('nickname' => $user->nickname));
|
||||||
$subtitle = sprintf(_('%1$s updates that reply to updates from %2$s / %3$s.'), $sitename, $user->nickname, $profile->getBestName());
|
$subtitle = sprintf(_('%1$s updates that reply to updates from %2$s / %3$s.'),
|
||||||
|
$sitename, $user->nickname, $profile->getBestName());
|
||||||
|
|
||||||
if (!$page) {
|
if (!$page) {
|
||||||
$page = 1;
|
$page = 1;
|
||||||
@ -385,7 +387,8 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
|
|
||||||
$since = strtotime($this->arg('since'));
|
$since = strtotime($this->arg('since'));
|
||||||
|
|
||||||
$notice = $user->getReplies((($page-1)*20), $count, $since_id, $before_id, $since);
|
$notice = $user->getReplies((($page-1)*20),
|
||||||
|
$count, $since_id, $before_id, $since);
|
||||||
$notices = array();
|
$notices = array();
|
||||||
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
@ -400,14 +403,10 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
$this->show_rss_timeline($notices, $title, $link, $subtitle);
|
$this->show_rss_timeline($notices, $title, $link, $subtitle);
|
||||||
break;
|
break;
|
||||||
case 'atom':
|
case 'atom':
|
||||||
if (isset($apidata['api_arg'])) {
|
$selfuri = common_root_url() .
|
||||||
$selfuri = $selfuri = common_root_url() .
|
ltrim($_SERVER['QUERY_STRING'], 'p=');
|
||||||
'api/statuses/replies/' . $apidata['api_arg'] . '.atom';
|
$this->show_atom_timeline($notices, $title, $id, $link, $subtitle,
|
||||||
} else {
|
null, $selfuri);
|
||||||
$selfuri = $selfuri = common_root_url() .
|
|
||||||
'api/statuses/replies.atom';
|
|
||||||
}
|
|
||||||
$this->show_atom_timeline($notices, $title, $id, $link, $subtitle, null, $selfuri);
|
|
||||||
break;
|
break;
|
||||||
case 'json':
|
case 'json':
|
||||||
$this->show_json_timeline($notices);
|
$this->show_json_timeline($notices);
|
||||||
@ -418,6 +417,11 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function replies($args, $apidata)
|
||||||
|
{
|
||||||
|
call_user_func(array($this, 'mentions'), $args, $apidata);
|
||||||
|
}
|
||||||
|
|
||||||
function show($args, $apidata)
|
function show($args, $apidata)
|
||||||
{
|
{
|
||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
|
|||||||
@ -82,8 +82,8 @@ class TwitapiusersAction extends TwitterapiAction
|
|||||||
$twitter_user['profile_text_color'] = '';
|
$twitter_user['profile_text_color'] = '';
|
||||||
$twitter_user['profile_link_color'] = '';
|
$twitter_user['profile_link_color'] = '';
|
||||||
$twitter_user['profile_sidebar_fill_color'] = '';
|
$twitter_user['profile_sidebar_fill_color'] = '';
|
||||||
$twitter_user['profile_sidebar_border_color'] = '';
|
$twitter_user['profile_sidebar_border_color'] = '';
|
||||||
$twitter_user['profile_background_tile'] = 'false';
|
$twitter_user['profile_background_tile'] = false;
|
||||||
|
|
||||||
$faves = DB_DataObject::factory('fave');
|
$faves = DB_DataObject::factory('fave');
|
||||||
$faves->user_id = $user->id;
|
$faves->user_id = $user->id;
|
||||||
@ -103,24 +103,16 @@ class TwitapiusersAction extends TwitterapiAction
|
|||||||
|
|
||||||
if (isset($apidata['user'])) {
|
if (isset($apidata['user'])) {
|
||||||
|
|
||||||
if ($apidata['user']->isSubscribed($profile)) {
|
$twitter_user['following'] = $apidata['user']->isSubscribed($profile);
|
||||||
$twitter_user['following'] = 'true';
|
|
||||||
} else {
|
// Notifications on?
|
||||||
$twitter_user['following'] = 'false';
|
$sub = Subscription::pkeyGet(array('subscriber' =>
|
||||||
|
$apidata['user']->id, 'subscribed' => $profile->id));
|
||||||
|
|
||||||
|
if ($sub) {
|
||||||
|
$twitter_user['notifications'] = ($sub->jabber || $sub->sms);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Notifications on?
|
|
||||||
$sub = Subscription::pkeyGet(array('subscriber' =>
|
|
||||||
$apidata['user']->id, 'subscribed' => $profile->id));
|
|
||||||
|
|
||||||
if ($sub) {
|
|
||||||
if ($sub->jabber || $sub->sms) {
|
|
||||||
$twitter_user['notifications'] = 'true';
|
|
||||||
} else {
|
|
||||||
$twitter_user['notifications'] = 'false';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($apidata['content-type'] == 'xml') {
|
if ($apidata['content-type'] == 'xml') {
|
||||||
$this->init_document('xml');
|
$this->init_document('xml');
|
||||||
|
|||||||
@ -206,7 +206,12 @@ class Notice extends Memcached_DataObject
|
|||||||
$notice->saveTags();
|
$notice->saveTags();
|
||||||
$notice->saveGroups();
|
$notice->saveGroups();
|
||||||
|
|
||||||
$notice->addToInboxes();
|
if (common_config('queue', 'enabled')) {
|
||||||
|
$notice->addToAuthorInbox();
|
||||||
|
} else {
|
||||||
|
$notice->addToInboxes();
|
||||||
|
}
|
||||||
|
|
||||||
$notice->query('COMMIT');
|
$notice->query('COMMIT');
|
||||||
|
|
||||||
Event::handle('EndNoticeSave', array($notice));
|
Event::handle('EndNoticeSave', array($notice));
|
||||||
@ -216,7 +221,11 @@ class Notice extends Memcached_DataObject
|
|||||||
# XXX: someone clever could prepend instead of clearing the cache
|
# XXX: someone clever could prepend instead of clearing the cache
|
||||||
|
|
||||||
if (common_config('memcached', 'enabled')) {
|
if (common_config('memcached', 'enabled')) {
|
||||||
$notice->blowCaches();
|
if (common_config('queue', 'enabled')) {
|
||||||
|
$notice->blowAuthorCaches();
|
||||||
|
} else {
|
||||||
|
$notice->blowCaches();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $notice;
|
return $notice;
|
||||||
@ -280,6 +289,17 @@ class Notice extends Memcached_DataObject
|
|||||||
$this->blowGroupCache($blowLast);
|
$this->blowGroupCache($blowLast);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function blowAuthorCaches($blowLast=false)
|
||||||
|
{
|
||||||
|
// Clear the user's cache
|
||||||
|
$cache = common_memcache();
|
||||||
|
if (!empty($cache)) {
|
||||||
|
$cache->delete(common_cache_key('notice_inbox:by_user:'.$this->profile_id));
|
||||||
|
}
|
||||||
|
$this->blowNoticeCache($blowLast);
|
||||||
|
$this->blowPublicCache($blowLast);
|
||||||
|
}
|
||||||
|
|
||||||
function blowGroupCache($blowLast=false)
|
function blowGroupCache($blowLast=false)
|
||||||
{
|
{
|
||||||
$cache = common_memcache();
|
$cache = common_memcache();
|
||||||
@ -296,9 +316,9 @@ class Notice extends Memcached_DataObject
|
|||||||
$member->group_id = $group_inbox->group_id;
|
$member->group_id = $group_inbox->group_id;
|
||||||
if ($member->find()) {
|
if ($member->find()) {
|
||||||
while ($member->fetch()) {
|
while ($member->fetch()) {
|
||||||
$cache->delete(common_cache_key('user:notices_with_friends:' . $member->profile_id));
|
$cache->delete(common_cache_key('notice_inbox:by_user:' . $member->profile_id));
|
||||||
if ($blowLast) {
|
if ($blowLast) {
|
||||||
$cache->delete(common_cache_key('user:notices_with_friends:' . $member->profile_id . ';last'));
|
$cache->delete(common_cache_key('notice_inbox:by_user:' . $member->profile_id . ';last'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -341,9 +361,9 @@ class Notice extends Memcached_DataObject
|
|||||||
'WHERE subscription.subscribed = ' . $this->profile_id);
|
'WHERE subscription.subscribed = ' . $this->profile_id);
|
||||||
|
|
||||||
while ($user->fetch()) {
|
while ($user->fetch()) {
|
||||||
$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
|
$cache->delete(common_cache_key('notice_inbox:by_user:'.$user->id));
|
||||||
if ($blowLast) {
|
if ($blowLast) {
|
||||||
$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
|
$cache->delete(common_cache_key('notice_inbox:by_user:'.$user->id.';last'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$user->free();
|
$user->free();
|
||||||
@ -602,27 +622,80 @@ class Notice extends Memcached_DataObject
|
|||||||
return $wrapper;
|
return $wrapper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getStreamByIds($ids)
|
||||||
|
{
|
||||||
|
$cache = common_memcache();
|
||||||
|
|
||||||
|
if (!empty($cache)) {
|
||||||
|
$notices = array();
|
||||||
|
foreach ($ids as $id) {
|
||||||
|
$notices[] = Notice::staticGet('id', $id);
|
||||||
|
}
|
||||||
|
return new ArrayWrapper($notices);
|
||||||
|
} else {
|
||||||
|
$notice = new Notice();
|
||||||
|
$notice->whereAdd('id in (' . implode(', ', $ids) . ')');
|
||||||
|
$notice->orderBy('id DESC');
|
||||||
|
|
||||||
|
$notice->find();
|
||||||
|
return $notice;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
|
function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
|
||||||
{
|
{
|
||||||
|
$ids = Notice::stream(array('Notice', '_publicStreamDirect'),
|
||||||
|
array(),
|
||||||
|
'public',
|
||||||
|
$offset, $limit, $since_id, $before_id, $since);
|
||||||
|
|
||||||
$parts = array();
|
return Notice::getStreamByIds($ids);
|
||||||
|
}
|
||||||
|
|
||||||
$qry = 'SELECT * FROM notice ';
|
function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
|
||||||
|
{
|
||||||
|
$notice = new Notice();
|
||||||
|
|
||||||
|
$notice->selectAdd(); // clears it
|
||||||
|
$notice->selectAdd('id');
|
||||||
|
|
||||||
|
$notice->orderBy('id DESC');
|
||||||
|
|
||||||
|
if (!is_null($offset)) {
|
||||||
|
$notice->limit($offset, $limit);
|
||||||
|
}
|
||||||
|
|
||||||
if (common_config('public', 'localonly')) {
|
if (common_config('public', 'localonly')) {
|
||||||
$parts[] = 'is_local = 1';
|
$notice->whereAdd('is_local = 1');
|
||||||
} else {
|
} else {
|
||||||
# -1 == blacklisted
|
# -1 == blacklisted
|
||||||
$parts[] = 'is_local != -1';
|
$notice->whereAdd('is_local != -1');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($parts) {
|
if ($since_id != 0) {
|
||||||
$qry .= ' WHERE ' . implode(' AND ', $parts);
|
$notice->whereAdd('id > ' . $since_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Notice::getStream($qry,
|
if ($before_id != 0) {
|
||||||
'public',
|
$notice->whereAdd('id < ' . $before_id);
|
||||||
$offset, $limit, $since_id, $before_id, null, $since);
|
}
|
||||||
|
|
||||||
|
if (!is_null($since)) {
|
||||||
|
$notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
||||||
|
}
|
||||||
|
|
||||||
|
$ids = array();
|
||||||
|
|
||||||
|
if ($notice->find()) {
|
||||||
|
while ($notice->fetch()) {
|
||||||
|
$ids[] = $notice->id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$notice->free();
|
||||||
|
$notice = NULL;
|
||||||
|
|
||||||
|
return $ids;
|
||||||
}
|
}
|
||||||
|
|
||||||
function addToInboxes()
|
function addToInboxes()
|
||||||
@ -648,6 +721,33 @@ class Notice extends Memcached_DataObject
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addToAuthorInbox()
|
||||||
|
{
|
||||||
|
$enabled = common_config('inboxes', 'enabled');
|
||||||
|
|
||||||
|
if ($enabled === true || $enabled === 'transitional') {
|
||||||
|
$user = User::staticGet('id', $this->profile_id);
|
||||||
|
if (empty($user)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$inbox = new Notice_inbox();
|
||||||
|
$UT = common_config('db','type')=='pgsql'?'"user"':'user';
|
||||||
|
$qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
|
||||||
|
"SELECT $UT.id, " . $this->id . ", '" . $this->created . "' " .
|
||||||
|
"FROM $UT " .
|
||||||
|
"WHERE $UT.id = " . $this->profile_id . ' ' .
|
||||||
|
'AND NOT EXISTS (SELECT user_id, notice_id ' .
|
||||||
|
'FROM notice_inbox ' .
|
||||||
|
"WHERE user_id = " . $this->profile_id . ' '.
|
||||||
|
'AND notice_id = ' . $this->id . ' )';
|
||||||
|
if ($enabled === 'transitional') {
|
||||||
|
$qry .= " AND $UT.inboxed = 1";
|
||||||
|
}
|
||||||
|
$inbox->query($qry);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
function saveGroups()
|
function saveGroups()
|
||||||
{
|
{
|
||||||
$enabled = common_config('inboxes', 'enabled');
|
$enabled = common_config('inboxes', 'enabled');
|
||||||
@ -700,24 +800,29 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
// FIXME: do this in an offline daemon
|
// FIXME: do this in an offline daemon
|
||||||
|
|
||||||
$inbox = new Notice_inbox();
|
$this->addToGroupInboxes($group);
|
||||||
$UT = common_config('db','type')=='pgsql'?'"user"':'user';
|
|
||||||
$qry = 'INSERT INTO notice_inbox (user_id, notice_id, created, source) ' .
|
|
||||||
"SELECT $UT.id, " . $this->id . ", '" . $this->created . "', 2 " .
|
|
||||||
"FROM $UT JOIN group_member ON $UT.id = group_member.profile_id " .
|
|
||||||
'WHERE group_member.group_id = ' . $group->id . ' ' .
|
|
||||||
'AND NOT EXISTS (SELECT user_id, notice_id ' .
|
|
||||||
'FROM notice_inbox ' .
|
|
||||||
"WHERE user_id = $UT.id " .
|
|
||||||
'AND notice_id = ' . $this->id . ' )';
|
|
||||||
if ($enabled === 'transitional') {
|
|
||||||
$qry .= " AND $UT.inboxed = 1";
|
|
||||||
}
|
|
||||||
$result = $inbox->query($qry);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addToGroupInboxes($group)
|
||||||
|
{
|
||||||
|
$inbox = new Notice_inbox();
|
||||||
|
$UT = common_config('db','type')=='pgsql'?'"user"':'user';
|
||||||
|
$qry = 'INSERT INTO notice_inbox (user_id, notice_id, created, source) ' .
|
||||||
|
"SELECT $UT.id, " . $this->id . ", '" . $this->created . "', 2 " .
|
||||||
|
"FROM $UT JOIN group_member ON $UT.id = group_member.profile_id " .
|
||||||
|
'WHERE group_member.group_id = ' . $group->id . ' ' .
|
||||||
|
'AND NOT EXISTS (SELECT user_id, notice_id ' .
|
||||||
|
'FROM notice_inbox ' .
|
||||||
|
"WHERE user_id = $UT.id " .
|
||||||
|
'AND notice_id = ' . $this->id . ' )';
|
||||||
|
if ($enabled === 'transitional') {
|
||||||
|
$qry .= " AND $UT.inboxed = 1";
|
||||||
|
}
|
||||||
|
$result = $inbox->query($qry);
|
||||||
|
}
|
||||||
|
|
||||||
function saveReplies()
|
function saveReplies()
|
||||||
{
|
{
|
||||||
// Alternative reply format
|
// Alternative reply format
|
||||||
@ -913,4 +1018,59 @@ class Notice extends Memcached_DataObject
|
|||||||
array('notice' => $this->id));
|
array('notice' => $this->id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
|
||||||
|
{
|
||||||
|
$cache = common_memcache();
|
||||||
|
|
||||||
|
if (empty($cache) ||
|
||||||
|
$since_id != 0 || $before_id != 0 || !is_null($since) ||
|
||||||
|
($offset + $limit) > NOTICE_CACHE_WINDOW) {
|
||||||
|
return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
|
||||||
|
$before_id, $since)));
|
||||||
|
}
|
||||||
|
|
||||||
|
$idkey = common_cache_key($cachekey);
|
||||||
|
|
||||||
|
$idstr = $cache->get($idkey);
|
||||||
|
|
||||||
|
if (!empty($idstr)) {
|
||||||
|
// Cache hit! Woohoo!
|
||||||
|
$window = explode(',', $idstr);
|
||||||
|
$ids = array_slice($window, $offset, $limit);
|
||||||
|
return $ids;
|
||||||
|
}
|
||||||
|
|
||||||
|
$laststr = $cache->get($idkey.';last');
|
||||||
|
|
||||||
|
if (!empty($laststr)) {
|
||||||
|
$window = explode(',', $laststr);
|
||||||
|
$last_id = $window[0];
|
||||||
|
$new_ids = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW,
|
||||||
|
$last_id, 0, null)));
|
||||||
|
|
||||||
|
$new_window = array_merge($new_ids, $window);
|
||||||
|
|
||||||
|
$new_windowstr = implode(',', $new_window);
|
||||||
|
|
||||||
|
$result = $cache->set($idkey, $new_windowstr);
|
||||||
|
$result = $cache->set($idkey . ';last', $new_windowstr);
|
||||||
|
|
||||||
|
$ids = array_slice($new_window, $offset, $limit);
|
||||||
|
|
||||||
|
return $ids;
|
||||||
|
}
|
||||||
|
|
||||||
|
$window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW,
|
||||||
|
0, 0, null)));
|
||||||
|
|
||||||
|
$windowstr = implode(',', $window);
|
||||||
|
|
||||||
|
$result = $cache->set($idkey, $windowstr);
|
||||||
|
$result = $cache->set($idkey . ';last', $windowstr);
|
||||||
|
|
||||||
|
$ids = array_slice($window, $offset, $limit);
|
||||||
|
|
||||||
|
return $ids;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* Laconica - a distributed open-source microblogging tool
|
* Laconica - a distributed open-source microblogging tool
|
||||||
* Copyright (C) 2008, Controlez-Vous, Inc.
|
* Copyright (C) 2008, 2009, Control Yourself, Inc.
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
@ -21,6 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
|
|||||||
|
|
||||||
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
|
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
|
||||||
|
|
||||||
|
// We keep 5 pages of inbox notices in memcache, +1 for pagination check
|
||||||
|
|
||||||
|
define('INBOX_CACHE_WINDOW', 101);
|
||||||
|
|
||||||
class Notice_inbox extends Memcached_DataObject
|
class Notice_inbox extends Memcached_DataObject
|
||||||
{
|
{
|
||||||
###START_AUTOCODE
|
###START_AUTOCODE
|
||||||
@ -38,4 +42,47 @@ class Notice_inbox extends Memcached_DataObject
|
|||||||
|
|
||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
|
function stream($user_id, $offset, $limit, $since_id, $before_id, $since)
|
||||||
|
{
|
||||||
|
return Notice::stream(array('Notice_inbox', '_streamDirect'),
|
||||||
|
array($user_id),
|
||||||
|
'notice_inbox:by_user:'.$user_id,
|
||||||
|
$offset, $limit, $since_id, $before_id, $since);
|
||||||
|
}
|
||||||
|
|
||||||
|
function _streamDirect($user_id, $offset, $limit, $since_id, $before_id, $since)
|
||||||
|
{
|
||||||
|
$inbox = new Notice_inbox();
|
||||||
|
|
||||||
|
$inbox->user_id = $user_id;
|
||||||
|
|
||||||
|
if ($since_id != 0) {
|
||||||
|
$inbox->whereAdd('notice_id > ' . $since_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($before_id != 0) {
|
||||||
|
$inbox->whereAdd('notice_id < ' . $before_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_null($since)) {
|
||||||
|
$inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
|
||||||
|
}
|
||||||
|
|
||||||
|
$inbox->orderBy('notice_id DESC');
|
||||||
|
|
||||||
|
if (!is_null($offset)) {
|
||||||
|
$inbox->limit($offset, $limit);
|
||||||
|
}
|
||||||
|
|
||||||
|
$ids = array();
|
||||||
|
|
||||||
|
if ($inbox->find()) {
|
||||||
|
while ($inbox->fetch()) {
|
||||||
|
$ids[] = $inbox->notice_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ids;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -444,21 +444,17 @@ class User extends Memcached_DataObject
|
|||||||
'SELECT notice.* ' .
|
'SELECT notice.* ' .
|
||||||
'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
|
'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
|
||||||
'WHERE subscription.subscriber = %d ';
|
'WHERE subscription.subscriber = %d ';
|
||||||
$order = null;
|
return Notice::getStream(sprintf($qry, $this->id),
|
||||||
|
'user:notices_with_friends:' . $this->id,
|
||||||
|
$offset, $limit, $since_id, $before_id,
|
||||||
|
$order, $since);
|
||||||
} else if ($enabled === true ||
|
} else if ($enabled === true ||
|
||||||
($enabled == 'transitional' && $this->inboxed == 1)) {
|
($enabled == 'transitional' && $this->inboxed == 1)) {
|
||||||
|
|
||||||
$qry =
|
$ids = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since);
|
||||||
'SELECT notice.* ' .
|
|
||||||
'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
|
return Notice::getStreamByIds($ids);
|
||||||
'WHERE notice_inbox.user_id = %d ';
|
|
||||||
// NOTE: we override ORDER
|
|
||||||
$order = null;
|
|
||||||
}
|
}
|
||||||
return Notice::getStream(sprintf($qry, $this->id),
|
|
||||||
'user:notices_with_friends:' . $this->id,
|
|
||||||
$offset, $limit, $since_id, $before_id,
|
|
||||||
$order, $since);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function blowFavesCache()
|
function blowFavesCache()
|
||||||
|
|||||||
@ -8,6 +8,7 @@ VALUES
|
|||||||
('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
|
('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
|
||||||
('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
|
('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
|
||||||
('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
|
('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
|
||||||
|
('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
|
||||||
('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
|
('Gwibber','Gwibber','http://launchpad.net/gwibber', now()),
|
||||||
('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
|
('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
|
||||||
('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
|
('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
|
||||||
|
|||||||
30
js/util.js
30
js/util.js
@ -166,6 +166,16 @@ $(document).ready(function(){
|
|||||||
$("#notice_action-submit").addClass("disabled");
|
$("#notice_action-submit").addClass("disabled");
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
error: function (xhr, textStatus, errorThrown) { $("#form_notice").removeClass("processing");
|
||||||
|
$("#notice_action-submit").removeAttr("disabled");
|
||||||
|
$("#notice_action-submit").removeClass("disabled");
|
||||||
|
if ($(".error", xhr.responseXML).length > 0) {
|
||||||
|
$('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
|
||||||
|
}
|
||||||
|
},
|
||||||
success: function(xml) { if ($("#error", xml).length > 0) {
|
success: function(xml) { if ($("#error", xml).length > 0) {
|
||||||
var result = document._importNode($("p", xml).get(0), true);
|
var result = document._importNode($("p", xml).get(0), true);
|
||||||
result = result.textContent || result.innerHTML;
|
result = result.textContent || result.innerHTML;
|
||||||
@ -178,11 +188,15 @@ $(document).ready(function(){
|
|||||||
alert(result);
|
alert(result);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true));
|
li = $("li", xml).get(0);
|
||||||
$("#notices_primary .notice:first").css({display:"none"});
|
id = li.id;
|
||||||
$("#notices_primary .notice:first").fadeIn(2500);
|
if ($("#"+li.id).length == 0) {
|
||||||
NoticeHover();
|
$("#notices_primary .notices").prepend(document._importNode(li, true));
|
||||||
NoticeReply();
|
$("#notices_primary .notice:first").css({display:"none"});
|
||||||
|
$("#notices_primary .notice:first").fadeIn(2500);
|
||||||
|
NoticeHover();
|
||||||
|
NoticeReply();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$("#notice_data-text").val("");
|
$("#notice_data-text").val("");
|
||||||
counter();
|
counter();
|
||||||
@ -192,10 +206,8 @@ $(document).ready(function(){
|
|||||||
$("#notice_action-submit").removeClass("disabled");
|
$("#notice_action-submit").removeClass("disabled");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if (document.body.id != 'inbox' && document.body.id != 'outbox') {
|
$("#form_notice").ajaxForm(PostNotice);
|
||||||
$("#form_notice").ajaxForm(PostNotice);
|
$("#form_notice").each(addAjaxHidden);
|
||||||
$("#form_notice").each(addAjaxHidden);
|
|
||||||
}
|
|
||||||
NoticeHover();
|
NoticeHover();
|
||||||
NoticeReply();
|
NoticeReply();
|
||||||
});
|
});
|
||||||
|
|||||||
@ -193,7 +193,7 @@ $_config_files[] = INSTALLDIR.'/config.php';
|
|||||||
$_have_a_config = false;
|
$_have_a_config = false;
|
||||||
|
|
||||||
foreach ($_config_files as $_config_file) {
|
foreach ($_config_files as $_config_file) {
|
||||||
if (file_exists($_config_file)) {
|
if (@file_exists($_config_file)) {
|
||||||
include_once($_config_file);
|
include_once($_config_file);
|
||||||
$_have_a_config = true;
|
$_have_a_config = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -134,9 +134,11 @@ class GalleryAction extends Action
|
|||||||
$this->elementStart('li', array('id'=>'filter_tags_item'));
|
$this->elementStart('li', array('id'=>'filter_tags_item'));
|
||||||
$this->elementStart('form', array('name' => 'bytag',
|
$this->elementStart('form', array('name' => 'bytag',
|
||||||
'id' => 'bytag',
|
'id' => 'bytag',
|
||||||
|
'action' => common_path('?action=' . $this->trimmed('action')),
|
||||||
'method' => 'post'));
|
'method' => 'post'));
|
||||||
$this->dropdown('tag', _('Tag'), $content,
|
$this->dropdown('tag', _('Tag'), $content,
|
||||||
_('Choose a tag to narrow list'), false, $tag);
|
_('Choose a tag to narrow list'), false, $tag);
|
||||||
|
$this->hidden('nickname', $this->user->nickname);
|
||||||
$this->submit('submit', _('Go'));
|
$this->submit('submit', _('Go'));
|
||||||
$this->elementEnd('form');
|
$this->elementEnd('form');
|
||||||
$this->elementEnd('li');
|
$this->elementEnd('li');
|
||||||
|
|||||||
@ -237,12 +237,12 @@ class Router
|
|||||||
$m->connect('api/statuses/:method',
|
$m->connect('api/statuses/:method',
|
||||||
array('action' => 'api',
|
array('action' => 'api',
|
||||||
'apiaction' => 'statuses'),
|
'apiaction' => 'statuses'),
|
||||||
array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|friends|followers|featured)(\.(atom|rss|xml|json))?'));
|
array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|friends|followers|featured)(\.(atom|rss|xml|json))?'));
|
||||||
|
|
||||||
$m->connect('api/statuses/:method/:argument',
|
$m->connect('api/statuses/:method/:argument',
|
||||||
array('action' => 'api',
|
array('action' => 'api',
|
||||||
'apiaction' => 'statuses'),
|
'apiaction' => 'statuses'),
|
||||||
array('method' => '(user_timeline|friends_timeline|replies|show|destroy|friends|followers)'));
|
array('method' => '(user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
|
||||||
|
|
||||||
// users
|
// users
|
||||||
|
|
||||||
|
|||||||
@ -74,3 +74,4 @@ class SubPeopleTagCloudSection extends TagCloudSection
|
|||||||
$this->out->elementEnd('li');
|
$this->out->elementEnd('li');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -49,6 +49,14 @@ class SubscribersPeopleSelfTagCloudSection extends SubPeopleTagCloudSection
|
|||||||
}
|
}
|
||||||
|
|
||||||
function query() {
|
function query() {
|
||||||
return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged group by tag order by weight desc';
|
// return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged group by tag order by weight desc';
|
||||||
|
|
||||||
|
|
||||||
|
return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
|
||||||
|
|
||||||
|
// return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscribed where subscriber=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -53,8 +53,9 @@ class SubscribersPeopleTagCloudSection extends SubPeopleTagCloudSection
|
|||||||
return common_local_url('subscribers', array('nickname' => $nickname, 'tag' => $tag));
|
return common_local_url('subscribers', array('nickname' => $nickname, 'tag' => $tag));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function query() {
|
function query() {
|
||||||
return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed group by tag order by weight desc';
|
// return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed group by tag order by weight desc';
|
||||||
|
return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagged and subscribed=tagger where subscribed=%d and subscriber != subscribed and tag is not null group by tag order by weight desc';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -49,6 +49,13 @@ class SubscriptionsPeopleSelfTagCloudSection extends SubPeopleTagCloudSection
|
|||||||
}
|
}
|
||||||
|
|
||||||
function query() {
|
function query() {
|
||||||
return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscriber != subscribed and tagger = tagged group by tag order by weight desc';
|
// return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscriber != subscribed and tagger = tagged group by tag order by weight desc';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscribed where subscriber=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
|
||||||
|
|
||||||
|
// return 'select tag, count(tag) as weight from subscription left join profile_tag on tagger = subscriber where subscribed=%d and subscribed != subscriber and tagger = tagged and tag is not null group by tag order by weight desc';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -54,6 +54,8 @@ class SubscriptionsPeopleTagCloudSection extends SubPeopleTagCloudSection
|
|||||||
}
|
}
|
||||||
|
|
||||||
function query() {
|
function query() {
|
||||||
return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed group by tag order by weight desc';
|
// return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed group by tag order by weight desc';
|
||||||
|
return 'select tag, count(tag) as weight from subscription left join profile_tag on subscriber=tagger and subscribed=tagged where subscriber=%d and subscriber != subscribed and tag is not null group by tag order by weight desc';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -51,6 +51,26 @@ class TwitterapiAction extends Action
|
|||||||
parent::handle($args);
|
parent::handle($args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Overrides XMLOutputter::element to write booleans as strings (true|false).
|
||||||
|
* See that method's documentation for more info.
|
||||||
|
*
|
||||||
|
* @param string $tag Element type or tagname
|
||||||
|
* @param array $attrs Array of element attributes, as
|
||||||
|
* key-value pairs
|
||||||
|
* @param string $content string content of the element
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
function element($tag, $attrs=null, $content=null)
|
||||||
|
{
|
||||||
|
if (is_bool($content)) {
|
||||||
|
$content = ($content ? 'true' : 'false');
|
||||||
|
}
|
||||||
|
|
||||||
|
return parent::element($tag, $attrs, $content);
|
||||||
|
}
|
||||||
|
|
||||||
function twitter_user_array($profile, $get_notice=false)
|
function twitter_user_array($profile, $get_notice=false)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -66,7 +86,7 @@ class TwitterapiAction extends Action
|
|||||||
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
|
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
|
||||||
|
|
||||||
$twitter_user['profile_image_url'] = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE);
|
$twitter_user['profile_image_url'] = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE);
|
||||||
$twitter_user['protected'] = 'false'; # not supported by Laconica yet
|
$twitter_user['protected'] = false; # not supported by Laconica yet
|
||||||
$twitter_user['url'] = ($profile->homepage) ? $profile->homepage : null;
|
$twitter_user['url'] = ($profile->homepage) ? $profile->homepage : null;
|
||||||
|
|
||||||
if ($get_notice) {
|
if ($get_notice) {
|
||||||
@ -86,7 +106,7 @@ class TwitterapiAction extends Action
|
|||||||
|
|
||||||
$twitter_status = array();
|
$twitter_status = array();
|
||||||
$twitter_status['text'] = $notice->content;
|
$twitter_status['text'] = $notice->content;
|
||||||
$twitter_status['truncated'] = 'false'; # Not possible on Laconica
|
$twitter_status['truncated'] = false; # Not possible on Laconica
|
||||||
$twitter_status['created_at'] = $this->date_twitter($notice->created);
|
$twitter_status['created_at'] = $this->date_twitter($notice->created);
|
||||||
$twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
|
$twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
|
||||||
intval($notice->reply_to) : null;
|
intval($notice->reply_to) : null;
|
||||||
@ -108,10 +128,9 @@ class TwitterapiAction extends Action
|
|||||||
($replier_profile) ? $replier_profile->nickname : null;
|
($replier_profile) ? $replier_profile->nickname : null;
|
||||||
|
|
||||||
if (isset($this->auth_user)) {
|
if (isset($this->auth_user)) {
|
||||||
$twitter_status['favorited'] =
|
$twitter_status['favorited'] = $this->auth_user->hasFave($notice);
|
||||||
($this->auth_user->hasFave($notice)) ? 'true' : 'false';
|
|
||||||
} else {
|
} else {
|
||||||
$twitter_status['favorited'] = 'false';
|
$twitter_status['favorited'] = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($include_user) {
|
if ($include_user) {
|
||||||
|
|||||||
10
lib/util.php
10
lib/util.php
@ -519,11 +519,16 @@ function common_shorten_links($text)
|
|||||||
|
|
||||||
function common_shorten_link($url, $reverse = false)
|
function common_shorten_link($url, $reverse = false)
|
||||||
{
|
{
|
||||||
|
|
||||||
static $url_cache = array();
|
static $url_cache = array();
|
||||||
if ($reverse) return isset($url_cache[$url]) ? $url_cache[$url] : $url;
|
if ($reverse) return isset($url_cache[$url]) ? $url_cache[$url] : $url;
|
||||||
|
|
||||||
$user = common_current_user();
|
$user = common_current_user();
|
||||||
|
if (!isset($user)) {
|
||||||
|
// common current user does not find a user when called from the XMPP daemon
|
||||||
|
// therefore we'll set one here fix, so that XMPP given URLs may be shortened
|
||||||
|
$user->urlshorteningservice = 'ur1.ca';
|
||||||
|
}
|
||||||
$curlh = curl_init();
|
$curlh = curl_init();
|
||||||
curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
|
curl_setopt($curlh, CURLOPT_CONNECTTIMEOUT, 20); // # seconds to wait
|
||||||
curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
|
curl_setopt($curlh, CURLOPT_USERAGENT, 'Laconica');
|
||||||
@ -1019,7 +1024,7 @@ function common_root_url($ssl=false)
|
|||||||
function common_good_rand($bytes)
|
function common_good_rand($bytes)
|
||||||
{
|
{
|
||||||
// XXX: use random.org...?
|
// XXX: use random.org...?
|
||||||
if (file_exists('/dev/urandom')) {
|
if (@file_exists('/dev/urandom')) {
|
||||||
return common_urandom($bytes);
|
return common_urandom($bytes);
|
||||||
} else { // FIXME: this is probably not good enough
|
} else { // FIXME: this is probably not good enough
|
||||||
return common_mtrand($bytes);
|
return common_mtrand($bytes);
|
||||||
@ -1392,4 +1397,3 @@ function common_database_tablename($tablename)
|
|||||||
//table prefixes could be added here later
|
//table prefixes could be added here later
|
||||||
return $tablename;
|
return $tablename;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
180
plugins/Comet/CometPlugin.php
Normal file
180
plugins/Comet/CometPlugin.php
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Laconica, the distributed open-source microblogging tool
|
||||||
|
*
|
||||||
|
* Plugin to do "real time" updates using Comet/Bayeux
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* @category Plugin
|
||||||
|
* @package Laconica
|
||||||
|
* @author Evan Prodromou <evan@controlyourself.ca>
|
||||||
|
* @copyright 2009 Control Yourself, Inc.
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
|
* @link http://laconi.ca/
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('LACONICA')) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Plugin to do realtime updates using Comet
|
||||||
|
*
|
||||||
|
* @category Plugin
|
||||||
|
* @package Laconica
|
||||||
|
* @author Evan Prodromou <evan@controlyourself.ca>
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||||
|
* @link http://laconi.ca/
|
||||||
|
*/
|
||||||
|
|
||||||
|
class CometPlugin extends Plugin
|
||||||
|
{
|
||||||
|
var $server = null;
|
||||||
|
|
||||||
|
function __construct($server=null)
|
||||||
|
{
|
||||||
|
$this->server = $server;
|
||||||
|
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
function onEndShowScripts($action)
|
||||||
|
{
|
||||||
|
$timeline = null;
|
||||||
|
|
||||||
|
$this->log(LOG_DEBUG, 'got action ' . $action->trimmed('action'));
|
||||||
|
|
||||||
|
switch ($action->trimmed('action')) {
|
||||||
|
case 'public':
|
||||||
|
$timeline = '/timelines/public';
|
||||||
|
break;
|
||||||
|
case 'tag':
|
||||||
|
$tag = $action->trimmed('tag');
|
||||||
|
if (!empty($tag)) {
|
||||||
|
$timeline = '/timelines/tag/'.$tag;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
$scripts = array('jquery.comet.js', 'json2.js', 'updatetimeline.js');
|
||||||
|
|
||||||
|
foreach ($scripts as $script) {
|
||||||
|
$action->element('script', array('type' => 'text/javascript',
|
||||||
|
'src' => common_path('plugins/Comet/'.$script)),
|
||||||
|
' ');
|
||||||
|
}
|
||||||
|
|
||||||
|
$action->elementStart('script', array('type' => 'text/javascript'));
|
||||||
|
$action->raw("$(document).ready(function() { updater.init(\"$this->server\", \"$timeline\");});");
|
||||||
|
$action->elementEnd('script');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function onEndNoticeSave($notice)
|
||||||
|
{
|
||||||
|
$this->log(LOG_INFO, "Called for save notice.");
|
||||||
|
|
||||||
|
$timelines = array();
|
||||||
|
|
||||||
|
// XXX: Add other timelines; this is just for the public one
|
||||||
|
|
||||||
|
if ($notice->is_local ||
|
||||||
|
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
|
||||||
|
$timelines[] = '/timelines/public';
|
||||||
|
}
|
||||||
|
|
||||||
|
$tags = $this->getNoticeTags($notice);
|
||||||
|
|
||||||
|
if (!empty($tags)) {
|
||||||
|
foreach ($tags as $tag) {
|
||||||
|
$timelines[] = '/timelines/tag/' . $tag;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count($timelines) > 0) {
|
||||||
|
// Require this, since we need it
|
||||||
|
require_once(INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php');
|
||||||
|
|
||||||
|
$json = $this->noticeAsJson($notice);
|
||||||
|
|
||||||
|
// Bayeux? Comet? Huh? These terms confuse me
|
||||||
|
$bay = new Bayeux($this->server);
|
||||||
|
|
||||||
|
foreach ($timelines as $timeline) {
|
||||||
|
$this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
|
||||||
|
$bay->publish($timeline, $json);
|
||||||
|
}
|
||||||
|
|
||||||
|
$bay = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function noticeAsJson($notice)
|
||||||
|
{
|
||||||
|
// FIXME: this code should be abstracted to a neutral third
|
||||||
|
// party, like Notice::asJson(). I'm not sure of the ethics
|
||||||
|
// of refactoring from within a plugin, so I'm just abusing
|
||||||
|
// the TwitterApiAction method. Don't do this unless you're me!
|
||||||
|
|
||||||
|
require_once(INSTALLDIR.'/lib/twitterapi.php');
|
||||||
|
|
||||||
|
$act = new TwitterApiAction('/dev/null');
|
||||||
|
|
||||||
|
$arr = $act->twitter_status_array($notice, true);
|
||||||
|
$arr['url'] = $notice->bestUrl();
|
||||||
|
$arr['html'] = htmlspecialchars($notice->rendered);
|
||||||
|
|
||||||
|
$profile = $notice->getProfile();
|
||||||
|
$arr['user']['profile_url'] = $profile->profileurl;
|
||||||
|
|
||||||
|
return $arr;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getNoticeTags($notice)
|
||||||
|
{
|
||||||
|
$tags = null;
|
||||||
|
|
||||||
|
$nt = new Notice_tag();
|
||||||
|
$nt->notice_id = $notice->id;
|
||||||
|
|
||||||
|
if ($nt->find()) {
|
||||||
|
$tags = array();
|
||||||
|
while ($nt->fetch()) {
|
||||||
|
$tags[] = $nt->tag;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$nt->free();
|
||||||
|
$nt = null;
|
||||||
|
|
||||||
|
return $tags;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Push this up to Plugin
|
||||||
|
|
||||||
|
function log($level, $msg)
|
||||||
|
{
|
||||||
|
common_log($level, get_class($this) . ': '.$msg);
|
||||||
|
}
|
||||||
|
}
|
||||||
26
plugins/Comet/README
Normal file
26
plugins/Comet/README
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
This is a plugin to automatically load notices in the browser no
|
||||||
|
matter who creates them -- the kind of thing we see with
|
||||||
|
search.twitter.com, rejaw.com, or FriendFeed's "real time" news.
|
||||||
|
|
||||||
|
NOTE: this is an insecure version; don't roll it out on a production
|
||||||
|
server.
|
||||||
|
|
||||||
|
It requires a cometd server. I've only had the cometd-java server work
|
||||||
|
correctly; something's wiggy with the Twisted-based server.
|
||||||
|
|
||||||
|
After you have a cometd server installed, just add this code to your
|
||||||
|
config.php:
|
||||||
|
|
||||||
|
require_once(INSTALLDIR.'/plugins/Comet/CometPlugin.php');
|
||||||
|
$cp = new CometPlugin('http://example.com:8080/cometd/');
|
||||||
|
|
||||||
|
Change 'example.com:8080' to the name and port of the server you
|
||||||
|
installed cometd on.
|
||||||
|
|
||||||
|
TODO:
|
||||||
|
|
||||||
|
* Needs to be tested with Ajax submission. Probably messes everything
|
||||||
|
up.
|
||||||
|
* Add more timelines: personal inbox and tags would be great.
|
||||||
|
* Add security. In particular, only let the PHP code publish notices
|
||||||
|
to the cometd server. Currently, it doesn't try to authenticate.
|
||||||
127
plugins/Comet/bayeux.class.inc.php
Normal file
127
plugins/Comet/bayeux.class.inc.php
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
<?php
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* Phomet: a php comet client
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008 Morgan 'ARR!' Allen <morganrallen@gmail.com> http://morglog.alleycatracing.com
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Bayeux
|
||||||
|
{
|
||||||
|
private $oCurl = '';
|
||||||
|
private $nNextId = 0;
|
||||||
|
|
||||||
|
public $sUrl = '';
|
||||||
|
|
||||||
|
function __construct($sUrl)
|
||||||
|
{
|
||||||
|
$this->sUrl = $sUrl;
|
||||||
|
|
||||||
|
$this->oCurl = curl_init();
|
||||||
|
|
||||||
|
$aHeaders = array();
|
||||||
|
$aHeaders[] = 'Connection: Keep-Alive';
|
||||||
|
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_URL, $sUrl);
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_HTTPHEADER, $aHeaders);
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_HEADER, 0);
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_POST, 1);
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_RETURNTRANSFER,1);
|
||||||
|
|
||||||
|
$this->handShake();
|
||||||
|
}
|
||||||
|
|
||||||
|
function __destruct()
|
||||||
|
{
|
||||||
|
$this->disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
function handShake()
|
||||||
|
{
|
||||||
|
$msgHandshake = array();
|
||||||
|
$msgHandshake['channel'] = '/meta/handshake';
|
||||||
|
$msgHandshake['version'] = "1.0";
|
||||||
|
$msgHandshake['minimumVersion'] = "0.9";
|
||||||
|
$msgHandshake['supportedConnectionTypes'] = array('long-polling');
|
||||||
|
$msgHandshake['id'] = $this->nNextId++;
|
||||||
|
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
|
||||||
|
|
||||||
|
$data = curl_exec($this->oCurl);
|
||||||
|
|
||||||
|
if(curl_errno($this->oCurl))
|
||||||
|
die("Error: " . curl_error($this->oCurl));
|
||||||
|
|
||||||
|
$oReturn = json_decode($data);
|
||||||
|
|
||||||
|
if (is_array($oReturn)) {
|
||||||
|
$oReturn = $oReturn[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
$bSuccessful = ($oReturn->successful) ? true : false;
|
||||||
|
|
||||||
|
if($bSuccessful)
|
||||||
|
{
|
||||||
|
$this->clientId = $oReturn->clientId;
|
||||||
|
|
||||||
|
$this->connect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function connect()
|
||||||
|
{
|
||||||
|
$aMsg['channel'] = '/meta/connect';
|
||||||
|
$aMsg['id'] = $this->nNextId++;
|
||||||
|
$aMsg['clientId'] = $this->clientId;
|
||||||
|
$aMsg['connectionType'] = 'long-polling';
|
||||||
|
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
|
||||||
|
|
||||||
|
$data = curl_exec($this->oCurl);
|
||||||
|
}
|
||||||
|
|
||||||
|
function disconnect()
|
||||||
|
{
|
||||||
|
$msgHandshake = array();
|
||||||
|
$msgHandshake['channel'] = '/meta/disconnect';
|
||||||
|
$msgHandshake['id'] = $this->nNextId++;
|
||||||
|
$msgHandshake['clientId'] = $this->clientId;
|
||||||
|
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($msgHandshake)))));
|
||||||
|
|
||||||
|
curl_exec($this->oCurl);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function publish($sChannel, $oData)
|
||||||
|
{
|
||||||
|
if(!$sChannel || !$oData)
|
||||||
|
return;
|
||||||
|
|
||||||
|
$aMsg = array();
|
||||||
|
|
||||||
|
$aMsg['channel'] = $sChannel;
|
||||||
|
$aMsg['id'] = $this->nNextId++;
|
||||||
|
$aMsg['data'] = $oData;
|
||||||
|
$aMsg['clientId'] = $this->clientId;
|
||||||
|
|
||||||
|
curl_setopt($this->oCurl, CURLOPT_POSTFIELDS, "message=".urlencode(str_replace('\\', '', json_encode(array($aMsg)))));
|
||||||
|
|
||||||
|
$data = curl_exec($this->oCurl);
|
||||||
|
// var_dump($data);
|
||||||
|
}
|
||||||
|
}
|
||||||
1451
plugins/Comet/jquery.comet.js
Normal file
1451
plugins/Comet/jquery.comet.js
Normal file
File diff suppressed because it is too large
Load Diff
478
plugins/Comet/json2.js
Normal file
478
plugins/Comet/json2.js
Normal file
@ -0,0 +1,478 @@
|
|||||||
|
/*
|
||||||
|
http://www.JSON.org/json2.js
|
||||||
|
2009-04-16
|
||||||
|
|
||||||
|
Public Domain.
|
||||||
|
|
||||||
|
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
|
||||||
|
|
||||||
|
See http://www.JSON.org/js.html
|
||||||
|
|
||||||
|
This file creates a global JSON object containing two methods: stringify
|
||||||
|
and parse.
|
||||||
|
|
||||||
|
JSON.stringify(value, replacer, space)
|
||||||
|
value any JavaScript value, usually an object or array.
|
||||||
|
|
||||||
|
replacer an optional parameter that determines how object
|
||||||
|
values are stringified for objects. It can be a
|
||||||
|
function or an array of strings.
|
||||||
|
|
||||||
|
space an optional parameter that specifies the indentation
|
||||||
|
of nested structures. If it is omitted, the text will
|
||||||
|
be packed without extra whitespace. If it is a number,
|
||||||
|
it will specify the number of spaces to indent at each
|
||||||
|
level. If it is a string (such as '\t' or ' '),
|
||||||
|
it contains the characters used to indent at each level.
|
||||||
|
|
||||||
|
This method produces a JSON text from a JavaScript value.
|
||||||
|
|
||||||
|
When an object value is found, if the object contains a toJSON
|
||||||
|
method, its toJSON method will be called and the result will be
|
||||||
|
stringified. A toJSON method does not serialize: it returns the
|
||||||
|
value represented by the name/value pair that should be serialized,
|
||||||
|
or undefined if nothing should be serialized. The toJSON method
|
||||||
|
will be passed the key associated with the value, and this will be
|
||||||
|
bound to the object holding the key.
|
||||||
|
|
||||||
|
For example, this would serialize Dates as ISO strings.
|
||||||
|
|
||||||
|
Date.prototype.toJSON = function (key) {
|
||||||
|
function f(n) {
|
||||||
|
// Format integers to have at least two digits.
|
||||||
|
return n < 10 ? '0' + n : n;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.getUTCFullYear() + '-' +
|
||||||
|
f(this.getUTCMonth() + 1) + '-' +
|
||||||
|
f(this.getUTCDate()) + 'T' +
|
||||||
|
f(this.getUTCHours()) + ':' +
|
||||||
|
f(this.getUTCMinutes()) + ':' +
|
||||||
|
f(this.getUTCSeconds()) + 'Z';
|
||||||
|
};
|
||||||
|
|
||||||
|
You can provide an optional replacer method. It will be passed the
|
||||||
|
key and value of each member, with this bound to the containing
|
||||||
|
object. The value that is returned from your method will be
|
||||||
|
serialized. If your method returns undefined, then the member will
|
||||||
|
be excluded from the serialization.
|
||||||
|
|
||||||
|
If the replacer parameter is an array of strings, then it will be
|
||||||
|
used to select the members to be serialized. It filters the results
|
||||||
|
such that only members with keys listed in the replacer array are
|
||||||
|
stringified.
|
||||||
|
|
||||||
|
Values that do not have JSON representations, such as undefined or
|
||||||
|
functions, will not be serialized. Such values in objects will be
|
||||||
|
dropped; in arrays they will be replaced with null. You can use
|
||||||
|
a replacer function to replace those with JSON values.
|
||||||
|
JSON.stringify(undefined) returns undefined.
|
||||||
|
|
||||||
|
The optional space parameter produces a stringification of the
|
||||||
|
value that is filled with line breaks and indentation to make it
|
||||||
|
easier to read.
|
||||||
|
|
||||||
|
If the space parameter is a non-empty string, then that string will
|
||||||
|
be used for indentation. If the space parameter is a number, then
|
||||||
|
the indentation will be that many spaces.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
text = JSON.stringify(['e', {pluribus: 'unum'}]);
|
||||||
|
// text is '["e",{"pluribus":"unum"}]'
|
||||||
|
|
||||||
|
|
||||||
|
text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
|
||||||
|
// text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
|
||||||
|
|
||||||
|
text = JSON.stringify([new Date()], function (key, value) {
|
||||||
|
return this[key] instanceof Date ?
|
||||||
|
'Date(' + this[key] + ')' : value;
|
||||||
|
});
|
||||||
|
// text is '["Date(---current time---)"]'
|
||||||
|
|
||||||
|
|
||||||
|
JSON.parse(text, reviver)
|
||||||
|
This method parses a JSON text to produce an object or array.
|
||||||
|
It can throw a SyntaxError exception.
|
||||||
|
|
||||||
|
The optional reviver parameter is a function that can filter and
|
||||||
|
transform the results. It receives each of the keys and values,
|
||||||
|
and its return value is used instead of the original value.
|
||||||
|
If it returns what it received, then the structure is not modified.
|
||||||
|
If it returns undefined then the member is deleted.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
// Parse the text. Values that look like ISO date strings will
|
||||||
|
// be converted to Date objects.
|
||||||
|
|
||||||
|
myData = JSON.parse(text, function (key, value) {
|
||||||
|
var a;
|
||||||
|
if (typeof value === 'string') {
|
||||||
|
a =
|
||||||
|
/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
|
||||||
|
if (a) {
|
||||||
|
return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
|
||||||
|
+a[5], +a[6]));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
});
|
||||||
|
|
||||||
|
myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
|
||||||
|
var d;
|
||||||
|
if (typeof value === 'string' &&
|
||||||
|
value.slice(0, 5) === 'Date(' &&
|
||||||
|
value.slice(-1) === ')') {
|
||||||
|
d = new Date(value.slice(5, -1));
|
||||||
|
if (d) {
|
||||||
|
return d;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
This is a reference implementation. You are free to copy, modify, or
|
||||||
|
redistribute.
|
||||||
|
|
||||||
|
This code should be minified before deployment.
|
||||||
|
See http://javascript.crockford.com/jsmin.html
|
||||||
|
|
||||||
|
USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
|
||||||
|
NOT CONTROL.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*jslint evil: true */
|
||||||
|
|
||||||
|
/*global JSON */
|
||||||
|
|
||||||
|
/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
|
||||||
|
call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
|
||||||
|
getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
|
||||||
|
lastIndex, length, parse, prototype, push, replace, slice, stringify,
|
||||||
|
test, toJSON, toString, valueOf
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Create a JSON object only if one does not already exist. We create the
|
||||||
|
// methods in a closure to avoid creating global variables.
|
||||||
|
|
||||||
|
if (!this.JSON) {
|
||||||
|
JSON = {};
|
||||||
|
}
|
||||||
|
(function () {
|
||||||
|
|
||||||
|
function f(n) {
|
||||||
|
// Format integers to have at least two digits.
|
||||||
|
return n < 10 ? '0' + n : n;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof Date.prototype.toJSON !== 'function') {
|
||||||
|
|
||||||
|
Date.prototype.toJSON = function (key) {
|
||||||
|
|
||||||
|
return this.getUTCFullYear() + '-' +
|
||||||
|
f(this.getUTCMonth() + 1) + '-' +
|
||||||
|
f(this.getUTCDate()) + 'T' +
|
||||||
|
f(this.getUTCHours()) + ':' +
|
||||||
|
f(this.getUTCMinutes()) + ':' +
|
||||||
|
f(this.getUTCSeconds()) + 'Z';
|
||||||
|
};
|
||||||
|
|
||||||
|
String.prototype.toJSON =
|
||||||
|
Number.prototype.toJSON =
|
||||||
|
Boolean.prototype.toJSON = function (key) {
|
||||||
|
return this.valueOf();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
|
||||||
|
escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
|
||||||
|
gap,
|
||||||
|
indent,
|
||||||
|
meta = { // table of character substitutions
|
||||||
|
'\b': '\\b',
|
||||||
|
'\t': '\\t',
|
||||||
|
'\n': '\\n',
|
||||||
|
'\f': '\\f',
|
||||||
|
'\r': '\\r',
|
||||||
|
'"' : '\\"',
|
||||||
|
'\\': '\\\\'
|
||||||
|
},
|
||||||
|
rep;
|
||||||
|
|
||||||
|
|
||||||
|
function quote(string) {
|
||||||
|
|
||||||
|
// If the string contains no control characters, no quote characters, and no
|
||||||
|
// backslash characters, then we can safely slap some quotes around it.
|
||||||
|
// Otherwise we must also replace the offending characters with safe escape
|
||||||
|
// sequences.
|
||||||
|
|
||||||
|
escapable.lastIndex = 0;
|
||||||
|
return escapable.test(string) ?
|
||||||
|
'"' + string.replace(escapable, function (a) {
|
||||||
|
var c = meta[a];
|
||||||
|
return typeof c === 'string' ? c :
|
||||||
|
'\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
|
||||||
|
}) + '"' :
|
||||||
|
'"' + string + '"';
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function str(key, holder) {
|
||||||
|
|
||||||
|
// Produce a string from holder[key].
|
||||||
|
|
||||||
|
var i, // The loop counter.
|
||||||
|
k, // The member key.
|
||||||
|
v, // The member value.
|
||||||
|
length,
|
||||||
|
mind = gap,
|
||||||
|
partial,
|
||||||
|
value = holder[key];
|
||||||
|
|
||||||
|
// If the value has a toJSON method, call it to obtain a replacement value.
|
||||||
|
|
||||||
|
if (value && typeof value === 'object' &&
|
||||||
|
typeof value.toJSON === 'function') {
|
||||||
|
value = value.toJSON(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we were called with a replacer function, then call the replacer to
|
||||||
|
// obtain a replacement value.
|
||||||
|
|
||||||
|
if (typeof rep === 'function') {
|
||||||
|
value = rep.call(holder, key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// What happens next depends on the value's type.
|
||||||
|
|
||||||
|
switch (typeof value) {
|
||||||
|
case 'string':
|
||||||
|
return quote(value);
|
||||||
|
|
||||||
|
case 'number':
|
||||||
|
|
||||||
|
// JSON numbers must be finite. Encode non-finite numbers as null.
|
||||||
|
|
||||||
|
return isFinite(value) ? String(value) : 'null';
|
||||||
|
|
||||||
|
case 'boolean':
|
||||||
|
case 'null':
|
||||||
|
|
||||||
|
// If the value is a boolean or null, convert it to a string. Note:
|
||||||
|
// typeof null does not produce 'null'. The case is included here in
|
||||||
|
// the remote chance that this gets fixed someday.
|
||||||
|
|
||||||
|
return String(value);
|
||||||
|
|
||||||
|
// If the type is 'object', we might be dealing with an object or an array or
|
||||||
|
// null.
|
||||||
|
|
||||||
|
case 'object':
|
||||||
|
|
||||||
|
// Due to a specification blunder in ECMAScript, typeof null is 'object',
|
||||||
|
// so watch out for that case.
|
||||||
|
|
||||||
|
if (!value) {
|
||||||
|
return 'null';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make an array to hold the partial results of stringifying this object value.
|
||||||
|
|
||||||
|
gap += indent;
|
||||||
|
partial = [];
|
||||||
|
|
||||||
|
// Is the value an array?
|
||||||
|
|
||||||
|
if (Object.prototype.toString.apply(value) === '[object Array]') {
|
||||||
|
|
||||||
|
// The value is an array. Stringify every element. Use null as a placeholder
|
||||||
|
// for non-JSON values.
|
||||||
|
|
||||||
|
length = value.length;
|
||||||
|
for (i = 0; i < length; i += 1) {
|
||||||
|
partial[i] = str(i, value) || 'null';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Join all of the elements together, separated with commas, and wrap them in
|
||||||
|
// brackets.
|
||||||
|
|
||||||
|
v = partial.length === 0 ? '[]' :
|
||||||
|
gap ? '[\n' + gap +
|
||||||
|
partial.join(',\n' + gap) + '\n' +
|
||||||
|
mind + ']' :
|
||||||
|
'[' + partial.join(',') + ']';
|
||||||
|
gap = mind;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the replacer is an array, use it to select the members to be stringified.
|
||||||
|
|
||||||
|
if (rep && typeof rep === 'object') {
|
||||||
|
length = rep.length;
|
||||||
|
for (i = 0; i < length; i += 1) {
|
||||||
|
k = rep[i];
|
||||||
|
if (typeof k === 'string') {
|
||||||
|
v = str(k, value);
|
||||||
|
if (v) {
|
||||||
|
partial.push(quote(k) + (gap ? ': ' : ':') + v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Otherwise, iterate through all of the keys in the object.
|
||||||
|
|
||||||
|
for (k in value) {
|
||||||
|
if (Object.hasOwnProperty.call(value, k)) {
|
||||||
|
v = str(k, value);
|
||||||
|
if (v) {
|
||||||
|
partial.push(quote(k) + (gap ? ': ' : ':') + v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Join all of the member texts together, separated with commas,
|
||||||
|
// and wrap them in braces.
|
||||||
|
|
||||||
|
v = partial.length === 0 ? '{}' :
|
||||||
|
gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
|
||||||
|
mind + '}' : '{' + partial.join(',') + '}';
|
||||||
|
gap = mind;
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the JSON object does not yet have a stringify method, give it one.
|
||||||
|
|
||||||
|
if (typeof JSON.stringify !== 'function') {
|
||||||
|
JSON.stringify = function (value, replacer, space) {
|
||||||
|
|
||||||
|
// The stringify method takes a value and an optional replacer, and an optional
|
||||||
|
// space parameter, and returns a JSON text. The replacer can be a function
|
||||||
|
// that can replace values, or an array of strings that will select the keys.
|
||||||
|
// A default replacer method can be provided. Use of the space parameter can
|
||||||
|
// produce text that is more easily readable.
|
||||||
|
|
||||||
|
var i;
|
||||||
|
gap = '';
|
||||||
|
indent = '';
|
||||||
|
|
||||||
|
// If the space parameter is a number, make an indent string containing that
|
||||||
|
// many spaces.
|
||||||
|
|
||||||
|
if (typeof space === 'number') {
|
||||||
|
for (i = 0; i < space; i += 1) {
|
||||||
|
indent += ' ';
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the space parameter is a string, it will be used as the indent string.
|
||||||
|
|
||||||
|
} else if (typeof space === 'string') {
|
||||||
|
indent = space;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If there is a replacer, it must be a function or an array.
|
||||||
|
// Otherwise, throw an error.
|
||||||
|
|
||||||
|
rep = replacer;
|
||||||
|
if (replacer && typeof replacer !== 'function' &&
|
||||||
|
(typeof replacer !== 'object' ||
|
||||||
|
typeof replacer.length !== 'number')) {
|
||||||
|
throw new Error('JSON.stringify');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make a fake root object containing our value under the key of ''.
|
||||||
|
// Return the result of stringifying the value.
|
||||||
|
|
||||||
|
return str('', {'': value});
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// If the JSON object does not yet have a parse method, give it one.
|
||||||
|
|
||||||
|
if (typeof JSON.parse !== 'function') {
|
||||||
|
JSON.parse = function (text, reviver) {
|
||||||
|
|
||||||
|
// The parse method takes a text and an optional reviver function, and returns
|
||||||
|
// a JavaScript value if the text is a valid JSON text.
|
||||||
|
|
||||||
|
var j;
|
||||||
|
|
||||||
|
function walk(holder, key) {
|
||||||
|
|
||||||
|
// The walk method is used to recursively walk the resulting structure so
|
||||||
|
// that modifications can be made.
|
||||||
|
|
||||||
|
var k, v, value = holder[key];
|
||||||
|
if (value && typeof value === 'object') {
|
||||||
|
for (k in value) {
|
||||||
|
if (Object.hasOwnProperty.call(value, k)) {
|
||||||
|
v = walk(value, k);
|
||||||
|
if (v !== undefined) {
|
||||||
|
value[k] = v;
|
||||||
|
} else {
|
||||||
|
delete value[k];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return reviver.call(holder, key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Parsing happens in four stages. In the first stage, we replace certain
|
||||||
|
// Unicode characters with escape sequences. JavaScript handles many characters
|
||||||
|
// incorrectly, either silently deleting them, or treating them as line endings.
|
||||||
|
|
||||||
|
cx.lastIndex = 0;
|
||||||
|
if (cx.test(text)) {
|
||||||
|
text = text.replace(cx, function (a) {
|
||||||
|
return '\\u' +
|
||||||
|
('0000' + a.charCodeAt(0).toString(16)).slice(-4);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// In the second stage, we run the text against regular expressions that look
|
||||||
|
// for non-JSON patterns. We are especially concerned with '()' and 'new'
|
||||||
|
// because they can cause invocation, and '=' because it can cause mutation.
|
||||||
|
// But just to be safe, we want to reject all unexpected forms.
|
||||||
|
|
||||||
|
// We split the second stage into 4 regexp operations in order to work around
|
||||||
|
// crippling inefficiencies in IE's and Safari's regexp engines. First we
|
||||||
|
// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
|
||||||
|
// replace all simple value tokens with ']' characters. Third, we delete all
|
||||||
|
// open brackets that follow a colon or comma or that begin the text. Finally,
|
||||||
|
// we look to see that the remaining characters are only whitespace or ']' or
|
||||||
|
// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
|
||||||
|
|
||||||
|
if (/^[\],:{}\s]*$/.
|
||||||
|
test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
|
||||||
|
replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
|
||||||
|
replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
|
||||||
|
|
||||||
|
// In the third stage we use the eval function to compile the text into a
|
||||||
|
// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
|
||||||
|
// in JavaScript: it can begin a block or an object literal. We wrap the text
|
||||||
|
// in parens to eliminate the ambiguity.
|
||||||
|
|
||||||
|
j = eval('(' + text + ')');
|
||||||
|
|
||||||
|
// In the optional fourth stage, we recursively walk the new structure, passing
|
||||||
|
// each name/value pair to a reviver function for possible transformation.
|
||||||
|
|
||||||
|
return typeof reviver === 'function' ?
|
||||||
|
walk({'': j}, '') : j;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the text is not JSON parseable, then a SyntaxError is thrown.
|
||||||
|
|
||||||
|
throw new SyntaxError('JSON.parse');
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}());
|
||||||
77
plugins/Comet/updatetimeline.js
Normal file
77
plugins/Comet/updatetimeline.js
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
// update the local timeline from a Comet server
|
||||||
|
//
|
||||||
|
|
||||||
|
var updater = function()
|
||||||
|
{
|
||||||
|
var _cometd;
|
||||||
|
|
||||||
|
return {
|
||||||
|
init: function(server, timeline)
|
||||||
|
{
|
||||||
|
_cometd = $.cometd; // Uses the default Comet object
|
||||||
|
_cometd.setLogLevel('debug');
|
||||||
|
_cometd.init(server);
|
||||||
|
_cometd.subscribe(timeline, receive);
|
||||||
|
$(window).unload(leave);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function leave()
|
||||||
|
{
|
||||||
|
_cometd.disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
|
function receive(message)
|
||||||
|
{
|
||||||
|
id = message.data.id;
|
||||||
|
|
||||||
|
// Don't add it if it already exists
|
||||||
|
|
||||||
|
if ($("#notice-"+id).length > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var noticeItem = makeNoticeItem(message.data);
|
||||||
|
$("#notices_primary .notices").prepend(noticeItem, true);
|
||||||
|
$("#notices_primary .notice:first").css({display:"none"});
|
||||||
|
$("#notices_primary .notice:first").fadeIn(2500);
|
||||||
|
NoticeHover();
|
||||||
|
NoticeReply();
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeNoticeItem(data)
|
||||||
|
{
|
||||||
|
user = data['user'];
|
||||||
|
html = data['html'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>');
|
||||||
|
|
||||||
|
ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
|
||||||
|
"<div class=\"entry-title\">"+
|
||||||
|
"<span class=\"vcard author\">"+
|
||||||
|
"<a href=\""+user['profile_url']+"\" class=\"url\">"+
|
||||||
|
"<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
|
||||||
|
"<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
|
||||||
|
"</a>"+
|
||||||
|
"</span>"+
|
||||||
|
"<p class=\"entry-content\">"+html+"</p>"+
|
||||||
|
"</div>"+
|
||||||
|
"<div class=\"entry-content\">"+
|
||||||
|
"<dl class=\"timestamp\">"+
|
||||||
|
"<dt>Published</dt>"+
|
||||||
|
"<dd>"+
|
||||||
|
"<a rel=\"bookmark\" href=\""+data['url']+"\" >"+
|
||||||
|
"<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
|
||||||
|
"</a> "+
|
||||||
|
"</dd>"+
|
||||||
|
"</dl>"+
|
||||||
|
"<dl class=\"device\">"+
|
||||||
|
"<dt>From</dt> "+
|
||||||
|
"<dd>"+data['source']+"</dd>"+
|
||||||
|
"</dl>"+
|
||||||
|
"</div>"+
|
||||||
|
"<div class=\"notice-options\">"+
|
||||||
|
"</div>"+
|
||||||
|
"</li>";
|
||||||
|
return ni;
|
||||||
|
}
|
||||||
|
}();
|
||||||
|
|
||||||
@ -121,6 +121,12 @@ class LinkbackPlugin extends Plugin
|
|||||||
{
|
{
|
||||||
$args = array($this->notice->uri, $url);
|
$args = array($this->notice->uri, $url);
|
||||||
|
|
||||||
|
if (!extension_loaded('xmlrpc')) {
|
||||||
|
if (!dl('xmlrpc.so')) {
|
||||||
|
common_log(LOG_ERR, "Can't pingback; xmlrpc extension not available.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$request = xmlrpc_encode_request('pingback.ping', $args);
|
$request = xmlrpc_encode_request('pingback.ping', $args);
|
||||||
$context = stream_context_create(array('http' => array('method' => "POST",
|
$context = stream_context_create(array('http' => array('method' => "POST",
|
||||||
'header' =>
|
'header' =>
|
||||||
@ -141,7 +147,7 @@ class LinkbackPlugin extends Plugin
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Largely cadged from trackback_cls.php by
|
// Largely cadged from trackback_cls.php by
|
||||||
// Ran Aroussi <ran@blogish.org>, GPL2
|
// Ran Aroussi <ran@blogish.org>, GPL2 or any later version
|
||||||
// http://phptrackback.sourceforge.net/
|
// http://phptrackback.sourceforge.net/
|
||||||
|
|
||||||
function getTrackback($text, $url)
|
function getTrackback($text, $url)
|
||||||
|
|||||||
52
scripts/getvaliddaemons.php
Executable file
52
scripts/getvaliddaemons.php
Executable file
@ -0,0 +1,52 @@
|
|||||||
|
#!/usr/bin/env php
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Laconica - a distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2008, Controlez-Vous, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Utility script to get a list of daemons that should run, based on the
|
||||||
|
* current configuration. This is used by startdaemons.sh to determine what
|
||||||
|
* it should and shouldn't start up. The output is a list of space-separated
|
||||||
|
* daemon names.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
# Abort if called from a web server
|
||||||
|
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
||||||
|
print "This script must be run from the command line\n";
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||||
|
define('LACONICA', true);
|
||||||
|
|
||||||
|
require_once(INSTALLDIR . '/lib/common.php');
|
||||||
|
|
||||||
|
if(common_config('xmpp','enabled')) {
|
||||||
|
echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
|
||||||
|
echo "xmppconfirmhandler.php ";
|
||||||
|
}
|
||||||
|
if(common_config('memcached','enabled')) {
|
||||||
|
echo "memcachedqueuehandler.php ";
|
||||||
|
}
|
||||||
|
echo "ombqueuehandler.php ";
|
||||||
|
echo "twitterqueuehandler.php ";
|
||||||
|
echo "facebookqueuehandler.php ";
|
||||||
|
echo "pingqueuehandler.php ";
|
||||||
|
echo "inboxqueuehandler.php ";
|
||||||
|
echo "smsqueuehandler.php ";
|
||||||
69
scripts/inboxqueuehandler.php
Executable file
69
scripts/inboxqueuehandler.php
Executable file
@ -0,0 +1,69 @@
|
|||||||
|
#!/usr/bin/env php
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Laconica - a distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2008,2009 Control Yourself, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Abort if called from a web server
|
||||||
|
|
||||||
|
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
||||||
|
print "This script must be run from the command line\n";
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||||
|
define('LACONICA', true);
|
||||||
|
|
||||||
|
require_once(INSTALLDIR . '/lib/common.php');
|
||||||
|
require_once(INSTALLDIR . '/lib/queuehandler.php');
|
||||||
|
|
||||||
|
set_error_handler('common_error_handler');
|
||||||
|
|
||||||
|
class InboxQueueHandler extends QueueHandler
|
||||||
|
{
|
||||||
|
function transport()
|
||||||
|
{
|
||||||
|
return 'inbox';
|
||||||
|
}
|
||||||
|
|
||||||
|
function start() {
|
||||||
|
$this->log(LOG_INFO, "INITIALIZE");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handle_notice($notice)
|
||||||
|
{
|
||||||
|
$this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
|
||||||
|
$notice->addToInboxes();
|
||||||
|
$notice->blowSubsCache();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function finish() {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ini_set("max_execution_time", "0");
|
||||||
|
ini_set("max_input_time", "0");
|
||||||
|
set_time_limit(0);
|
||||||
|
mb_internal_encoding('UTF-8');
|
||||||
|
|
||||||
|
$id = ($argc > 1) ? $argv[1] : null;
|
||||||
|
|
||||||
|
$handler = new InboxQueueHandler($id);
|
||||||
|
|
||||||
|
$handler->runOnce();
|
||||||
70
scripts/memcachedqueuehandler.php
Executable file
70
scripts/memcachedqueuehandler.php
Executable file
@ -0,0 +1,70 @@
|
|||||||
|
#!/usr/bin/env php
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Laconica - a distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2008,2009 Control Yourself, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Abort if called from a web server
|
||||||
|
|
||||||
|
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
||||||
|
print "This script must be run from the command line\n";
|
||||||
|
exit();
|
||||||
|
}
|
||||||
|
|
||||||
|
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||||
|
define('LACONICA', true);
|
||||||
|
|
||||||
|
require_once(INSTALLDIR . '/lib/common.php');
|
||||||
|
require_once(INSTALLDIR . '/lib/queuehandler.php');
|
||||||
|
|
||||||
|
set_error_handler('common_error_handler');
|
||||||
|
|
||||||
|
class MemcachedQueueHandler extends QueueHandler
|
||||||
|
{
|
||||||
|
function transport()
|
||||||
|
{
|
||||||
|
return 'memcache';
|
||||||
|
}
|
||||||
|
|
||||||
|
function start() {
|
||||||
|
$this->log(LOG_INFO, "INITIALIZE");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handle_notice($notice)
|
||||||
|
{
|
||||||
|
// XXX: fork here
|
||||||
|
$this->log(LOG_INFO, "Blowing memcached for $notice->id");
|
||||||
|
$notice->blowCaches();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function finish() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
ini_set("max_execution_time", "0");
|
||||||
|
ini_set("max_input_time", "0");
|
||||||
|
set_time_limit(0);
|
||||||
|
mb_internal_encoding('UTF-8');
|
||||||
|
|
||||||
|
$id = ($argc > 1) ? $argv[1] : null;
|
||||||
|
|
||||||
|
$handler = new MemcachedQueueHandler($id);
|
||||||
|
|
||||||
|
$handler->runOnce();
|
||||||
@ -21,10 +21,9 @@
|
|||||||
# Note that the 'maildaemon' needs to run as a mail filter.
|
# Note that the 'maildaemon' needs to run as a mail filter.
|
||||||
|
|
||||||
DIR=`dirname $0`
|
DIR=`dirname $0`
|
||||||
|
DAEMONS=`php $DIR/getvaliddaemons.php`
|
||||||
|
|
||||||
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
|
for f in $DAEMONS; do
|
||||||
xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
|
|
||||||
twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php; do
|
|
||||||
|
|
||||||
echo -n "Starting $f...";
|
echo -n "Starting $f...";
|
||||||
php $DIR/$f
|
php $DIR/$f
|
||||||
|
|||||||
@ -24,7 +24,8 @@ SDIR=`dirname $0`
|
|||||||
DIR=`php $SDIR/getpiddir.php`
|
DIR=`php $SDIR/getpiddir.php`
|
||||||
|
|
||||||
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
||||||
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
|
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
|
||||||
|
memcachehandler inboxhandler; do
|
||||||
|
|
||||||
FILES="$DIR/$f.*.pid"
|
FILES="$DIR/$f.*.pid"
|
||||||
for ff in "$FILES" ; do
|
for ff in "$FILES" ; do
|
||||||
|
|||||||
@ -152,11 +152,6 @@ class XMPPDaemon extends Daemon
|
|||||||
$body = preg_replace('/d[\ ]*('. $to .')[\ ]*/', '', $pl['body']);
|
$body = preg_replace('/d[\ ]*('. $to .')[\ ]*/', '', $pl['body']);
|
||||||
$this->add_direct($user, $body, $to, $from);
|
$this->add_direct($user, $body, $to, $from);
|
||||||
} else {
|
} else {
|
||||||
$len = mb_strlen($pl['body']);
|
|
||||||
if($len > 140) {
|
|
||||||
$this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . $len);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$this->add_notice($user, $pl);
|
$this->add_notice($user, $pl);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -255,15 +250,13 @@ class XMPPDaemon extends Daemon
|
|||||||
function add_notice(&$user, &$pl)
|
function add_notice(&$user, &$pl)
|
||||||
{
|
{
|
||||||
$body = trim($pl['body']);
|
$body = trim($pl['body']);
|
||||||
$content_shortened = common_shorten_link($body);
|
$content_shortened = common_shorten_links($body);
|
||||||
if (mb_strlen($content_shortened) > 140) {
|
if (mb_strlen($content_shortened) > 140) {
|
||||||
$content = trim(mb_substr($body, 0, 140));
|
$from = jabber_normalize_jid($pl['from']);
|
||||||
$content_shortened = common_shorten_link($content);
|
$this->from_site($from, "Message too long - maximum is 140 characters, you sent ".mb_strlen($content_shortened));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else {
|
$notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
|
||||||
$content = $body;
|
|
||||||
}
|
|
||||||
$notice = Notice::saveNew($user->id, $content, 'xmpp');
|
|
||||||
if (is_string($notice)) {
|
if (is_string($notice)) {
|
||||||
$this->log(LOG_ERR, $notice);
|
$this->log(LOG_ERR, $notice);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -86,7 +86,7 @@ border:0;
|
|||||||
|
|
||||||
.error,
|
.error,
|
||||||
.success {
|
.success {
|
||||||
padding:4px 7px;
|
padding:4px 1.55%;
|
||||||
border-radius:4px;
|
border-radius:4px;
|
||||||
-moz-border-radius:4px;
|
-moz-border-radius:4px;
|
||||||
-webkit-border-radius:4px;
|
-webkit-border-radius:4px;
|
||||||
@ -426,6 +426,7 @@ line-height:1;
|
|||||||
#form_notice fieldset {
|
#form_notice fieldset {
|
||||||
border:0;
|
border:0;
|
||||||
padding:0;
|
padding:0;
|
||||||
|
position:relative;
|
||||||
}
|
}
|
||||||
#form_notice legend {
|
#form_notice legend {
|
||||||
display:none;
|
display:none;
|
||||||
@ -480,7 +481,13 @@ margin-bottom:7px;
|
|||||||
margin-left:18px;
|
margin-left:18px;
|
||||||
float:left;
|
float:left;
|
||||||
}
|
}
|
||||||
|
#form_notice .error {
|
||||||
|
float:left;
|
||||||
|
clear:both;
|
||||||
|
width:96.9%;
|
||||||
|
margin-bottom:0;
|
||||||
|
line-height:1.618;
|
||||||
|
}
|
||||||
|
|
||||||
/* entity_profile */
|
/* entity_profile */
|
||||||
.entity_profile {
|
.entity_profile {
|
||||||
@ -835,23 +842,6 @@ text-transform:lowercase;
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.notice-data {
|
|
||||||
position:absolute;
|
|
||||||
top:18px;
|
|
||||||
right:0;
|
|
||||||
min-height:50px;
|
|
||||||
margin-bottom:4px;
|
|
||||||
}
|
|
||||||
.notice .entry-content .notice-data dt {
|
|
||||||
display:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notice-data a {
|
|
||||||
display:block;
|
|
||||||
outline:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.notice-options {
|
.notice-options {
|
||||||
padding-left:2%;
|
padding-left:2%;
|
||||||
float:left;
|
float:left;
|
||||||
@ -1029,6 +1019,8 @@ padding-right:30px;
|
|||||||
.hentry .entry-content p {
|
.hentry .entry-content p {
|
||||||
margin-bottom:18px;
|
margin-bottom:18px;
|
||||||
}
|
}
|
||||||
|
.system_notice ul,
|
||||||
|
.instructions ul,
|
||||||
.hentry entry-content ol,
|
.hentry entry-content ol,
|
||||||
.hentry .entry-content ul {
|
.hentry .entry-content ul {
|
||||||
list-style-position:inside;
|
list-style-position:inside;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user