Commit 5224c7d6 authored by Craig Andrews's avatar Craig Andrews

Merge branch '0.9.x' into 1.0.x

parents 767b77d6 656d9541
...@@ -115,11 +115,11 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction ...@@ -115,11 +115,11 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
$original = clone($profile); $original = clone($profile);
if (empty($this->name)) { if (!empty($this->name)) {
$profile->fullname = $this->name; $profile->fullname = $this->name;
} }
if (empty($this->url)) { if (!empty($this->url)) {
$profile->homepage = $this->url; $profile->homepage = $this->url;
} }
......
...@@ -112,7 +112,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction ...@@ -112,7 +112,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction
$repeat = $this->original->repeat($this->user->id, $this->source); $repeat = $this->original->repeat($this->user->id, $this->source);
common_broadcast_notice($repeat);
$this->showNotice($repeat); $this->showNotice($repeat);
} }
......
...@@ -255,7 +255,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction ...@@ -255,7 +255,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
$upload->attachToNotice($this->notice); $upload->attachToNotice($this->notice);
} }
common_broadcast_notice($this->notice);
} }
$this->showNotice(); $this->showNotice();
......
...@@ -201,7 +201,7 @@ class NewnoticeAction extends Action ...@@ -201,7 +201,7 @@ class NewnoticeAction extends Action
$upload->attachToNotice($notice); $upload->attachToNotice($notice);
} }
common_broadcast_notice($notice);
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
header('Content-Type: text/xml;charset=utf-8'); header('Content-Type: text/xml;charset=utf-8');
......
...@@ -106,7 +106,7 @@ class RepeatAction extends Action ...@@ -106,7 +106,7 @@ class RepeatAction extends Action
{ {
$repeat = $this->notice->repeat($this->user->id, 'web'); $repeat = $this->notice->repeat($this->user->id, 'web');
common_broadcast_notice($repeat);
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8'); $this->startHTML('text/xml;charset=utf-8');
......
...@@ -120,11 +120,7 @@ class Inbox extends Memcached_DataObject ...@@ -120,11 +120,7 @@ class Inbox extends Memcached_DataObject
$notice_id, $user_id)); $notice_id, $user_id));
if ($result) { if ($result) {
$c = self::memcache(); self::blow('inbox:user_id:%d', $user_id);
if (!empty($c)) {
$c->delete(self::cacheKey('inbox', 'user_id', $user_id));
}
} }
return $result; return $result;
......
...@@ -458,4 +458,23 @@ class Memcached_DataObject extends DB_DataObject ...@@ -458,4 +458,23 @@ class Memcached_DataObject extends DB_DataObject
return $dsn; return $dsn;
} }
static function blow()
{
$c = self::memcache();
if (empty($c)) {
return false;
}
$args = func_get_args();
$format = array_shift($args);
$keyPart = vsprintf($format, $args);
$cacheKey = common_cache_key($keyPart);
return $c->delete($cacheKey);
}
} }
This diff is collapsed.
...@@ -86,13 +86,9 @@ class Notice_tag extends Memcached_DataObject ...@@ -86,13 +86,9 @@ class Notice_tag extends Memcached_DataObject
function blowCache($blowLast=false) function blowCache($blowLast=false)
{ {
$cache = common_memcache(); self::blow('notice_tag:notice_ids:%s', common_keyize($this->tag));
if ($cache) { if ($blowLast) {
$idkey = common_cache_key('notice_tag:notice_ids:' . common_keyize($this->tag)); self::blow('notice_tag:notice_ids:%s;last', common_keyize($this->tag));
$cache->delete($idkey);
if ($blowLast) {
$cache->delete($idkey.';last');
}
} }
} }
......
...@@ -48,6 +48,7 @@ class Status_network extends DB_DataObject ...@@ -48,6 +48,7 @@ class Status_network extends DB_DataObject
static $cache = null; static $cache = null;
static $base = null; static $base = null;
static $wildcard = null;
/** /**
* @param string $dbhost * @param string $dbhost
...@@ -187,7 +188,12 @@ class Status_network extends DB_DataObject ...@@ -187,7 +188,12 @@ class Status_network extends DB_DataObject
$config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname"; $config['db']['database'] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname";
$config['site']['name'] = $sn->sitename; $config['site']['name'] = $sn->sitename;
$config['site']['nickname'] = $sn->nickname;
self::$wildcard = $wildcard;
$config['site']['wildcard'] =& self::$wildcard;
if (!empty($sn->hostname)) { if (!empty($sn->hostname)) {
$config['site']['server'] = $sn->hostname; $config['site']['server'] = $sn->hostname;
...@@ -230,4 +236,13 @@ class Status_network extends DB_DataObject ...@@ -230,4 +236,13 @@ class Status_network extends DB_DataObject
exit; exit;
} }
function getServerName()
{
if (!empty($this->hostname)) {
return $this->hostname;
} else {
return $this->nickname . '.' . self::$wildcard;
}
}
} }
...@@ -383,7 +383,7 @@ class User extends Memcached_DataObject ...@@ -383,7 +383,7 @@ class User extends Memcached_DataObject
common_config('site', 'name'), common_config('site', 'name'),
$user->nickname), $user->nickname),
'system'); 'system');
common_broadcast_notice($notice);
} }
} }
......
...@@ -495,7 +495,7 @@ var SN = { // StatusNet ...@@ -495,7 +495,7 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeLocationId).val(''); $('#'+SN.C.S.NoticeLocationId).val('');
$('#'+SN.C.S.NoticeDataGeo).attr('checked', false); $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
$.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled'); $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/', expires: SN.U.GetFullYear(2029, 0, 1) });
} }
function getJSONgeocodeURL(geocodeURL, data) { function getJSONgeocodeURL(geocodeURL, data) {
...@@ -537,7 +537,8 @@ var SN = { // StatusNet ...@@ -537,7 +537,8 @@ var SN = { // StatusNet
NLNU: location.url, NLNU: location.url,
NDG: true NDG: true
}; };
$.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue));
$.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue), { path: '/', expires: SN.U.GetFullYear(2029, 0, 1) });
}); });
} }
...@@ -658,6 +659,13 @@ var SN = { // StatusNet ...@@ -658,6 +659,13 @@ var SN = { // StatusNet
} }
return false; return false;
}); });
},
GetFullYear: function(year, month, day) {
var date = new Date();
date.setFullYear(year, month, day);
return date;
} }
}, },
......
...@@ -422,7 +422,7 @@ class RepeatCommand extends Command ...@@ -422,7 +422,7 @@ class RepeatCommand extends Command
$repeat = $notice->repeat($this->user->id, $channel->source); $repeat = $notice->repeat($this->user->id, $channel->source);
if ($repeat) { if ($repeat) {
common_broadcast_notice($repeat);
$channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname)); $channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname));
} else { } else {
$channel->error($this->user, _('Error repeating notice.')); $channel->error($this->user, _('Error repeating notice.'));
...@@ -492,7 +492,7 @@ class ReplyCommand extends Command ...@@ -492,7 +492,7 @@ class ReplyCommand extends Command
} else { } else {
$channel->error($this->user, _('Error saving notice.')); $channel->error($this->user, _('Error saving notice.'));
} }
common_broadcast_notice($notice);
} }
} }
......
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
$default = $default =
array('site' => array('site' =>
array('name' => 'Just another StatusNet microblog', array('name' => 'Just another StatusNet microblog',
'nickname' => 'statusnet',
'wildcard' => null,
'server' => $_server, 'server' => $_server,
'theme' => 'default', 'theme' => 'default',
'path' => $_path, 'path' => $_path,
......
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, 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/>.
*/
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
/**
* Base class for queue handlers.
*
* As extensions of the Daemon class, each queue handler has the ability
* to launch itself in the background, at which point it'll pass control
* to the configured QueueManager class to poll for updates.
*
* Subclasses must override at least the following methods:
* - transport
* - handle_notice
*/
class DistribQueueHandler
{
/**
* Return transport keyword which identifies items this queue handler
* services; must be defined for all subclasses.
*
* Must be 8 characters or less to fit in the queue_item database.
* ex "email", "jabber", "sms", "irc", ...
*
* @return string
*/
function transport()
{
return 'distrib';
}
/**
* Here's the meat of your queue handler -- you're handed a Notice
* object, which you may do as you will with.
*
* If this function indicates failure, a warning will be logged
* and the item is placed back in the queue to be re-run.
*
* @param Notice $notice
* @return boolean true on success, false on failure
*/
function handle($notice)
{
// XXX: do we need to change this for remote users?
$notice->saveTags();
$groups = $notice->saveGroups();
$recipients = $notice->saveReplies();
$notice->addToInboxes($groups, $recipients);
$notice->saveUrls();
Event::handle('EndNoticeSave', array($notice));
// Enqueue for other handlers
common_enqueue_notice($notice);
return true;
}
}
...@@ -88,7 +88,7 @@ abstract class IoMaster ...@@ -88,7 +88,7 @@ abstract class IoMaster
$sn = new Status_network(); $sn = new Status_network();
$sn->find(); $sn->find();
while ($sn->fetch()) { while ($sn->fetch()) {
$hosts[] = $sn->hostname; $hosts[] = $sn->getServerName();
} }
return $hosts; return $hosts;
} }
...@@ -102,7 +102,7 @@ abstract class IoMaster ...@@ -102,7 +102,7 @@ abstract class IoMaster
*/ */
protected function instantiate($class) protected function instantiate($class)
{ {
if (isset($this->singletons[$class])) { if (is_string($class) && isset($this->singletons[$class])) {
// Already instantiated a multi-site-capable handler. // Already instantiated a multi-site-capable handler.
// Just let it know it should listen to this site too! // Just let it know it should listen to this site too!
$this->singletons[$class]->addSite(common_config('site', 'server')); $this->singletons[$class]->addSite(common_config('site', 'server'));
...@@ -129,7 +129,11 @@ abstract class IoMaster ...@@ -129,7 +129,11 @@ abstract class IoMaster
protected function getManager($class) protected function getManager($class)
{ {
return call_user_func(array($class, 'get')); if(is_object($class)){
return $class;
} else {
return call_user_func(array($class, 'get'));
}
} }
/** /**
...@@ -347,7 +351,7 @@ abstract class IoMaster ...@@ -347,7 +351,7 @@ abstract class IoMaster
* for per-queue and per-site records. * for per-queue and per-site records.
* *
* @param string $key counter name * @param string $key counter name
* @param array $owners list of owner keys like 'queue:jabber' or 'site:stat01' * @param array $owners list of owner keys like 'queue:xmpp' or 'site:stat01'
*/ */
public function stats($key, $owners=array()) public function stats($key, $owners=array())
{ {
......
...@@ -160,7 +160,7 @@ class MailHandler ...@@ -160,7 +160,7 @@ class MailHandler
foreach($mediafiles as $mf){ foreach($mediafiles as $mf){
$mf->attachToNotice($notice); $mf->attachToNotice($notice);
} }
common_broadcast_notice($notice);
$this->log(LOG_INFO, $this->log(LOG_INFO,
'Added notice ' . $notice->id . ' from user ' . $user->nickname); 'Added notice ' . $notice->id . ' from user ' . $user->nickname);
return true; return true;
......
...@@ -362,7 +362,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore ...@@ -362,7 +362,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
array('is_local' => Notice::REMOTE_OMB, array('is_local' => Notice::REMOTE_OMB,
'uri' => $omb_notice->getIdentifierURI())); 'uri' => $omb_notice->getIdentifierURI()));
common_broadcast_notice($notice, true);
} }
/** /**
......
...@@ -170,7 +170,9 @@ abstract class QueueManager extends IoManager ...@@ -170,7 +170,9 @@ abstract class QueueManager extends IoManager
{ {
if (isset($this->handlers[$queue])) { if (isset($this->handlers[$queue])) {
$class = $this->handlers[$queue]; $class = $this->handlers[$queue];
if (class_exists($class)) { if(is_object($class)) {
return $class;
} else if (class_exists($class)) {
return new $class(); return new $class();
} else { } else {
common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'"); common_log(LOG_ERR, "Nonexistent handler class '$class' for queue '$queue'");
...@@ -206,6 +208,7 @@ abstract class QueueManager extends IoManager ...@@ -206,6 +208,7 @@ abstract class QueueManager extends IoManager
$this->connect('plugin', 'PluginQueueHandler'); $this->connect('plugin', 'PluginQueueHandler');
$this->connect('omb', 'OmbQueueHandler'); $this->connect('omb', 'OmbQueueHandler');
$this->connect('ping', 'PingQueueHandler'); $this->connect('ping', 'PingQueueHandler');
$this->connect('distrib', 'DistribQueueHandler');
if (common_config('sms', 'enabled')) { if (common_config('sms', 'enabled')) {
$this->connect('sms', 'SmsQueueHandler'); $this->connect('sms', 'SmsQueueHandler');
} }
...@@ -213,7 +216,7 @@ abstract class QueueManager extends IoManager ...@@ -213,7 +216,7 @@ abstract class QueueManager extends IoManager
// XMPP output handlers... // XMPP output handlers...
$this->connect('jabber', 'JabberQueueHandler'); $this->connect('jabber', 'JabberQueueHandler');
$this->connect('public', 'PublicQueueHandler'); $this->connect('public', 'PublicQueueHandler');
// @fixme this should get an actual queue // @fixme this should get an actual queue
//$this->connect('confirm', 'XmppConfirmHandler'); //$this->connect('confirm', 'XmppConfirmHandler');
...@@ -231,7 +234,7 @@ abstract class QueueManager extends IoManager ...@@ -231,7 +234,7 @@ abstract class QueueManager extends IoManager
* Only registered transports will be reliably picked up! * Only registered transports will be reliably picked up!
* *
* @param string $transport * @param string $transport
* @param string $class * @param string $class class name or object instance
* @param string $group * @param string $group
*/ */
public function connect($transport, $class, $group='queuedaemon') public function connect($transport, $class, $group='queuedaemon')
......
...@@ -294,7 +294,26 @@ class StompQueueManager extends QueueManager ...@@ -294,7 +294,26 @@ class StompQueueManager extends QueueManager
StatusNet::init($site); StatusNet::init($site);
} }
$item = $this->decode($frame->body); if (is_numeric($frame->body)) {
$id = intval($frame->body);
$info = "notice $id posted at {$frame->headers['created']} in queue $queue";
$notice = Notice::staticGet('id', $id);
if (empty($notice)) {
$this->_log(LOG_WARNING, "Skipping missing $info");
$this->ack($frame);
$this->commit();
$this->begin();
$this->stats('badnotice', $queue);
return false;
}
$item = $notice;
} else {
// @fixme should we serialize, or json, or what here?
$info = "string posted at {$frame->headers['created']} in queue $queue";
$item = $frame->body;
}
$handler = $this->getHandler($queue); $handler = $this->getHandler($queue);
if (!$handler) { if (!$handler) {
......
...@@ -980,7 +980,7 @@ function common_redirect($url, $code=307) ...@@ -980,7 +980,7 @@ function common_redirect($url, $code=307)
function common_broadcast_notice($notice, $remote=false) function common_broadcast_notice($notice, $remote=false)
{ {
return common_enqueue_notice($notice); // DO NOTHING!
} }
// Stick the notice on the queue // Stick the notice on the queue
......
...@@ -101,7 +101,7 @@ class XmppManager extends IoManager ...@@ -101,7 +101,7 @@ class XmppManager extends IoManager
$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this); $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
$this->conn->setReconnectTimeout(600); $this->conn->setReconnectTimeout(600);
jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1); jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', 100);
return !is_null($this->conn); return !is_null($this->conn);
} }
...@@ -233,7 +233,7 @@ class XmppManager extends IoManager ...@@ -233,7 +233,7 @@ class XmppManager extends IoManager
common_log(LOG_NOTICE, 'XMPP reconnected'); common_log(LOG_NOTICE, 'XMPP reconnected');
$this->conn->processUntil('session_start'); $this->conn->processUntil('session_start');
$this->conn->presence(null, 'available', null, 'available', -1); $this->conn->presence(null, 'available', null, 'available', 100);
} }
......
...@@ -397,7 +397,7 @@ class FacebookAction extends Action ...@@ -397,7 +397,7 @@ class FacebookAction extends Action
return; return;
} }
common_broadcast_notice($notice);
} }
......
...@@ -86,7 +86,7 @@ class ImapPlugin extends Plugin ...@@ -86,7 +86,7 @@ class ImapPlugin extends Plugin
} }
} }
function onStartIoManagerClasses(&$classes) function onStartQueueDaemonIoManagers(&$classes)
{ {
$classes[] = new ImapManager($this); $classes[] = new ImapManager($this);
} }
......
...@@ -414,7 +414,15 @@ class MobileProfilePlugin extends WAP20Plugin ...@@ -414,7 +414,15 @@ class MobileProfilePlugin extends WAP20Plugin
return $proto.'://'.$serverpart.'/'.$pathpart.$relative; return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
} }
}
?> function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'MobileProfile',
'version' => STATUSNET_VERSION,
'author' => 'Sarven Capadisli',
'homepage' => 'http://status.net/wiki/Plugin:MobileProfile',
'rawdescription' =>
_m('XHTML MobileProfile output for supporting user agents.'));
return true;
}
}
...@@ -46,8 +46,9 @@ class PoweredByStatusNetPlugin extends Plugin ...@@ -46,8 +46,9 @@ class PoweredByStatusNetPlugin extends Plugin
function onEndAddressData($action) function onEndAddressData($action)
{ {
$action->elementStart('span', 'poweredby'); $action->elementStart('span', 'poweredby');
$action->text(_('powered by')); $action->raw(sprintf(_m('powered by %s'),
$action->element('a', array('href' => 'http://status.net/'), 'StatusNet'); sprintf('<a href="http://status.net/">%s</a>',
_m('StatusNet'))));
$action->elementEnd('span'); $action->elementEnd('span');
return true; return true;
......
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"