Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix scheduled to better randomize phone to send messages

This commit is contained in:
osaajani 2021-02-23 18:57:14 +01:00
parent c2ead276dc
commit 8020d68572
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v3.0.10 v3.0.11

22
controllers/internals/Scheduled.php
View File

@ -258,22 +258,22 @@ namespace controllers\internals;
$phone_to_use = $phone; $phone_to_use = $phone;
} }
if (null === $phone_to_use)
{
$rnd_key = array_rand($users_phones[$scheduled['id_user']]);
$phone_to_use = $users_phones[$scheduled['id_user']][$rnd_key];
}
$messages = []; $messages = [];
//Add messages for numbers //Add messages for numbers
$numbers = $this->get_numbers($scheduled['id']); $numbers = $this->get_numbers($scheduled['id']);
foreach ($numbers as $number) foreach ($numbers as $number)
{ {
if (null === $phone_to_use)
{
$rnd_key = array_rand($users_phones[$scheduled['id_user']]);
$random_phone = $users_phones[$scheduled['id_user']][$rnd_key];
}
$message = [ $message = [
'id_user' => $scheduled['id_user'], 'id_user' => $scheduled['id_user'],
'id_scheduled' => $scheduled['id'], 'id_scheduled' => $scheduled['id'],
'id_phone' => $phone_to_use['id'], 'id_phone' => $phone_to_use['id'] ?? $random_phone['id'],
'destination' => $number['number'], 'destination' => $number['number'],
'flash' => $scheduled['flash'], 'flash' => $scheduled['flash'],
]; ];
@ -323,11 +323,17 @@ namespace controllers\internals;
} }
$added_contacts[$contact['id']] = true; $added_contacts[$contact['id']] = true;
if (null === $phone_to_use)
{
$rnd_key = array_rand($users_phones[$scheduled['id_user']]);
$random_phone = $users_phones[$scheduled['id_user']][$rnd_key];
}
$message = [ $message = [
'id_user' => $scheduled['id_user'], 'id_user' => $scheduled['id_user'],
'id_scheduled' => $scheduled['id'], 'id_scheduled' => $scheduled['id'],
'id_phone' => $phone_to_use['id'], 'id_phone' => $phone_to_use['id'] ?? $random_phone['id'],
'destination' => $contact['number'], 'destination' => $contact['number'],
'flash' => $scheduled['flash'], 'flash' => $scheduled['flash'],
]; ];