kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-03 12:04:28 +00:00
Code Issues Projects Releases Wiki Activity

Expand all notifications.

Browse Source
This commit is contained in:
James Cole
2024-12-14 08:03:18 +01:00
parent 5520992861
commit 03e9e3dbdb
8 changed files with 154 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,11 +26,14 @@ namespace FireflyIII\Notifications\User;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\Notifications\ReturnsSettings;
use FireflyIII\User;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
use NotificationChannels\Pushover\PushoverMessage;
use Ntfy\Message;
/**
* Class UserLogin
@@ -60,41 +63,38 @@ class UserLogin extends Notification
public function toMail(User $notifiable)
{
$time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js'));
$host = '';
try {
$hostName = app('steam')->getHostName($this->ip);
} catch (FireflyException $e) {
app('log')->error($e->getMessage());
$hostName = $this->ip;
}
if ($hostName !== $this->ip) {
$host = $hostName;
}
return (new MailMessage())
->markdown('emails.new-ip', ['time' => $time, 'ipAddress' => $this->ip, 'host' => $host])
->markdown('emails.new-ip', ['time' => $time, 'ipAddress' => $this->ip, 'host' => $this->getHost()])
->subject((string) trans('email.login_from_new_ip'));
}
public function toNtfy(User $notifiable): Message
{
$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', ['host' => $this->getHost(), 'ip' => $this->ip]));
return $message;
}
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function toPushover(User $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['host' => $this->getHost(), 'ip' => $this->ip]))
->title((string) trans('email.login_from_new_ip'));
}
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function toSlack(User $notifiable)
{
$host = '';
try {
$hostName = app('steam')->getHostName($this->ip);
} catch (FireflyException $e) {
app('log')->error($e->getMessage());
$hostName = $this->ip;
}
if ($hostName !== $this->ip) {
$host = $hostName;
}
return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['host' => $host, 'ip' => $this->ip]));
return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['host' => $this->getHost(), 'ip' => $this->ip]));
}
/**
@@ -104,4 +104,19 @@ class UserLogin extends Notification
{
return ReturnsAvailableChannels::returnChannels('user', $notifiable);
}
private function getHost(): string {
$host = '';
try {
$hostName = app('steam')->getHostName($this->ip);
} catch (FireflyException $e) {
app('log')->error($e->getMessage());
$hostName = $this->ip;
}
if ($hostName !== $this->ip) {
$host = $hostName;
}
return $host;
}
}