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-14

Browse Source
This commit is contained in:
github-actions
2024-12-14 21:55:42 +01:00
parent 28d7e24d30
commit e2289ce1e6
54 changed files with 911 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Notifications/User/BillReminder.php
View File

@@ -46,7 +46,6 @@ class BillReminder extends Notification
private int $diff;
private string $field;
public function __construct(Bill $bill, string $field, int $diff)
{
$this->bill = $bill;
@@ -54,7 +53,6 @@ class BillReminder extends Notification
$this->diff = $diff;
}
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
@@ -71,7 +69,8 @@ class BillReminder extends Notification
{
return (new MailMessage())
->markdown('emails.bill-warning', ['field' => $this->field, 'diff' => $this->diff, 'bill' => $this->bill])
->subject($this->getSubject());
->subject($this->getSubject())
;
}
/**
@@ -87,7 +86,8 @@ class BillReminder extends Notification
->attachment(static function ($attachment) use ($bill, $url): void {
$attachment->title((string) trans('firefly.visit_bill', ['name' => $bill->name]), $url);
})
->content($this->getSubject());
->content($this->getSubject())
;
}
public function toNtfy(User $notifiable): Message
@@ -107,7 +107,8 @@ class BillReminder extends Notification
public function toPushover(User $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.bill_warning_please_action'))
->title($this->getSubject());
->title($this->getSubject())
;
}
private function getSubject(): string
@@ -116,6 +117,7 @@ class BillReminder extends Notification
if (0 === $this->diff) {
$message = (string) trans(sprintf('email.bill_warning_subject_now_%s', $this->field), ['diff' => $this->diff, 'name' => $this->bill->name]);
}
return $message;
}

8
app/Notifications/User/NewAccessToken.php
View File

@@ -41,10 +41,8 @@ class NewAccessToken extends Notification
{
use Queueable;
public function __construct() {}
public function toArray(User $notifiable)
{
return [
@@ -58,7 +56,8 @@ class NewAccessToken extends Notification
{
return (new MailMessage())
->markdown('emails.token-created')
->subject((string) trans('email.access_token_created_subject'));
->subject((string) trans('email.access_token_created_subject'))
;
}
/**
@@ -86,7 +85,8 @@ class NewAccessToken extends Notification
public function toPushover(User $notifiable): PushoverMessage
{
return PushoverMessage::create((string) trans('email.access_token_created_body'))
->title((string) trans('email.access_token_created_subject'));
->title((string) trans('email.access_token_created_subject'))
;
}
/**

15
app/Notifications/User/RuleActionFailed.php
View File

@@ -46,15 +46,14 @@ class RuleActionFailed extends Notification
private string $ruleLink;
private string $ruleTitle;
public function __construct(array $params)
{
[$mainMessage, $groupTitle, $groupLink, $ruleTitle, $ruleLink] = $params;
$this->message = $mainMessage;
$this->groupTitle = $groupTitle;
$this->groupLink = $groupLink;
$this->ruleTitle = $ruleTitle;
$this->ruleLink = $ruleLink;
$this->message = $mainMessage;
$this->groupTitle = $groupTitle;
$this->groupLink = $groupLink;
$this->ruleTitle = $ruleTitle;
$this->ruleLink = $ruleLink;
}
/**
@@ -83,7 +82,6 @@ class RuleActionFailed extends Notification
});
}
public function toNtfy(User $notifiable): Message
{
$settings = ReturnsSettings::getSettings('ntfy', 'user', $notifiable);
@@ -108,9 +106,10 @@ class RuleActionFailed extends Notification
public function via(User $notifiable)
{
$channels = ReturnsAvailableChannels::returnChannels('user', $notifiable);
if (($key = array_search('mail', $channels)) !== false) {
if (($key = array_search('mail', $channels, true)) !== false) {
unset($channels[$key]);
}
return $channels;
}
}

7
app/Notifications/User/TransactionCreation.php
View File

@@ -24,7 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Notifications\User;
use FireflyIII\Notifications\ReturnsAvailableChannels;
use FireflyIII\User;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
@@ -39,7 +38,6 @@ class TransactionCreation extends Notification
private array $collection;
public function __construct(array $collection)
{
$this->collection = $collection;
@@ -57,15 +55,14 @@ class TransactionCreation extends Notification
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function toMail(User $notifiable)
{
return (new MailMessage())
->markdown('emails.report-new-journals', ['transformed' => $this->collection])
->subject(trans_choice('email.new_journals_subject', count($this->collection)));
->subject(trans_choice('email.new_journals_subject', count($this->collection)))
;
}
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/

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

@@ -44,13 +44,11 @@ class UserLogin extends Notification
private string $ip;
public function __construct(string $ip)
{
$this->ip = $ip;
}
public function toArray(User $notifiable)
{
return [
@@ -66,7 +64,8 @@ class UserLogin extends Notification
return (new MailMessage())
->markdown('emails.new-ip', ['time' => $time, 'ipAddress' => $this->ip, 'host' => $this->getHost()])
->subject((string) trans('email.login_from_new_ip'));
->subject((string) trans('email.login_from_new_ip'))
;
}
public function toNtfy(User $notifiable): Message
@@ -86,7 +85,8 @@ class UserLogin extends Notification
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'));
->title((string) trans('email.login_from_new_ip'))
;
}
/**
@@ -105,7 +105,8 @@ class UserLogin extends Notification
return ReturnsAvailableChannels::returnChannels('user', $notifiable);
}
private function getHost(): string {
private function getHost(): string
{
$host = '';
try {
@@ -117,6 +118,7 @@ class UserLogin extends Notification
if ($hostName !== $this->ip) {
$host = $hostName;
}
return $host;
}
}

4
app/Notifications/User/UserNewPassword.php
View File

@@ -43,7 +43,6 @@ class UserNewPassword extends Notification
private string $url;
public function __construct(string $url)
{
$this->url = $url;
@@ -65,7 +64,8 @@ class UserNewPassword extends Notification
{
return (new MailMessage())
->markdown('emails.password', ['url' => $this->url])
->subject((string) trans('email.reset_pw_subject'));
->subject((string) trans('email.reset_pw_subject'))
;
}
/**

4
app/Notifications/User/UserRegistration.php
View File

@@ -36,7 +36,6 @@ class UserRegistration extends Notification
{
use Queueable;
public function __construct() {}
/**
@@ -55,7 +54,8 @@ class UserRegistration extends Notification
{
return (new MailMessage())
->markdown('emails.registered', ['address' => route('index')])
->subject((string) trans('email.registered_subject'));
->subject((string) trans('email.registered_subject'))
;
}
/**