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

OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org) 

Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
This commit is contained in:
Brion Vibber 2010-02-25 02:43:55 +00:00
parent b798faf9ea
commit 58e232a10a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/OStatus/OStatusPlugin.php
View File

@ -210,7 +210,7 @@ class OStatusPlugin extends Plugin
*
*/
function onStartFindMentions($sender, $text, &$mentions)
function onEndFindMentions($sender, $text, &$mentions)
{
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
$text,
@ -233,11 +233,21 @@ class OStatusPlugin extends Plugin
$this->log(LOG_INFO, "Ostatus_profile found for address '$webfinger'");
if ($oprofile->isGroup()) {
continue;
}
$profile = $oprofile->localProfile();
$pos = $wmatch[1];
foreach ($mentions as $i => $other) {
// If we share a common prefix with a local user, override it!
if ($other['position'] == $pos) {
unset($mentions[$i]);
}
}
$mentions[] = array('mentioned' => array($profile),
'text' => $wmatch[0],
'position' => $wmatch[1],
'position' => $pos,
'url' => $profile->profileurl);
}
}