harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mike/master' into dev

Browse Source
This commit is contained in:
git-marijus 2017-07-16 21:02:28 +02:00
commit 5408264559
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Wfinger.php
View File

@ -117,7 +117,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
[ [
'rel' => 'http://ostatus.org/schema/1.0/subscribe', 'rel' => 'http://ostatus.org/schema/1.0/subscribe',
'template' => z_root() . '/follow/url={uri}', 'template' => z_root() . '/follow?f=&url={uri}',
], ],
[ [

2
Zotlabs/Module/Xrd.php
View File

@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
'$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'], '$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'],
'$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'], '$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
'$modexp' => 'data:application/magic-public-key,' . $salmon_key, '$modexp' => 'data:application/magic-public-key,' . $salmon_key,
'$subscribe' => z_root() . '/follow?url={uri}', '$subscribe' => z_root() . '/follow?f=&url={uri}',
)); ));

21
include/feedutils.php
View File

@ -408,8 +408,11 @@ function get_atom_elements($feed, $item, &$author) {
$ostatus_protocol = (($ostatus_conversation) ? true : false); $ostatus_protocol = (($ostatus_conversation) ? true : false);
$mastodon = (($item->get_item_tags('http://mastodon.social/schema/1.0','scope')) ? true : false); $mastodon = (($item->get_item_tags('http://mastodon.social/schema/1.0','scope')) ? true : false);
if($mastodon) if($mastodon) {
$ostatus_protocol = true; $ostatus_protocol = true;
if(($mastodon[0]['data']) && ($mastodon[0]['data'] !== 'public'))
$res['item_private'] = 1;
}
$apps = $item->get_item_tags(NAMESPACE_STATUSNET, 'notice_info'); $apps = $item->get_item_tags(NAMESPACE_STATUSNET, 'notice_info');
if($apps && $apps[0]['attribs']['']['source']) { if($apps && $apps[0]['attribs']['']['source']) {
@ -1024,6 +1027,14 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid']) if(! $datarray['mid'])
continue; continue;
// A Mastodon privacy tag has been found. We cannot send private comments
// through the OStatus protocol, so block commenting.
if(array_key_exists('item_private',$datarray) && intval($datarray['item_private'])) {
$datarray['public_policy'] = 'specific';
$datarray['comment_policy'] = 'none';
}
if($contact['xchan_network'] === 'rss') { if($contact['xchan_network'] === 'rss') {
$datarray['public_policy'] = 'specific'; $datarray['public_policy'] = 'specific';
$datarray['comment_policy'] = 'none'; $datarray['comment_policy'] = 'none';
@ -1220,6 +1231,14 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid']) if(! $datarray['mid'])
continue; continue;
// A Mastodon privacy tag has been found. We cannot send private comments
// through the OStatus protocol, so block commenting.
if(array_key_exists('item_private',$datarray) && intval($datarray['item_private'])) {
$datarray['public_policy'] = 'specific';
$datarray['comment_policy'] = 'none';
}
if($contact['xchan_network'] === 'rss') { if($contact['xchan_network'] === 'rss') {
$datarray['public_policy'] = 'specific'; $datarray['public_policy'] = 'specific';
$datarray['comment_policy'] = 'none'; $datarray['comment_policy'] = 'none';