feat: Add map and granular instant notif preferences

kumy · kumy · commit 9c040cc4bec2 · 2026-02-19T14:38:29.000+01:00
diff --git a/website/app-templates/smarty/dialog/user_update_email.tpl b/website/app-templates/smarty/dialog/user_update_email.tpl
@@ -24,6 +24,30 @@
             </label>
         </div>
 
+        <div id="instantNotificationsOptions" class="alert alert-info {if !$instant_notifications}hidden{/if}">
+            <strong>{t}Instant notification types:{/t}</strong>
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="instant_notifications_moves_own_gk" class="instant-notif-checkbox" {if $instant_notifications_moves_own_gk}checked{/if}>{t}Moves of my GeoKrety{/t}
+                </label>
+            </div>
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="instant_notifications_moves_watched_gk" class="instant-notif-checkbox" {if $instant_notifications_moves_watched_gk}checked{/if}>{t}Moves of GeoKrety I watch{/t}
+                </label>
+            </div>
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="instant_notifications_moves_around_home" class="instant-notif-checkbox" {if $instant_notifications_moves_around_home}checked{/if}>{t}Moves around my home location{/t}
+                </label>
+            </div>
+            <div class="checkbox">
+                <label>
+                    <input type="checkbox" name="instant_notifications_move_comments" class="instant-notif-checkbox" {if $instant_notifications_move_comments}checked{/if}>{t}Comments on moves{/t}
+                </label>
+            </div>
+        </div>
+
         <hr />
         <p>
             <strong>{t}The main purpose of collecting email is to permit password recovery.{/t}</strong>
diff --git a/website/app-templates/smarty/emails/instant-move-notification.tpl b/website/app-templates/smarty/emails/instant-move-notification.tpl
@@ -52,6 +52,11 @@
         </tbody>
     </table>
 
+    {if isset($notification_home_map_cid)}{* Map for moves around home notifications *}
+    <div class="s-3"></div>
+    <a href="{'geokrety_map'|alias}" title="{t}Open interactive map{/t}"><img src="cid:{$notification_home_map_cid}" alt="{t}Move location map{/t}" class="img-fluid max-w-150 align-center text-center"></a>
+    {/if}
+
     {if $comments}
     <table class="table table-striped thead-default table-bordered">
         <thead>
diff --git a/website/app-templates/smarty/js/dialogs/dialog_user_update_email.tpl.js b/website/app-templates/smarty/js/dialogs/dialog_user_update_email.tpl.js
@@ -0,0 +1,17 @@
+$("body").on("change", "#instantNotificationsCheckbox", function(event) {
+    const $optionsDiv = $("#instantNotificationsOptions");
+    const $checkboxes = $(".instant-notif-checkbox");
+console.log("Instant notifications checkbox changed:", $(this).is(":checked"));
+    if ($(this).is(":checked")) {
+        $optionsDiv.removeClass("hidden");
+        // Check all granular checkboxes when enabling instant notifications
+        $checkboxes.prop("checked", true);
+    } else {
+        $optionsDiv.addClass("hidden");
+    }
+});
+
+// Initialize on page load
+$(document).ready(function() {
+    $("#instantNotificationsCheckbox").trigger("change");
+});
diff --git a/website/app-templates/smarty/pages/user_details.tpl b/website/app-templates/smarty/pages/user_details.tpl
@@ -63,6 +63,7 @@
 
     // Bind modal
     {include 'js/dialogs/dialog_user_details.tpl.js'}
+    {include 'js/dialogs/dialog_user_update_email.tpl.js'}
     {include 'js/dialogs/dialog_contact_user.tpl.js'}
     {include 'js/dialogs/dialog_picture_actions.tpl.js'}
     {include 'js/dialogs/dialog_oauth_disconnect.tpl.js'}
diff --git a/website/app/GeoKrety/Controller/Cli/DailyDigest.php b/website/app/GeoKrety/Controller/Cli/DailyDigest.php
@@ -10,8 +10,8 @@
 use GeoKrety\Model\MoveComment;
 use GeoKrety\Model\News;
 use GeoKrety\Model\User;
