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

deal with mastodon privacy scopes - mark private and block commenting since we refuse to send private activities through the public OStatus connector.

Browse Source
This commit is contained in:
zotlabs 2017-07-15 15:49:10 -07:00
parent b1d4e97699
commit e891199a23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/feedutils.php
View File

@ -408,8 +408,11 @@ function get_atom_elements($feed, $item, &$author) {
$ostatus_protocol = (($ostatus_conversation) ? true : false);
$mastodon = (($item->get_item_tags('http://mastodon.social/schema/1.0','scope')) ? true : false);
if($mastodon)
if($mastodon) {
$ostatus_protocol = true;
if(($mastodon[0]['data']) && ($mastodon[0]['data'] !== 'public'))
$res['item_private'] = 1;
}
$apps = $item->get_item_tags(NAMESPACE_STATUSNET, 'notice_info');
if($apps && $apps[0]['attribs']['']['source']) {
@ -1024,6 +1027,14 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid'])
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') {
$datarray['public_policy'] = 'specific';
$datarray['comment_policy'] = 'none';
@ -1220,6 +1231,14 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid'])
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') {
$datarray['public_policy'] = 'specific';
$datarray['comment_policy'] = 'none';