starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-02-24 19:07:20 +03:00
Code Issues 784 Packages Projects Releases 14 Wiki Activity

Notifications: Fixed attempted null usage issue where int expected

Browse Source
This commit is contained in:
Dan Brown
2025-11-09 11:39:38 +00:00
parent 1421ba871d
commit 5bf2d801cf
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Activity/Notifications/Handlers/CommentCreationNotificationHandler.php
View File

@@ -27,7 +27,7 @@ class CommentCreationNotificationHandler extends BaseNotificationHandler
$watcherIds = $watchers->getWatcherUserIds();
// Page owner if user preferences allow
if (!$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
if ($page->owned_by && !$watchers->isUserIgnoring($page->owned_by) && $page->ownedBy) {
$userNotificationPrefs = new UserNotificationPreferences($page->ownedBy);
if ($userNotificationPrefs->notifyOnOwnPageComments()) {
$watcherIds[] = $page->owned_by;
@@ -36,7 +36,7 @@ class CommentCreationNotificationHandler extends BaseNotificationHandler
// Parent comment creator if preferences allow
$parentComment = $detail->parent()->first();
if ($parentComment && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
if ($parentComment && $parentComment->created_by && !$watchers->isUserIgnoring($parentComment->created_by) && $parentComment->createdBy) {
$parentCommenterNotificationsPrefs = new UserNotificationPreferences($parentComment->createdBy);
if ($parentCommenterNotificationsPrefs->notifyOnCommentReplies()) {
$watcherIds[] = $parentComment->created_by;

4
app/Activity/Notifications/Handlers/PageUpdateNotificationHandler.php
View File

@@ -39,8 +39,8 @@ class PageUpdateNotificationHandler extends BaseNotificationHandler
$watchers = new EntityWatchers($detail, WatchLevels::UPDATES);
$watcherIds = $watchers->getWatcherUserIds();
// Add page owner if preferences allow
if (!$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
// Add the page owner if preferences allow
if ($detail->owned_by && !$watchers->isUserIgnoring($detail->owned_by) && $detail->ownedBy) {
$userNotificationPrefs = new UserNotificationPreferences($detail->ownedBy);
if ($userNotificationPrefs->notifyOnOwnPageChanges()) {
$watcherIds[] = $detail->owned_by;

6
app/Entities/Models/Entity.php
View File

@@ -44,9 +44,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property Carbon $created_at
* @property Carbon $updated_at
* @property Carbon $deleted_at
* @property int $created_by
* @property int $updated_by
* @property int $owned_by
* @property int|null $created_by
* @property int|null $updated_by
* @property int|null $owned_by
* @property Collection $tags
*
* @method static Entity|Builder visible()

18
tests/Activity/WatchTest.php
View File

@@ -327,6 +327,24 @@ class WatchTest extends TestCase
});
}
public function test_notify_watch_page_ignore_when_no_page_owner()
{
$editor = $this->users->editor();
$entities = $this->entities->createChainBelongingToUser($editor);
$entities['page']->owned_by = null;
$entities['page']->save();
$watches = new UserEntityWatchOptions($editor, $entities['page']);
$watches->updateLevelByValue(WatchLevels::IGNORE);
$notifications = Notification::fake();
$this->asAdmin();
$this->entities->updatePage($entities['page'], ['name' => 'My updated page', 'html' => 'Hello']);
$notifications->assertNothingSent();
}
public function test_notifications_sent_in_right_language()
{
$editor = $this->users->editor();