-use GeoKrety\Service\File;
 use GeoKrety\Service\Smarty;
+use GeoKrety\Service\StaticMapImage;
 use GeoKrety\Service\UserSettings;
 use PHPMailer\PHPMailer\Exception;
 use Sugar\Event;
@@ -269,52 +269,12 @@ private function load_near_home_dropped_geokrety() {
 SQL;
         $this->console_writer->print([$this->user->id, $this->user->username, 'load dropped - geojson']);
         $result = \Base::instance()->get('DB')->exec($sql, [$this->user->id, $this->since->format(GK_DB_DATETIME_FORMAT), Geokret::GEOKRETY_PRESENT_IN_CACHE]);
-        $geojson = $result[0]['geojson'];
-
-        $home = <<<'GEOJSON'
-{
-  "type": "Feature",
-  "geometry": {
-    "type": "Point",
-    "coordinates": [ %s, %s]
-  },
-  "markerIconOptions": {
-    "iconUrl": "%s/home48.png",
-    "iconAnchor": [24, 24]
-  }
-}
-GEOJSON;
-        $home = sprintf($home, $this->user->home_longitude, $this->user->home_latitude, GK_CDN_ICONS_URL);
-
-        $geojson = json_decode($geojson);
-        array_unshift($geojson->features, json_decode($home, true));
-
-        $img_url_params = http_build_query([
-            // 'center' => sprintf('%s,%s', $this->user->home_longitude, $this->user->home_latitude),
-            'arrows' => true,
-            'geojson' => json_encode($geojson),
-            'width' => 640,
-            'height' => 480,
-            'oxipng' => true,
-            'maxZoom' => 13,
-            // 'zoom' => 11,
-            'markerIconOptions' => sprintf('{"iconUrl": "%s/pins/green.png", iconAnchor: [6, 20]}', GK_CDN_ICONS_URL),
-        ]);
-        $this->console_writer->print([$this->user->id, $this->user->username, 'load dropped - image']);
-        try {
-            $fp = fopen('php://memory', 'w');
-            File::download(sprintf('%s?%s', GK_OSM_STATIC_MAPS_URI, $img_url_params), $fp);
-            rewind($fp);
-            $img_string = stream_get_contents($fp);
-            fclose($fp);
-        } catch (\Exception $e) {
-            echo $this->console_writer->sprintf('E: Download static maps image failed: %s', $e->getMessage());
+        $positions = $result;
 
-            return;
+        $this->console_writer->print([$this->user->id, $this->user->username, 'load dropped - image']);
+        $imgCid = 'GK_NEAR_HOME_IMG';
+        if (StaticMapImage::generateHomeMapWithMarkers($this->email, $this->user, $positions, $imgCid)) {
+            Smarty::assign('gk_near_home_img', $imgCid);
         }
-
-        $img_cid = 'GK_NEAR_HOME_IMG';
-        Smarty::assign('gk_near_home_img', $img_cid);
-        $this->email->addStringEmbeddedImage($img_string, $img_cid, 'gk_near_home.png');
     }
 }
