From e2ce7b448dc5885013442af4e9af41f12ba3bd12 Mon Sep 17 00:00:00 2001
From: Emilio Mariscal <emi.mariscal.dev@gmail.com>
Date: Fri, 14 Aug 2026 11:38:08 -0300
Subject: [PATCH 1/6] Add 'my location' control

---
 .../shoelace/assets/icons/crosshair.svg       |  3 ++
 .../shoelace/assets/icons/crosshair2.svg      |  3 ++
 chatmap-ui/src/components/Map/controls.jsx    | 41 +++++++++++++++++++
 chatmap-ui/src/components/Map/index.jsx       | 12 +++++-
 chatmap-ui/src/styles/main.css                | 12 ++++++
 5 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 chatmap-ui/public/shoelace/assets/icons/crosshair.svg
 create mode 100644 chatmap-ui/public/shoelace/assets/icons/crosshair2.svg

diff --git a/chatmap-ui/public/shoelace/assets/icons/crosshair.svg b/chatmap-ui/public/shoelace/assets/icons/crosshair.svg
new file mode 100644
index 0000000..13bed74
--- /dev/null
+++ b/chatmap-ui/public/shoelace/assets/icons/crosshair.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-crosshair" viewBox="0 0 16 16">
+  <path d="M8.5.5a.5.5 0 0 0-1 0v.518A7 7 0 0 0 1.018 7.5H.5a.5.5 0 0 0 0 1h.518A7 7 0 0 0 7.5 14.982v.518a.5.5 0 0 0 1 0v-.518A7 7 0 0 0 14.982 8.5h.518a.5.5 0 0 0 0-1h-.518A7 7 0 0 0 8.5 1.018zm-6.48 7A6 6 0 0 1 7.5 2.02v.48a.5.5 0 0 0 1 0v-.48a6 6 0 0 1 5.48 5.48h-.48a.5.5 0 0 0 0 1h.48a6 6 0 0 1-5.48 5.48v-.48a.5.5 0 0 0-1 0v.48A6 6 0 0 1 2.02 8.5h.48a.5.5 0 0 0 0-1zM8 10a2 2 0 1 0 0-4 2 2 0 0 0 0 4"/>
+</svg>
\ No newline at end of file
diff --git a/chatmap-ui/public/shoelace/assets/icons/crosshair2.svg b/chatmap-ui/public/shoelace/assets/icons/crosshair2.svg
new file mode 100644
index 0000000..3c28586
--- /dev/null
+++ b/chatmap-ui/public/shoelace/assets/icons/crosshair2.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-crosshair2" viewBox="0 0 16 16">
+  <path d="M8 0a.5.5 0 0 1 .5.5v.518A7 7 0 0 1 14.982 7.5h.518a.5.5 0 0 1 0 1h-.518A7 7 0 0 1 8.5 14.982v.518a.5.5 0 0 1-1 0v-.518A7 7 0 0 1 1.018 8.5H.5a.5.5 0 0 1 0-1h.518A7 7 0 0 1 7.5 1.018V.5A.5.5 0 0 1 8 0m-.5 2.02A6 6 0 0 0 2.02 7.5h1.005A5 5 0 0 1 7.5 3.025zm1 1.005A5 5 0 0 1 12.975 7.5h1.005A6 6 0 0 0 8.5 2.02zM12.975 8.5A5 5 0 0 1 8.5 12.975v1.005a6 6 0 0 0 5.48-5.48zM7.5 12.975A5 5 0 0 1 3.025 8.5H2.02a6 6 0 0 0 5.48 5.48zM10 8a2 2 0 1 0-4 0 2 2 0 0 0 4 0"/>
+</svg>
\ No newline at end of file
diff --git a/chatmap-ui/src/components/Map/controls.jsx b/chatmap-ui/src/components/Map/controls.jsx
index b7cddef..a0871a8 100644
--- a/chatmap-ui/src/components/Map/controls.jsx
+++ b/chatmap-ui/src/components/Map/controls.jsx
@@ -62,3 +62,44 @@ export class BackgroundControl {
         this._map = undefined;
     }
 }
+
+const locationHandler = async () => {
+    if (!navigator.geolocation) {
+      console.error("Geolocation is not supported by your browser");
+      return;
+    }
+
+    try {
+      const position = await new Promise((resolve, reject) => {
+        const watchId = navigator.geolocation.watchPosition(
+          (pos) => {
+            navigator.geolocation.clearWatch(watchId);
+            clearTimeout(timeoutId);
+            resolve(pos);
+          },
+          (err) => {
+            navigator.geolocation.clearWatch(watchId);
+            clearTimeout(timeoutId);
+            reject(err);
+          },
+          {
+            enableHighAccuracy: true,
+            timeout: 15000,
+            maximumAge: 0
+          }
+        );
+
+        const timeoutId = setTimeout(() => {
+          navigator.geolocation.clearWatch(watchId);
+          reject(new Error("Location timeout: Could not get GPS fix within 15s"));
+        }, 15000);
+      });
+
+      return position.coords;
+
+    } catch (error) {
+      console.error("Failed to get location:", error.message || error);
+      return false;
+    }
+};
+
diff --git a/chatmap-ui/src/components/Map/index.jsx b/chatmap-ui/src/components/Map/index.jsx
index 282b922..3481948 100644
--- a/chatmap-ui/src/components/Map/index.jsx
+++ b/chatmap-ui/src/components/Map/index.jsx
@@ -1,5 +1,5 @@
 import React, { useRef, useEffect, useState } from 'react';
-import { Map as MapGL } from 'maplibre-gl';
+import { Map as MapGL, GeolocateControl } from 'maplibre-gl';
 import 'maplibre-gl/dist/maplibre-gl.css';
 import { osm } from './source';
 import Popup from './popup';
