summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-23 15:59:10 -0500
committerEvan Prodromou <evan@status.net>2010-02-23 15:59:10 -0500
commita0c255e231a84cf77554cc3c0a095eae7b0ffd9c (patch)
treeb8443f7880f42c9434a90ce39d5dde7173db6630
parentc79c70ea2c2dadafa72c65dc4593a66fecb070e3 (diff)
move mention detection before default in OStatusPlugin
-rw-r--r--plugins/OStatus/OStatusPlugin.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index db4a0af35..679857f89 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -224,7 +224,7 @@ class OStatusPlugin extends Plugin
*
*/
- function onEndFindMentions($sender, $text, &$mentions)
+ function onStartFindMentions($sender, $text, &$mentions)
{
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
$text,
@@ -464,14 +464,13 @@ class OStatusPlugin extends Plugin
$oprofile = Ostatus_profile::staticGet('group_id', $group->id);
if ($oprofile) {
// Drop the PuSH subscription if there are no other subscribers.
-
+
$members = $group->getMembers(0, 1);
if ($members->N == 0) {
common_log(LOG_INFO, "Unsubscribing from now-unused group feed $oprofile->feeduri");
$oprofile->unsubscribe();
}
-
$member = Profile::staticGet($user->id);
$act = new Activity();