read comment notification working
This commit is contained in:
parent
9222069ef5
commit
246d21f85a
17 changed files with 86 additions and 111 deletions
|
|
@ -52,7 +52,7 @@ return [
|
|||
try {
|
||||
$project->createNotification($commentData);
|
||||
} catch (\Throwable $th) {
|
||||
throw new Exception($th->getMessage() . ". Line " . $th->getLine() . " in file " . $th->getFile(), 1);
|
||||
throw new Exception($th->getMessage() . ". line " . $th->getLine() . " in file " . $th->getFile(), 1);
|
||||
}
|
||||
|
||||
exit;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,18 @@ return [
|
|||
'action' => function () {
|
||||
$json = file_get_contents('php://input');
|
||||
$data = json_decode($json);
|
||||
|
||||
$newNotifications = kirby()->user()->readNotification($data->notificationId);
|
||||
return $newNotifications;
|
||||
|
||||
try {
|
||||
$project = page($data->projectUuid);
|
||||
$project->readNotification($data->notificationId);
|
||||
return json_encode([
|
||||
"status" => "success"
|
||||
]);
|
||||
} catch (\Throwable $th) {
|
||||
return json_encode([
|
||||
"status" => "error",
|
||||
"message" => $th->getMessage() . ' line ' . $th->getLine() . " in file " . $th->getFile()
|
||||
]);
|
||||
}
|
||||
}
|
||||
];
|
||||
|
|
@ -12,7 +12,7 @@ class Notification
|
|||
protected Author $author;
|
||||
protected string $date;
|
||||
protected string $id;
|
||||
protected string $isread = "false";
|
||||
protected array $readby = [];
|
||||
|
||||
protected ?Position $position = null;
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ class Notification
|
|||
"author" => $this->author->toArray(),
|
||||
"date" => $this->date,
|
||||
"id" => $this->id,
|
||||
"isread" => $this->isread,
|
||||
"readby" => $this->readby,
|
||||
];
|
||||
|
||||
return $array;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,36 @@ class NotificationsPage extends Page {
|
|||
}
|
||||
|
||||
$this->update([
|
||||
'notifications' => Yaml::encode(array_values($notifications))
|
||||
'notifications' => $notifications
|
||||
]);
|
||||
}
|
||||
|
||||
public function readNotification($notificationId) {
|
||||
$notifications = $this->notifications()->isNotEmpty()
|
||||
? Yaml::decode($this->notifications()->value())
|
||||
: [];
|
||||
|
||||
foreach ($notifications as $key => &$notification) {
|
||||
if ($notification['id'] !== $notificationId) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!isset($notification["readby"])) {
|
||||
$notification["readby"] = [];
|
||||
}
|
||||
|
||||
$userUuid = (string) kirby()->user()->uuid();
|
||||
if (in_array($userUuid, $notification["readby"])) {
|
||||
return;
|
||||
}
|
||||
|
||||
$notification["readby"][] = $userUuid;
|
||||
break;
|
||||
}
|
||||
|
||||
$this->update([
|
||||
'notifications' => Yaml::encode($notifications)
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue