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

User user_group.uri to look up local groups for OStatus addressing checks when available. Will still fall back to the URL-scheme-checking code if there's no matching user_group record.

Browse Source 
Should help with keeping remote groups working when renaming sites -- as long as user_group.uri has been filled out on the site changing its domain and other issues with POST handling are resolved.
This commit is contained in:
Brion Vibber 2010-09-27 11:29:54 -07:00
parent a6469aeed8
commit 617b6f4f7d
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/OStatus/OStatusPlugin.php
View File

@ -956,7 +956,7 @@ class OStatusPlugin extends Plugin
} }
/** /**
* Utility function to check if the given URL is a canonical group profile * Utility function to check if the given URI is a canonical group profile
* page, and if so return the ID number. * page, and if so return the ID number.
* *
* @param string $url * @param string $url
@ -964,11 +964,22 @@ class OStatusPlugin extends Plugin
*/ */
public static function localGroupFromUrl($url) public static function localGroupFromUrl($url)
{ {
$template = common_local_url('groupbyid', array('id' => '31337')); $group = User_group::staticGet('uri', $url);
$template = preg_quote($template, '/'); if ($group) {
$template = str_replace('31337', '(\d+)', $template); $local = Local_group::staticGet('id', $group->id);
if (preg_match("/$template/", $url, $matches)) { if ($local) {
return intval($matches[1]); return $group->id;
}
} else {
// To find local groups which haven't had their uri fields filled out...
// If the domain has changed since a subscriber got the URI, it'll
// be broken.
$template = common_local_url('groupbyid', array('id' => '31337'));
$template = preg_quote($template, '/');
$template = str_replace('31337', '(\d+)', $template);
if (preg_match("/$template/", $url, $matches)) {
return intval($matches[1]);
}
} }
return false; return false;
} }