mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-19 23:35:12 +00:00
Merge branch 'dev' into collect
This commit is contained in:
commit
54ffb2039d
6 changed files with 29 additions and 12 deletions
|
@ -4,6 +4,7 @@ namespace Code\ActivityStreams;
|
|||
|
||||
class Link
|
||||
{
|
||||
public $type;
|
||||
public $href;
|
||||
public $rel;
|
||||
public $mediaType;
|
||||
|
@ -33,6 +34,26 @@ class Link
|
|||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
public function getType()
|
||||
{
|
||||
return $this->type;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param mixed $type
|
||||
* @return Link
|
||||
*/
|
||||
public function setType($type)
|
||||
{
|
||||
$this->type = $type;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
|
|
|
@ -844,10 +844,7 @@ class Activity
|
|||
$activity['location'] = $place->toArray();
|
||||
}
|
||||
|
||||
if ($item['mid'] === $item['parent_mid']) {
|
||||
$activity['isContainedConversation'] = true;
|
||||
}
|
||||
else {
|
||||
if ($item['mid'] !== $item['parent_mid']) {
|
||||
// inReplyTo needs to be set in the activity for followup actions (Like, Dislike, Announce, etc.),
|
||||
// but *not* for comments and RSVPs, where it should only be present in the object
|
||||
|
||||
|
@ -4929,6 +4926,7 @@ class Activity
|
|||
'directMessage' => 'nomad:directMessage',
|
||||
'Category' => 'nomad:Category',
|
||||
'copiedTo' => 'nomad:copiedTo',
|
||||
'replyTo' => 'nomad:replyTo',
|
||||
'searchContent' => 'nomad:searchContent',
|
||||
'searchTags' => 'nomad:searchTags',
|
||||
];
|
||||
|
|
|
@ -252,7 +252,7 @@ class Share
|
|||
$bb .= "\n\n" . '[map=' . $this->item['lat'] . ',' . $this->item['lon'] . ']' . "\n";
|
||||
}
|
||||
|
||||
$bb .= "[/share]";
|
||||
$bb .= "\n[/share]";
|
||||
}
|
||||
|
||||
return $bb;
|
||||
|
|
|
@ -144,7 +144,7 @@ class Oep extends Controller
|
|||
}
|
||||
|
||||
$o .= $x;
|
||||
$o .= "[/share]";
|
||||
$o .= "\n[/share]";
|
||||
$o = bbcode($o);
|
||||
|
||||
$o = str_replace($x, bbcode($p[0]['body']), $o);
|
||||
|
@ -235,7 +235,7 @@ class Oep extends Controller
|
|||
}
|
||||
|
||||
$o .= $x;
|
||||
$o .= "[/share]";
|
||||
$o .= "\n[/share]";
|
||||
$o = bbcode($o);
|
||||
|
||||
$o = str_replace($x, bbcode($p[0]['body']), $o);
|
||||
|
@ -325,7 +325,7 @@ class Oep extends Controller
|
|||
}
|
||||
|
||||
$o .= $x;
|
||||
$o .= "[/share]";
|
||||
$o .= "\n[/share]";
|
||||
$o = bbcode($o);
|
||||
|
||||
$o = str_replace($x, bbcode($p[0]['body']), $o);
|
||||
|
@ -407,7 +407,7 @@ class Oep extends Controller
|
|||
$o .= '[b]' . $p[0]['title'] . '[/b]' . "\r\n";
|
||||
}
|
||||
$o .= $x;
|
||||
$o .= "[/share]";
|
||||
$o .= "\n[/share]";
|
||||
$o = bbcode($o);
|
||||
|
||||
$o = str_replace($x, bbcode($p[0]['body']), $o);
|
||||
|
|
|
@ -1308,7 +1308,6 @@ function md_header($content)
|
|||
|
||||
function md_codeblock($content)
|
||||
{
|
||||
|
||||
$language = !empty($content[3]) ? filter_var($content[3], FILTER_SANITIZE_STRING) : '';
|
||||
$class = !empty($language) ? sprintf(' class="%s language-%s"', $language, $language) : '';
|
||||
// Build one block so that we not render each paragraph separately.
|
||||
|
@ -1319,7 +1318,6 @@ function md_codeblock($content)
|
|||
|
||||
function md_italic($content)
|
||||
{
|
||||
|
||||
return '<em>' . $content[1] . $content[3] . '</em>';
|
||||
}
|
||||
|
||||
|
|
|
@ -2991,7 +2991,7 @@ function start_delivery_chain($channel, $item, $item_id, bool|array $parent, $gr
|
|||
$arr['title'] = $item['title'];
|
||||
}
|
||||
$bb .= $item['body'];
|
||||
$bb .= "[/share]";
|
||||
$bb .= "\n[/share]";
|
||||
|
||||
$arr['body'] = $bb;
|
||||
|
||||
|
|
Loading…
Reference in a new issue