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

OStatus onStartNoticeSourceLink to use exceptions

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-04-19 22:18:36 +02:00
parent 132be99506
commit 639cf48cc7
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/OStatus/OStatusPlugin.php
View File

@ -523,9 +523,16 @@ class OStatusPlugin extends Plugin
*/ */
function onStartNoticeSourceLink($notice, &$name, &$url, &$title) function onStartNoticeSourceLink($notice, &$name, &$url, &$title)
{ {
if ($notice->source == 'ostatus') { // If we don't handle this, keep the event handler going
if ($notice->url) { if ($notice->source != 'ostatus') {
$bits = parse_url($notice->url); return true;
}
try {
$url = $notice->getUrl();
// If getUrl() throws exception, $url is never set
$bits = parse_url($url);
$domain = $bits['host']; $domain = $bits['host'];
if (substr($domain, 0, 4) == 'www.') { if (substr($domain, 0, 4) == 'www.') {
$name = substr($domain, 4); $name = substr($domain, 4);
@ -533,14 +540,16 @@ class OStatusPlugin extends Plugin
$name = $domain; $name = $domain;
} }
$url = $notice->url;
// TRANS: Title. %s is a domain name. // TRANS: Title. %s is a domain name.
$title = sprintf(_m('Sent from %s via OStatus'), $domain); $title = sprintf(_m('Sent from %s via OStatus'), $domain);
// Abort event handler, we have a name and URL!
return false; return false;
} } catch (InvalidUrlException $e) {
} // This just means we don't have the notice source data
return true; return true;
} }
}
/** /**
* Send incoming PuSH feeds for OStatus endpoints in for processing. * Send incoming PuSH feeds for OStatus endpoints in for processing.