kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Expand notifications settings.

Browse Source
This commit is contained in:
James Cole
2024-12-07 09:41:09 +01:00
parent 26948a058a
commit c06fb8daf6
6 changed files with 111 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/Admin/HomeController.php
View File

@@ -65,38 +65,7 @@ class HomeController extends Controller
$email = $pref->data;
}
// admin notification settings:
$notifications = [];
foreach (config('notifications.notifications.owner') as $key => $info) {
if($info['enabled']) {
$notifications[$key] = app('fireflyconfig')->get(sprintf('notification_%s', $key), true)->data;
}
}
//
return view('admin.index', compact('title', 'mainTitleIcon', 'email', 'notifications'));
}
public function notifications(Request $request): RedirectResponse
{
foreach (config('notifications.notifications.owner') as $key => $info) {
$value = false;
if ($request->has(sprintf('notification_%s', $key))) {
$value = true;
}
app('fireflyconfig')->set(sprintf('notification_%s', $key), $value);
}
$url = (string)$request->get('slackUrl');
if ('' === $url) {
app('fireflyconfig')->delete('slack_webhook_url');
}
if (UrlValidator::isValidWebhookURL($url)) {
app('fireflyconfig')->set('slack_webhook_url', $url);
}
session()->flash('success', (string)trans('firefly.notification_settings_saved'));
return redirect(route('admin.index'));
return view('admin.index', compact('title', 'mainTitleIcon', 'email'));
}
/**
@@ -106,6 +75,7 @@ class HomeController extends Controller
*/
public function testMessage()
{
die('disabled.');
Log::channel('audit')->info('User sends test message.');
/** @var User $user */

25
app/Http/Controllers/Admin/NotificationController.php
View File

@@ -24,6 +24,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\NotificationRequest;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Log;
class NotificationController extends Controller
@@ -39,6 +41,27 @@ class NotificationController extends Controller
$discordUrl = app('fireflyconfig')->get('discord_webhook_url', '')->data;
$channels = config('notifications.channels');
return view('admin.notifications.index', compact('title', 'subTitle', 'mainTitleIcon', 'subTitleIcon', 'channels', 'slackUrl','discordUrl'));
// admin notification settings:
$notifications = [];
foreach (config('notifications.notifications.owner') as $key => $info) {
if($info['enabled']) {
$notifications[$key] = app('fireflyconfig')->get(sprintf('notification_%s', $key), true)->data;
}
}
return view('admin.notifications.index', compact('title', 'subTitle', 'mainTitleIcon', 'subTitleIcon', 'channels', 'slackUrl','discordUrl','notifications'));
}
public function postIndex(NotificationRequest $request): RedirectResponse {
var_dump($request->getAll());
exit;
// app('fireflyconfig')->set(sprintf('notification_%s', $key), $value);;
session()->flash('success', (string)trans('firefly.notification_settings_saved'));
return redirect(route('admin.index'));
}
}

70
app/Http/Requests/NotificationRequest.php Normal file
View File

@@ -0,0 +1,70 @@
<?php
/*
* NotificationRequest.php
* Copyright (c) 2024 james@firefly-iii.org.
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see https://www.gnu.org/licenses/.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Support\Request\ChecksLogin;
use FireflyIII\Support\Request\ConvertsDataTypes;
use Illuminate\Foundation\Http\FormRequest;
class NotificationRequest extends FormRequest
{
use ChecksLogin;
use ConvertsDataTypes;
public function getAll(): array
{
$return = [];
foreach (config('notifications.notifications.owner') as $key => $info) {
$value = false;
if ($this->has(sprintf('notification_%s', $key))) {
$value = true;
}
$return[$key] = $value;
}
$return['discord_url'] = $this->convertString('discordUrl');
$return['slack_url'] = $this->convertString('slackUrl');
return $return;
// if (UrlValidator::isValidWebhookURL($url)) {
// app('fireflyconfig')->set('slack_webhook_url', $url);
// }
// }
//
//
// var_dump($this->all());
// exit;
// return [];
}
/**
* Rules for this request.
*/
public function rules(): array
{
// fixed
return [
//'password' => 'required',
];
}
}