Mobilizon/connector-wordpress
1
0
Fork 0
mirror of https://github.com/dwaxweiler/connector-mobilizon synced 2025-06-05 21:59:25 +02:00
Code Issues Releases Wiki Activity

Revert "use timezone of event"

Browse Source 
This reverts commit 9662e1f333.
This commit is contained in:
Daniel Waxweiler
2025-05-26 10:20:11 +02:00
parent 9662e1f333
commit be8fd96ee9
12 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/connector-mobilizon.php
View File

@ -17,7 +17,8 @@ require_once __DIR__ . '/includes/Api.php';
require_once __DIR__ . '/includes/EventsCache.php';
require_once __DIR__ . '/includes/Settings.php';
require_once __DIR__ . '/includes/SiteSettings.php';
require_once __DIR__ . '/includes/DateTimeFormatter.php';
require_once __DIR__ . '/includes/LocalDateTime.php';
require_once __DIR__ . '/includes/LocalDateTimeFormatter.php';
require_once __DIR__ . '/includes/LineFormatter.php';
require_once __DIR__ . '/includes/GraphQlClient.php';
require_once __DIR__ . '/includes/EventsListBlock.php';

10
source/includes/DateTimeFormatter.php
View File

@ -1,10 +0,0 @@
<?php
namespace MobilizonConnector;
final class DateTimeFormatter
{
public static function format(\DateTimeImmutable $dateTime, string $format) {
$timestamp = $dateTime->getTimestamp();
return date_i18n($format, $timestamp);
}
}

1
source/includes/EventsListBlock.php
View File

