forked from GNUsocial/gnu-social
Merge branch '0.8.x' of jill@xmpp001.controlezvous.ca:/opt/local/share/laconica into 0.8.x
This commit is contained in:
commit
0c3bfc2212
@ -63,7 +63,14 @@ if (isset($longoptions)) {
|
||||
|
||||
$parser = new Console_Getopt();
|
||||
|
||||
list($options, $args) = $parser->getopt($argv, $shortoptions, $longoptions);
|
||||
$result = $parser->getopt($argv, $shortoptions, $longoptions);
|
||||
|
||||
if (PEAR::isError($result)) {
|
||||
print $result->getMessage()."\n";
|
||||
exit(1);
|
||||
} else {
|
||||
list($options, $args) = $result;
|
||||
}
|
||||
|
||||
function show_help()
|
||||
{
|
||||
|
@ -24,22 +24,17 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||
|
||||
common_log(LOG_INFO, 'Fixing up conversations.');
|
||||
|
||||
$notice = new Notice();
|
||||
$notice->whereAdd('conversation is null');
|
||||
$notice->orderBy('id');
|
||||
$nid = new Notice();
|
||||
$nid->query('select id, reply_to from notice where conversation is null');
|
||||
|
||||
$cnt = $notice->find();
|
||||
while ($nid->fetch()) {
|
||||
|
||||
print "Found $cnt notices.\n";
|
||||
|
||||
while ($notice->fetch()) {
|
||||
|
||||
print "$notice->id =>";
|
||||
|
||||
$orig = clone($notice);
|
||||
|
||||
if (empty($notice->reply_to)) {
|
||||
$notice->conversation = $notice->id;
|
||||
$cid = null;
|
||||
|
||||
$notice = new Notice();
|
||||
|
||||
if (empty($nid->reply_to)) {
|
||||
$cid = $nid->id;
|
||||
} else {
|
||||
$reply = Notice::staticGet('id', $notice->reply_to);
|
||||
|
||||
@ -52,6 +47,9 @@ while ($notice->fetch()) {
|
||||
} else {
|
||||
$notice->conversation = $reply->conversation;
|
||||
}
|
||||
|
||||
unset($reply);
|
||||
$reply = null;
|
||||
}
|
||||
|
||||
print "$notice->conversation";
|
||||
@ -63,5 +61,10 @@ while ($notice->fetch()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$notice = null;
|
||||
$orig = null;
|
||||
unset($notice);
|
||||
unset($orig);
|
||||
|
||||
print ".\n";
|
||||
}
|
||||
|
@ -25,9 +25,14 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||
define('MAXCHILDREN', 2);
|
||||
define('POLL_INTERVAL', 60); // in seconds
|
||||
|
||||
$shortoptions = 'i::';
|
||||
$longoptions = array('id::');
|
||||
|
||||
$helptext = <<<END_OF_TRIM_HELP
|
||||
Batch script for retrieving Twitter messages from foreign service.
|
||||
|
||||
-i --id Identity (default 'generic')
|
||||
|
||||
END_OF_TRIM_HELP;
|
||||
|
||||
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||
@ -64,7 +69,7 @@ class TwitterStatusFetcher extends Daemon
|
||||
|
||||
function name()
|
||||
{
|
||||
return ('twitterstatusfetcher.generic');
|
||||
return ('twitterstatusfetcher.'.$this->_id);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -625,6 +630,16 @@ class TwitterStatusFetcher extends Daemon
|
||||
|
||||
declare(ticks = 1);
|
||||
|
||||
$fetcher = new TwitterStatusFetcher();
|
||||
if (have_option('i')) {
|
||||
$id = get_option_value('i');
|
||||
} else if (have_option('--id')) {
|
||||
$id = get_option_value('--id');
|
||||
} else if (count($args) > 0) {
|
||||
$id = $args[0];
|
||||
} else {
|
||||
$id = null;
|
||||
}
|
||||
|
||||
$fetcher = new TwitterStatusFetcher($id);
|
||||
$fetcher->runOnce();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user