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

Fix issues with non-subscribed Ostatus_profiles

Browse Source
This commit is contained in:
Mikael Nordfeldth 2017-05-02 09:14:30 +02:00
parent 979c525124
commit e9ab06b59e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/OStatus/OStatusPlugin.php
View File

@ -1200,6 +1200,22 @@ class OStatusPlugin extends Plugin
if ($profile->isLocal()) { if ($profile->isLocal()) {
return true; return true;
} }
try {
$oprofile = Ostatus_profile::fromProfile($profile);
} catch (NoResultException $e) {
// Not a remote Ostatus_profile! Maybe some other network
// that has imported a non-local user?
return true;
}
try {
$feedsub = $oprofile->getFeedSub();
} catch (NoResultException $e) {
// No WebSub subscription has been attempted or exists for this profile
// which is the case, say for remote profiles that are only included
// via mentions or repeat/share.
return true;
}
$websub_states = [ $websub_states = [
'subscribe' => _m('Pending'), 'subscribe' => _m('Pending'),
'active' => _m('Active'), 'active' => _m('Active'),
@ -1207,8 +1223,6 @@ class OStatusPlugin extends Plugin
'inactive' => _m('Inactive'), 'inactive' => _m('Inactive'),
]; ];
$out->elementStart('dl', 'entity_tags ostatus_profile'); $out->elementStart('dl', 'entity_tags ostatus_profile');
$oprofile = Ostatus_profile::fromProfile($profile);
$feedsub = $oprofile->getFeedSub();
$out->element('dt', null, _m('WebSub')); $out->element('dt', null, _m('WebSub'));
$out->element('dd', null, $websub_states[$feedsub->sub_state]); $out->element('dd', null, $websub_states[$feedsub->sub_state]);
$out->elementEnd('dl'); $out->elementEnd('dl');