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

OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)

Browse Source 
Plus misc warnings/notices cleanup in the submission path.
This commit is contained in:
Brion Vibber 2010-03-01 16:36:33 -08:00
parent 8da1b71d69
commit 49a872b56f
4 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/newnotice.php
View File

@ -294,6 +294,9 @@ class NewnoticeAction extends Action
if ($profile) {
$content = '@' . $profile->nickname . ' ';
}
} else {
// @fixme most of these bits above aren't being passed on above
$inreplyto = null;
}
$notice_form = new NoticeForm($this, '', $content, null, $inreplyto);

55
plugins/OStatus/OStatusPlugin.php
View File

@ -222,31 +222,62 @@ class OStatusPlugin extends Plugin
}
/**
*
* Find any explicit remote mentions. Accepted forms:
* Webfinger: @user@example.com
* Profile link: @example.com/mublog/user
* @param Profile $sender (os user?)
* @param string $text input markup text
* @param array &$mention in/out param: set of found mentions
* @return boolean hook return value
*/
function onEndFindMentions($sender, $text, &$mentions)
{
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
preg_match_all('!(?:^|\s+)
@( # Webfinger:
(?:\w+\.)*\w+ # user
@ # @
(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+ # domain
| # Profile:
(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+ # domain
(?:/\w+)+ # /path1(/path2...)
)!x',
$text,
$wmatches,
PREG_OFFSET_CAPTURE);
foreach ($wmatches[1] as $wmatch) {
$target = $wmatch[0];
$oprofile = null;
$webfinger = $wmatch[0];
$this->log(LOG_INFO, "Checking Webfinger for address '$webfinger'");
$oprofile = Ostatus_profile::ensureWebfinger($webfinger);
if (strpos($target, '/') === false) {
$this->log(LOG_INFO, "Checking Webfinger for address '$target'");
try {
$oprofile = Ostatus_profile::ensureWebfinger($target);
} catch (Exception $e) {
$this->log(LOG_ERR, "Webfinger check failed: " . $e->getMessage());
}
} else {
$schemes = array('https', 'http');
foreach ($schemes as $scheme) {
$url = "$scheme://$target";
$this->log(LOG_INFO, "Checking profile address '$url'");
try {
$oprofile = Ostatus_profile::ensureProfile($url);
if ($oprofile) {
continue;
}
} catch (Exception $e) {
$this->log(LOG_ERR, "Profile check failed: " . $e->getMessage());
}
}
}
if (empty($oprofile)) {
$this->log(LOG_INFO, "No Ostatus_profile found for address '$webfinger'");
$this->log(LOG_INFO, "No Ostatus_profile found for address '$target'");
} else {
$this->log(LOG_INFO, "Ostatus_profile found for address '$webfinger'");
$this->log(LOG_INFO, "Ostatus_profile found for address '$target'");
if ($oprofile->isGroup()) {
continue;
@ -261,7 +292,7 @@ class OStatusPlugin extends Plugin
}
}
$mentions[] = array('mentioned' => array($profile),
'text' => $wmatch[0],
'text' => $target,
'position' => $pos,
'url' => $profile->profileurl);
}

2
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -698,7 +698,7 @@ class Ostatus_profile extends Memcached_DataObject
{
// Get the canonical feed URI and check it
$discover = new FeedDiscovery();
if ($hints['feedurl']) {
if (isset($hints['feedurl'])) {
$feeduri = $hints['feedurl'];
$feeduri = $discover->discoverFromFeedURL($feeduri);
} else {

10
plugins/OStatus/lib/xrd.php
View File

@ -161,20 +161,20 @@ class XRD
function saveLink($doc, $link)
{
$link_element = $doc->createElement('Link');
if ($link['rel']) {
if (!empty($link['rel'])) {
$link_element->setAttribute('rel', $link['rel']);
}
if ($link['type']) {
if (!empty($link['type'])) {
$link_element->setAttribute('type', $link['type']);
}
if ($link['href']) {
if (!empty($link['href'])) {
$link_element->setAttribute('href', $link['href']);
}
if ($link['template']) {
if (!empty($link['template'])) {
$link_element->setAttribute('template', $link['template']);
}
if (is_array($link['title'])) {
if (!empty($link['title']) && is_array($link['title'])) {
foreach($link['title'] as $title) {
$title = $doc->createElement('Title', $title);
$link_element->appendChild($title);