attempted fix for #10956

This commit is contained in:
Sander Dorigo
2025-09-24 14:39:54 +02:00
parent d8f05492c3
commit 855bc2f8e7

View File

@@ -158,18 +158,23 @@ class ShowController extends Controller
Log::debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id)); Log::debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id));
Log::channel('audit')->info(sprintf('User triggers webhook #%d on transaction group #%d.', $webhook->id, $group->id)); Log::channel('audit')->info(sprintf('User triggers webhook #%d on transaction group #%d.', $webhook->id, $group->id));
/** @var MessageGeneratorInterface $engine */
$engine = app(MessageGeneratorInterface::class);
$engine->setUser(auth()->user());
// tell the generator which trigger it should look for /** @var \FireflyIII\Models\WebhookTrigger $trigger */
$engine->setTrigger(WebhookTrigger::tryFrom($webhook->trigger)); foreach($webhook->webhookTriggers as $trigger) {
// tell the generator which objects to process /** @var MessageGeneratorInterface $engine */
$engine->setObjects(new Collection()->push($group)); $engine = app(MessageGeneratorInterface::class);
// set the webhook to trigger $engine->setUser(auth()->user());
$engine->setWebhooks(new Collection()->push($webhook));
// tell the generator to generate the messages // tell the generator which trigger it should look for
$engine->generateMessages(); $engine->setTrigger(WebhookTrigger::tryFrom((int)$trigger->key));
// tell the generator which objects to process
$engine->setObjects(new Collection()->push($group));
// set the webhook to trigger
$engine->setWebhooks(new Collection()->push($webhook));
// tell the generator to generate the messages
$engine->generateMessages();
}
// trigger event to send them: // trigger event to send them:
Log::debug('send event RequestedSendWebhookMessages from ShowController::triggerTransaction()'); Log::debug('send event RequestedSendWebhookMessages from ShowController::triggerTransaction()');