mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 00:35:30 +00:00
Merge remote-tracking branch 'mike/master' into dev
This commit is contained in:
commit
126e06b32a
2 changed files with 16 additions and 3 deletions
|
@ -1028,6 +1028,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
|
|||
if(! $datarray['mid'])
|
||||
continue;
|
||||
|
||||
// This probably isn't an appropriate default but we're about to change it
|
||||
// if it's wrong.
|
||||
|
||||
$datarray['comment_policy'] = 'authenticated';
|
||||
|
||||
// A Mastodon privacy tag has been found. We cannot send private comments
|
||||
// through the OStatus protocol, so block commenting.
|
||||
|
||||
|
@ -1256,6 +1261,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
|
|||
if(! $datarray['mid'])
|
||||
continue;
|
||||
|
||||
// This probably isn't an appropriate default but we're about to change it
|
||||
// if it's wrong.
|
||||
|
||||
$datarray['comment_policy'] = 'authenticated';
|
||||
|
||||
// A Mastodon privacy tag has been found. We cannot send private comments
|
||||
// through the OStatus protocol, so block commenting.
|
||||
|
||||
|
@ -1270,6 +1280,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
|
|||
}
|
||||
|
||||
|
||||
|
||||
// if we have everything but a photo, provide the default profile photo
|
||||
|
||||
if($author['author_name'] && $author['author_link'] && (! $author['author_photo']))
|
||||
|
@ -1493,7 +1504,7 @@ function process_salmon_feed($xml, $importer) {
|
|||
// reset policies which are restricted by default for RSS connections
|
||||
// This item is likely coming from GNU-social via salmon and allows public interaction
|
||||
$datarray['public_policy'] = '';
|
||||
$datarray['comment_policy'] = '';
|
||||
$datarray['comment_policy'] = 'authenticated';
|
||||
|
||||
$ret['item'] = $datarray;
|
||||
}
|
||||
|
|
|
@ -151,7 +151,7 @@ function bb_to_markdown_share($match) {
|
|||
|
||||
|
||||
|
||||
function bb_to_markdown($Text) {
|
||||
function bb_to_markdown($Text, $options = []) {
|
||||
|
||||
/*
|
||||
* Transform #tags, strip off the [url] and replace spaces with underscore
|
||||
|
@ -168,9 +168,11 @@ function bb_to_markdown($Text) {
|
|||
|
||||
$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism", 'bb_to_markdown_share', $Text);
|
||||
|
||||
$x = [ 'bbcode' => $Text, 'options' => $options ];
|
||||
|
||||
call_hooks('bb_to_markdown_bb',$Text);
|
||||
call_hooks('bb_to_markdown_bb',$x);
|
||||
|
||||
$Text = $x['bbcode'];
|
||||
|
||||
// Convert it to HTML - don't try oembed
|
||||
$Text = bbcode($Text, $preserve_nl, false);
|
||||
|
|
Loading…
Reference in a new issue