Merge branch 'master' into testing
This commit is contained in:
commit
772018810b
@ -39,6 +39,22 @@ class Foreign_user extends Memcached_DataObject
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static function getByNickname($nickname, $service)
|
||||||
|
{
|
||||||
|
if (empty($nickname) || empty($service)) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
$fuser = new Foreign_user();
|
||||||
|
$fuser->service = $service;
|
||||||
|
$fuser->nickname = $nickname;
|
||||||
|
$fuser->limit(1);
|
||||||
|
|
||||||
|
$result = $fuser->find(true);
|
||||||
|
|
||||||
|
return empty($result) ? null : $fuser;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function updateKeys(&$orig)
|
function updateKeys(&$orig)
|
||||||
{
|
{
|
||||||
$this->_connect();
|
$this->_connect();
|
||||||
|
@ -593,7 +593,7 @@ class Memcached_DataObject extends Safe_DataObject
|
|||||||
return $c->get($cacheKey);
|
return $c->get($cacheKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
static function cacheSet($keyPart, $value)
|
static function cacheSet($keyPart, $value, $flag=null, $expiry=null)
|
||||||
{
|
{
|
||||||
$c = self::memcache();
|
$c = self::memcache();
|
||||||
|
|
||||||
@ -603,7 +603,7 @@ class Memcached_DataObject extends Safe_DataObject
|
|||||||
|
|
||||||
$cacheKey = common_cache_key($keyPart);
|
$cacheKey = common_cache_key($keyPart);
|
||||||
|
|
||||||
return $c->set($cacheKey, $value);
|
return $c->set($cacheKey, $value, $flag, $expiry);
|
||||||
}
|
}
|
||||||
|
|
||||||
static function valueString($v)
|
static function valueString($v)
|
||||||
|
@ -90,7 +90,13 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
function getProfile()
|
function getProfile()
|
||||||
{
|
{
|
||||||
return Profile::staticGet('id', $this->profile_id);
|
$profile = Profile::staticGet('id', $this->profile_id);
|
||||||
|
|
||||||
|
if (empty($profile)) {
|
||||||
|
throw new ServerException(sprintf(_('No such profile (%d) for notice (%d)'), $this->profile_id, $this->id));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
function delete()
|
function delete()
|
||||||
|
@ -126,6 +126,7 @@ class ApiAction extends Action
|
|||||||
var $max_id = null;
|
var $max_id = null;
|
||||||
var $since_id = null;
|
var $since_id = null;
|
||||||
var $source = null;
|
var $source = null;
|
||||||
|
var $callback = null;
|
||||||
|
|
||||||
var $access = self::READ_ONLY; // read (default) or read-write
|
var $access = self::READ_ONLY; // read (default) or read-write
|
||||||
|
|
||||||
@ -145,6 +146,7 @@ class ApiAction extends Action
|
|||||||
parent::prepare($args);
|
parent::prepare($args);
|
||||||
|
|
||||||
$this->format = $this->arg('format');
|
$this->format = $this->arg('format');
|
||||||
|
$this->callback = $this->arg('callback');
|
||||||
$this->page = (int)$this->arg('page', 1);
|
$this->page = (int)$this->arg('page', 1);
|
||||||
$this->count = (int)$this->arg('count', 20);
|
$this->count = (int)$this->arg('count', 20);
|
||||||
$this->max_id = (int)$this->arg('max_id', 0);
|
$this->max_id = (int)$this->arg('max_id', 0);
|
||||||
@ -461,6 +463,7 @@ class ApiAction extends Action
|
|||||||
function twitterRssEntryArray($notice)
|
function twitterRssEntryArray($notice)
|
||||||
{
|
{
|
||||||
$profile = $notice->getProfile();
|
$profile = $notice->getProfile();
|
||||||
|
|
||||||
$entry = array();
|
$entry = array();
|
||||||
|
|
||||||
// We trim() to avoid extraneous whitespace in the output
|
// We trim() to avoid extraneous whitespace in the output
|
||||||
@ -733,14 +736,16 @@ class ApiAction extends Action
|
|||||||
'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
|
'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
|
||||||
|
|
||||||
if (is_array($notice)) {
|
if (is_array($notice)) {
|
||||||
foreach ($notice as $n) {
|
$notice = new ArrayWrapper($notice);
|
||||||
$twitter_status = $this->twitterStatusArray($n);
|
|
||||||
$this->showTwitterXmlStatus($twitter_status);
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
try {
|
||||||
$twitter_status = $this->twitterStatusArray($notice);
|
$twitter_status = $this->twitterStatusArray($notice);
|
||||||
$this->showTwitterXmlStatus($twitter_status);
|
$this->showTwitterXmlStatus($twitter_status);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -788,14 +793,16 @@ class ApiAction extends Action
|
|||||||
$this->element('ttl', null, '40');
|
$this->element('ttl', null, '40');
|
||||||
|
|
||||||
if (is_array($notice)) {
|
if (is_array($notice)) {
|
||||||
foreach ($notice as $n) {
|
$notice = new ArrayWrapper($notice);
|
||||||
$entry = $this->twitterRssEntryArray($n);
|
|
||||||
$this->showTwitterRssItem($entry);
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
try {
|
||||||
$entry = $this->twitterRssEntryArray($notice);
|
$entry = $this->twitterRssEntryArray($notice);
|
||||||
$this->showTwitterRssItem($entry);
|
$this->showTwitterRssItem($entry);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
// continue on exceptions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -831,12 +838,15 @@ class ApiAction extends Action
|
|||||||
$this->element('subtitle', null, $subtitle);
|
$this->element('subtitle', null, $subtitle);
|
||||||
|
|
||||||
if (is_array($notice)) {
|
if (is_array($notice)) {
|
||||||
foreach ($notice as $n) {
|
$notice = new ArrayWrapper($notice);
|
||||||
$this->raw($n->asAtomEntry());
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
try {
|
||||||
$this->raw($notice->asAtomEntry());
|
$this->raw($notice->asAtomEntry());
|
||||||
|
} catch (Exception $e) {
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1031,14 +1041,16 @@ class ApiAction extends Action
|
|||||||
$statuses = array();
|
$statuses = array();
|
||||||
|
|
||||||
if (is_array($notice)) {
|
if (is_array($notice)) {
|
||||||
foreach ($notice as $n) {
|
$notice = new ArrayWrapper($notice);
|
||||||
$twitter_status = $this->twitterStatusArray($n);
|
|
||||||
array_push($statuses, $twitter_status);
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
while ($notice->fetch()) {
|
while ($notice->fetch()) {
|
||||||
|
try {
|
||||||
$twitter_status = $this->twitterStatusArray($notice);
|
$twitter_status = $this->twitterStatusArray($notice);
|
||||||
array_push($statuses, $twitter_status);
|
array_push($statuses, $twitter_status);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1175,9 +1187,8 @@ class ApiAction extends Action
|
|||||||
header('Content-Type: application/json; charset=utf-8');
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
|
|
||||||
// Check for JSONP callback
|
// Check for JSONP callback
|
||||||
$callback = $this->arg('callback');
|
if (isset($this->callback)) {
|
||||||
if ($callback) {
|
print $this->callback . '(';
|
||||||
print $callback . '(';
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'rss':
|
case 'rss':
|
||||||
@ -1206,8 +1217,7 @@ class ApiAction extends Action
|
|||||||
case 'json':
|
case 'json':
|
||||||
|
|
||||||
// Check for JSONP callback
|
// Check for JSONP callback
|
||||||
$callback = $this->arg('callback');
|
if (isset($this->callback)) {
|
||||||
if ($callback) {
|
|
||||||
print ')';
|
print ')';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -1237,7 +1247,10 @@ class ApiAction extends Action
|
|||||||
|
|
||||||
$status_string = ClientErrorAction::$status[$code];
|
$status_string = ClientErrorAction::$status[$code];
|
||||||
|
|
||||||
|
// Do not emit error header for JSONP
|
||||||
|
if (!isset($this->callback)) {
|
||||||
header('HTTP/1.1 '.$code.' '.$status_string);
|
header('HTTP/1.1 '.$code.' '.$status_string);
|
||||||
|
}
|
||||||
|
|
||||||
if ($format == 'xml') {
|
if ($format == 'xml') {
|
||||||
$this->initDocument('xml');
|
$this->initDocument('xml');
|
||||||
@ -1270,7 +1283,10 @@ class ApiAction extends Action
|
|||||||
|
|
||||||
$status_string = ServerErrorAction::$status[$code];
|
$status_string = ServerErrorAction::$status[$code];
|
||||||
|
|
||||||
|
// Do not emit error header for JSONP
|
||||||
|
if (!isset($this->callback)) {
|
||||||
header('HTTP/1.1 '.$code.' '.$status_string);
|
header('HTTP/1.1 '.$code.' '.$status_string);
|
||||||
|
}
|
||||||
|
|
||||||
if ($content_type == 'xml') {
|
if ($content_type == 'xml') {
|
||||||
$this->initDocument('xml');
|
$this->initDocument('xml');
|
||||||
|
@ -227,7 +227,7 @@ class ApiAuthAction extends ApiAction
|
|||||||
|
|
||||||
} catch (OAuthException $e) {
|
} catch (OAuthException $e) {
|
||||||
common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage());
|
common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage());
|
||||||
$this->showAuthError();
|
$this->clientError($e->getMessage(), 401, $this->format);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -265,7 +265,7 @@ class ApiAuthAction extends ApiAction
|
|||||||
|
|
||||||
// show error if the user clicks 'cancel'
|
// show error if the user clicks 'cancel'
|
||||||
|
|
||||||
$this->showAuthError();
|
$this->clientError("Could not authenticate you.", 401, $this->format);
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -298,7 +298,7 @@ class ApiAuthAction extends ApiAction
|
|||||||
$proxy,
|
$proxy,
|
||||||
$ip);
|
$ip);
|
||||||
common_log(LOG_WARNING, $msg);
|
common_log(LOG_WARNING, $msg);
|
||||||
$this->showAuthError();
|
$this->clientError("Could not authenticate you.", 401, $this->format);
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -345,36 +345,4 @@ class ApiAuthAction extends ApiAction
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Output an authentication error message. Use XML or JSON if one
|
|
||||||
* of those formats is specified, otherwise output plain text
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
|
|
||||||
function showAuthError()
|
|
||||||
{
|
|
||||||
header('HTTP/1.1 401 Unauthorized');
|
|
||||||
$msg = 'Could not authenticate you.';
|
|
||||||
|
|
||||||
if ($this->format == 'xml') {
|
|
||||||
header('Content-Type: application/xml; charset=utf-8');
|
|
||||||
$this->startXML();
|
|
||||||
$this->elementStart('hash');
|
|
||||||
$this->element('error', null, $msg);
|
|
||||||
$this->element('request', null, $_SERVER['REQUEST_URI']);
|
|
||||||
$this->elementEnd('hash');
|
|
||||||
$this->endXML();
|
|
||||||
} elseif ($this->format == 'json') {
|
|
||||||
header('Content-Type: application/json; charset=utf-8');
|
|
||||||
$error_array = array('error' => $msg,
|
|
||||||
'request' => $_SERVER['REQUEST_URI']);
|
|
||||||
print(json_encode($error_array));
|
|
||||||
} else {
|
|
||||||
header('Content-type: text/plain');
|
|
||||||
print "$msg\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -125,12 +125,17 @@ class AtomNoticeFeed extends Atom10Feed
|
|||||||
*/
|
*/
|
||||||
function addEntryFromNotice($notice)
|
function addEntryFromNotice($notice)
|
||||||
{
|
{
|
||||||
|
try {
|
||||||
$source = $this->showSource();
|
$source = $this->showSource();
|
||||||
$author = $this->showAuthor();
|
$author = $this->showAuthor();
|
||||||
|
|
||||||
$cur = empty($this->cur) ? common_current_user() : $this->cur;
|
$cur = empty($this->cur) ? common_current_user() : $this->cur;
|
||||||
|
|
||||||
$this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur));
|
$this->addEntryRaw($notice->asAtomEntry(false, $source, $author, $cur));
|
||||||
|
} catch (Exception $e) {
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
// we continue on exceptions
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showSource()
|
function showSource()
|
||||||
|
@ -96,8 +96,14 @@ class NoticeList extends Widget
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
$item = $this->newListItem($this->notice);
|
$item = $this->newListItem($this->notice);
|
||||||
$item->show();
|
$item->show();
|
||||||
|
} catch (Exception $e) {
|
||||||
|
// we log exceptions and continue
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->out->elementEnd('ol');
|
$this->out->elementEnd('ol');
|
||||||
|
@ -178,7 +178,13 @@ class Rss10Action extends Action
|
|||||||
|
|
||||||
if (count($this->notices)) {
|
if (count($this->notices)) {
|
||||||
foreach ($this->notices as $n) {
|
foreach ($this->notices as $n) {
|
||||||
|
try {
|
||||||
$this->showItem($n);
|
$this->showItem($n);
|
||||||
|
} catch (Exception $e) {
|
||||||
|
// log exceptions and continue
|
||||||
|
common_log(LOG_ERR, $e->getMessage());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -232,7 +238,7 @@ class Rss10Action extends Action
|
|||||||
|
|
||||||
function showItem($notice)
|
function showItem($notice)
|
||||||
{
|
{
|
||||||
$profile = Profile::staticGet($notice->profile_id);
|
$profile = $notice->getProfile();
|
||||||
$nurl = common_local_url('shownotice', array('notice' => $notice->id));
|
$nurl = common_local_url('shownotice', array('notice' => $notice->id));
|
||||||
$creator_uri = common_profile_uri($profile);
|
$creator_uri = common_profile_uri($profile);
|
||||||
$this->elementStart('item', array('rdf:about' => $notice->uri,
|
$this->elementStart('item', array('rdf:about' => $notice->uri,
|
||||||
|
87
plugins/OStatus/lib/hubprepqueuehandler.php
Normal file
87
plugins/OStatus/lib/hubprepqueuehandler.php
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* StatusNet - the distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2010, 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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When we have a large batch of PuSH consumers, we break the data set
|
||||||
|
* into smaller chunks. Enqueue final destinations...
|
||||||
|
*
|
||||||
|
* @package Hub
|
||||||
|
* @author Brion Vibber <brion@status.net>
|
||||||
|
*/
|
||||||
|
class HubPrepQueueHandler extends QueueHandler
|
||||||
|
{
|
||||||
|
// Enqueue this many low-level distributions before re-queueing the rest
|
||||||
|
// of the batch to be processed later. Helps to keep latency down for other
|
||||||
|
// things happening during a particularly long OStatus delivery session.
|
||||||
|
//
|
||||||
|
// [Could probably ditch this if we had working message delivery priorities
|
||||||
|
// for queueing, but this isn't supported in ActiveMQ 5.3.]
|
||||||
|
const ROLLING_BATCH = 20;
|
||||||
|
|
||||||
|
function transport()
|
||||||
|
{
|
||||||
|
return 'hubprep';
|
||||||
|
}
|
||||||
|
|
||||||
|
function handle($data)
|
||||||
|
{
|
||||||
|
$topic = $data['topic'];
|
||||||
|
$atom = $data['atom'];
|
||||||
|
$pushCallbacks = $data['pushCallbacks'];
|
||||||
|
|
||||||
|
assert(is_string($atom));
|
||||||
|
assert(is_string($topic));
|
||||||
|
assert(is_array($pushCallbacks));
|
||||||
|
|
||||||
|
// Set up distribution for the first n subscribing sites...
|
||||||
|
// If we encounter an uncatchable error, queue handling should
|
||||||
|
// automatically re-run the batch, which could lead to some dupe
|
||||||
|
// distributions.
|
||||||
|
//
|
||||||
|
// Worst case is if one of these hubprep entries dies too many
|
||||||
|
// times and gets dropped; the rest of the batch won't get processed.
|
||||||
|
try {
|
||||||
|
$n = 0;
|
||||||
|
while (count($pushCallbacks) && $n < self::ROLLING_BATCH) {
|
||||||
|
$n++;
|
||||||
|
$callback = array_shift($pushCallbacks);
|
||||||
|
$sub = HubSub::staticGet($topic, $callback);
|
||||||
|
if (!$sub) {
|
||||||
|
common_log(LOG_ERR, "Skipping PuSH delivery for deleted(?) consumer $callback on $topic");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$sub->distribute($atom);
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
common_log(LOG_ERR, "Exception during PuSH batch out: " .
|
||||||
|
$e->getMessage() .
|
||||||
|
" prepping $topic to $callback");
|
||||||
|
}
|
||||||
|
|
||||||
|
// And re-queue the rest of the batch!
|
||||||
|
if (count($pushCallbacks) > 0) {
|
||||||
|
$sub = new HubSub();
|
||||||
|
$sub->topic = $topic;
|
||||||
|
$sub->bulkDistribute($atom, $pushCallbacks);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
@ -202,6 +202,12 @@ class SitemapPlugin extends Plugin
|
|||||||
null, false),
|
null, false),
|
||||||
new ColumnDef('modified', 'timestamp')));
|
new ColumnDef('modified', 'timestamp')));
|
||||||
|
|
||||||
|
$userCreated = $schema->getColumnDef('user', 'created');
|
||||||
|
|
||||||
|
if (empty($userCreated) || $userCreated->key != 'MUL') {
|
||||||
|
$schema->createIndex('user', 'created');
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,7 +153,9 @@ class Sitemap_notice_count extends Memcached_DataObject
|
|||||||
$noticeCounts[$snc->notice_date] = $snc->notice_count;
|
$noticeCounts[$snc->notice_date] = $snc->notice_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
self::cacheSet('sitemap:notice:counts', $noticeCounts);
|
// Cache notice counts for 4 hours.
|
||||||
|
|
||||||
|
self::cacheSet('sitemap:notice:counts', $noticeCounts, null, time() + 4 * 60 * 60);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $noticeCounts;
|
return $noticeCounts;
|
||||||
|
@ -154,7 +154,9 @@ class Sitemap_user_count extends Memcached_DataObject
|
|||||||
$userCounts[$suc->registration_date] = $suc->user_count;
|
$userCounts[$suc->registration_date] = $suc->user_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
self::cacheSet('sitemap:user:counts', $userCounts);
|
// Cache user counts for 4 hours.
|
||||||
|
|
||||||
|
self::cacheSet('sitemap:user:counts', $userCounts, null, time() + 4 * 60 * 60);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $userCounts;
|
return $userCounts;
|
||||||
|
36
plugins/Sitemap/scripts/updatecounts.php
Normal file
36
plugins/Sitemap/scripts/updatecounts.php
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/env php
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* StatusNet - a distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2010, 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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
|
||||||
|
|
||||||
|
$helptext = <<<END_OF_UPDATECOUNTS_HELP
|
||||||
|
updatecounts.php [options]
|
||||||
|
Update the notice and user counts cached in the database.
|
||||||
|
|
||||||
|
END_OF_UPDATECOUNTS_HELP;
|
||||||
|
|
||||||
|
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||||
|
|
||||||
|
// Will fill the cache
|
||||||
|
|
||||||
|
$userCounts = Sitemap_user_count::getAll();
|
||||||
|
$noticeCounts = Sitemap_notice_count::getAll();
|
||||||
|
|
||||||
|
echo "Done.\n";
|
@ -75,8 +75,6 @@ function save_twitter_user($twitter_id, $screen_name)
|
|||||||
|
|
||||||
if (!empty($fuser)) {
|
if (!empty($fuser)) {
|
||||||
|
|
||||||
$result = true;
|
|
||||||
|
|
||||||
// Delete old record if Twitter user changed screen name
|
// Delete old record if Twitter user changed screen name
|
||||||
|
|
||||||
if ($fuser->nickname != $screen_name) {
|
if ($fuser->nickname != $screen_name) {
|
||||||
@ -88,6 +86,25 @@ function save_twitter_user($twitter_id, $screen_name)
|
|||||||
$screen_name,
|
$screen_name,
|
||||||
$oldname));
|
$oldname));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
// Kill any old, invalid records for this screen name
|
||||||
|
|
||||||
|
$fuser = Foreign_user::getByNickname($screen_name, TWITTER_SERVICE);
|
||||||
|
|
||||||
|
if (!empty($fuser)) {
|
||||||
|
$fuser->delete();
|
||||||
|
common_log(
|
||||||
|
LOG_INFO,
|
||||||
|
sprintf(
|
||||||
|
'Twitter bridge - deteted old record for Twitter ' .
|
||||||
|
'screen name "%s" belonging to Twitter ID %d.',
|
||||||
|
$screen_name,
|
||||||
|
$fuser->id
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return add_twitter_user($twitter_id, $screen_name);
|
return add_twitter_user($twitter_id, $screen_name);
|
||||||
|
Loading…
Reference in New Issue
Block a user