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

Auto commit for release 'branch-v6.2' on 2024-12-22

Browse Source
This commit is contained in:
github-actions
2024-12-22 07:05:15 +01:00
parent 303548a5fe
commit a500de8ab1
67 changed files with 256 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Notifications/Admin/UnknownUserLoginAttempt.php
View File

@@ -68,7 +68,8 @@ class UnknownUserLoginAttempt extends Notification
return new MailMessage()
->markdown('emails.owner.unknown-user', ['address' => $this->address, 'ip' => $ip, 'host' => $host, 'userAgent' => $userAgent, 'time' => $time])
->subject((string) trans('email.unknown_user_subject'));
->subject((string) trans('email.unknown_user_subject'))
;
}
/**
@@ -91,7 +92,8 @@ class UnknownUserLoginAttempt extends Notification
public function toPushover(OwnerNotifiable $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address]))
->title((string) trans('email.unknown_user_subject'));
->title((string) trans('email.unknown_user_subject'))
;
}
/**

2
app/Notifications/Security/DisabledMFANotification.php
View File

@@ -61,7 +61,7 @@ class DisabledMFANotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.disabled_mfa_subject');
$subject = (string) trans('email.disabled_mfa_subject');
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/EnabledMFANotification.php
View File

@@ -61,7 +61,7 @@ class EnabledMFANotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.enabled_mfa_subject');
$subject = (string) trans('email.enabled_mfa_subject');
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/MFABackupFewLeftNotification.php
View File

@@ -63,7 +63,7 @@ class MFABackupFewLeftNotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.mfa_few_backups_left_subject', ['count' => $this->count]);
$subject = (string) trans('email.mfa_few_backups_left_subject', ['count' => $this->count]);
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/MFABackupNoLeftNotification.php
View File

@@ -61,7 +61,7 @@ class MFABackupNoLeftNotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.mfa_no_backups_left_subject');
$subject = (string) trans('email.mfa_no_backups_left_subject');
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/MFAManyFailedAttemptsNotification.php
View File

@@ -60,7 +60,7 @@ class MFAManyFailedAttemptsNotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.mfa_many_failed_subject', ['count' => $this->count]);
$subject = (string) trans('email.mfa_many_failed_subject', ['count' => $this->count]);
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/MFAUsedBackupCodeNotification.php
View File

@@ -61,7 +61,7 @@ class MFAUsedBackupCodeNotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.used_backup_code_subject');
$subject = (string) trans('email.used_backup_code_subject');
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/NewBackupCodesNotification.php
View File

@@ -61,7 +61,7 @@ class NewBackupCodesNotification extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.new_backup_codes_subject');
$subject = (string) trans('email.new_backup_codes_subject');
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

2
app/Notifications/Security/UserFailedLoginAttempt.php
View File

@@ -58,7 +58,7 @@ class UserFailedLoginAttempt extends Notification
*/
public function toMail(User $notifiable)
{
$subject = (string) trans('email.failed_login_subject');
$subject = (string) trans('email.failed_login_subject');
$ip = Request::ip();
$host = Steam::getHostName($ip);
$userAgent = Request::userAgent();

23
app/Notifications/User/UserLogin.php
View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\User;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Notifications\ReturnsSettings;
use FireflyIII\Support\Facades\Steam;
@@ -68,13 +67,13 @@ class UserLogin extends Notification
public function toNtfy(User $notifiable): Message
{
$ip = Request::ip();
$host = Steam::getHostName($ip);
$ip = Request::ip();
$host = Steam::getHostName($ip);
$settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
$message = new Message();
$message->topic($settings['ntfy_topic']);
$message->title((string) trans('email.login_from_new_ip'));
$message->body((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host, ]));
$message->body((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]));
return $message;
}
@@ -84,9 +83,10 @@ class UserLogin extends Notification
*/
public function toPushover(User $notifiable): PushoverMessage
{
$ip = Request::ip();
$host = Steam::getHostName($ip);
return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host, ]))
$ip = Request::ip();
$host = Steam::getHostName($ip);
return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]))
->title((string) trans('email.login_from_new_ip'))
;
}
@@ -96,9 +96,10 @@ class UserLogin extends Notification
*/
public function toSlack(User $notifiable)
{
$ip = Request::ip();
$host = Steam::getHostName($ip);
return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host, ]));
$ip = Request::ip();
$host = Steam::getHostName($ip);
return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]));
}
/**
@@ -108,6 +109,4 @@ class UserLogin extends Notification
{
return ReturnsAvailableChannels::returnChannels('user', $notifiable);
}
}