Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 10:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'friendica:develop' into mastodon-edit-title-spoiler-update

Browse source
This commit is contained in:
Hank G 2023-03-11 08:28:51 -06:00 • committed by GitHub
commit 4fe278be7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 625 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Module/BaseApi.php
View file

@ -221,8 +221,8 @@ class BaseApi extends BaseModule
}
break;
case TimelineOrderByTypes::EDITED:
if (!empty($status->friendicaExtension()->editedAt())) {
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->friendicaExtension()->editedAt(), DateTimeFormat::JSON)));
if (!empty($status->editedAt())) {
self::setBoundaries(new DateTime(DateTimeFormat::utc($status->editedAt(), DateTimeFormat::JSON)));
}
break;
case TimelineOrderByTypes::RECEIVED:

1
src/Module/Post/Edit.php
View file

@ -116,6 +116,7 @@ class Edit extends BaseModule
}
$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
$item = Post\Media::addHTMLAttachmentToItem($item);
$jotplugins = '';