Update directory structure

Gruntfile.js

@@ -17,7 +17,7 @@ module.exports = grunt => {
                 files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}]
             },
             php: {
-                files: [{expand: true, cwd: "src/main/", src: "**/*.php", dest: "dist/", flatten: true}]
+                files: [{expand: true, cwd: "src/main/", src: "**/*.php", dest: "dist/", flatten: false}]
             },
         },
         focus: {

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "fwdekker/death-notifier",
     "description": "Get notified when a famous person dies.",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "type": "project",
     "license": "MIT",
     "homepage": "https://git.fwdekker.com/tools/death-notifier",
@@ -23,7 +23,7 @@
     },
     "autoload": {
         "psr-4": {
-            "main\\": "./"
+            "php\\": "php/"
         }
     },
     "minimum-stability": "stable"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "death-notifier",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "Get notified when a famous person dies.",
     "author": "Florine W. Dekker",
     "browser": "dist/bundle.js",

src/main/api.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace main;
-
-use Exception;
 use Monolog\ErrorHandler;
-use Monolog\Handler\BrowserConsoleHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use SQLite3;
+use php\Mailer;
+use php\Mediawiki;
+use php\Response;
+use php\TrackingManager;
+use php\UserManager;
 
 /** @noinspection PhpIncludeInspection Exists after `npm run deploy` */
 require_once __DIR__ . "/vendor/autoload.php";
@@ -62,7 +62,8 @@ function generate_csrf_token(): string
 }
 
 session_start();
-$_SESSION["token"] = generate_csrf_token();
+if (!isset($_SESSION["token"]))
+    $_SESSION["token"] = generate_csrf_token();
 
 // Read JSON from POST
 $_POST = json_decode(file_get_contents("php://input"), associative: true);
@@ -200,7 +201,7 @@ if (isset($_POST["action"])) {
     $response = match ($_GET["action"]) {
         "get-user-data" => validate_logged_in() ?? $user_manager->get_user_data($_SESSION["uuid"]),
         "list-trackings" => validate_logged_in() ?? $tracking_manager->list_trackings($_SESSION["uuid"]),
-        "is-alive" => $mediawiki->people_are_alive(array("Janelle Monáe", "John Malkovich", "Adolf Hitler")),
+        "is-alive" => $mediawiki->people_are_alive(array("John Cusack", "Cameron Diaz", "John Malkovich")),
         default => new Response("Unknown GET action '" . $_GET["action"] . "'.", false),
     };
 } else {

src/main/php/Mailer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace main;
+namespace php;
 
 use Monolog\Logger;
 use PHPMailer\PHPMailer\Exception;

src/main/php/Mediawiki.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace main;
+namespace php;
 
 use Exception;
 use Monolog\Logger;
@@ -87,6 +87,7 @@ class Mediawiki
         $pages = array_values($response["query"]["pages"]);
         $page_names = array_column($pages, "title");
         $page_categories = array_column($pages, "categories");
+        // TODO: Differentiate between living, dead, missing, presumed dead, etc.
         $is_alive = fn($it): bool => in_array("Category:Living people", array_column($it, "title"));
         $alive_results = array_combine($page_names, array_map($is_alive, $page_categories));
 

src/main/php/Response.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace main;
+namespace php;
 
 
 /**

src/main/php/TrackingManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace main;
+namespace php;
 
 use Monolog\Logger;
 use SQLite3;

src/main/php/UserManager.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace main;
+namespace php;
 
 use Exception;
 use Monolog\Logger;