Compare commits
24 Commits
ca8a75a71f
...
2dd31d265c
Author | SHA1 | Date |
---|---|---|
Daniel Waxweiler | 2dd31d265c | |
Daniel Waxweiler | a75d3a3915 | |
Daniel Waxweiler | c0cc4199df | |
Daniel Waxweiler | 6a5f9981a0 | |
Daniel Waxweiler | 0a95cbdac3 | |
Daniel Waxweiler | 3e0117fb21 | |
Daniel Waxweiler | 3b8279b0fe | |
Daniel Waxweiler | 063458b2c9 | |
Daniel Waxweiler | 1866e75f70 | |
Daniel Waxweiler | 718119d299 | |
Daniel Waxweiler | d230d941dc | |
Daniel Waxweiler | 3bcea397d7 | |
Daniel Waxweiler | 4e99fab421 | |
Daniel Waxweiler | 52c41d7dec | |
Daniel Waxweiler | dfcdec3eba | |
Daniel Waxweiler | 0a8c4bedbf | |
Daniel Waxweiler | 04767d4411 | |
Daniel Waxweiler | a8cda32ae3 | |
Daniel Waxweiler | e69d87187b | |
Daniel Waxweiler | d79a0cf9a6 | |
Daniel Waxweiler | 091317a532 | |
Daniel Waxweiler | e1898af935 | |
Daniel Waxweiler | e28cdb7158 | |
Daniel Waxweiler | 7322f196e9 |
|
@ -3,3 +3,6 @@ build/
|
||||||
coverage/
|
coverage/
|
||||||
node_modules/
|
node_modules/
|
||||||
vendor/
|
vendor/
|
||||||
|
|
||||||
|
.phpunit.cache
|
||||||
|
.phpunit.result.cache
|
||||||
|
|
|
@ -34,6 +34,8 @@ The current changelog can be found under [source/changelog.txt](source/changelog
|
||||||
11. Commit the new version in git with the same message.
|
11. Commit the new version in git with the same message.
|
||||||
12. Tag the new version: `git tag v<version>`
|
12. Tag the new version: `git tag v<version>`
|
||||||
13. Push the new tag to the repository: `git push --tags`
|
13. Push the new tag to the repository: `git push --tags`
|
||||||
|
14. Append `-next` to the version number in `package.json`.
|
||||||
|
15. Update the `package-lock.json`: `npm i --package-lock-only`
|
||||||
|
|
||||||
### Other commands
|
### Other commands
|
||||||
|
|
||||||
|
@ -44,3 +46,4 @@ The current changelog can be found under [source/changelog.txt](source/changelog
|
||||||
- Update PHP dependencies: `composer update`
|
- Update PHP dependencies: `composer update`
|
||||||
- Check for direct PHP dependency updates: `composer outdated --direct`
|
- Check for direct PHP dependency updates: `composer outdated --direct`
|
||||||
- Format code with prettier: `npm run format`
|
- Format code with prettier: `npm run format`
|
||||||
|
- Generate `vendor/autoload.php` file after creating new class: `composer dump-autoload`
|
||||||
|
|
|
@ -1 +1,10 @@
|
||||||
{}
|
{
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"MobilizonConnector\\": "source/includes/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"phpunit/phpunit": "^9.6"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -11,9 +11,8 @@ function injectMetadata() {
|
||||||
return src(
|
return src(
|
||||||
[
|
[
|
||||||
FOLDER_BUILD + '/front/block-events-loader.js',
|
FOLDER_BUILD + '/front/block-events-loader.js',
|
||||||
FOLDER_BUILD + '/front/events-loader.js',
|
|
||||||
FOLDER_BUILD + '/' + PACKAGE.name + '.php',
|
FOLDER_BUILD + '/' + PACKAGE.name + '.php',
|
||||||
FOLDER_BUILD + '/includes/constants.php',
|
FOLDER_BUILD + '/includes/Constants.php',
|
||||||
FOLDER_BUILD + '/readme.txt',
|
FOLDER_BUILD + '/readme.txt',
|
||||||
],
|
],
|
||||||
{ base: './' },
|
{ base: './' },
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "connector-mobilizon",
|
"name": "connector-mobilizon",
|
||||||
"version": "0.11.4",
|
"version": "0.11.4-next",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "connector-mobilizon",
|
"name": "connector-mobilizon",
|
||||||
"version": "0.11.4",
|
"version": "0.11.4-next",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"graphql": "16.8.1",
|
"graphql": "16.8.1",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "connector-mobilizon",
|
"name": "connector-mobilizon",
|
||||||
"version": "0.11.4",
|
"version": "0.11.4-next",
|
||||||
"description": "Display Mobilizon events in WordPress.",
|
"description": "Display Mobilizon events in WordPress.",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
"eslint": "npx eslint source/**/*.js",
|
"eslint": "npx eslint source/**/*.js",
|
||||||
"format": "npx prettier --write .",
|
"format": "npx prettier --write .",
|
||||||
"prepare": "husky install",
|
"prepare": "husky install",
|
||||||
"test": "ava"
|
"test": "ava && ./vendor/bin/phpunit"
|
||||||
},
|
},
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Daniel Waxweiler",
|
"name": "Daniel Waxweiler",
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
|
||||||
|
bootstrap="vendor/autoload.php"
|
||||||
|
cacheResultFile=".phpunit.cache/test-results"
|
||||||
|
executionOrder="depends,defects"
|
||||||
|
forceCoversAnnotation="false"
|
||||||
|
beStrictAboutCoversAnnotation="true"
|
||||||
|
beStrictAboutOutputDuringTests="true"
|
||||||
|
beStrictAboutTodoAnnotatedTests="true"
|
||||||
|
convertDeprecationsToExceptions="true"
|
||||||
|
failOnRisky="true"
|
||||||
|
failOnWarning="true"
|
||||||
|
verbose="true">
|
||||||
|
<testsuites>
|
||||||
|
<testsuite name="default">
|
||||||
|
<directory>tests</directory>
|
||||||
|
</testsuite>
|
||||||
|
</testsuites>
|
||||||
|
|
||||||
|
<coverage cacheDirectory=".phpunit.cache/code-coverage"
|
||||||
|
processUncoveredFiles="true">
|
||||||
|
<include>
|
||||||
|
<directory suffix=".php">source/includes</directory>
|
||||||
|
</include>
|
||||||
|
</coverage>
|
||||||
|
</phpunit>
|
|
@ -1,6 +1,8 @@
|
||||||
### [Unreleased]
|
### [Unreleased]
|
||||||
#### Added
|
#### Added
|
||||||
|
- Display name of group when it cannot be found
|
||||||
#### Changed
|
#### Changed
|
||||||
|
- Let backend do requests to API for viewing all forms, except for in-editor block preview
|
||||||
#### Deprecated
|
#### Deprecated
|
||||||
#### Removed
|
#### Removed
|
||||||
#### Fixed
|
#### Fixed
|
||||||
|
|
|
@ -10,11 +10,17 @@
|
||||||
* License: <wordpress-license>
|
* License: <wordpress-license>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require_once __DIR__ . '/includes/constants.php';
|
require_once __DIR__ . '/includes/exceptions/GeneralException.php';
|
||||||
require_once __DIR__ . '/includes/settings.php';
|
require_once __DIR__ . '/includes/exceptions/GroupNotFoundException.php';
|
||||||
require_once __DIR__ . '/includes/events-list-block.php';
|
require_once __DIR__ . '/includes/Constants.php';
|
||||||
require_once __DIR__ . '/includes/events-list-shortcut.php';
|
require_once __DIR__ . '/includes/EventsCache.php';
|
||||||
require_once __DIR__ . '/includes/events-list-widget.php';
|
require_once __DIR__ . '/includes/Settings.php';
|
||||||
|
require_once __DIR__ . '/includes/DateTimeWrapper.php';
|
||||||
|
require_once __DIR__ . '/includes/Formatter.php';
|
||||||
|
require_once __DIR__ . '/includes/GraphQlClient.php';
|
||||||
|
require_once __DIR__ . '/includes/EventsListBlock.php';
|
||||||
|
require_once __DIR__ . '/includes/EventsListShortcut.php';
|
||||||
|
require_once __DIR__ . '/includes/EventsListWidget.php';
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
// Exit if this file is called directly.
|
||||||
if (!defined('ABSPATH')) {
|
if (!defined('ABSPATH')) {
|
||||||
|
@ -28,7 +34,6 @@ final class Mobilizon_Connector {
|
||||||
add_action('init', [$this, 'register_settings'], 1); // required for register_blocks
|
add_action('init', [$this, 'register_settings'], 1); // required for register_blocks
|
||||||
add_action('init', [$this, 'register_shortcut']);
|
add_action('init', [$this, 'register_shortcut']);
|
||||||
add_action('widgets_init', [$this, 'register_widget']);
|
add_action('widgets_init', [$this, 'register_widget']);
|
||||||
add_action('wp_enqueue_scripts', [$this, 'register_scripts']);
|
|
||||||
register_activation_hook(__FILE__, [$this, 'enable_activation']);
|
register_activation_hook(__FILE__, [$this, 'enable_activation']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,12 +69,6 @@ final class Mobilizon_Connector {
|
||||||
MobilizonConnector\Settings::init();
|
MobilizonConnector\Settings::init();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function register_scripts() {
|
|
||||||
$name = MobilizonConnector\NAME . '-js';
|
|
||||||
wp_enqueue_script($name, plugins_url('front/events-loader.js', __FILE__ ));
|
|
||||||
$this->load_settings_globally_before_script($name);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function register_shortcut() {
|
public function register_shortcut() {
|
||||||
MobilizonConnector\EventsListShortcut::init();
|
MobilizonConnector\EventsListShortcut::init();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace MobilizonConnector;
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
|
||||||
if (!defined('ABSPATH')) {
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
const DEFAULT_EVENTS_COUNT = 5;
|
const DEFAULT_EVENTS_COUNT = 5;
|
||||||
const NAME = '<wordpress-name>';
|
const NAME = '<wordpress-name>';
|
||||||
const NICE_NAME = '<wordpress-nice-name>';
|
const NICE_NAME = '<wordpress-nice-name>';
|
|
@ -0,0 +1,34 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
final class DateTimeWrapper {
|
||||||
|
private $dateTime;
|
||||||
|
private $locale;
|
||||||
|
private $timeZone;
|
||||||
|
|
||||||
|
public function __construct(string $text, string $locale = 'en-GB', string $timeZone = 'utc') {
|
||||||
|
if (!$locale) {
|
||||||
|
$locale = 'en-GB';
|
||||||
|
}
|
||||||
|
if (!$timeZone) {
|
||||||
|
$timeZone = 'utc';
|
||||||
|
}
|
||||||
|
$this->dateTime = new \DateTime($text);
|
||||||
|
$this->locale = $locale;
|
||||||
|
$this->timeZone = new \DateTimeZone($timeZone);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function get24Time(): string {
|
||||||
|
$formatter = \IntlDateFormatter::create($this->locale, \IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, $this->timeZone);
|
||||||
|
return $formatter->format($this->dateTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getShortDate(): string {
|
||||||
|
$formatter = \IntlDateFormatter::create($this->locale, \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE, $this->timeZone);
|
||||||
|
return $formatter->format($this->dateTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getTimeZoneName(): string {
|
||||||
|
return $this->timeZone->getName();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
final class EventsCache {
|
||||||
|
|
||||||
|
private static $MAX_AGE_IN_S = 120;
|
||||||
|
|
||||||
|
public static function set(array $parameters, mixed $data): void {
|
||||||
|
// md5 is used as key must be 172 characters or fewer in length.
|
||||||
|
$key = md5(json_encode($parameters));
|
||||||
|
set_transient($key, $data, self::$MAX_AGE_IN_S);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function get(array $parameters): mixed {
|
||||||
|
$key = md5(json_encode($parameters));
|
||||||
|
$data = get_transient($key);
|
||||||
|
return $data;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace MobilizonConnector;
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
|
||||||
if (!defined('ABSPATH')) {
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
class EventsListBlock {
|
class EventsListBlock {
|
||||||
|
|
||||||
public static function initAndReturnScriptName(): string {
|
public static function initAndReturnScriptName(): string {
|
||||||
|
@ -41,12 +36,29 @@ class EventsListBlock {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function render($block_attributes, $content) {
|
public static function render($block_attributes, $content) {
|
||||||
$classNamePrefix = NAME;
|
$url = Settings::getUrl();
|
||||||
$eventsCount = $block_attributes['eventsCount'];
|
$eventsCount = $block_attributes['eventsCount'];
|
||||||
$groupName = isset($block_attributes['groupName']) ? $block_attributes['groupName'] : '';
|
$groupName = isset($block_attributes['groupName']) ? $block_attributes['groupName'] : '';
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
require dirname(__DIR__) . '/view/events-list.php';
|
try {
|
||||||
|
if ($groupName) {
|
||||||
|
$events = GraphQlClient::get_upcoming_events_by_group_name($url, (int) $eventsCount, $groupName);
|
||||||
|
} else {
|
||||||
|
$events = GraphQlClient::get_upcoming_events($url, (int) $eventsCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
$classNamePrefix = NAME;
|
||||||
|
$locale = get_locale();
|
||||||
|
$isShortOffsetNameShown = Settings::isShortOffsetNameShown();
|
||||||
|
$timeZone = wp_timezone_string();
|
||||||
|
|
||||||
|
require dirname(__DIR__) . '/view/events-list.php';
|
||||||
|
} catch (GeneralException $e) {
|
||||||
|
require dirname(__DIR__) . '/view/events-list-not-loaded.php';
|
||||||
|
} catch (GroupNotFoundException $e) {
|
||||||
|
require dirname(__DIR__) . '/view/events-list-group-not-found.php';
|
||||||
|
}
|
||||||
$output = ob_get_clean();
|
$output = ob_get_clean();
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
|
@ -1,11 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace MobilizonConnector;
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
|
||||||
if (!defined('ABSPATH')) {
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
class EventsListShortcut {
|
class EventsListShortcut {
|
||||||
|
|
||||||
public static function init() {
|
public static function init() {
|
||||||
|
@ -24,12 +19,29 @@ class EventsListShortcut {
|
||||||
), $atts
|
), $atts
|
||||||
);
|
);
|
||||||
|
|
||||||
$classNamePrefix = NAME;
|
$url = Settings::getUrl();
|
||||||
$eventsCount = $atts_with_overriden_defaults['events-count'];
|
$eventsCount = $atts_with_overriden_defaults['events-count'];
|
||||||
$groupName = $atts_with_overriden_defaults['group-name'];
|
$groupName = $atts_with_overriden_defaults['group-name'];
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
require dirname(__DIR__) . '/view/events-list.php';
|
try {
|
||||||
|
if ($groupName) {
|
||||||
|
$events = GraphQlClient::get_upcoming_events_by_group_name($url, (int) $eventsCount, $groupName);
|
||||||
|
} else {
|
||||||
|
$events = GraphQlClient::get_upcoming_events($url, (int) $eventsCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
$classNamePrefix = NAME;
|
||||||
|
$locale = get_locale();
|
||||||
|
$isShortOffsetNameShown = Settings::isShortOffsetNameShown();
|
||||||
|
$timeZone = wp_timezone_string();
|
||||||
|
|
||||||
|
require dirname(__DIR__) . '/view/events-list.php';
|
||||||
|
} catch (GeneralException $e) {
|
||||||
|
require dirname(__DIR__) . '/view/events-list-not-loaded.php';
|
||||||
|
} catch (GroupNotFoundException $e) {
|
||||||
|
require dirname(__DIR__) . '/view/events-list-group-not-found.php';
|
||||||
|
}
|
||||||
$output = ob_get_clean();
|
$output = ob_get_clean();
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
|
@ -1,11 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace MobilizonConnector;
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
|
||||||
if (!defined('ABSPATH')) {
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
class EventsListWidget extends \WP_Widget {
|
class EventsListWidget extends \WP_Widget {
|
||||||
|
|
||||||
public function __construct() {
|
public function __construct() {
|
||||||
|
@ -25,11 +20,28 @@ class EventsListWidget extends \WP_Widget {
|
||||||
echo $args['before_title'].apply_filters('widget_title', $options['title']).$args['after_title'];
|
echo $args['before_title'].apply_filters('widget_title', $options['title']).$args['after_title'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$classNamePrefix = NAME;
|
$url = Settings::getUrl();
|
||||||
$eventsCount = $options['eventsCount'];
|
$eventsCount = $options['eventsCount'];
|
||||||
$groupName = isset($options['groupName']) ? $options['groupName'] : '';
|
$groupName = isset($options['groupName']) ? $options['groupName'] : '';
|
||||||
|
|
||||||
require dirname(__DIR__) . '/view/events-list.php';
|
try {
|
||||||
|
if ($groupName) {
|
||||||
|
$events = GraphQlClient::get_upcoming_events_by_group_name($url, (int) $eventsCount, $groupName);
|
||||||
|
} else {
|
||||||
|
$events = GraphQlClient::get_upcoming_events($url, (int) $eventsCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
$classNamePrefix = NAME;
|
||||||
|
$locale = get_locale();
|
||||||
|
$isShortOffsetNameShown = Settings::isShortOffsetNameShown();
|
||||||
|
$timeZone = wp_timezone_string();
|
||||||
|
|
||||||
|
require dirname(__DIR__) . '/view/events-list.php';
|
||||||
|
} catch (GeneralException $e) {
|
||||||
|
require dirname(__DIR__) . '/view/events-list-not-loaded.php';
|
||||||
|
} catch (GroupNotFoundException $e) {
|
||||||
|
require dirname(__DIR__) . '/view/events-list-group-not-found.php';
|
||||||
|
}
|
||||||
|
|
||||||
echo $args['after_widget'];
|
echo $args['after_widget'];
|
||||||
}
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
final class Formatter
|
||||||
|
{
|
||||||
|
public static function format_date(string $locale, string $timeZone, string $start, ?string $end, bool $isShortOffsetNameShown): string {
|
||||||
|
$startDateTime = new DateTimeWrapper($start, $locale, $timeZone);
|
||||||
|
$dateText = $startDateTime->getShortDate();
|
||||||
|
$dateText .= ' ' . $startDateTime->get24Time();
|
||||||
|
if (!$end && $isShortOffsetNameShown) {
|
||||||
|
$dateText .= ' (' . $startDateTime->getTimeZoneName() . ')';
|
||||||
|
}
|
||||||
|
if ($end) {
|
||||||
|
$endDateTime = new DateTimeWrapper($end, $locale, $timeZone);
|
||||||
|
if ($startDateTime->getShortDate() != $endDateTime->getShortDate()) {
|
||||||
|
$dateText .= ' - ';
|
||||||
|
$dateText .= $endDateTime->getShortDate() . ' ';
|
||||||
|
} else {
|
||||||
|
$dateText .= ' - ';
|
||||||
|
}
|
||||||
|
$dateText .= $endDateTime->get24Time();
|
||||||
|
if ($isShortOffsetNameShown) {
|
||||||
|
$dateText .= ' (' . $endDateTime->getTimeZoneName() . ')';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $dateText;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function format_location(string $description, string $locality): string {
|
||||||
|
$location = '';
|
||||||
|
if ($description && trim($description)) {
|
||||||
|
$location .= trim($description);
|
||||||
|
}
|
||||||
|
if ($location && $locality) {
|
||||||
|
$location .= ', ';
|
||||||
|
}
|
||||||
|
if ($locality) {
|
||||||
|
$location .= $locality;
|
||||||
|
}
|
||||||
|
return $location;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,113 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
final class GraphQlClient {
|
||||||
|
|
||||||
|
public static function query(string $endpoint, string $query, array $variables = [], ?string $token = null): array
|
||||||
|
{
|
||||||
|
$headers = ['Content-Type: application/json'];
|
||||||
|
if ($token !== null) {
|
||||||
|
$headers[] = "Authorization: bearer $token";
|
||||||
|
}
|
||||||
|
|
||||||
|
$context = stream_context_create([
|
||||||
|
'http' => [
|
||||||
|
'method' => 'POST',
|
||||||
|
'header' => $headers,
|
||||||
|
'content' => json_encode(['query' => $query, 'variables' => $variables]),
|
||||||
|
]
|
||||||
|
]);
|
||||||
|
$data = @file_get_contents($endpoint, false, $context);
|
||||||
|
|
||||||
|
if ($data === false) {
|
||||||
|
$error = error_get_last();
|
||||||
|
throw new \ErrorException($error['message'], $error['type']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return json_decode($data, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function get_upcoming_events(string $url, int $limit): array {
|
||||||
|
$query = <<<'GRAPHQL'
|
||||||
|
query ($limit: Int) {
|
||||||
|
events(limit: $limit) {
|
||||||
|
elements {
|
||||||
|
id,
|
||||||
|
title,
|
||||||
|
url,
|
||||||
|
beginsOn,
|
||||||
|
endsOn,
|
||||||
|
physicalAddress {
|
||||||
|
description,
|
||||||
|
locality
|
||||||
|
}
|
||||||
|
},
|
||||||
|
total
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GRAPHQL;
|
||||||
|
|
||||||
|
$cachedEvents = EventsCache::get(['url' => $url, 'query' => $query, 'limit' => $limit]);
|
||||||
|
if ($cachedEvents !== false) {
|
||||||
|
return $cachedEvents;
|
||||||
|
}
|
||||||
|
|
||||||
|
$endpoint = $url . '/api';
|
||||||
|
$data = self::query($endpoint, $query, ['limit' => $limit]);
|
||||||
|
self::checkData($data);
|
||||||
|
|
||||||
|
$events = $data['data']['events']['elements'];
|
||||||
|
EventsCache::set(['url' => $url, 'query' => $query, 'limit' => $limit], $events);
|
||||||
|
return $events;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function get_upcoming_events_by_group_name(string $url, int $limit, string $groupName): array {
|
||||||
|
$query = <<<'GRAPHQL'
|
||||||
|
query ($afterDatetime: DateTime, $groupName: String!, $limit: Int) {
|
||||||
|
group(preferredUsername: $groupName) {
|
||||||
|
organizedEvents(afterDatetime: $afterDatetime, limit: $limit) {
|
||||||
|
elements {
|
||||||
|
id,
|
||||||
|
title,
|
||||||
|
url,
|
||||||
|
beginsOn,
|
||||||
|
endsOn,
|
||||||
|
physicalAddress {
|
||||||
|
description,
|
||||||
|
locality
|
||||||
|
}
|
||||||
|
},
|
||||||
|
total
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GRAPHQL;
|
||||||
|
|
||||||
|
$afterDatetime = date(\DateTime::ISO8601);
|
||||||
|
|
||||||
|
$cachedEvents = EventsCache::get(['url' => $url, 'query' => $query, 'afterDatetime' => $afterDatetime, 'groupName' => $groupName, 'limit' => $limit]);
|
||||||
|
if ($cachedEvents !== false) {
|
||||||
|
return $cachedEvents;
|
||||||
|
}
|
||||||
|
|
||||||
|
$endpoint = $url . '/api';
|
||||||
|
$data = self::query($endpoint, $query, ['afterDatetime' => $afterDatetime, 'groupName' => $groupName, 'limit' => $limit]);
|
||||||
|
self::checkData($data);
|
||||||
|
|
||||||
|
$events = $data['data']['group']['organizedEvents']['elements'];
|
||||||
|
EventsCache::set(['url' => $url, 'query' => $query, 'afterDatetime' => $afterDatetime, 'groupName' => $groupName, 'limit' => $limit], $events);
|
||||||
|
return $events;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function checkData($data) {
|
||||||
|
if (isset($data['errors'])) {
|
||||||
|
if (count($data['errors']) > 0 &&
|
||||||
|
isset($data['errors'][0]['code']) &&
|
||||||
|
$data['errors'][0]['code'] === 'group_not_found') {
|
||||||
|
throw new GroupNotFoundException(serialize($data['errors'][0]));
|
||||||
|
} else {
|
||||||
|
throw new GeneralException(serialize($data['errors']));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
namespace MobilizonConnector;
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
|
||||||
if (!defined('ABSPATH')) {
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
class Settings {
|
class Settings {
|
||||||
|
|
||||||
private static $DEFAULT_OPTION_URL = 'https://mobilizon.fr';
|
private static $DEFAULT_OPTION_URL = 'https://mobilizon.fr';
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
class GeneralException extends \Exception {
|
||||||
|
public function __construct($message, $code = 0, Throwable $previous = null) {
|
||||||
|
parent::__construct($message, $code, $previous);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __toString() {
|
||||||
|
return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
class GroupNotFoundException extends \Exception {
|
||||||
|
public function __construct($message, $code = 0, Throwable $previous = null) {
|
||||||
|
parent::__construct($message, $code, $previous);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __toString() {
|
||||||
|
return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
|
||||||
|
}
|
||||||
|
}
|
|
@ -17,7 +17,7 @@ License: <wordpress-license>
|
||||||
Features
|
Features
|
||||||
- Display events as Gutenberg block, as widget and as shortcut
|
- Display events as Gutenberg block, as widget and as shortcut
|
||||||
- Display events' title, date, and location, if available
|
- Display events' title, date, and location, if available
|
||||||
- Cache requests' responses for 2 minutes in the browser's `sessionStorage`
|
- Cache requests' responses for 2 minutes in the database
|
||||||
- Configure number of events to show per block, per widget and per shortcut
|
- Configure number of events to show per block, per widget and per shortcut
|
||||||
- Optionally filter events by a specific group per block, per widget and per shortcut
|
- Optionally filter events by a specific group per block, per widget and per shortcut
|
||||||
- Set the URL of the Mobilizon instance in the settings
|
- Set the URL of the Mobilizon instance in the settings
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
require_once __DIR__ . '/includes/constants.php';
|
require_once __DIR__ . '/includes/Constants.php';
|
||||||
require_once __DIR__ . '/includes/settings.php';
|
require_once __DIR__ . '/includes/Settings.php';
|
||||||
|
|
||||||
// If uninstall.php is not called by WordPress, exit.
|
// If uninstall.php is not called by WordPress, exit.
|
||||||
if (!defined('WP_UNINSTALL_PLUGIN')) {
|
if (!defined('WP_UNINSTALL_PLUGIN')) {
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
// Exit if this file is called directly.
|
||||||
|
if (!defined('ABSPATH')) {
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<div class="<?php echo esc_attr($classNamePrefix); ?>_events-list">
|
||||||
|
<?php echo esc_html(sprintf(__('The group "%s" could not be found!', 'connector-mobilizon'), $groupName)); ?>
|
||||||
|
</div>
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
|
// Exit if this file is called directly.
|
||||||
|
if (!defined('ABSPATH')) {
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
<div class="<?php echo esc_attr($classNamePrefix); ?>_events-list">
|
||||||
|
<?php esc_html_e('The events could not be loaded!', 'connector-mobilizon'); ?>
|
||||||
|
</div>
|
|
@ -1,4 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
// Exit if this file is called directly.
|
||||||
if (!defined('ABSPATH')) {
|
if (!defined('ABSPATH')) {
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -1,14 +1,23 @@
|
||||||
<?php
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
// Exit if this file is called directly.
|
||||||
if (!defined('ABSPATH')) {
|
if (!defined('ABSPATH')) {
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<div class="<?php echo esc_attr($classNamePrefix); ?>_events-list"
|
<div class="<?php echo esc_attr($classNamePrefix); ?>_events-list">
|
||||||
data-maximum="<?php echo esc_attr($eventsCount); ?>"
|
<ul style="list-style-type: none; padding-left: 0;">
|
||||||
data-group-name="<?php echo esc_attr($groupName); ?>">
|
<?php foreach($events as $event) { ?>
|
||||||
<div class="general-error" style="display: none;"><?php esc_html_e('The events could not be loaded!', 'connector-mobilizon'); ?></div>
|
<li>
|
||||||
<div class="group-not-found" style="display: none;"><?php esc_html_e('The group could not be found!', 'connector-mobilizon'); ?></div>
|
<a href="<?php echo esc_attr($event['url']); ?>"><?php echo esc_html_e($event['title']); ?></a>
|
||||||
<div class="loading-indicator" style="display: none;"><?php esc_html_e('Loading...', 'connector-mobilizon'); ?></div>
|
<br>
|
||||||
<ul style="list-style-type: none; padding-left: 0;"></ul>
|
<?php echo esc_html_e(Formatter::format_date($locale, $timeZone, $event['beginsOn'], $event['endsOn'], $isShortOffsetNameShown)); ?>
|
||||||
|
<?php if (isset($event['physicalAddress'])) { ?>
|
||||||
|
<br>
|
||||||
|
<?php echo esc_html_e(Formatter::format_location($event['physicalAddress']['description'], $event['physicalAddress']['locality'])) ?>
|
||||||
|
<?php } ?>
|
||||||
|
</li>
|
||||||
|
<?php } ?>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
// Exit if this file is called directly.
|
||||||
if (!defined('ABSPATH')) {
|
if (!defined('ABSPATH')) {
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
// Exit if this file is called directly.
|
||||||
if (!defined('ABSPATH')) {
|
if (!defined('ABSPATH')) {
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
namespace MobilizonConnector;
|
||||||
|
|
||||||
// Exit if this file is called directly.
|
// Exit if this file is called directly.
|
||||||
if (!defined('ABSPATH')) {
|
if (!defined('ABSPATH')) {
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use MobilizonConnector\DateTimeWrapper;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
final class DateTimeWrapperTest extends TestCase {
|
||||||
|
public function testCanGet24TimeForUsualTime(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z');
|
||||||
|
$this->assertSame('16:45', $d->get24Time());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortDateForUsualDate(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z');
|
||||||
|
$this->assertSame('24/12/2020', $d->getShortDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortDateForUsualDateWithLocaleWithUnderscore(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z');
|
||||||
|
$this->assertSame('24/12/2020', $d->getShortDate(), 'en_GB');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortDateForUsualDateWithTimezoneString(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z', 'en-GB', 'Europe/Rome');
|
||||||
|
$this->assertSame('24/12/2020', $d->getShortDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortDateForUsualDateWithNamedOffset(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z', 'en-GB', 'UTC');
|
||||||
|
$this->assertSame('24/12/2020', $d->getShortDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortDateForUsualDateWithOffset(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z', 'en-GB', '+02:00');
|
||||||
|
$this->assertSame('24/12/2020', $d->getShortDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortDateForUsualDateWithEmptyTimezone(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z', 'en-GB', '');
|
||||||
|
$this->assertSame('24/12/2020', $d->getShortDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanGetShortOffsetNameForUsualTime(): void {
|
||||||
|
$d = new DateTimeWrapper('2020-12-24T16:45:00Z');
|
||||||
|
$this->assertSame('UTC', $d->getTimeZoneName());
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,52 @@
|
||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use MobilizonConnector\Formatter;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
final class FormatterTest extends PHPUnit\Framework\TestCase
|
||||||
|
{
|
||||||
|
public function testCanDateFormatOneDate(): void {
|
||||||
|
$this->assertSame('15/04/2021 10:30 - 15:30', Formatter::format_date('en-GB', 'UTC', '2021-04-15T10:30:00Z', '2021-04-15T15:30:00Z', false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanDateFormatOneDateWithOffset(): void {
|
||||||
|
$this->assertSame('15/04/2021 10:30 - 15:30 (UTC)', Formatter::format_date('en-GB', 'UTC', '2021-04-15T10:30:00Z', '2021-04-15T15:30:00Z', true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanDateFormatOneDateWithTimeZoneOffset(): void {
|
||||||
|
$this->assertSame('15/04/2021 11:30 - 16:30', Formatter::format_date('en-GB', '+01:00', '2021-04-15T10:30:00Z', '2021-04-15T15:30:00Z', false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanDateFormatTwoDates(): void {
|
||||||
|
$this->assertSame('15/04/2021 10:30 - 16/04/2021 15:30', Formatter::format_date('en-GB', 'UTC', '2021-04-15T10:30:00Z', '2021-04-16T15:30:00Z', false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanDateFormatTwoDatesWithOffset(): void {
|
||||||
|
$this->assertSame('15/04/2021 10:30 - 16/04/2021 15:30 (UTC)', Formatter::format_date('en-GB', 'UTC', '2021-04-15T10:30:00Z', '2021-04-16T15:30:00Z', true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanDateFormatWhenSecondDateIsNull(): void {
|
||||||
|
$this->assertSame('15/04/2021 10:30', Formatter::format_date('en-GB', 'UTC', '2021-04-15T10:30:00Z', null, false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanDateFormatWhenSecondDateIsNullWithOffset(): void {
|
||||||
|
$this->assertSame('15/04/2021 10:30 (UTC)', Formatter::format_date('en-GB', 'UTC', '2021-04-15T10:30:00Z', null, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCanLocationFormatBothParameters(): void {
|
||||||
|
$this->assertSame('a, b', Formatter::format_location('a', 'b'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testLocationFormatDescriptionOnly(): void {
|
||||||
|
$this->assertSame('a', Formatter::format_location('a', ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testLocationFormatDescriptionWithSpaceOnly(): void {
|
||||||
|
$this->assertSame('', Formatter::format_location(' ', ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testLocationFormatLocalityOnly(): void {
|
||||||
|
$this->assertSame('a', Formatter::format_location('', 'a'));
|
||||||
|
}
|
||||||
|
}
|
|
@ -8,7 +8,6 @@ const FOLDER_SOURCE = './source'
|
||||||
module.exports = {
|
module.exports = {
|
||||||
entry: {
|
entry: {
|
||||||
'block-events-loader': FOLDER_SOURCE + '/front/block-events-loader.js',
|
'block-events-loader': FOLDER_SOURCE + '/front/block-events-loader.js',
|
||||||
'events-loader': FOLDER_SOURCE + '/front/events-loader.js',
|
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: '[name].js',
|
filename: '[name].js',
|
||||||
|
|
Loading…
Reference in New Issue