kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-11 23:28:54 +00:00
Code Issues Projects Releases Wiki Activity

Prevent a loop.

Browse Source
This commit is contained in:
James Cole
2025-08-21 20:31:32 +02:00
parent 6c5ddfcb8a
commit 1ba641c279
9 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Webhook/ShowController.php
View File

@@ -172,7 +172,7 @@ class ShowController extends Controller
$engine->generateMessages(); $engine->generateMessages();
// trigger event to send them: // trigger event to send them:
Log::debug('send event RequestedSendWebhookMessages'); Log::debug('send event RequestedSendWebhookMessages from ShowController::triggerTransaction()');
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
return response()->json([], 204); return response()->json([], 204);

2
app/Casts/SeparateTimezoneCaster.php
View File

@@ -52,7 +52,7 @@ class SeparateTimezoneCaster implements CastsAttributes
$timeZone = $attributes[sprintf('%s_tz', $key)] ?? config('app.timezone'); $timeZone = $attributes[sprintf('%s_tz', $key)] ?? config('app.timezone');
$result = Carbon::parse($value, $timeZone)->setTimezone(config('app.timezone')); $result = Carbon::parse($value, $timeZone)->setTimezone(config('app.timezone'));
Log::debug(sprintf('SeparateTimezoneCaster: %s.%s = %s', str_replace('FireflyIII\\Models\\','',get_class($model)), $key, $result->toAtomString())); // Log::debug(sprintf('SeparateTimezoneCaster: %s.%s = %s', str_replace('FireflyIII\\Models\\','',get_class($model)), $key, $result->toAtomString()));
return $result; return $result;
} }

2
app/Handlers/Events/DestroyedGroupEventHandler.php
View File

@@ -55,7 +55,7 @@ class DestroyedGroupEventHandler
$engine->setObjects(new Collection([$group])); $engine->setObjects(new Collection([$group]));
$engine->setTrigger(WebhookTrigger::DESTROY_TRANSACTION); $engine->setTrigger(WebhookTrigger::DESTROY_TRANSACTION);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }

1
app/Handlers/Events/StoredGroupEventHandler.php
View File

@@ -121,6 +121,7 @@ class StoredGroupEventHandler
$engine->generateMessages(); $engine->generateMessages();
// trigger event to send them: // trigger event to send them:
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }
} }

1
app/Handlers/Events/UpdatedGroupEventHandler.php
View File

@@ -167,6 +167,7 @@ class UpdatedGroupEventHandler
$engine->setTrigger(WebhookTrigger::UPDATE_TRANSACTION); $engine->setTrigger(WebhookTrigger::UPDATE_TRANSACTION);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }

2
app/Handlers/Observer/BudgetLimitObserver.php
View File

@@ -53,6 +53,7 @@ class BudgetLimitObserver
$engine->setTrigger(WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT); $engine->setTrigger(WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }
@@ -90,6 +91,7 @@ class BudgetLimitObserver
$engine->setTrigger(WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT); $engine->setTrigger(WebhookTrigger::STORE_UPDATE_BUDGET_LIMIT);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }
} }

7
app/Handlers/Observer/BudgetObserver.php
View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Observer;
use FireflyIII\Enums\WebhookTrigger; use FireflyIII\Enums\WebhookTrigger;
use FireflyIII\Events\RequestedSendWebhookMessages; use FireflyIII\Events\RequestedSendWebhookMessages;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Generator\Webhook\MessageGeneratorInterface; use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
@@ -54,7 +55,7 @@ class BudgetObserver
$engine->setObjects(new Collection()->push($budget)); $engine->setObjects(new Collection()->push($budget));
$engine->setTrigger(WebhookTrigger::STORE_BUDGET); $engine->setTrigger(WebhookTrigger::STORE_BUDGET);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }
@@ -69,7 +70,7 @@ class BudgetObserver
$engine->setObjects(new Collection()->push($budget)); $engine->setObjects(new Collection()->push($budget));
$engine->setTrigger(WebhookTrigger::UPDATE_BUDGET); $engine->setTrigger(WebhookTrigger::UPDATE_BUDGET);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
} }
@@ -85,7 +86,7 @@ class BudgetObserver
$engine->setObjects(new Collection()->push($budget)); $engine->setObjects(new Collection()->push($budget));
$engine->setTrigger(WebhookTrigger::DESTROY_BUDGET); $engine->setTrigger(WebhookTrigger::DESTROY_BUDGET);
$engine->generateMessages(); $engine->generateMessages();
Log::debug(sprintf('send event RequestedSendWebhookMessages from %s', __METHOD__));
event(new RequestedSendWebhookMessages()); event(new RequestedSendWebhookMessages());
$repository = app(AttachmentRepositoryInterface::class); $repository = app(AttachmentRepositoryInterface::class);

2
app/Repositories/Budget/BudgetRepository.php
View File

@@ -268,7 +268,7 @@ class BudgetRepository implements BudgetRepositoryInterface, UserGroupInterface
*/ */
foreach ($budgets as $index => $budget) { foreach ($budgets as $index => $budget) {
$budget->order = $index + 1; $budget->order = $index + 1;
$budget->save(); $budget->saveQuietly();
} }
// other budgets, set to 0. // other budgets, set to 0.
$this->user->budgets()->where('active', 0)->update(['order' => 0]); $this->user->budgets()->where('active', 0)->update(['order' => 0]);

2
config/translations.php
View File

@@ -248,6 +248,7 @@ return [
'multi_account_warning_deposit', 'multi_account_warning_deposit',
'multi_account_warning_transfer', 'multi_account_warning_transfer',
'webhook_trigger_ANY',
'webhook_trigger_STORE_TRANSACTION', 'webhook_trigger_STORE_TRANSACTION',
'webhook_trigger_UPDATE_TRANSACTION', 'webhook_trigger_UPDATE_TRANSACTION',
'webhook_trigger_DESTROY_TRANSACTION', 'webhook_trigger_DESTROY_TRANSACTION',
@@ -258,6 +259,7 @@ return [
'webhook_trigger_STORE_UPDATE_BUDGET_LIMIT', 'webhook_trigger_STORE_UPDATE_BUDGET_LIMIT',
'webhook_response_TRANSACTIONS', 'webhook_response_TRANSACTIONS',
'webhook_response_RELEVANT',
'webhook_response_ACCOUNTS', 'webhook_response_ACCOUNTS',
'webhook_response_NONE', 'webhook_response_NONE',
'webhook_delivery_JSON', 'webhook_delivery_JSON',