diff --git a/website/app/GeoKrety/Controller/Pages/UserUpdateEmail.php b/website/app/GeoKrety/Controller/Pages/UserUpdateEmail.php
@@ -20,6 +20,10 @@ public function get(\Base $f3) {
         }
         Smarty::assign('daily_digest', UserSettings::getForCurrentUser('DAILY_DIGEST'));
         Smarty::assign('instant_notifications', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS'));
+        Smarty::assign('instant_notifications_moves_own_gk', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_OWN_GK'));
+        Smarty::assign('instant_notifications_moves_watched_gk', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK'));
+        Smarty::assign('instant_notifications_moves_around_home', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME'));
+        Smarty::assign('instant_notifications_move_comments', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVE_COMMENTS'));
         Smarty::render('extends:full_screen_modal.tpl|dialog/user_update_email.tpl');
     }
 
@@ -30,6 +34,10 @@ public function get_ajax(\Base $f3) {
         }
         Smarty::assign('daily_digest', UserSettings::getForCurrentUser('DAILY_DIGEST'));
         Smarty::assign('instant_notifications', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS'));
+        Smarty::assign('instant_notifications_moves_own_gk', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_OWN_GK'));
+        Smarty::assign('instant_notifications_moves_watched_gk', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK'));
+        Smarty::assign('instant_notifications_moves_around_home', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME'));
+        Smarty::assign('instant_notifications_move_comments', UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVE_COMMENTS'));
         Smarty::render('extends:base_modal.tpl|dialog/user_update_email.tpl');
     }
 
@@ -41,6 +49,18 @@ public function post(\Base $f3) {
         // Get values from POST
         $daily_digest = filter_var($f3->get('POST.daily_digest'), FILTER_VALIDATE_BOOLEAN);
         $instant_notifications = filter_var($f3->get('POST.instant_notifications'), FILTER_VALIDATE_BOOLEAN);
+        $instant_notifications_moves_own_gk = filter_var($f3->get('POST.instant_notifications_moves_own_gk'), FILTER_VALIDATE_BOOLEAN);
+        $instant_notifications_moves_watched_gk = filter_var($f3->get('POST.instant_notifications_moves_watched_gk'), FILTER_VALIDATE_BOOLEAN);
+        $instant_notifications_moves_around_home = filter_var($f3->get('POST.instant_notifications_moves_around_home'), FILTER_VALIDATE_BOOLEAN);
+        $instant_notifications_move_comments = filter_var($f3->get('POST.instant_notifications_move_comments'), FILTER_VALIDATE_BOOLEAN);
+
+        // If instant_notifications is enabled, default all granular settings to true if not explicitly set
+        if ($instant_notifications) {
+            $instant_notifications_moves_own_gk = $instant_notifications_moves_own_gk ?? true;
+            $instant_notifications_moves_watched_gk = $instant_notifications_moves_watched_gk ?? true;
+            $instant_notifications_moves_around_home = $instant_notifications_moves_around_home ?? true;
+            $instant_notifications_move_comments = $instant_notifications_move_comments ?? true;
+        }
 
         // Save user preferences using UserSettings service
         $userSettings = UserSettings::instance();
@@ -56,6 +76,26 @@ public function post(\Base $f3) {
             $changed = true;
         }
 
+        if (UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_OWN_GK') !== $instant_notifications_moves_own_gk) {
+            $userSettings->put($user, 'INSTANT_NOTIFICATIONS_MOVES_OWN_GK', $instant_notifications_moves_own_gk ? 'true' : 'false');
+            $changed = true;
+        }
+
+        if (UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK') !== $instant_notifications_moves_watched_gk) {
+            $userSettings->put($user, 'INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK', $instant_notifications_moves_watched_gk ? 'true' : 'false');
+            $changed = true;
+        }
+
+        if (UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME') !== $instant_notifications_moves_around_home) {
+            $userSettings->put($user, 'INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME', $instant_notifications_moves_around_home ? 'true' : 'false');
+            $changed = true;
+        }
+
+        if (UserSettings::getForCurrentUser('INSTANT_NOTIFICATIONS_MOVE_COMMENTS') !== $instant_notifications_move_comments) {
+            $userSettings->put($user, 'INSTANT_NOTIFICATIONS_MOVE_COMMENTS', $instant_notifications_move_comments ? 'true' : 'false');
+            $changed = true;
+        }
+
         if ($changed) {
             \Flash::instance()->addMessage(_('Your email preferences were saved.'), 'success');
         }
diff --git a/website/app/GeoKrety/Model/Move.php b/website/app/GeoKrety/Model/Move.php
@@ -158,11 +158,11 @@ public function get_move_type($value): LogType {
         return new LogType($value);
     }
 
-    public function get_lat($value) {
+    public function get_lat($value): mixed {
         return $value ? number_format(floatval($value), 5, '.', '') : $value;
     }
 
-    public function get_lon($value) {
+    public function get_lon($value): mixed {
         return $value ? number_format(floatval($value), 5, '.', '') : $value;
     }
 
diff --git a/website/app/GeoKrety/Service/StaticMapImage.php b/website/app/GeoKrety/Service/StaticMapImage.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace GeoKrety\Service;
+
+use GeoKrety\Email\BasePHPMailer;
+use GeoKrety\Model\User;
+
+class StaticMapImage {
+    private const HOME_ICON_SIZE = 48;
+    private const GK_ICON_SIZE = 16;
+
+    /**
+     * Generate and embed a static map image showing GeoKrets dropped near user's home.
+     *
+     * @param BasePHPMailer $email     Email instance to embed image in
+     * @param User          $user      User object with home coordinates
+     * @param array         $positions Array of position geometries (from query result)
+     * @param string        $imageId   Content ID for embedding (default: GK_NEAR_HOME_IMG)
+     *
+     * @return bool true if image was successfully generated and embedded, false otherwise
+     *
+     * @throws \Exception If file download or image handling fails
+     */
+    public static function generateHomeMapWithMarkers(
+        BasePHPMailer $email,
+        User $user,
+        array $positions,
+        string $imageId = 'GK_NEAR_HOME_IMG',
+    ): bool {
+        if (!$user->hasHomeCoordinates()) {
+            return false;
+        }
+
+        try {
+            // Build GeoJSON for the map
+            $geojson = self::buildGeoJSON($positions, $user);
+
+            // Build URL parameters for static maps service
+            $imgUrlParams = http_build_query([
+                'arrows' => true,
+                'geojson' => json_encode($geojson),
+                'width' => 640,
+                'height' => 480,
+                'oxipng' => true,
+                'maxZoom' => 13,
+                'markerIconOptions' => sprintf(
+                    '{"iconUrl": "%s/pins/green.png", iconAnchor: [6, 20]}',
+                    GK_CDN_ICONS_URL
+                ),
+            ]);
+
+            $mapUrl = sprintf('%s?%s', GK_OSM_STATIC_MAPS_URI, $imgUrlParams);
+
+            // Download the image
+            $fp = fopen('php://memory', 'w');
+            File::download($mapUrl, $fp);
+            rewind($fp);
+            $imgString = stream_get_contents($fp);
+            fclose($fp);
+
+            // Embed image in email
+            $email->addStringEmbeddedImage($imgString, $imageId, 'gk_near_home.png');
+
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Build GeoJSON FeatureCollection from positions with home location marker.
+     *
+     * @param array $queryResult Array from database query containing 'geojson' field
+     * @param User  $user        User object with home coordinates
+     *
+     * @return object GeoJSON FeatureCollection
+     */
+    private static function buildGeoJSON(array $queryResult, User $user): object {
+        // Build home marker feature
+        $homeFeature = self::buildHomeMarkerFeature($user);
+
+        // Extract GeoJSON from query result
+        if (!empty($queryResult) && isset($queryResult[0]['geojson'])) {
+            $geojson = json_decode($queryResult[0]['geojson']);
+        } else {
+            $geojson = (object) [
+                'type' => 'FeatureCollection',
+                'features' => [],
+            ];
+        }
+
+        // Ensure features array exists
+        if (!isset($geojson->features) || !is_array($geojson->features)) {
+            $geojson->features = [];
+        }
+
+        // Add home marker at the beginning
+        array_unshift($geojson->features, $homeFeature);
+
+        return $geojson;
+    }
+
+    /**
+     * Build a GeoJSON feature for home location marker.
+     *
+     * @param User $user User with home coordinates
+     *
+     * @return array GeoJSON Feature object
+     */
+    private static function buildHomeMarkerFeature(User $user): array {
+        return [
+            'type' => 'Feature',
+            'geometry' => [
+                'type' => 'Point',
+                'coordinates' => [(float) $user->home_longitude, (float) $user->home_latitude],
+            ],
+            'markerIconOptions' => [
+                'iconUrl' => GK_CDN_ICONS_URL.'/home'.self::HOME_ICON_SIZE.'.png',
+                'iconAnchor' => [24, 24],
+            ],
+        ];
+    }
+}
diff --git a/website/app/shutdown.php b/website/app/shutdown.php
@@ -16,6 +16,11 @@ function shutdown_force_send_response_to_client(Base $f3) {
 }
 
 function shutdown_piwik(Base $f3) {
+    // Skip in worker/CLI context where there's no current user/session
+    if (!$f3->exists('SESSION.CURRENT_USER')) {
+        return;
+    }
+
     $ip = $f3->get('IP');
     $ip_excluded = false;
     foreach (GK_SYSTEM_PATH_ALLOWED_IPS as $range) {
diff --git a/website/db/migrations/20260219120000_add_granular_instant_notifications.php b/website/db/migrations/20260219120000_add_granular_instant_notifications.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddGranularInstantNotifications extends AbstractMigration {
+    public function up(): void {
+        // 1. Add granular instant notification settings parameters
+        $this->execute("
+            INSERT INTO geokrety.gk_users_settings_parameters (name, type, \"default\", description, created_on_datetime, updated_on_datetime)
+            VALUES
+                ('INSTANT_NOTIFICATIONS_MOVES_OWN_GK', 'bool', 'true', 'Receive instant notifications for moves of my own GeoKrety', NOW(), NOW()),
+                ('INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK', 'bool', 'true', 'Receive instant notifications for moves of GeoKrety I watch', NOW(), NOW()),
+                ('INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME', 'bool', 'true', 'Receive instant notifications for moves around my home location', NOW(), NOW()),
+                ('INSTANT_NOTIFICATIONS_MOVE_COMMENTS', 'bool', 'true', 'Receive instant notifications for comments on moves', NOW(), NOW());
+        ");
+    }
+
+    public function down(): void {
+        // 1. Remove granular instant notification settings parameters
+        $this->execute("
+            DELETE FROM geokrety.gk_users_settings_parameters
+            WHERE name IN (
+                'INSTANT_NOTIFICATIONS_MOVES_OWN_GK',
+                'INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK',
+                'INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME',
+                'INSTANT_NOTIFICATIONS_MOVE_COMMENTS'
+            );
+        ");
+
+        // 2. Clean up any user settings for these parameters
+        $this->execute("
+            DELETE FROM geokrety.gk_users_settings
+            WHERE name IN (
+                'INSTANT_NOTIFICATIONS_MOVES_OWN_GK',
+                'INSTANT_NOTIFICATIONS_MOVES_WATCHED_GK',
+                'INSTANT_NOTIFICATIONS_MOVES_AROUND_HOME',
+                'INSTANT_NOTIFICATIONS_MOVE_COMMENTS'
+            );
+        ");
+    }
+}
diff --git a/website/workers/mail-notification.php b/website/workers/mail-notification.php

Original file line number	Diff line number	Diff line change
`@@ -158,11 +158,11 @@ public function get_move_type($value): LogType {`
`158`	`158`	`return new LogType($value);`
`159`	`159`	`}`
`160`	`160`
`161`		`- public function get_lat($value) {`
	`161`	`+ public function get_lat($value): mixed {`
`162`	`162`	`return $value ? number_format(floatval($value), 5, '.', '') : $value;`
`163`	`163`	`}`
`164`	`164`
`165`		`- public function get_lon($value) {`
	`165`	`+ public function get_lon($value): mixed {`
`166`	`166`	`return $value ? number_format(floatval($value), 5, '.', '') : $value;`
`167`	`167`	`}`
`168`	`168`