fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into pr/manager-scopes

Browse source
This commit is contained in:
Kijin Sung 2024-11-16 16:54:54 +09:00
commit 7503223d26
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/framework/drivers/mail/mailgun.php
View file

@ -116,12 +116,13 @@ class Mailgun extends Base implements \Rhymix\Framework\Drivers\MailInterface
// Send the API request. // Send the API request.
$url = self::$_url . '/' . $this->_config['api_domain'] . '/messages.mime'; $url = self::$_url . '/' . $this->_config['api_domain'] . '/messages.mime';
$request = \Rhymix\Framework\HTTP::post($url, $data, $headers, [], $settings); $request = \Rhymix\Framework\HTTP::post($url, $data, $headers, [], $settings);
$result = @json_decode($request->getBody()->getContents()); $result_text = $request->getBody()->getContents();
$result = @json_decode($result_text);
// Parse the result. // Parse the result.
if (!$result) if (!$result)
{ {
$message->errors[] = 'Mailgun: API error: ' . $request->getBody()->getContents(); $message->errors[] = 'Mailgun: API error: ' . $result_text;
return false; return false;
} }
elseif (!$result->id) elseif (!$result->id)

10
common/framework/drivers/push/fcmv1.php
View file

@ -151,7 +151,8 @@ class FCMv1 extends Base implements PushInterface
foreach ($responses as $i => $response) foreach ($responses as $i => $response)
{ {
$status_code = $response->getStatusCode(); $status_code = $response->getStatusCode();
$result = @json_decode($response->getBody()->getContents()); $result_text = $response->getBody()->getContents();
$result = @json_decode($result_text);
if ($status_code === 200) if ($status_code === 200)
{ {
$output->success[$tokens[$i]] = $result->name ?? ''; $output->success[$tokens[$i]] = $result->name ?? '';
@ -164,6 +165,10 @@ class FCMv1 extends Base implements PushInterface
{ {
$output->invalid[$tokens[$i]] = $tokens[$i]; $output->invalid[$tokens[$i]] = $tokens[$i];
} }
elseif (str_contains($error_message, 'Requested entity was not found'))
{
$output->invalid[$tokens[$i]] = $tokens[$i];
}
} }
else else
{ {
@ -196,7 +201,8 @@ class FCMv1 extends Base implements PushInterface
foreach ($responses as $i => $response) foreach ($responses as $i => $response)
{ {
$status_code = $response->getStatusCode(); $status_code = $response->getStatusCode();
$result = @json_decode($response->getBody()->getContents()); $result_text = $response->getBody()->getContents();
$result = @json_decode($result_text);
if ($status_code === 200) if ($status_code === 200)
{ {
$output->success[$topics[$i]] = $result->name ?? ''; $output->success[$topics[$i]] = $result->name ?? '';