GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

move mention detection before default in OStatusPlugin

This commit is contained in:
Evan Prodromou 2010-02-23 15:59:10 -05:00
parent c79c70ea2c
commit a0c255e231
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/OStatus/OStatusPlugin.php
View File

@ -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+)/', preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
$text, $text,
@ -464,14 +464,13 @@ class OStatusPlugin extends Plugin
$oprofile = Ostatus_profile::staticGet('group_id', $group->id); $oprofile = Ostatus_profile::staticGet('group_id', $group->id);
if ($oprofile) { if ($oprofile) {
// Drop the PuSH subscription if there are no other subscribers. // Drop the PuSH subscription if there are no other subscribers.
$members = $group->getMembers(0, 1); $members = $group->getMembers(0, 1);
if ($members->N == 0) { if ($members->N == 0) {
common_log(LOG_INFO, "Unsubscribing from now-unused group feed $oprofile->feeduri"); common_log(LOG_INFO, "Unsubscribing from now-unused group feed $oprofile->feeduri");
$oprofile->unsubscribe(); $oprofile->unsubscribe();
} }
$member = Profile::staticGet($user->id); $member = Profile::staticGet($user->id);
$act = new Activity(); $act = new Activity();