Skip to content

Commit e1b6909

Browse files
RoardomRoardom
authored
Merge pull request #4539 from HDInnovations/Notifications
(Fix) Notification setting logic when notification doesn't exist
2 parents c5da3f1 + 7e4ae4a commit e1b6909

18 files changed

+77
-80
lines changed

‎app/Notifications/NewBon.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return true;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_bon_gift) {
60+
if ($notifiable->notification?->show_bon_gift === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->gift->sender->group_id, $notifiable->notification->json_bon_groups, true);
66+
return ! \in_array($this->gift->sender->group_id, $notifiable->notification?->json_bon_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewComment.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,28 @@ public function shouldSend(User $notifiable): bool
6464
}
6565

6666
// Evaluate general settings
67-
if ($notifiable->notification?->block_notifications == 1) {
67+
if ($notifiable->notification?->block_notifications === 1) {
6868
return false;
6969
}
7070

7171
// Evaluate model based settings
7272
switch (true) {
7373
case $this->model instanceof Torrent:
74-
if (!$notifiable->notification?->show_torrent_comment) {
74+
if ($notifiable->notification?->show_torrent_comment === 0) {
7575
return false;
7676
}
7777

7878
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
7979
// the expression will return false.
80-
return ! \in_array($this->comment->user->group_id, $notifiable->notification->json_torrent_groups, true);
80+
return ! \in_array($this->comment->user->group_id, $notifiable->notification?->json_torrent_groups ?? [], true);
8181
case $this->model instanceof TorrentRequest:
82-
if (!$notifiable->notification?->show_request_comment) {
82+
if ($notifiable->notification?->show_request_comment === 0) {
8383
return false;
8484
}
8585

8686
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
8787
// the expression will return false.
88-
return ! \in_array($this->comment->user->group_id, $notifiable->notification->json_request_groups, true);
88+
return ! \in_array($this->comment->user->group_id, $notifiable->notification?->json_request_groups ?? [], true);
8989
case $this->model instanceof Ticket:
9090
return ! ($this->model->staff_id === $this->comment->id && $this->model->staff_id !== null)
9191
;

‎app/Notifications/NewCommentTag.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,39 +66,39 @@ public function shouldSend(User $notifiable): bool
6666
}
6767

6868
// Evaluate general settings
69-
if ($notifiable->notification?->block_notifications == 1) {
69+
if ($notifiable->notification?->block_notifications === 1) {
7070
return false;
7171
}
7272

7373
// Evaluate model based settings
7474
switch (true) {
7575
case $this->model instanceof Torrent:
76-
if (!$notifiable->notification?->show_mention_torrent_comment) {
76+
if ($notifiable->notification?->show_mention_torrent_comment === 0) {
7777
return false;
7878
}
7979

8080
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
8181
// the expression will return false.
82-
return ! \in_array($this->comment->user->group_id, $notifiable->notification->json_mention_groups, true);
82+
return ! \in_array($this->comment->user->group_id, $notifiable->notification?->json_mention_groups ?? [], true);
8383
case $this->model instanceof TorrentRequest:
84-
if (!$notifiable->notification?->show_mention_request_comment) {
84+
if ($notifiable->notification?->show_mention_request_comment === 0) {
8585
return false;
8686
}
8787

8888
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
8989
// the expression will return false.
90-
return ! \in_array($this->comment->user->group_id, $notifiable->notification->json_mention_groups, true);
90+
return ! \in_array($this->comment->user->group_id, $notifiable->notification?->json_mention_groups ?? [], true);
9191
case $this->model instanceof Ticket:
9292
return ! ($this->model->staff_id === $this->comment->id);
9393
case $this->model instanceof Playlist:
9494
case $this->model instanceof Article:
95-
if (!$notifiable->notification?->show_mention_article_comment) {
95+
if ($notifiable->notification?->show_mention_article_comment === 0) {
9696
return false;
9797
}
9898

9999
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
100100
// the expression will return false.
101-
return ! \in_array($this->comment->user->group_id, $notifiable->notification->json_mention_groups, true);
101+
return ! \in_array($this->comment->user->group_id, $notifiable->notification?->json_mention_groups ?? [], true);
102102
case $this->model instanceof Collection:
103103
break;
104104
}

‎app/Notifications/NewFollow.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ public function via(object $notifiable): array
4747
*/
4848
public function shouldSend(User $notifiable): bool
4949
{
50-
if ($notifiable->notification?->block_notifications == 1) {
50+
if ($notifiable->notification?->block_notifications === 1) {
5151
return false;
5252
}
5353

54-
if (!$notifiable->notification?->show_account_follow) {
54+
if ($notifiable->notification?->show_account_follow === 0) {
5555
return false;
5656
}
5757

5858
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
5959
// the expression will return false.
60-
return ! \in_array($this->follower->group_id, $notifiable->notification->json_following_groups, true);
60+
return ! \in_array($this->follower->group_id, $notifiable->notification?->json_following_groups ?? [], true);
6161
}
6262

6363
/**

‎app/Notifications/NewPost.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function shouldSend(User $notifiable): bool
6464
default => 'show_forum_topic',
6565
};
6666

67-
if (!$notifiable->notification?->$targetNotification) {
67+
if ($notifiable->notification?->$targetNotification === 0) {
6868
return false;
6969
}
7070

@@ -80,7 +80,7 @@ public function shouldSend(User $notifiable): bool
8080
return true;
8181
}
8282

83-
return ! \in_array($this->post->user->group_id, $notifiable->notification->$targetGroup, true);
83+
return ! \in_array($this->post->user->group_id, $notifiable->notification?->$targetGroup ?? [], true);
8484
}
8585

8686
/**

‎app/Notifications/NewPostTag.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ public function shouldSend(User $notifiable): bool
5858
return true;
5959
}
6060

61-
if ($notifiable->notification?->block_notifications == 1) {
61+
if ($notifiable->notification?->block_notifications === 1) {
6262
return false;
6363
}
6464

65-
if (!$notifiable->notification?->show_mention_forum_post) {
65+
if ($notifiable->notification?->show_mention_forum_post === 0) {
6666
return false;
6767
}
6868

6969
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
7070
// the expression will return false.
71-
return ! \in_array($this->post->user->group_id, $notifiable->notification->json_mention_groups, true);
71+
return ! \in_array($this->post->user->group_id, $notifiable->notification?->json_mention_groups ?? [], true);
7272
}
7373

7474
/**

‎app/Notifications/NewRequestBounty.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return false;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_request_bounty) {
60+
if ($notifiable->notification?->show_request_bounty === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->bounty->user->group_id, $notifiable->notification->json_request_groups, true);
66+
return ! \in_array($this->bounty->user->group_id, $notifiable->notification?->json_request_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewRequestClaim.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return false;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_request_claim) {
60+
if ($notifiable->notification?->show_request_claim === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->claim->user->group_id, $notifiable->notification->json_request_groups, true);
66+
return ! \in_array($this->claim->user->group_id, $notifiable->notification?->json_request_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewRequestFill.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return false;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_request_fill) {
60+
if ($notifiable->notification?->show_request_fill === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->torrentRequest->filler->group_id, $notifiable->notification->json_request_groups, true);
66+
return ! \in_array($this->torrentRequest->filler->group_id, $notifiable->notification?->json_request_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewRequestFillApprove.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return false;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_request_fill_approve) {
60+
if ($notifiable->notification?->show_request_fill_approve === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->torrentRequest->approver->group_id, $notifiable->notification->json_request_groups, true);
66+
return ! \in_array($this->torrentRequest->approver->group_id, $notifiable->notification?->json_request_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewRequestFillReject.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return false;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_request_fill_reject) {
60+
if ($notifiable->notification?->show_request_fill_reject === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->torrentRequest->user->group_id, $notifiable->notification->json_request_groups, true);
66+
return ! \in_array($this->torrentRequest->user->group_id, $notifiable->notification?->json_request_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewRequestUnclaim.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ public function shouldSend(User $notifiable): bool
5353
return false;
5454
}
5555

56-
if ($notifiable->notification?->block_notifications == 1) {
56+
if ($notifiable->notification?->block_notifications === 1) {
5757
return false;
5858
}
5959

60-
if (!$notifiable->notification?->show_request_unclaim) {
60+
if ($notifiable->notification?->show_request_unclaim === 0) {
6161
return false;
6262
}
6363

6464
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6565
// the expression will return false.
66-
return ! \in_array($this->torrentRequestClaim->user->group_id, $notifiable->notification->json_request_groups, true);
66+
return ! \in_array($this->torrentRequestClaim->user->group_id, $notifiable->notification?->json_request_groups ?? [], true);
6767
}
6868

6969
/**

‎app/Notifications/NewTopic.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ public function via(object $notifiable): array
4848
*/
4949
public function shouldSend(User $notifiable): bool
5050
{
51-
if ($notifiable->notification?->block_notifications == 1) {
51+
if ($notifiable->notification?->block_notifications === 1) {
5252
return false;
5353
}
5454

55-
if (!$notifiable->notification?->show_subscription_forum) {
55+
if ($notifiable->notification?->show_subscription_forum === 0) {
5656
return false;
5757
}
5858

5959
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6060
// the expression will return false.
61-
return ! \in_array($this->user->group_id, $notifiable->notification->json_subscription_groups, true);
61+
return ! \in_array($this->user->group_id, $notifiable->notification?->json_subscription_groups ?? [], true);
6262
}
6363

6464
/**

‎app/Notifications/NewUnfollow.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ public function via(object $notifiable): array
4747
*/
4848
public function shouldSend(User $notifiable): bool
4949
{
50-
if ($notifiable->notification?->block_notifications == 1) {
50+
if ($notifiable->notification?->block_notifications === 1) {
5151
return false;
5252
}
5353

54-
if (!$notifiable->notification?->show_account_unfollow) {
54+
if ($notifiable->notification?->show_account_unfollow === 0) {
5555
return false;
5656
}
5757

5858
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
5959
// the expression will return false.
60-
return ! \in_array($this->unfollower->group_id, $notifiable->notification->json_account_groups, true);
60+
return ! \in_array($this->unfollower->group_id, $notifiable->notification?->json_account_groups ?? [], true);
6161
}
6262

6363
/**

‎app/Notifications/NewUpload.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ public function shouldSend(User $notifiable): bool
5252
return false;
5353
}
5454

55-
if ($notifiable->notification?->block_notifications == 1) {
55+
if ($notifiable->notification?->block_notifications === 1) {
5656
return false;
5757
}
5858

59-
if (!$notifiable->notification?->show_following_upload) {
59+
if ($notifiable->notification?->show_following_upload === 0) {
6060
return false;
6161
}
6262

6363
// If the sender's group ID is found in the "Block all notifications from the selected groups" array,
6464
// the expression will return false.
65-
return ! \in_array($this->torrent->user->group_id, $notifiable->notification->json_following_groups, true);
65+
return ! \in_array($this->torrent->user->group_id, $notifiable->notification?->json_following_groups ?? [], true);
6666
}
6767

6868
/**

‎tests/Feature/Notifications/NewCommentTorrentRequestTagNotificationTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
$this->assertEquals(1, Comment::count());
7676

7777
Notification::assertSentTo(
78-
[$user],
79-
NewCommentTag::class
78+
$user,
79+
NewCommentTag::class,
80+
1,
8081
);
81-
Notification::assertCount(1);
8282
});
8383

8484
test('user tags user on request creates a notification for tagged user when mentions are disabled for other specific group', function (): void {
@@ -128,11 +128,11 @@
128128

129129
$this->assertEquals(1, Comment::count());
130130

131-
Notification::assertSentTo(
132-
[$user],
133-
NewCommentTag::class
131+
Notification::assertSentToTimes(
132+
$user,
133+
NewCommentTag::class,
134+
1,
134135
);
135-
Notification::assertCount(1);
136136
});
137137

138138
test('user tags user on request does not create a notification for tagged user when all notifications disabled', function (): void {

0 commit comments

Comments
 (0)