wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up OStatus mentions finding; separate regexes keeps the code paths a bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster.

Browse Source
This commit is contained in:
Brion Vibber 2010-03-03 09:32:25 -08:00
parent ffa1931c9d
commit 1e63fda669
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
plugins/OStatus/OStatusPlugin.php
View File

@ -233,70 +233,70 @@ class OStatusPlugin extends Plugin
function onEndFindMentions($sender, $text, &$mentions) function onEndFindMentions($sender, $text, &$mentions)
{ {
preg_match_all('!(?:^|\s+) $matches = array();
@( # Webfinger:
(?:\w+\.)*\w+ # user // Webfinger matches: @user@example.com
@ # @ if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+ # domain
| # Profile:
(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+ # domain
(?:/\w+)+ # /path1(/path2...)
)!x',
$text, $text,
$wmatches, $wmatches,
PREG_OFFSET_CAPTURE); PREG_OFFSET_CAPTURE)) {
foreach ($wmatches[1] as $wmatch) {
foreach ($wmatches[1] as $wmatch) { list($target, $pos) = $wmatch;
$target = $wmatch[0]; $this->log(LOG_INFO, "Checking webfinger '$target'");
$oprofile = null;
if (strpos($target, '/') === false) {
$this->log(LOG_INFO, "Checking Webfinger for address '$target'");
try { try {
$oprofile = Ostatus_profile::ensureWebfinger($target); $oprofile = Ostatus_profile::ensureWebfinger($target);
if ($oprofile && !$oprofile->isGroup()) {
$profile = $oprofile->localProfile();
$matches[$pos] = array('mentioned' => array($profile),
'text' => $target,
'position' => $pos,
'url' => $profile->profileurl);
}
} catch (Exception $e) { } catch (Exception $e) {
$this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage()); $this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage());
} }
} else { }
$schemes = array('https', 'http'); }
// Profile matches: @example.com/mublog/user
if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+(?:/\w+)+)!',
$text,
$wmatches,
PREG_OFFSET_CAPTURE)) {
foreach ($wmatches[1] as $wmatch) {
list($target, $pos) = $wmatch;
$schemes = array('http', 'https');
foreach ($schemes as $scheme) { foreach ($schemes as $scheme) {
$url = "$scheme://$target"; $url = "$scheme://$target";
$this->log(LOG_INFO, "Checking profile address '$url'"); $this->log(LOG_INFO, "Checking profile address '$url'");
try { try {
$oprofile = Ostatus_profile::ensureProfile($url); $oprofile = Ostatus_profile::ensureProfile($url);
if ($oprofile) { if ($oprofile && !$oprofile->isGroup()) {
continue; $profile = $oprofile->localProfile();
$matches[$pos] = array('mentioned' => array($profile),
'text' => $target,
'position' => $pos,
'url' => $profile->profileurl);
break;
} }
} catch (Exception $e) { } catch (Exception $e) {
$this->log(LOG_ERR, "Profile check failed: " . $e->getMessage()); $this->log(LOG_ERR, "Profile check failed: " . $e->getMessage());
} }
} }
} }
}
if (empty($oprofile)) { foreach ($mentions as $i => $other) {
$this->log(LOG_INFO, "No Ostatus_profile found for address '$target'"); // If we share a common prefix with a local user, override it!
} else { $pos = $other['position'];
if (isset($matches[$pos])) {
$this->log(LOG_INFO, "Ostatus_profile found for address '$target'"); $mentions[$i] = $matches[$pos];
unset($matches[$pos]);
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' => $target,
'position' => $pos,
'url' => $profile->profileurl);
} }
} }
foreach ($matches as $mention) {
$mentions[] = $mention;
}
return true; return true;
} }