Bump global-autoresponder to 1.4.12
This commit is contained in:
+1
-1
@@ -2,7 +2,7 @@ name=global-autoresponder
|
|||||||
id=global-autoresponder
|
id=global-autoresponder
|
||||||
type=user
|
type=user
|
||||||
author=HITME.PL
|
author=HITME.PL
|
||||||
version=1.4.11
|
version=1.4.12
|
||||||
active=no
|
active=no
|
||||||
installed=no
|
installed=no
|
||||||
user_run_as=root
|
user_run_as=root
|
||||||
|
|||||||
@@ -4,17 +4,30 @@ declare(strict_types=1);
|
|||||||
require_once PLUGIN_ROOT . '/exec/lib/Settings.php';
|
require_once PLUGIN_ROOT . '/exec/lib/Settings.php';
|
||||||
require_once PLUGIN_ROOT . '/exec/lib/RuleValidator.php';
|
require_once PLUGIN_ROOT . '/exec/lib/RuleValidator.php';
|
||||||
|
|
||||||
|
/** @return array{0:string,1:string} */
|
||||||
|
function future_exact_schedule(Settings $settings, string $startTime = '09:37', string $endTime = '17:12'): array
|
||||||
|
{
|
||||||
|
$tz = new DateTimeZone($settings->timezone());
|
||||||
|
[$startHour, $startMinute] = array_map('intval', explode(':', $startTime));
|
||||||
|
[$endHour, $endMinute] = array_map('intval', explode(':', $endTime));
|
||||||
|
$start = (new DateTimeImmutable('tomorrow', $tz))->setTime($startHour, $startMinute);
|
||||||
|
$end = (new DateTimeImmutable('+15 days', $tz))->setTime($endHour, $endMinute);
|
||||||
|
|
||||||
|
return [$start->format('Y-m-d\TH:i'), $end->format('Y-m-d\TH:i')];
|
||||||
|
}
|
||||||
|
|
||||||
test('rule validator normalizes exact hour schedule', function (): void {
|
test('rule validator normalizes exact hour schedule', function (): void {
|
||||||
$settingsPath = TEST_TMP . '/validator.conf';
|
$settingsPath = TEST_TMP . '/validator.conf';
|
||||||
test_write($settingsPath, "GLOBAL_AUTORESPONDER_TIMEZONE=Europe/Warsaw\n");
|
test_write($settingsPath, "GLOBAL_AUTORESPONDER_TIMEZONE=Europe/Warsaw\n");
|
||||||
$settings = Settings::load($settingsPath);
|
$settings = Settings::load($settingsPath);
|
||||||
|
[$startValue, $endValue] = future_exact_schedule($settings);
|
||||||
$rule = RuleValidator::validate([
|
$rule = RuleValidator::validate([
|
||||||
'name' => 'Urlop czerwcowy',
|
'name' => 'Urlop czerwcowy',
|
||||||
'subject_prefix' => 'Urlop',
|
'subject_prefix' => 'Urlop',
|
||||||
'reply_frequency' => '120',
|
'reply_frequency' => '120',
|
||||||
'body' => "Dzień dobry\r\nWracam jutro",
|
'body' => "Dzień dobry\r\nWracam jutro",
|
||||||
'start_value' => '2026-06-10T09:37',
|
'start_value' => $startValue,
|
||||||
'end_value' => '2026-06-24T17:12',
|
'end_value' => $endValue,
|
||||||
'enabled' => '1',
|
'enabled' => '1',
|
||||||
], $settings);
|
], $settings);
|
||||||
|
|
||||||
@@ -23,35 +36,37 @@ test('rule validator normalizes exact hour schedule', function (): void {
|
|||||||
assert_same(120, $rule['repeat_minutes']);
|
assert_same(120, $rule['repeat_minutes']);
|
||||||
assert_same("Dzień dobry\nWracam jutro", $rule['body']);
|
assert_same("Dzień dobry\nWracam jutro", $rule['body']);
|
||||||
assert_same('exact_hour', $rule['schedule_mode']);
|
assert_same('exact_hour', $rule['schedule_mode']);
|
||||||
assert_same('2026-06-10T09:37', $rule['start_value']);
|
assert_same($startValue, $rule['start_value']);
|
||||||
assert_true($rule['start_ts'] < $rule['end_ts']);
|
assert_true($rule['start_ts'] < $rule['end_ts']);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('rule validator accepts exact hour schedule', function (): void {
|
test('rule validator accepts exact hour schedule', function (): void {
|
||||||
$settings = Settings::load(TEST_TMP . '/validator-da.conf');
|
$settings = Settings::load(TEST_TMP . '/validator-da.conf');
|
||||||
|
[$startValue, $endValue] = future_exact_schedule($settings, '00:00', '23:59');
|
||||||
$rule = RuleValidator::validate([
|
$rule = RuleValidator::validate([
|
||||||
'subject_prefix' => 'Urlop',
|
'subject_prefix' => 'Urlop',
|
||||||
'reply_frequency' => '1',
|
'reply_frequency' => '1',
|
||||||
'body' => 'Body',
|
'body' => 'Body',
|
||||||
'start_value' => '2026-06-10T00:00',
|
'start_value' => $startValue,
|
||||||
'end_value' => '2026-06-24T23:59',
|
'end_value' => $endValue,
|
||||||
'enabled' => '1',
|
'enabled' => '1',
|
||||||
], $settings);
|
], $settings);
|
||||||
assert_same('exact_hour', $rule['schedule_mode']);
|
assert_same('exact_hour', $rule['schedule_mode']);
|
||||||
assert_same(1, $rule['repeat_minutes']);
|
assert_same(1, $rule['repeat_minutes']);
|
||||||
assert_same('2026-06-10T00:00', $rule['start_value']);
|
assert_same($startValue, $rule['start_value']);
|
||||||
assert_same('2026-06-24T23:59', $rule['end_value']);
|
assert_same($endValue, $rule['end_value']);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('rule validator rejects unsupported non-interval frequency', function (): void {
|
test('rule validator rejects unsupported non-interval frequency', function (): void {
|
||||||
$settings = Settings::load(TEST_TMP . '/validator-da-every.conf');
|
$settings = Settings::load(TEST_TMP . '/validator-da-every.conf');
|
||||||
|
[$startValue, $endValue] = future_exact_schedule($settings, '00:00', '23:59');
|
||||||
try {
|
try {
|
||||||
RuleValidator::validate([
|
RuleValidator::validate([
|
||||||
'subject_prefix' => 'Urlop',
|
'subject_prefix' => 'Urlop',
|
||||||
'reply_frequency' => 'every',
|
'reply_frequency' => 'every',
|
||||||
'body' => 'Body',
|
'body' => 'Body',
|
||||||
'start_value' => '2026-06-10T00:00',
|
'start_value' => $startValue,
|
||||||
'end_value' => '2026-06-24T23:59',
|
'end_value' => $endValue,
|
||||||
], $settings);
|
], $settings);
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
assert_contains('Częstość odpowiedzi', $e->getMessage());
|
assert_contains('Częstość odpowiedzi', $e->getMessage());
|
||||||
@@ -78,13 +93,14 @@ test('rule validator rejects header injection and reversed dates', function ():
|
|||||||
|
|
||||||
test('rule validator rejects unsupported response frequency', function (): void {
|
test('rule validator rejects unsupported response frequency', function (): void {
|
||||||
$settings = Settings::load(TEST_TMP . '/missing-frequency.conf');
|
$settings = Settings::load(TEST_TMP . '/missing-frequency.conf');
|
||||||
|
[$startValue, $endValue] = future_exact_schedule($settings, '00:00', '23:59');
|
||||||
try {
|
try {
|
||||||
RuleValidator::validate([
|
RuleValidator::validate([
|
||||||
'subject_prefix' => 'Urlop',
|
'subject_prefix' => 'Urlop',
|
||||||
'reply_frequency' => '45',
|
'reply_frequency' => '45',
|
||||||
'body' => 'Body',
|
'body' => 'Body',
|
||||||
'start_value' => '2026-06-10T00:00',
|
'start_value' => $startValue,
|
||||||
'end_value' => '2026-06-24T23:59',
|
'end_value' => $endValue,
|
||||||
], $settings);
|
], $settings);
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
assert_contains('Częstość odpowiedzi', $e->getMessage());
|
assert_contains('Częstość odpowiedzi', $e->getMessage());
|
||||||
|
|||||||
Reference in New Issue
Block a user