@@ -49,6 +49,16 @@ export default function Map({ dataFiles, center, zoom, className, onInteract, sh
         // Add background control
         map.current.addControl(new BackgroundControl());
 
+        // Add location control
+       let geolocate = new GeolocateControl({
+          positionOptions: {
+              enableHighAccuracy: true
+          },
+          trackUserLocation: true
+        });
+        // Add the control to the map.
+        map.current.addControl(geolocate);
+
         // Add geojson data source
         map.current.addSource('locations', {
           data: data,
diff --git a/chatmap-ui/src/styles/main.css b/chatmap-ui/src/styles/main.css
index b6d8d01..68933a7 100644
--- a/chatmap-ui/src/styles/main.css
+++ b/chatmap-ui/src/styles/main.css
@@ -638,6 +638,18 @@ https://github.com/KarimMokhtar/react-drag-drop-files/issues/121 */
     font-size: var(--hot-font-size-x-small);
 }
 
+.maplibregl-ctrl button.maplibregl-ctrl-geolocate .maplibregl-ctrl-icon {
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-crosshair" viewBox="0 0 16 16"><path d="M8.5.5a.5.5 0 0 0-1 0v.518A7 7 0 0 0 1.018 7.5H.5a.5.5 0 0 0 0 1h.518A7 7 0 0 0 7.5 14.982v.518a.5.5 0 0 0 1 0v-.518A7 7 0 0 0 14.982 8.5h.518a.5.5 0 0 0 0-1h-.518A7 7 0 0 0 8.5 1.018zm-6.48 7A6 6 0 0 1 7.5 2.02v.48a.5.5 0 0 0 1 0v-.48a6 6 0 0 1 5.48 5.48h-.48a.5.5 0 0 0 0 1h.48a6 6 0 0 1-5.48 5.48v-.48a.5.5 0 0 0-1 0v.48A6 6 0 0 1 2.02 8.5h.48a.5.5 0 0 0 0-1zM8 10a2 2 0 1 0 0-4 2 2 0 0 0 0 4"/></svg>') !important;
+}
+
+.maplibregl-ctrl button.maplibregl-ctrl-geolocate.maplibregl-ctrl-geolocate-active .maplibregl-ctrl-icon {
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-crosshair2" viewBox="0 0 16 16"><path d="M8 0a.5.5 0 0 1 .5.5v.518A7 7 0 0 1 14.982 7.5h.518a.5.5 0 0 1 0 1h-.518A7 7 0 0 1 8.5 14.982v.518a.5.5 0 0 1-1 0v-.518A7 7 0 0 1 1.018 8.5H.5a.5.5 0 0 1 0-1h.518A7 7 0 0 1 7.5 1.018V.5A.5.5 0 0 1 8 0m-.5 2.02A6 6 0 0 0 2.02 7.5h1.005A5 5 0 0 1 7.5 3.025zm1 1.005A5 5 0 0 1 12.975 7.5h1.005A6 6 0 0 0 8.5 2.02zM12.975 8.5A5 5 0 0 1 8.5 12.975v1.005a6 6 0 0 0 5.48-5.48zM7.5 12.975A5 5 0 0 1 3.025 8.5H2.02a6 6 0 0 0 5.48 5.48zM10 8a2 2 0 1 0-4 0 2 2 0 0 0 4 0"/></svg>') !important;
+}
+
+.maplibregl-ctrl button.maplibregl-ctrl-geolocate.maplibregl-ctrl-geolocate-background .maplibregl-ctrl-icon {
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-crosshair2" viewBox="0 0 16 16"><path d="M8 0a.5.5 0 0 1 .5.5v.518A7 7 0 0 1 14.982 7.5h.518a.5.5 0 0 1 0 1h-.518A7 7 0 0 1 8.5 14.982v.518a.5.5 0 0 1-1 0v-.518A7 7 0 0 1 1.018 8.5H.5a.5.5 0 0 1 0-1h.518A7 7 0 0 1 7.5 1.018V.5A.5.5 0 0 1 8 0m-.5 2.02A6 6 0 0 0 2.02 7.5h1.005A5 5 0 0 1 7.5 3.025zm1 1.005A5 5 0 0 1 12.975 7.5h1.005A6 6 0 0 0 8.5 2.02zM12.975 8.5A5 5 0 0 1 8.5 12.975v1.005a6 6 0 0 0 5.48-5.48zM7.5 12.975A5 5 0 0 1 3.025 8.5H2.02a6 6 0 0 0 5.48 5.48zM10 8a2 2 0 1 0-4 0 2 2 0 0 0 4 0"/></svg>') !important;
+}
+
 /* Media queries */
 
 /* Desktop */

From 46e17f46a0de444c98a3d0df80dde158ad5738eb Mon Sep 17 00:00:00 2001
From: Emilio Mariscal <emi.mariscal.dev@gmail.com>
Date: Sat, 15 Aug 2026 18:58:45 -0300
Subject: [PATCH 2/6] Refactor: move WA parser datetime functions to its own
 file

---
 .../src/components/ChatMap/parsers/ignore.js  |  11 +-
 .../components/ChatMap/parsers/whatsapp.js    | 323 +-----------------
 .../tests/whatsapp.parseAndIndex.test.js      |   3 +-
 .../tests/whatsapp.parseTimeString.test.js    |   2 +-
 4 files changed, 16 insertions(+), 323 deletions(-)

diff --git a/chatmap-ui/src/components/ChatMap/parsers/ignore.js b/chatmap-ui/src/components/ChatMap/parsers/ignore.js
index d7af287..7d2b1e7 100644
--- a/chatmap-ui/src/components/ChatMap/parsers/ignore.js
+++ b/chatmap-ui/src/components/ChatMap/parsers/ignore.js
@@ -14,5 +14,14 @@ const ignore = [
     "<Multimedia omitido>",
 ]
 
-export default ignore;
+// Check if message is in list of ignored strings
+export const isInTheIgnoreList = msg => {
+    for (let i = 0; i < ignore.length; i++) {
+        if (msg.indexOf(ignore[i]) > -1) {
+            return true;
+        }
+    };
+    return false;
+}
+
 
diff --git a/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js b/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
index 1fb4efe..8a62cdf 100644
--- a/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
+++ b/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
@@ -7,19 +7,18 @@
  * of media files
  */
 
-import ignore from "./ignore";
+import { isInTheIgnoreList } from "./ignore";
+import { getDateFormat } from "./whatsapp-datetime";
 
 // Regex to search for coordinates in the format <lat>,<lon> (ex: -31.006037,-64.262794)
 const LOCATION_PATTERN = /[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?).*$/;
 
 // Regex to search for messages in the format [<date>, <time>] <username>: <message>
-const MSG_PATTERN = {
+export const MSG_PATTERN = {
     IOS: /^\[(.*)\] ([^:]*): (.*)/,
     ANDROID: /^(.*) - ([^:]*): (.*)/
 }
 
-const HOUR_PATTERN = /(\d{1,2})[:.](\d{1,2})(:\d{1,2})?(\s+[pP])?/;
-
 const TYPES = {
   ".jpg": "image",
   ".ogg": "audio",
@@ -82,16 +81,6 @@ export const searchLocation = msgObject => {
     return null;
 }
 
-// Check if message is in list of ignored strings
-const isInTheIgnoreList = msg => {
-    for (let i = 0; i < ignore.length; i++) {
-        if (msg.indexOf(ignore[i]) > -1) {
-            return true;
-        }
-    };
-    return false;
-}
-
 // Parse time, username and message
 const parseMessage = (line, system, getTime) => {
     const match = line.match(MSG_PATTERN[system]);
@@ -127,312 +116,6 @@ const parseMessage = (line, system, getTime) => {
     }
 }
 
-// Parse time strings
-export const parseTimeString = (dateStr) => {
-    let dateTimeStr = dateStr.replace("a. m.", "AM").replace("p. m.", "PM")
-    dateTimeStr = dateTimeStr.replace("a.m.", "AM").replace("p.m.", "PM")
-    let dateTime = dateTimeStr.split(" ");
-    const now = new Date();
-    let fmtDate = [[now.getFullYear(), now.getMonth() + 1, now.getDate()].join("/"), dateTime[1]].join(" ").replaceAll(".", ":")
-
-    return new Date(fmtDate);
-}
-
-/**
- * Returns how many items differ between two 3-item arrays and what their
- * indices are
- */
-export function howManyChanged(parts1, parts2) {
-  const indices = [];
-
-  for (let i = 0; i<3; i++) {
-    if (parts1[i] !== parts2[i]) {
-      indices.push(i);
-    }
-  }
-
-  return indices;
-}
-
-/**
- * @returns {int[]} A three-element array with the parts of a date as numbers
- */
-function getDateParts(match) {
-  return match
-    .split(' ')[0].replace(',', '')
-    .split('/').map(Number);
-}
-
-/**
- * @returns {string[]}
- */
-function getTimeParts(match) {
-  const matches = match.match(HOUR_PATTERN);
-  let hour = Number(matches[1]);
-  const minute = Number(matches[2]);
-  let second = 0;
-
-  if ((matches[3] && matches[3].startsWith(' ')) || matches[4]) {
-    hour += 12;
-  } else if (matches[3] && matches[3].match(/\d+/)) {
-    second = Number(matches[3].slice(1));
-  }
-
-  return [
-    hour.toString().padStart(2, "0"),
-    minute.toString().padStart(2, "0"),
-    second.toString().padStart(2, "0"),
-  ];
-}
-
-function normalizeParts(dateParts, yearIndex, monthIndex, dayIndex, match) {
-  try {
-    const year = (dateParts[yearIndex] < 100 ? dateParts[yearIndex] + 2000 : dateParts[yearIndex]).toString();
-    const [month, day] = [dateParts[monthIndex].toString().padStart(2, "0"), dateParts[dayIndex].toString().padStart(2, "0")];
-    const [hour, minute, second] = getTimeParts(match[1]);
-    return [year, month, day, hour, minute, second];
-  } catch (e) {
-    // This prevents errors with date parsing, but we should review date parsing for preventing errors
-    const now = new Date();
-    return [now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]
-  }
-  
-}
-
-/**
- * Returns a function that correctly parses a message's date given that no
- * transition was found in the exported file.
- */
-function makeCase0Function(dateParts, system) {
-  let yearIndex, monthIndex, dayIndex;
-
-  if (dateParts[0] <= 12) {
-    monthIndex = 0;
-    dayIndex = 1;
-    yearIndex = 2;
-  } else if (dateParts[1] <= 12) {
-    monthIndex = 1;
-    dayIndex = 0;
-    yearIndex = 2;
-  } else {
-    monthIndex = 2;
-    yearIndex = 0;
-    dayIndex = 1;
-  }
-
-  return (msg) => {
-    const match = msg.match(MSG_PATTERN[system]);
-    const dateParts = getDateParts(match[1]);
-    const [year, month, day, hour, minute, second] = normalizeParts(
-      dateParts, yearIndex, monthIndex, dayIndex, match
-    );
-
-    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
-  };
-}
-
-/**
- * returns a function that correctly parses a message's date given that a
- * transition of a single day (no month) was found.
- *
- * @param {int[]} oldDate the older date
- * @param {int[]} newDate the newer date
- * @param {int[]} indices an array with a
- */
-function makeCase1Function(oldDate, dayIndex, system) {
-  const otherIndex1 = (dayIndex + 1) % 3;
-  const otherIndex2 = (dayIndex + 2) % 3;
-  let yearIndex, monthIndex;
-
-  if (oldDate[otherIndex1] < oldDate[otherIndex2]) {
-    monthIndex = otherIndex1;
-    yearIndex = otherIndex2;
-  } else {
-    monthIndex = otherIndex2;
-    yearIndex = otherIndex1;
-  }
-
-  return (msg) => {
-    const match = msg.match(MSG_PATTERN[system]);
-    const dateParts = getDateParts(match[1]);
-    const [year, month, day, hour, minute, second] = normalizeParts(
-      dateParts, yearIndex, monthIndex, dayIndex, match
-    );
-
-    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
-  };
-}
-
-/**
- * returns a function that correctly parses a message's date given that a
- * transition of month happened.
- */
-function makeCase2Function(changes, maxObserved, system) {
-  // year is the index that didn't change
-  const yearIndex = changes.map((c, i) => [c, i]).filter(([c, i]) => c === 0)[0][1];
-  const otherIndex1 = (yearIndex + 1) % 3;
-  const otherIndex2 = (yearIndex + 2) % 3;
-  let  monthIndex, dayIndex;
-
-  // Day is the index that changed most, month is the other one.
-  if (changes[otherIndex1] > changes[otherIndex2]) {
-    dayIndex = otherIndex1;
-    monthIndex = otherIndex2;
-  } else if (changes[otherIndex1] == changes[otherIndex2]) {
-    if (maxObserved[otherIndex1] > maxObserved[otherIndex2]) {
-      dayIndex = otherIndex1;
-      monthIndex = otherIndex2;
-    } else {
-      dayIndex = otherIndex2;
-      monthIndex = otherIndex1;
-    }
-  } else {
-    dayIndex = otherIndex2;
-    monthIndex = otherIndex1;
-  }
-  // day is the index that became 1
-
-  return (msg) => {
-    const match = msg.match(MSG_PATTERN[system]);
-    const dateParts = getDateParts(match[1]);
-    const [year, month, day, hour, minute, second] = normalizeParts(
-      dateParts, yearIndex, monthIndex, dayIndex, match
-    );
-
-    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
-  };
-}
-
-function makeCase3Function(changes, maxObserved, hasDecreased, fourDigits, system) {
-  // If there is a four digit number take it straight as the year
-  const maybeYearIndex = fourDigits.map((n, i) => [n, i]).filter(([n, i]) => n);
-  let yearIndex;
-
-  if (maybeYearIndex.length > 0) {
-    yearIndex = maybeYearIndex[0][1];
-  } else {
-    const decreased = hasDecreased.map((h, i) => [h, i]).filter(([h, i]) => !h);
-    // year index is the one number that didn't decrease. give priority to the
-    // last position, since the year tends to be last item
-    // in the date
-    yearIndex = decreased[decreased.length-1][1];
-  }
-
-  const otherIndex1 = (yearIndex + 1) % 3;
-  const otherIndex2 = (yearIndex + 2) % 3;
-  let dayIndex, monthIndex;
-
-  const changesWithIndex = changes.map((c, i) => [c, i]);
-
-  // sort by number of changes in increasing order
-  changesWithIndex.sort((a, b) => a[0] - b[0]);
-
-  // if there's only one index bellow 12 that's the month, otherwise take the
-  // index with the most changes is the day.
-  if (maxObserved[otherIndex1] <= 12 && maxObserved[otherIndex2] <= 12) {
-    if (changes[otherIndex1] > changes[otherIndex2]) {
-      dayIndex = otherIndex1;
-      monthIndex = otherIndex2;
-    } else {
-      dayIndex = otherIndex2;
-      monthIndex = otherIndex1;
-    }
-  } else {
-    if (maxObserved[otherIndex1] <= 12) {
-      monthIndex = otherIndex1;
-      dayIndex = otherIndex2;
-    } else {
-      monthIndex = otherIndex2;
-      dayIndex = otherIndex1;
-    }
-  }
-
-  return (msg) => {
-    const match = msg.match(MSG_PATTERN[system]);
-    const dateParts = getDateParts(match[1]);
-    const [year, month, day, hour, minute, second] = normalizeParts(
-      dateParts, yearIndex, monthIndex, dayIndex, match
-    );
-
-    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
-  };
-}
-
-/**
- * This function analyzes all the dates in `lines` and returns a function that
- * correctly identifies its parts (year, month, day). It works under the
- * assumption that the times in every line are sorted chronologically. The logic
- * is as follows:
- *
- * It analyzes all messages in order and stores how many times the date changed.
- * The core assumption is that the component that changes the most is the day,
- * followed by the month and finally the year. Ordering the amount of changes
- * observed we can tell what is what.
- *
- * @param {string[]} lines of the chat.
- * @param {string} the identified system for this chat.
- * @returns {function} A function that takes a message and returns correctly its
- *                     date object.
- */
-function getDateFormat(lines, system) {
-  let oldDateParts = [null, null, null];
-  const changes = [0, 0, 0];  // stores how many times each part has changed
-  let maxObserved = [0, 0, 0];
-  const hasDecreased = [false, false, false]
-
-  for (let line of lines) {
-    const match = line.match(MSG_PATTERN[system]);
-
-    if (match) {
-      // if this line includes a date, get its parts as numbers. E.g. "3/4/25"
-      // becomes [3, 4, 25]
-      const newDateParts = getDateParts(match[1]);
-
-      if (oldDateParts[0] === null) {
-        // this is the first date seen, set it for comparisson
-        oldDateParts = newDateParts;
-        maxObserved = newDateParts;
-      } else {
-        // see which parts have changed since the last date observed
-        const indices = howManyChanged(oldDateParts, newDateParts);
-        for (let i of indices) {
-          changes[i] += 1;
-        }
-        for (let i = 0; i < 3; i++) {
-          if (newDateParts[i] > maxObserved[i]) {
-            maxObserved[i] = newDateParts[i];
-          }
-          if (newDateParts[i] < oldDateParts[i]) {
-            hasDecreased[i] = true;
-          }
-        }
-        oldDateParts = newDateParts;
-      }
-    }
-  }
-
-  // How many date components changed?
-  const numChanges = changes.map((c) => c !== 0).reduce((a, b) => a + b, 0);
-  const fourDigits = maxObserved.map((n) => n > 999);
-
-  if (numChanges === 0) {
-    // nothing changed (only one date was observed in the export)
-    return makeCase0Function(oldDateParts, system);
-  } else if (numChanges === 1) {
-    // only the day ever changed.
-    const dayIndex = changes
-      .map((c, i) => [c, i])
-      .filter(([c, i]) => c > 0)[0][1];
-    return makeCase1Function(oldDateParts, dayIndex, system);
-  } else if (numChanges === 2) {
-    // date and month changed
-    return makeCase2Function(changes, maxObserved, system);
-  } else {
-    // everything changed
-    return makeCase3Function(changes, maxObserved, hasDecreased, fourDigits, system);
-  }
-}
-
 // Parse messages from lines and create an index
 export const parseAndIndex = (lines, system) => {
     const getDate = getDateFormat(lines, system);
diff --git a/chatmap-ui/tests/whatsapp.parseAndIndex.test.js b/chatmap-ui/tests/whatsapp.parseAndIndex.test.js
index f9d2ac6..522b68c 100644
--- a/chatmap-ui/tests/whatsapp.parseAndIndex.test.js
+++ b/chatmap-ui/tests/whatsapp.parseAndIndex.test.js
@@ -1,6 +1,7 @@
 import { expect, test as it} from 'vitest'
 
-import { howManyChanged, parseAndIndex } from '../src/components/ChatMap/parsers/whatsapp';
+import { parseAndIndex } from '../src/components/ChatMap/parsers/whatsapp';
+import { howManyChanged } from '../src/components/ChatMap/parsers/whatsapp-datetime';
 
 it('should count properly how many parts of two array differ', () => {
   var indexes = howManyChanged([1, 2, 3], [1, 2, 3]);
diff --git a/chatmap-ui/tests/whatsapp.parseTimeString.test.js b/chatmap-ui/tests/whatsapp.parseTimeString.test.js
index 2a14915..a17f872 100644
--- a/chatmap-ui/tests/whatsapp.parseTimeString.test.js
+++ b/chatmap-ui/tests/whatsapp.parseTimeString.test.js
@@ -1,6 +1,6 @@
 import { expect, test as it} from 'vitest'
 
-import { parseTimeString } from '../src/components/ChatMap/parsers/whatsapp';
+import { parseTimeString } from '../src/components/ChatMap/parsers/whatsapp-datetime';
 
 // parseTimeString
 it('should parse a datetime', () => {

From 60ef468268cfd732e13f6659285958f7c5b55d73 Mon Sep 17 00:00:00 2001
From: Emilio Mariscal <emi.mariscal.dev@gmail.com>
Date: Sat, 15 Aug 2026 18:59:08 -0300
Subject: [PATCH 3/6] Refactor: move WA parser datetime functions to its own
 file

---
 .../ChatMap/parsers/whatsapp-datetime.js      | 309 ++++++++++++++++++
 1 file changed, 309 insertions(+)
 create mode 100644 chatmap-ui/src/components/ChatMap/parsers/whatsapp-datetime.js

diff --git a/chatmap-ui/src/components/ChatMap/parsers/whatsapp-datetime.js b/chatmap-ui/src/components/ChatMap/parsers/whatsapp-datetime.js
new file mode 100644
index 0000000..c4608cd
--- /dev/null
+++ b/chatmap-ui/src/components/ChatMap/parsers/whatsapp-datetime.js
@@ -0,0 +1,309 @@
+import { MSG_PATTERN } from "./whatsapp";
+
+const HOUR_PATTERN = /(\d{1,2})[:.](\d{1,2})(:\d{1,2})?(\s+[pP])?/;
+
+// Parse time strings
+export const parseTimeString = (dateStr) => {
+    let dateTimeStr = dateStr.replace("a. m.", "AM").replace("p. m.", "PM")
+    dateTimeStr = dateTimeStr.replace("a.m.", "AM").replace("p.m.", "PM")
+    let dateTime = dateTimeStr.split(" ");
+    const now = new Date();
+    let fmtDate = [[now.getFullYear(), now.getMonth() + 1, now.getDate()].join("/"), dateTime[1]].join(" ").replaceAll(".", ":")
+
+    return new Date(fmtDate);
+}
+
+/**
+ * Returns how many items differ between two 3-item arrays and what their
+ * indices are
+ */
+export function howManyChanged(parts1, parts2) {
+  const indices = [];
+
+  for (let i = 0; i<3; i++) {
+    if (parts1[i] !== parts2[i]) {
+      indices.push(i);
+    }
+  }
+
+  return indices;
+}
+
+/**
+ * @returns {int[]} A three-element array with the parts of a date as numbers
+ */
+function getDateParts(match) {
+  return match
+    .split(' ')[0].replace(',', '')
+    .split('/').map(Number);
+}
+
+/**
+ * @returns {string[]}
+ */
+function getTimeParts(match) {
+  const matches = match.match(HOUR_PATTERN);
+  let hour = Number(matches[1]);
+  const minute = Number(matches[2]);
+  let second = 0;
+
+  if ((matches[3] && matches[3].startsWith(' ')) || matches[4]) {
+    hour += 12;
+  } else if (matches[3] && matches[3].match(/\d+/)) {
+    second = Number(matches[3].slice(1));
+  }
+
+  return [
+    hour.toString().padStart(2, "0"),
+    minute.toString().padStart(2, "0"),
+    second.toString().padStart(2, "0"),
+  ];
+}
+
+function normalizeParts(dateParts, yearIndex, monthIndex, dayIndex, match) {
+  try {
+    const year = (dateParts[yearIndex] < 100 ? dateParts[yearIndex] + 2000 : dateParts[yearIndex]).toString();
+    const [month, day] = [dateParts[monthIndex].toString().padStart(2, "0"), dateParts[dayIndex].toString().padStart(2, "0")];
+    const [hour, minute, second] = getTimeParts(match[1]);
+    return [year, month, day, hour, minute, second];
+  } catch (e) {
+    // This prevents errors with date parsing, but we should review date parsing for preventing errors
+    const now = new Date();
+    return [now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()]
+  }
+  
+}
+
+/**
+ * Returns a function that correctly parses a message's date given that no
+ * transition was found in the exported file.
+ */
+function makeCase0Function(dateParts, system) {
+  let yearIndex, monthIndex, dayIndex;
+
+  if (dateParts[0] <= 12) {
+    monthIndex = 0;
+    dayIndex = 1;
+    yearIndex = 2;
+  } else if (dateParts[1] <= 12) {
+    monthIndex = 1;
+    dayIndex = 0;
+    yearIndex = 2;
+  } else {
+    monthIndex = 2;
+    yearIndex = 0;
+    dayIndex = 1;
+  }
+
+  return (msg) => {
+    const match = msg.match(MSG_PATTERN[system]);
+    const dateParts = getDateParts(match[1]);
+    const [year, month, day, hour, minute, second] = normalizeParts(
+      dateParts, yearIndex, monthIndex, dayIndex, match
+    );
+
+    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
+  };
+}
+
+/**
+ * returns a function that correctly parses a message's date given that a
+ * transition of a single day (no month) was found.
+ *
+ * @param {int[]} oldDate the older date
+ * @param {int[]} newDate the newer date
+ * @param {int[]} indices an array with a
+ */
+function makeCase1Function(oldDate, dayIndex, system) {
+  const otherIndex1 = (dayIndex + 1) % 3;
+  const otherIndex2 = (dayIndex + 2) % 3;
+  let yearIndex, monthIndex;
+
+  if (oldDate[otherIndex1] < oldDate[otherIndex2]) {
+    monthIndex = otherIndex1;
+    yearIndex = otherIndex2;
+  } else {
+    monthIndex = otherIndex2;
+    yearIndex = otherIndex1;
+  }
+
+  return (msg) => {
+    const match = msg.match(MSG_PATTERN[system]);
+    const dateParts = getDateParts(match[1]);
+    const [year, month, day, hour, minute, second] = normalizeParts(
+      dateParts, yearIndex, monthIndex, dayIndex, match
+    );
+
+    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
+  };
+}
+
+/**
+ * returns a function that correctly parses a message's date given that a
+ * transition of month happened.
+ */
+function makeCase2Function(changes, maxObserved, system) {
+  // year is the index that didn't change
+  const yearIndex = changes.map((c, i) => [c, i]).filter(([c, i]) => c === 0)[0][1];
+  const otherIndex1 = (yearIndex + 1) % 3;
+  const otherIndex2 = (yearIndex + 2) % 3;
+  let  monthIndex, dayIndex;
+
+  // Day is the index that changed most, month is the other one.
+  if (changes[otherIndex1] > changes[otherIndex2]) {
+    dayIndex = otherIndex1;
+    monthIndex = otherIndex2;
+  } else if (changes[otherIndex1] == changes[otherIndex2]) {
+    if (maxObserved[otherIndex1] > maxObserved[otherIndex2]) {
+      dayIndex = otherIndex1;
+      monthIndex = otherIndex2;
+    } else {
+      dayIndex = otherIndex2;
+      monthIndex = otherIndex1;
+    }
+  } else {
+    dayIndex = otherIndex2;
+    monthIndex = otherIndex1;
+  }
+  // day is the index that became 1
+
+  return (msg) => {
+    const match = msg.match(MSG_PATTERN[system]);
+    const dateParts = getDateParts(match[1]);
+    const [year, month, day, hour, minute, second] = normalizeParts(
+      dateParts, yearIndex, monthIndex, dayIndex, match
+    );
+
+    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
+  };
+}
+
+function makeCase3Function(changes, maxObserved, hasDecreased, fourDigits, system) {
+  // If there is a four digit number take it straight as the year
+  const maybeYearIndex = fourDigits.map((n, i) => [n, i]).filter(([n, i]) => n);
+  let yearIndex;
+
+  if (maybeYearIndex.length > 0) {
+    yearIndex = maybeYearIndex[0][1];
+  } else {
+    const decreased = hasDecreased.map((h, i) => [h, i]).filter(([h, i]) => !h);
+    // year index is the one number that didn't decrease. give priority to the
+    // last position, since the year tends to be last item
+    // in the date
+    yearIndex = decreased[decreased.length-1][1];
+  }
+
+  const otherIndex1 = (yearIndex + 1) % 3;
+  const otherIndex2 = (yearIndex + 2) % 3;
+  let dayIndex, monthIndex;
+
+  const changesWithIndex = changes.map((c, i) => [c, i]);
+
+  // sort by number of changes in increasing order
+  changesWithIndex.sort((a, b) => a[0] - b[0]);
+
+  // if there's only one index bellow 12 that's the month, otherwise take the
+  // index with the most changes is the day.
+  if (maxObserved[otherIndex1] <= 12 && maxObserved[otherIndex2] <= 12) {
+    if (changes[otherIndex1] > changes[otherIndex2]) {
+      dayIndex = otherIndex1;
+      monthIndex = otherIndex2;
+    } else {
+      dayIndex = otherIndex2;
+      monthIndex = otherIndex1;
+    }
+  } else {
+    if (maxObserved[otherIndex1] <= 12) {
+      monthIndex = otherIndex1;
+      dayIndex = otherIndex2;
+    } else {
+      monthIndex = otherIndex2;
+      dayIndex = otherIndex1;
+    }
+  }
+
+  return (msg) => {
+    const match = msg.match(MSG_PATTERN[system]);
+    const dateParts = getDateParts(match[1]);
+    const [year, month, day, hour, minute, second] = normalizeParts(
+      dateParts, yearIndex, monthIndex, dayIndex, match
+    );
+
+    return new Date(`${year}-${month}-${day}T${hour}:${minute}:${second}Z`);
+  };
+}
+
+/**
+ * This function analyzes all the dates in `lines` and returns a function that
+ * correctly identifies its parts (year, month, day). It works under the
+ * assumption that the times in every line are sorted chronologically. The logic
+ * is as follows:
+ *
+ * It analyzes all messages in order and stores how many times the date changed.
+ * The core assumption is that the component that changes the most is the day,
+ * followed by the month and finally the year. Ordering the amount of changes
+ * observed we can tell what is what.
+ *
+ * @param {string[]} lines of the chat.
+ * @param {string} the identified system for this chat.
+ * @returns {function} A function that takes a message and returns correctly its
+ *                     date object.
+ */
+export function getDateFormat(lines, system) {
+  let oldDateParts = [null, null, null];
+  const changes = [0, 0, 0];  // stores how many times each part has changed
+  let maxObserved = [0, 0, 0];
+  const hasDecreased = [false, false, false]
+
+  for (let line of lines) {
+    const match = line.match(MSG_PATTERN[system]);
+
+    if (match) {
+      // if this line includes a date, get its parts as numbers. E.g. "3/4/25"
+      // becomes [3, 4, 25]
+      const newDateParts = getDateParts(match[1]);
+
+      if (oldDateParts[0] === null) {
+        // this is the first date seen, set it for comparisson
+        oldDateParts = newDateParts;
+        maxObserved = newDateParts;
+      } else {
+        // see which parts have changed since the last date observed
+        const indices = howManyChanged(oldDateParts, newDateParts);
+        for (let i of indices) {
+          changes[i] += 1;
+        }
+        for (let i = 0; i < 3; i++) {
+          if (newDateParts[i] > maxObserved[i]) {
+            maxObserved[i] = newDateParts[i];
+          }
+          if (newDateParts[i] < oldDateParts[i]) {
+            hasDecreased[i] = true;
+          }
+        }
+        oldDateParts = newDateParts;
+      }
+    }
+  }
+
+  // How many date components changed?
+  const numChanges = changes.map((c) => c !== 0).reduce((a, b) => a + b, 0);
+  const fourDigits = maxObserved.map((n) => n > 999);
+
+  if (numChanges === 0) {
+    // nothing changed (only one date was observed in the export)
+    return makeCase0Function(oldDateParts, system);
+  } else if (numChanges === 1) {
+    // only the day ever changed.
+    const dayIndex = changes
+      .map((c, i) => [c, i])
+      .filter(([c, i]) => c > 0)[0][1];
+    return makeCase1Function(oldDateParts, dayIndex, system);
+  } else if (numChanges === 2) {
+    // date and month changed
+    return makeCase2Function(changes, maxObserved, system);
+  } else {
+    // everything changed
+    return makeCase3Function(changes, maxObserved, hasDecreased, fourDigits, system);
+  }
+}
\ No newline at end of file

From 2c499e75fc286726bc9ee5af1fe470a5ece07859 Mon Sep 17 00:00:00 2001
From: Emilio Mariscal <emi.mariscal.dev@gmail.com>
Date: Sat, 15 Aug 2026 21:03:03 -0300
Subject: [PATCH 4/6] + Better support for multiline + attachments

---
 .../components/ChatMap/parsers/whatsapp.js    | 47 ++++++++++---------
 chatmap-ui/src/styles/main.css                |  1 +
 .../tests/whatsapp.lookForMediaFile.test.js   | 12 ++---
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js b/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
index 8a62cdf..5f86cef 100644
--- a/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
+++ b/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
@@ -42,14 +42,13 @@ export const detectSystem = (line) => {
 }
 
 // Look for jpg, mp4, or audio media files
-export const lookForMediaFile = (msgObject) => {
-    const msg = msgObject.message.toLowerCase();
+export const lookForMediaFile = (line) => {
     // Supported media extensions
     const extensions = [".jpg", ".mp4", ".ogg", ".opus", ".mp3", ".m4a", ".wav"];
     let mediaFileIndex = -1;
     let foundExt = "";
     for (let ext of extensions) {
-        let idx = msg.indexOf(ext);
+        let idx = line.indexOf(ext);
         if (idx > 0) {
             mediaFileIndex = idx;
             foundExt = ext;
@@ -58,7 +57,7 @@ export const lookForMediaFile = (msgObject) => {
     }
 
     if (mediaFileIndex > 0) {
-        let path = msgObject.message.substring(msg.lastIndexOf(":") + 1, mediaFileIndex + foundExt.length);
+        let path = line.substring(line.lastIndexOf(":") + 1, mediaFileIndex + foundExt.length);
 
         if (path.substring(0, 1) == " ") {
             path = path.substring(1);
@@ -84,6 +83,9 @@ export const searchLocation = msgObject => {
 // Parse time, username and message
 const parseMessage = (line, system, getTime) => {
     const match = line.match(MSG_PATTERN[system]);
+    const msgObject = {
+        message: "",
+    };
 
     if (match && !isInTheIgnoreList(match[3])) {
         let username = match[2];
@@ -94,26 +96,22 @@ const parseMessage = (line, system, getTime) => {
             username = username.substring(0, usernameIndexOf);
         }
 
-        let msgObject = {
-            time: getTime(line),
-            username:  username,
-            message: match[3],
-        }
-
-        // Look for media
-        const mediaFile = lookForMediaFile(msgObject);
+        msgObject.time = getTime(line);
+        msgObject.username = username;
+        msgObject.message = match[3];
 
-        if (mediaFile !== null) {
-          msgObject.file = mediaFile.path;
-          msgObject.file_type = mediaFile.type;
-        }
+    }
 
-        if (msgObject.file) {
-            msgObject.message = "";
-        }
+    // Look for media
+    const mediaFile = lookForMediaFile(line);
 
-        return msgObject;
+    if (mediaFile !== null) {
+        msgObject.file = mediaFile.path;
+        msgObject.file_type = mediaFile.type;
     }
+
+    return msgObject;
+
 }
 
 // Parse messages from lines and create an index
@@ -128,7 +126,7 @@ export const parseAndIndex = (lines, system) => {
 
         const msg = parseMessage(line, system, getDate);
 
-        if (msg && !isInTheIgnoreList(msg.message)) {
+        if (msg.time && !isInTheIgnoreList(msg.message)) {
             result.push(msg);
         } else {
             // If message is just text without datestring,
@@ -142,7 +140,12 @@ export const parseAndIndex = (lines, system) => {
                 (system == "IOS" &&
                 line.indexOf("[") == -1))
             {
-                result[result.length - 1].message += " " + line.replaceAll("\r", "");
+                if (!msg.file) {
+                    result[result.length - 1].message += " " + line.replaceAll("\r", "");
+                } else {
+                    result[result.length - 1].file = msg.file;
+                    result[result.length - 1].file_type = msg.file_type;
+                }
             }
         }
     })
diff --git a/chatmap-ui/src/styles/main.css b/chatmap-ui/src/styles/main.css
index 68933a7..e26b3bc 100644
--- a/chatmap-ui/src/styles/main.css
+++ b/chatmap-ui/src/styles/main.css
@@ -472,6 +472,7 @@ https://github.com/KarimMokhtar/react-drag-drop-files/issues/121 */
     text-align: left;
     padding-left: var(--hot-spacing-small);
     padding-right: var(--hot-spacing-small);
+    font-size: var(--hot-font-size-small);
 }
 
 .message .media {
diff --git a/chatmap-ui/tests/whatsapp.lookForMediaFile.test.js b/chatmap-ui/tests/whatsapp.lookForMediaFile.test.js
index 6f782d3..7945b49 100644
--- a/chatmap-ui/tests/whatsapp.lookForMediaFile.test.js
+++ b/chatmap-ui/tests/whatsapp.lookForMediaFile.test.js
@@ -5,23 +5,17 @@ import { lookForMediaFile } from '../src/components/ChatMap/parsers/whatsapp';
 // lookForMediaFile
 
 it('should find a video', () => {
-  const { path, type } = lookForMediaFile({
-    message: "‎[08/01/25, 1:48:18 p.m.] La M: ‎<adjunto: 00000005-VIDEO-2025-01-08-13-48-18.mp4>",
-  });
+  const { path, type } = lookForMediaFile("‎[08/01/25, 1:48:18 p.m.] La M: ‎<adjunto: 00000005-VIDEO-2025-01-08-13-48-18.mp4>");
   expect(path).toEqual("00000005-VIDEO-2025-01-08-13-48-18.mp4");
   expect(type).toEqual("video");
 });
 it('should find a picture', () => {
-  const { path, type } = lookForMediaFile({
-    message: "‎[09/01/2025 12:23:17] Salomon: ‎< pièce jointe : 00000005-PHOTO-2025-01-09-12-23-16.jpg >",
-  });
+  const { path, type } = lookForMediaFile("‎[09/01/2025 12:23:17] Salomon: ‎< pièce jointe : 00000005-PHOTO-2025-01-09-12-23-16.jpg >");
   expect(path).toEqual("00000005-PHOTO-2025-01-09-12-23-16.jpg");
   expect(type).toEqual("image");
 });
 it('should find a picture (no space after :)', () => {
-  const { path, type } = lookForMediaFile({
-    message: "‎[09/01/2025 12:23:17] Salomon: ‎< pièce jointe :00000005-PHOTO-2025-01-09-12-23-16.jpg >",
-  });
+  const { path, type } = lookForMediaFile("‎[09/01/2025 12:23:17] Salomon: ‎< pièce jointe :00000005-PHOTO-2025-01-09-12-23-16.jpg >");
   expect(path).toEqual("00000005-PHOTO-2025-01-09-12-23-16.jpg");
   expect(type).toEqual("image");
 });

From c321748adee9822658ce90fa98bb69bdab573c8d Mon Sep 17 00:00:00 2001
From: Emilio Mariscal <emi.mariscal.dev@gmail.com>
Date: Sat, 15 Aug 2026 21:06:19 -0300
Subject: [PATCH 5/6] Always show attachment

---
 chatmap-ui/src/components/ChatMap/parsers/whatsapp.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js b/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
index 5f86cef..074315f 100644
--- a/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
+++ b/chatmap-ui/src/components/ChatMap/parsers/whatsapp.js
@@ -140,9 +140,8 @@ export const parseAndIndex = (lines, system) => {
                 (system == "IOS" &&
                 line.indexOf("[") == -1))
             {
-                if (!msg.file) {
-                    result[result.length - 1].message += " " + line.replaceAll("\r", "");
-                } else {
+                result[result.length - 1].message += " " + line.replaceAll("\r", "");
+                if (msg.file) {
                     result[result.length - 1].file = msg.file;
                     result[result.length - 1].file_type = msg.file_type;
                 }

From 4f1cfb949a7ea7335127819ea56e572e89c82064 Mon Sep 17 00:00:00 2001
From: anupamme <mediratta@gmail.com>
Date: Sun, 16 Aug 2026 00:13:39 +0000
Subject: [PATCH 6/6] fix: V-001 security vulnerability

Automated security fix generated by OrbisAI Security
---
 chatmap-im-connector/main.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chatmap-im-connector/main.go b/chatmap-im-connector/main.go
index 2a31de6..90f7ee2 100644
--- a/chatmap-im-connector/main.go
+++ b/chatmap-im-connector/main.go
@@ -959,8 +959,10 @@ func main() {
         redis_port = DefaultRedisPort
     }
     log.Printf("Connecting to Redis %s:%s \n", redis_host, redis_port)
+	redis_password := os.Getenv("REDIS_PASSWORD")
     redisClient = redis.NewClient(&redis.Options{
-        Addr: redis_host + ":" + redis_port,
+		Addr:     redis_host + ":" + redis_port,
+		Password: redis_password,
     })
 
     // WhatsApp rejects connections using an outdated hardcoded client