summaryrefslogtreecommitdiff
path: root/plugins/Aim
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-04-30 14:41:54 -0700
committerBrion Vibber <brion@pobox.com>2010-04-30 15:29:05 -0700
commit5414396a2ee9f1401d69b60969e04a1941e24e21 (patch)
tree5b6f503f01d6d8e3eda4e9cf26ce1a74d28473c0 /plugins/Aim
parente3e90b4c27e27bbdd293767071dea3d7b5022046 (diff)
IM cleanup on 1.0.x branch:
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them. * fix fatal error in IM settings while waiting for a Jabber confirmation. * Caching fix for user_im_prefs * fix for saving multiple transport settings * some fixes for AIM & using normalized addresses for lookups
Diffstat (limited to 'plugins/Aim')
-rw-r--r--plugins/Aim/AimPlugin.php9
-rw-r--r--plugins/Aim/README2
2 files changed, 9 insertions, 2 deletions
diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 3855d1fb0..30da1dbc7 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -126,6 +126,11 @@ class AimPlugin extends ImPlugin
return true;
}
+ /**
+ * Accept a queued input message.
+ *
+ * @return true if processing completed, false if message should be reprocessed
+ */
function receive_raw_message($message)
{
$info=Aim::getMessageInfo($message);
@@ -133,7 +138,9 @@ class AimPlugin extends ImPlugin
$user = $this->get_user($from);
$notice_text = $info['message'];
- return $this->handle_incoming($from, $notice_text);
+ $this->handle_incoming($from, $notice_text);
+
+ return true;
}
function initialize(){
diff --git a/plugins/Aim/README b/plugins/Aim/README
index 046591738..7d486a036 100644
--- a/plugins/Aim/README
+++ b/plugins/Aim/README
@@ -6,7 +6,7 @@ add "addPlugin('aim',
array('setting'=>'value', 'setting2'=>'value2', ...);"
to the bottom of your config.php
-The daemon included with this plugin must be running. It will be started by
+scripts/imdaemon.php included with StatusNet must be running. It will be started by
the plugin along with their other daemons when you run scripts/startdaemons.sh.
See the StatusNet README for more about queuing and daemons.