friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-21 08:56:42 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/develop' into no-blocklist

Browse source
This commit is contained in:
Michael 2023-12-29 23:46:23 +00:00
parent b59f166314 ad1389b20a
commit 6530f82056
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Conversation.php
View file

@ -96,6 +96,8 @@ class Conversation
private $session;
/** @var Repository\UserGServer */
private $userGServer;
/** @var Array */
private $blockList;
public function __construct(Repository\UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app, IHandleUserSessions $session)
{

7
src/Protocol/Diaspora.php
View file

@ -3259,7 +3259,9 @@ class Diaspora
/// @todo - establish "all day" events in Friendica
$eventdata['all_day'] = 'false';
$eventdata['timezone'] = 'UTC';
// @todo Should be user timezone - but only if the event is supposed to be displayed
// in that specific timezone and not the user's timezone.
// $eventdata['timezone'] = 'UTC';
if ($event['start']) {
$eventdata['start'] = DateTimeFormat::utc($event['start'], $mask);
@ -3403,8 +3405,7 @@ class Diaspora
if ($item['event-id'] > 0) {
$event = self::buildEvent($item['event-id']);
if (count($event)) {
// Deactivated, since Diaspora seems to have problems with the processing.
// $message['event'] = $event;
$message['event'] = $event;
if (
!empty($event['location']['address']) &&