kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 10:16:49 +00:00
Code Issues Projects Releases Wiki Activity

Update message generator.

Browse Source
This commit is contained in:
James Cole
2025-08-20 06:32:25 +02:00
parent 01cce49070
commit bcaa0bddea
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Generator/Webhook/StandardMessageGenerator.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\BudgetLimit;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\WebhookResponse as WebhookResponseModel;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\Webhook; use FireflyIII\Models\Webhook;
@@ -123,14 +124,15 @@ class StandardMessageGenerator implements MessageGeneratorInterface
'uuid' => $uuid->toString(), 'uuid' => $uuid->toString(),
'user_id' => 0, 'user_id' => 0,
'user_group_id' => 0, 'user_group_id' => 0,
'trigger' => WebhookTrigger::from((int)$webhook->trigger)->name, 'trigger' => $this->trigger->name,
'response' => WebhookResponse::from((int)$webhook->response)->name, 'response' => $webhook->webhookResponses()->first()->title, // guess that the database is correct.
'url' => $webhook->url, 'url' => $webhook->url,
'version' => sprintf('v%d', $this->getVersion()), 'version' => sprintf('v%d', $this->getVersion()),
'content' => [], 'content' => [],
]; ];
// depends on the model how user_id is set: // depends on the model how user_id is set:
$relevantResponse = WebhookResponse::TRANSACTIONS->name;
switch ($class) { switch ($class) {
default: default:
// Line is ignored because all of Firefly III's Models have an id property. // Line is ignored because all of Firefly III's Models have an id property.
@@ -142,12 +144,14 @@ class StandardMessageGenerator implements MessageGeneratorInterface
/** @var Budget $model */ /** @var Budget $model */
$basicMessage['user_id'] = $model->user_id; $basicMessage['user_id'] = $model->user_id;
$basicMessage['user_group_id'] = $model->user_group_id; $basicMessage['user_group_id'] = $model->user_group_id;
$relevantResponse = WebhookResponse::BUDGET->name;
break; break;
case BudgetLimit::class: case BudgetLimit::class:
$basicMessage['user_id'] = $model->budget->user_id; $basicMessage['user_id'] = $model->budget->user_id;
$basicMessage['user_group_id'] = $model->budget->user_group_id; $basicMessage['user_group_id'] = $model->budget->user_group_id;
$relevantResponse = WebhookResponse::BUDGET->name;
break; break;
@@ -160,7 +164,17 @@ class StandardMessageGenerator implements MessageGeneratorInterface
} }
// then depends on the response what to put in the message: // then depends on the response what to put in the message:
switch ($webhook->response) { /** @var WebhookResponseModel $response */
$model = $webhook->webhookResponses()->first();
$response = $model->title;
// if it's relevant, just switch to another.
if(WebhookResponse::RELEVANT->name === $response) {
// switch to whatever is actually relevant.
$response = $relevantResponse;
}
switch ($response) {
default: default:
Log::error(sprintf('The response code for webhook #%d is "%d" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response)); Log::error(sprintf('The response code for webhook #%d is "%d" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response));
@@ -177,12 +191,6 @@ class StandardMessageGenerator implements MessageGeneratorInterface
} }
if ($model instanceof BudgetLimit) { if ($model instanceof BudgetLimit) {
$user = $model->budget->user; $user = $model->budget->user;
$enrichment = new BudgetEnrichment();
$enrichment->setUser($user);
$enrichment->setStart($model->start_date);
$enrichment->setEnd($model->end_date);
$budget = $enrichment->enrichSingle($model->budget);
$enrichment = new BudgetLimitEnrichment(); $enrichment = new BudgetLimitEnrichment();
$enrichment->setUser($user); $enrichment->setUser($user);