}
$this->broadcast_queue();
-# $this->confirmation_queue();
+ $this->confirmation_queue();
}
}
}
if ($this->handle_command($user, $pl['body'])) {
return;
+ } else if ($this->is_autoreply($pl['body'])) {
+ $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);
+ return;
} else {
$this->add_notice($user, $pl);
}
}
+ function is_autoreply($txt) {
+ if (preg_match('/[\[\(]?[Aa]uto-?[Rr]eply[\]\)]/', $txt)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
function from_site($address, $msg) {
$text = '['.common_config('site', 'name') . '] ' . $msg;
jabber_send_message($address, $text);
$notice = new Notice();
$notice->profile_id = $user->id;
$notice->content = trim(substr($pl['body'], 0, 140));
+ $notice->rendered = common_render_content($notice->content, $notice);
$notice->created = DB_DataObject_Cast::dateTime();
$notice->query('BEGIN');
$id = $notice->insert();
return;
}
$notice->query('COMMIT');
+ common_save_replies($notice);
common_real_broadcast($notice);
$this->log(LOG_INFO,
'Added notice ' . $notice->id . ' from user ' . $user->nickname);
function clear_old_claims() {
$qi = new Queue_item();
+ $qi->claimed = NULL;
$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
}
$this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
# Mark confirmation sent
$original = clone($confirm);
- $confirm->sent = DB_DataObject_Cast::dateTime();
+ $confirm->sent = $confirm->claimed;
$result = $confirm->update($original);
if (!$result) {
$this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
function next_confirm() {
$confirm = new Confirm_address();
$confirm->whereAdd('claimed IS NULL');
+ $confirm->whereAdd('sent IS NULL');
# XXX: eventually we could do other confirmations in the queue, too
$confirm->address_type = 'jabber';
$confirm->orderBy('modified DESC');
$confirm->limit(1);
if ($confirm->find(TRUE)) {
$this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address);
- $original = clone($confirm);
+ # working around some weird DB_DataObject behaviour
+ $confirm->whereAdd(''); # clears where stuff
+ $original = clone($confirm);
$confirm->claimed = DB_DataObject_Cast::dateTime();
$result = $confirm->update($original);
if ($result) {
- $this->log(LOG_INFO, 'Succeeded in claim!');
+ $this->log(LOG_INFO, 'Succeeded in claim! '. $result);
return $confirm;
} else {
$this->log(LOG_INFO, 'Failed in claim!');
function clear_old_confirm_claims() {
$confirm = new Confirm();
+ $confirm->claimed = NULL;
$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
}