Commit a0c255e2 authored by Evan Prodromou's avatar Evan Prodromou

move mention detection before default in OStatusPlugin

parent c79c70ea
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment