clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13701 from annando/diaspora-events 

Fix transmission of events to Diaspora
This commit is contained in:
Hypolite Petovan 2023-12-07 07:08:46 -05:00 committed by GitHub
parent 0d6974a6d2 1301730ed8
commit e22e58f5b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Content/Text/BBCode.php
View File

@ -2171,6 +2171,9 @@ class BBCode
// Maybe we should make this newline at every time before a quote. // Maybe we should make this newline at every time before a quote.
$text = str_replace(['</a><blockquote>'], ['</a><br><blockquote>'], $text); $text = str_replace(['</a><blockquote>'], ['</a><br><blockquote>'], $text);
// The converter doesn't convert these elements
$text = str_replace(['<div>', '</div>'], ['<p>', '</p>'], $text);
// Now convert HTML to Markdown // Now convert HTML to Markdown
$text = HTML::toMarkdown($text); $text = HTML::toMarkdown($text);

3
src/Protocol/Diaspora.php
View File

@ -3403,7 +3403,8 @@ class Diaspora
if ($item['event-id'] > 0) { if ($item['event-id'] > 0) {
$event = self::buildEvent($item['event-id']); $event = self::buildEvent($item['event-id']);
if (count($event)) { if (count($event)) {
$message['event'] = $event; // Deactivated, since Diaspora seems to have problems with the processing.
// $message['event'] = $event;
if ( if (
!empty($event['location']['address']) && !empty($event['location']['address']) &&