@ -53,6 +53,7 @@ class EventsListBlock {
$dateFormat = SiteSettings::getDateFormat();
$timeFormat = SiteSettings::getTimeFormat();
$timeZone = SiteSettings::getTimeZone();
require dirname(__DIR__) . '/view/events-list.php';
} catch (GeneralException $e) {

1
source/includes/EventsListShortcut.php
View File

@ -36,6 +36,7 @@ class EventsListShortcut {
$dateFormat = SiteSettings::getDateFormat();
$timeFormat = SiteSettings::getTimeFormat();
$timeZone = SiteSettings::getTimeZone();
require dirname(__DIR__) . '/view/events-list.php';
} catch (GeneralException $e) {

1
source/includes/EventsListWidget.php
View File

@ -36,6 +36,7 @@ class EventsListWidget extends \WP_Widget {
$dateFormat = SiteSettings::getDateFormat();
$timeFormat = SiteSettings::getTimeFormat();
$timeZone = SiteSettings::getTimeZone();
require dirname(__DIR__) . '/view/events-list.php';
} catch (GeneralException $e) {

14
source/includes/LineFormatter.php
View File

@ -3,16 +3,16 @@ namespace MobilizonConnector;
final class LineFormatter
{
public static function format_date_time(string $dateFormat, string $timeFormat, string $start, ?string $end): string {
$startDateTime = new \DateTimeImmutable($start);
$startDate = DateTimeFormatter::format($startDateTime, $dateFormat);
$startTime = DateTimeFormatter::format($startDateTime, $timeFormat);
public static function format_date_time(\DateTimeZone $timeZone, string $dateFormat, string $timeFormat, string $start, ?string $end): string {
$startDateTime = new LocalDateTime($start, $timeZone);
$startDate = LocalDateTimeFormatter::format($startDateTime, $dateFormat);
$startTime = LocalDateTimeFormatter::format($startDateTime, $timeFormat);
$dateText = $startDate . ' ' . $startTime;
if ($end) {
$endDateTime = new \DateTimeImmutable($end);
$endDate = DateTimeFormatter::format($endDateTime, $dateFormat);
$endTime = DateTimeFormatter::format($endDateTime, $timeFormat);
$endDateTime = new LocalDateTime($end, $timeZone);
$endDate = LocalDateTimeFormatter::format($endDateTime, $dateFormat);
$endTime = LocalDateTimeFormatter::format($endDateTime, $timeFormat);
if ($startDate != $endDate) {
$dateText .= ' - ';

15
source/includes/LocalDateTime.php Normal file
View File

@ -0,0 +1,15 @@
<?php
namespace MobilizonConnector;
final class LocalDateTime {
private $dateTime;
public function __construct(string $text, \DateTimeZone $timeZone) {
$date = new \DateTimeImmutable($text);
$this->dateTime = $date->setTimezone($timeZone);
}
public function getValue() {
return $this->dateTime;
}
}

10
source/includes/LocalDateTimeFormatter.php Normal file
View File

@ -0,0 +1,10 @@
<?php
namespace MobilizonConnector;
final class LocalDateTimeFormatter
{
public static function format(LocalDateTime $dateTime, string $format) {
$timestamp = $dateTime->getValue()->getTimestamp();
return date_i18n($format, $timestamp);
}
}

4
source/includes/SiteSettings.php
View File

@ -14,4 +14,8 @@ class SiteSettings {
return get_option(self::$OPTION_NAME_TIME_FORMAT);
}
public static function getTimeZone() {
return wp_timezone();
}
}

2
source/view/events-list.php
View File

@ -15,7 +15,7 @@ if (!defined('ABSPATH')) {
<?php } ?>
<a href="<?php echo esc_attr($event['url']); ?>"><?php echo esc_html($event['title']); ?></a>
<br>
<?php echo esc_html(LineFormatter::format_date_time($dateFormat, $timeFormat, $event['beginsOn'], $event['endsOn'])); ?>
<?php echo esc_html(LineFormatter::format_date_time($timeZone, $dateFormat, $timeFormat, $event['beginsOn'], $event['endsOn'])); ?>
<?php if (isset($event['physicalAddress'])) { ?>
<br>
<?php echo esc_html(LineFormatter::format_location($event['physicalAddress']['description'], $event['physicalAddress']['locality'])) ?>

6
tests/LineFormatterTest.php
View File

@ -25,15 +25,15 @@ function date_i18n(string $format, int $timestamp) {
final class LineFormatterTest extends TestCase
{
public function testCanDateFormatOneDate(): void {
$this->assertSame('15/04/2021 10:30 - 15:30', LineFormatter::format_date_time('d/m/Y', 'H:i', '2021-04-15T10:30:00Z', '2021-04-15T15:30:00Z'));
$this->assertSame('15/04/2021 10:30 - 15:30', LineFormatter::format_date_time(new \DateTimeZone('UTC'), 'd/m/Y', 'H:i', '2021-04-15T10:30:00Z', '2021-04-15T15:30:00Z'));
}
public function testCanDateFormatTwoDates(): void {
$this->assertSame('15/04/2021 10:30 - 16/04/2021 15:30', LineFormatter::format_date_time('d/m/Y', 'H:i', '2021-04-15T10:30:00Z', '2021-04-16T15:30:00Z'));
$this->assertSame('15/04/2021 10:30 - 16/04/2021 15:30', LineFormatter::format_date_time(new \DateTimeZone('UTC'), 'd/m/Y', 'H:i', '2021-04-15T10:30:00Z', '2021-04-16T15:30:00Z'));
}
public function testCanDateFormatWhenSecondDateIsNull(): void {
$this->assertSame('15/04/2021 10:30', LineFormatter::format_date_time('d/m/Y', 'H:i', '2021-04-15T10:30:00Z', null));
$this->assertSame('15/04/2021 10:30', LineFormatter::format_date_time(new \DateTimeZone('UTC'), 'd/m/Y', 'H:i', '2021-04-15T10:30:00Z', null));
}
public function testCanLocationFormatBothParameters(): void {

12
tests/LocalDateTimeTest.php Normal file
View File

@ -0,0 +1,12 @@
<?php
declare(strict_types=1);
use MobilizonConnector\LocalDateTime;
use PHPUnit\Framework\TestCase;
final class LocalDateTimeTest extends TestCase {
public function testCanGet24TimeForUsualTime(): void {
$d = new LocalDateTime('2020-12-24T16:45:00Z', new DateTimeZone("utc"));
$this->assertEquals(new DateTimeImmutable('2020-12-24T16:45:00Z'), $d->getValue());
}
}