toilet_tracker 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64738532b1c80623a41ce64ead3709e4802702b03f87c593ccbc7edbeb1ab7a6
-  data.tar.gz: 18c6967a7280153c7e8b0022bb4e8d42e2a422870e3d0af92e5a5b57c23f57eb
+  metadata.gz: 4af948bef38e4c8911b60d3bdc887c38b11593d687841f950f0472c7b5748a51
+  data.tar.gz: 8ea58aabc73391c82395c7aaa91af3b369f6ad2c2d1d7ad0f513d02ef9976d7f
 SHA512:
-  metadata.gz: 1e45b15dc41c8d141284bd94abb2d650052722b02344830f8b06fcb264d7e2e0cb320ac2c845d11280eb3e1faa1cfa12ff2b670a65df4b5535f7b1b563517723
-  data.tar.gz: 86504e632326c8f0c21a6ee3b7845bc129a809e1573c6efc2796232eed6dacffd02037a718c556db233b7e64aee1ab6cbc69efa701b4a657a7429eba492eeb94
+  metadata.gz: c11a69adeb79215f621857aa03782fd98518f7e36d2afa2e491f96e1b6f0d1ed94df24b3701a9282e680c01a7054450de894e9eecabf992b716c8c52949b0fd8
+  data.tar.gz: f0b54ca705f8b548225bcac1ac9d47803b27704a316b9b3a57414d9f5a9aa204eb7c231c88fcba1c87e10b0b801be70759467315b2f75cfca632778f91f5b6d8

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 ## [Unreleased]
 
+## [0.2.2] - 2026-09-03
+
+### Fixed
+- Parse WhatsApp exports that use 4-digit years (`[02/01/2025, 23:27:21]`). The
+  message pattern required a 2-digit year, so current exports failed to parse
+  entirely: the only lines that matched were old-format timestamps quoted inside
+  message bodies, which produced a handful of events attributed to the quoted
+  sender. A 21,906-line export went from 3 parsed events to 13,996.
+- Stop prefixing the century onto years that already have one (`2025` no longer
+  becomes `202025`).
+
+### Added
+- Accept day and month without zero padding (`[2/1/2025, ...]`)
+- Accept timestamps without seconds (`[02/01/2025, 23:27]`), defaulting to `:00`
+
+## [0.2.1] - 2025-12-18
+
+### Changed
+- Update activesupport to 8.1.1 (from 8.0.2.1)
+- Update rubyzip to 3.2.2 (from 3.0.1)
+- Update rake to 13.3.1 (from 13.3.0)
+- Update rspec to 3.13.2 (from 3.13.1)
+- Update overcommit to 0.68.0 (from 0.67.1)
+- Relax version constraints for activesupport and rubyzip
+
+## [0.2.0] - 2025-12-18
+
+### Added
+- Metadata emoji support for both 💩 and 🚽 commands
+- Format: `[command emoji] [metadata emojis...] [shift/timezone] [time]`
+- Metadata stored as array of individual emoji strings
+- New `metadata` field on `PoopEventResult` and `ToiletShiftResult`
+- `BaseParser#parse_metadata` and `#metadata_emoji?` helper methods
+- Comprehensive test suite for metadata parsing (28 new tests)
+
+### Changed
+- All regex patterns updated to capture optional metadata group
+- Result objects now include `metadata: []` by default (backward compatible)
+
 ## [0.1.1] - 2025-12-18
 
 ### Added

data/PARSING_SPEC.md

@@ -9,8 +9,10 @@ ToiletTracker is a Ruby gem that parses WhatsApp message exports to track toilet
 ### Message Structure
 All WhatsApp messages follow this format:
 ```
-[DD/MM/YY, HH:MM:SS] Sender: Content
+[DD/MM/YYYY, HH:MM:SS] Sender: Content
 ```
+Exports vary by platform and locale. The year may be 2 or 4 digits, the day and
+month may be zero-padded or not, and the seconds may be absent.
 
 ### Command Types
 - **🚽 (Settings)**: Configure timezone shifts and preferences
@@ -20,20 +22,45 @@ All WhatsApp messages follow this format:
 - **Functional Shifts**: Applied to event timestamps (patterns 1, 2, 5)
 - **Decorative Shifts**: For statistics only, do not affect timestamps (patterns 7, 9)
 
+### Metadata Emojis
+Both 💩 and 🚽 commands support optional metadata emojis placed between the command emoji and the time/shift specifications. Metadata emojis are stored as an array and can be used for additional categorization or tagging of events.
+
+**Format**: `[command emoji] [metadata emojis...] [shift/timezone] [time]`
+
+**Examples**:
+- `💩 🩸` → Event with metadata `["🩸"]`
+- `💩 🩸💧🔥` → Event with metadata `["🩸", "💧", "🔥"]`
+- `💩 🩸 +2` → Event with metadata `["🩸"]` and shift `+2`
+- `🚽 ✈️🌍 +5:30` → Setting with metadata `["✈️", "🌍"]` and shift `+5:30`
+
+**Behavior**:
+- Metadata is any emoji placed after the command emoji but before time specs
+- Emojis are extracted as individual grapheme clusters (supports complex emojis)
+- Command emojis (💩, 🚽) are excluded from metadata
+- Stored as an array of strings in result objects
+- Does not affect parsing of shifts, timezones, or times
+
 ## Supported Parsing Patterns
 
 ### WhatsApp Message Format
-**Pattern**: `\[(?<day>\d{2})/(?<month>\d{2})/(?<year>\d{2}),\s*(?<time>\d{2}:\d{2}:\d{2})\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$`
+**Pattern**: `\[(?<day>\d{1,2})/(?<month>\d{1,2})/(?<year>\d{4}|\d{2}),\s*(?<time>\d{1,2}:\d{2}(?::\d{2})?)\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$`
 
 **Examples**:
+- `[01/01/2025, 12:00:00] Alice: 💩`
 - `[01/01/25, 12:00:00] Alice: 💩`
 - `[25/12/24, 23:59:59] Bob: 🚽 +2`
-- `[15/06/25, 14:30:15] Charlie: 💩 +1 2025-06-15 12:00:00`
+- `[15/06/2025, 14:30:15] Charlie: 💩 +1 2025-06-15 12:00:00`
+- `[2/1/2025, 9:05] Dave: 💩`
 
 **Behavior**:
-- Extracts day, month, year (2-digit), time, sender, content
+- Extracts day, month, year (2- or 4-digit), time, sender, content
 - Handles edited messages with suffix `‎<This message was edited>`
-- Year is converted to 20XX format (25 → 2025)
+- A 2-digit year is converted to 20XX format (25 → 2025); a 4-digit year is used as-is
+- Seconds are optional and default to 0 when absent
+- Day and month may be given with or without zero padding
+
+**Not supported**: 12-hour timestamps with an AM/PM suffix, and the Android
+export layout (`DD/MM/YYYY, HH:MM - Sender: Content`).
 
 ### 1. Shift Set (Functional)
 **Pattern**: `🚽\s*([+-]?\d+)$`
@@ -262,8 +289,9 @@ When timezone shifts are set retroactively:
   type: :shift_set | :shift_set_at_time | :timezone_set,
   status: :ok | :alert | :error,
   message: Core::Message,
-  shift: Integer,
+  shift: Integer | Float,
   effective_time: Time,
+  metadata: Array<String>,
   error_details: String | nil
 }
 ```
@@ -275,9 +303,10 @@ When timezone shifts are set retroactively:
         :event_in_timezone | :event_in_timezone_at_time,
   status: :ok | :alert | :error,
   message: Core::Message,
-  shift: Integer | nil,
+  shift: Integer | Float | nil,
   poop_time: Time,
   timezone: String | nil,
+  metadata: Array<String>,
   error_details: String | nil
 }
 ```
@@ -342,6 +371,16 @@ When timezone shifts are set retroactively:
 [02/01/25, 15:00:00] Bob: 💩 PST 2025-01-02 12:00:00
 ```
 
+### Valid Examples with Metadata
+```
+[01/01/25, 08:30:00] Alice: 💩 🩸                    # metadata: ["🩸"]
+[01/01/25, 10:00:00] Alice: 💩 🩸💧 +2               # metadata: ["🩸", "💧"], shift: 2
+[01/01/25, 12:00:00] Alice: 💩 🧱 14:30              # metadata: ["🧱"], time: 14:30
+[01/01/25, 14:00:00] Alice: 💩 🔥 +2 2025-01-01 13:00  # metadata + shift + time
+[02/01/25, 09:00:00] Bob: 🚽 ✈️ +5:30                # metadata: ["✈️"], shift: 5.5
+[02/01/25, 10:00:00] Bob: 🚽 🏠✈️ Europe/Rome        # metadata: ["🏠", "✈️"], timezone
+```
+
 ### Invalid Examples
 ```
 [01/01/25, 10:00:00] Alice: 🚽 +25        # Exceeds max_shift_hours

data/README.md

@@ -1,253 +1,106 @@
 # ToiletTracker
 
-A modern Ruby gem for parsing WhatsApp messages containing toilet tracking data using emoji-based commands. Built with clean architecture principles and comprehensive timezone support.
+[![CI](https://github.com/BrownOps/toilet_tracker/actions/workflows/main.yml/badge.svg)](https://github.com/BrownOps/toilet_tracker/actions/workflows/main.yml)
+[![Gem Version](https://img.shields.io/gem/v/toilet_tracker.svg)](https://rubygems.org/gems/toilet_tracker)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.txt)
+[![Ruby](https://img.shields.io/badge/ruby-%3E%3D%203.4-red.svg)](https://www.ruby-lang.org)
 
-## Features
-
-- 🚽 **Settings**: Set timezone shifts and preferences
-- 💩 **Event Tracking**: Log events with automatic timezone adjustments
-- ⏰ **Timezone Support**: Handle multiple timezones and retroactive shifts
-- 📊 **Multiple Output Formats**: JSON, CSV, and formatted tables
-- 🔧 **Thor CLI**: Interactive command-line interface with TTY::Prompt
-- 🧪 **Comprehensive Testing**: 77 tests with 96%+ coverage
-- 🏗️ **Clean Architecture**: Modular design with clear separation of concerns
-- 📋 **Statistics**: Detailed parsing statistics and error reporting
-
-## Requirements
+Track bowel movements through WhatsApp messages using simple emoji commands. Export your WhatsApp chat, run it through ToiletTracker, and get structured data with timezone support.
 
-- **Ruby 3.4+** - Uses modern Ruby features for optimal performance
-- **RuboCop Omakase** - Opinionated Ruby styling from the Rails team
+## Features
 
-## Installation
+- **No app needed** - Use WhatsApp, which you already have
+- **Travel-friendly** - Full timezone support for globetrotters
+- **Flexible input** - Log now, log past events, add metadata
+- **Multiple exports** - JSON, CSV, or formatted tables
+- **Privacy first** - Your data stays on your device
 
-Add this line to your application's Gemfile:
+## Why?
 
-```ruby
-gem 'toilet_tracker'
-```
+Tracking health data shouldn't require a dedicated app. WhatsApp is already on your phone, always synced, and easy to use. Just send a 💩 to a chat (or yourself) whenever nature calls, and this gem turns those messages into analyzable data.
 
-And then execute:
-
-```bash
-bundle install
-```
-
-Or install it yourself as:
+## Quick Start
 
 ```bash
 gem install toilet_tracker
 ```
 
-## Usage
-
-### Command Line Interface
-
-Process WhatsApp export files:
+Export your WhatsApp chat and run:
 
 ```bash
-# Basic usage
-toilet_tracker parse whatsapp_export.txt
-
-# Parse WhatsApp zip exports (automatically extracts _chat.txt)
 toilet_tracker parse whatsapp_export.zip
-
-# JSON output
-toilet_tracker parse --format json messages.txt
-
-# Custom timezone
-toilet_tracker parse --timezone "Europe/Rome" messages.txt
-
-# Show statistics
-toilet_tracker stats messages.txt
-
-# Interactive mode
-toilet_tracker interactive
-
-# Show version
-toilet_tracker version
-```
-
-### Ruby API
-
-```ruby
-require 'toilet_tracker'
-
-# Parse individual lines
-result = ToiletTracker.parse_line("[01/01/25, 12:00:00] Alice: 💩")
-puts result.type  # => :event_now
-
-# Parse multiple lines
-lines = [
-  "[01/01/25, 10:00:00] Alice: 🚽 +2",
-  "[01/01/25, 12:00:00] Alice: 💩"
-]
-results = ToiletTracker.parse_lines(lines)
-
-# Configure settings
-ToiletTracker.configure do |config|
-  config.default_timezone = "Europe/Rome"
-  config.max_shift_hours = 12
-end
 ```
 
-### Supported Message Formats
-
-#### 🚽 Settings (Functional - Affect Timestamps)
-- `🚽 +2` - Set timezone shift to +2 hours (immediate)
-- `🚽 -1` - Set timezone shift to -1 hour (immediate)
-- `🚽 +1 2025-01-15 14:30` - Set shift effective from specific time (retroactive)
-- `🚽 Europe/Rome` - Set timezone by name
-- `🚽 PST` - Set timezone by abbreviation
-
-#### 💩 Events
-
-**Functional Shifts (Affect Actual Times):**
-- `💩` - Log live event with current active shift
-- `💩 +1` - Log live event with +1 hour shift override
-- `💩 PST` - Log live event converted to PST timezone
-
-**Fixed Times (No Shift Applied):**
-- `💩 2025-01-15 14:30` - Log event at exact time specified
+## How It Works
 
-**Decorative Data (For Statistics Only):**
-- `💩 +2 2025-01-15 14:30` - Log event at 14:30 exactly, +2 shift stored for display
-- `💩 EST 2025-01-15 14:30` - Log event at 14:30 exactly, EST timezone stored for display
+Send emoji commands in any WhatsApp chat:
 
-> **Important**: In decorative patterns, the shift/timezone is stored for statistics but does NOT modify the actual poop timestamp.
+| Command | What it does |
+|---------|--------------|
+| `💩` | Log an event right now |
+| `💩 14:30` | Log an event at a specific time |
+| `🚽 +2` | Set your timezone offset to +2 hours |
+| `🚽 Europe/Rome` | Set timezone by name |
 
-### Configuration Options
+See the full [message specification](https://github.com/BrownOps/spec) for all supported formats.
 
-```ruby
-ToiletTracker.configure do |config|
-  # Default timezone for parsing timestamps
-  config.default_timezone = "UTC"
-
-  # Maximum allowed shift hours
-  config.max_shift_hours = 12
-
-  # Custom message patterns (advanced)
-  config.message_patterns[:custom] = /custom_pattern/
-
-  # Supported date formats
-  config.date_formats = ["%Y-%m-%d %H:%M:%S", "%Y/%m/%d %H:%M"]
-end
-```
-
-## Examples
+### Timezone Support
 
-### Basic Usage Scenarios
+Traveling? Just update your timezone:
 
-#### Setting Up Timezone Shifts
 ```
-[15/01/25, 10:00:00] Alice: 🚽 +2
-[15/01/25, 12:00:00] Alice: 💩
-# Result: Event logged at 14:00 (12:00 + 2 hours)
+🚽 +5:30          # Flying to India
+💩                 # Logged with +5:30 offset
+🚽 Europe/Rome    # Back home
+💩                 # Logged with Rome timezone
 ```
 
-#### Retroactive Timezone Adjustments  
-```
-[15/01/25, 10:00:00] Alice: 💩
-[15/01/25, 14:00:00] Alice: 🚽 +3 2025-01-15 09:00:00
-# Result: First event adjusted to 13:00 (10:00 + 3 hours)
-```
+### Metadata
 
-#### Decorative vs Functional Shifts
-```
-# Functional: Affects timestamp
-[15/01/25, 12:00:00] Alice: 💩 +2
-# Result: Event at 14:00 (12:00 + 2 hours)
-
-# Decorative: Only for statistics  
-[15/01/25, 12:00:00] Alice: 💩 +2 2025-01-15 10:00:00
-# Result: Event at exactly 10:00, +2 stored for display
-```
+Add extra context with additional emojis:
 
-#### Complex Multi-User Scenario
 ```
-[15/01/25, 09:00:00] Alice: 🚽 +2
-[15/01/25, 09:30:00] Bob: 🚽 Europe/Rome  
-[15/01/25, 10:00:00] Alice: 💩
-[15/01/25, 10:30:00] Bob: 💩
-[15/01/25, 11:00:00] Alice: 💩 +1
-[15/01/25, 11:30:00] Bob: 💩 EST 2025-01-15 08:00:00
+💩 🩸              # Flag something unusual
+💩 🧱              # Note the consistency
+💩 ☕ 🍕           # Track what you ate
 ```
 
-Results:
-- Alice's first event: 12:00 (10:00 + 2 hours active shift)
-- Bob's first event: ~11:30 (10:30 converted from UTC to Rome time)
-- Alice's override event: 12:00 (11:00 + 1 hour override)
-- Bob's decorative event: exactly 08:00 (EST is decorative only)
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run the following commands:
+## Output Formats
 
 ```bash
-# Run tests
-bundle exec rspec
-
-# Check code style (RuboCop)
-bundle exec rubocop
+# Table (default)
+toilet_tracker parse chat.zip
 
-# Auto-fix style issues
-bundle exec rubocop -a
+# JSON for further processing
+toilet_tracker parse --format json chat.zip
 
-# Install gem locally
-bundle exec rake install
+# CSV for spreadsheets
+toilet_tracker parse --format csv chat.zip
 ```
 
-### Code Quality
+## Ruby API
 
-This project uses **RuboCop Omakase** for opinionated Ruby linting and formatting. Omakase provides the Rails team's preferred styling rules.
-
-Key principles:
-- **Ruby 3.4+ features** - Modern syntax and performance optimizations
-- **KISS principle** - Keep code simple and readable
-- **Test-driven development** - Comprehensive RSpec test suite
-- **Clean architecture** - Clear separation of concerns
-
-### Creating a Release
-
-To release a new version:
-
-1. **Update the version** in `lib/toilet_tracker/version.rb`:
-   ```ruby
-   module ToiletTracker
-     VERSION = "1.2.3"
-   end
-   ```
-
-2. **Update CHANGELOG.md** with release notes (optional but recommended)
+```ruby
+require 'toilet_tracker'
 
-3. **Commit your changes**:
-   ```bash
-   git add -A
-   git commit -m "Bump version to 1.2.3"
-   ```
+# Parse a WhatsApp export
+results = ToiletTracker.parse_file("chat.txt")
 
-4. **Create and push a git tag**:
-   ```bash
-   git tag v1.2.3
-   git push origin main --tags
-   ```
+# Or parse individual messages
+result = ToiletTracker.parse_line("[01/01/2025, 12:00:00] Me: 💩")
+```
 
-5. **Automated Release Process**: The GitHub Actions workflow will automatically:
-   - Run tests and linting to validate the release
-   - Build the gem
-   - Publish to RubyGems.org (requires `RUBYGEMS_API_KEY` secret)
-   - Create a GitHub release with auto-generated changelog
-   - Upload the gem file as a release asset
+## Requirements
 
-**Note**: Ensure the `RUBYGEMS_API_KEY` secret is configured in your GitHub repository settings for automatic publishing to work.
+- Ruby 3.4+
 
-## Contributing
+## Development
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/toilet_tracker. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/toilet_tracker/blob/main/CODE_OF_CONDUCT.md).
+```bash
+bin/setup          # Install dependencies
+bundle exec rspec  # Run tests
+```
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the ToiletTracker project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/toilet_tracker/blob/main/CODE_OF_CONDUCT.md).
+MIT - see [LICENSE.txt](LICENSE.txt)

data/lib/toilet_tracker/configuration.rb

@@ -9,37 +9,38 @@ module ToiletTracker
     def initialize
       @default_timezone = "UTC"
       @max_shift_hours = 12
+      # Capture group 1 is always metadata emojis, subsequent groups are pattern-specific
       @message_patterns = {
-        # 💩 14:30
-        event_at_time_only: /💩\s*(\d{1,2}:\d{2})$/,
-        # 💩 +5 14:30, 💩 +5:30 14:30
-        event_at_time_only_shifted: /💩\s*([+-]?\d+(?::\d{2})?)\s+(\d{1,2}:\d{2})$/,
-        # 💩 Asia/Kolkata 14:30
-        event_in_timezone_at_time_only: %r{💩\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{1,2}:\d{2})$},
-        # 🚽 +5 14:30, 🚽 +5:30 14:30
-        shift_set_at_time_only: /🚽\s*([+-]?\d+(?::\d{2})?)\s+(\d{1,2}:\d{2})$/,
-        # 🚽 Asia/Kolkata 14:30
-        timezone_set_at_time_only: %r{🚽\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{1,2}:\d{2})$},
-        # 🚽 +2, 🚽 -3, 🚽 +5:30
-        shift_set: /🚽\s*([+-]?\d+(?::\d{2})?)$/,
-        # 🚽 +2 2025-01-15 14:30, 🚽 +5:30 2025-01-15 14:30
-        shift_set_at_time: %r{🚽\s*([+-]?\d+(?::\d{2})?)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
-        # 🚽 Europe/Rome, 🚽 PST
-        timezone_set: %r{🚽\s*([A-Za-z_/][A-Za-z0-9_/+-]*)$},
-        # 🚽 Asia/Kolkata 2025-01-15 14:30
-        timezone_set_at_time: %r{🚽\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
-        # 💩
-        event_now: /💩$/,
-        # 💩 +2, 💩 -1, 💩 +5:30
-        event_now_shifted: /💩\s*([+-]?\d+(?::\d{2})?)$/,
-        # 💩 2025-01-15 14:30
-        event_at_time: %r{💩\s*(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
-        # 💩 +2 2025-01-15 14:30, 💩 +5:30 2025-01-15 14:30
-        event_at_time_shifted: %r{💩\s*([+-]?\d+(?::\d{2})?)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
-        # 💩 Europe/Rome, 💩 PST
-        event_in_timezone: %r{💩\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s*$},
-        # 💩 Asia/Kolkata 2025-01-15 14:30
-        event_in_timezone_at_time: %r{💩\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$}
+        # 💩 🩸 14:30
+        event_at_time_only: /💩\s*([^+\-\dA-Za-z\s]*)\s*(\d{1,2}:\d{2})$/,
+        # 💩 🩸 +5 14:30, 💩 🩸 +5:30 14:30
+        event_at_time_only_shifted: /💩\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{1,2}:\d{2})$/,
+        # 💩 🩸 Asia/Kolkata 14:30
+        event_in_timezone_at_time_only: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{1,2}:\d{2})$},
+        # 🚽 📍 +5 14:30, 🚽 📍 +5:30 14:30
+        shift_set_at_time_only: /🚽\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{1,2}:\d{2})$/,
+        # 🚽 📍 Asia/Kolkata 14:30
+        timezone_set_at_time_only: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{1,2}:\d{2})$},
+        # 🚽 📍 +2, 🚽 📍 -3, 🚽 📍 +5:30
+        shift_set: /🚽\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)$/,
+        # 🚽 📍 +2 2025-01-15 14:30, 🚽 📍 +5:30 2025-01-15 14:30
+        shift_set_at_time: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 🚽 📍 Europe/Rome, 🚽 📍 PST
+        timezone_set: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)$},
+        # 🚽 📍 Asia/Kolkata 2025-01-15 14:30
+        timezone_set_at_time: %r{🚽\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 💩, 💩 🩸
+        event_now: /💩\s*([^+\-\dA-Za-z\s]*)$/,
+        # 💩 🩸 +2, 💩 🩸 -1, 💩 🩸 +5:30
+        event_now_shifted: /💩\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)$/,
+        # 💩 🩸 2025-01-15 14:30
+        event_at_time: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 💩 🩸 +2 2025-01-15 14:30, 💩 🩸 +5:30 2025-01-15 14:30
+        event_at_time_shifted: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([+-]?\d+(?::\d{2})?)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$},
+        # 💩 🩸 Europe/Rome, 💩 🩸 PST
+        event_in_timezone: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s*$},
+        # 💩 🩸 Asia/Kolkata 2025-01-15 14:30
+        event_in_timezone_at_time: %r{💩\s*([^+\-\dA-Za-z\s]*)\s*([A-Za-z_/][A-Za-z0-9_/+-]*)\s+(\d{4}[-/]\d{1,2}[-/]\d{1,2}\s+\d{1,2}:\d{1,2}(?::\d{1,2})?)$}
       }
       @date_formats = [
         "%Y-%m-%d %H:%M:%S",
@@ -60,7 +61,9 @@ module ToiletTracker
     end
 
     def whatsapp_message_pattern
-      @whatsapp_message_pattern ||= %r{\[(?<day>\d{2})/(?<month>\d{2})/(?<year>\d{2}),\s*(?<time>\d{2}:\d{2}:\d{2})\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$}
+      # WhatsApp exports vary by platform and locale: years are either 2 or 4
+      # digits, day and month may be zero-padded or not, and seconds may be absent.
+      @whatsapp_message_pattern ||= %r{\[(?<day>\d{1,2})/(?<month>\d{1,2})/(?<year>\d{4}|\d{2}),\s*(?<time>\d{1,2}:\d{2}(?::\d{2})?)\]\s*(?<sender>[^:]+):\s*(?<content>.+?)(?:\s*‎<This message was edited>)?$}
     end
 
     def edited_message_suffix

data/lib/toilet_tracker/core/parse_result.rb

@@ -22,15 +22,15 @@ module ToiletTracker
     end
 
     # Result for toilet shift settings
-    ToiletShiftResult = Data.define(:type, :status, :message, :shift, :effective_time, :error_details) do
-      def initialize(type:, status:, message:, shift: nil, effective_time: nil, error_details: nil)
+    ToiletShiftResult = Data.define(:type, :status, :message, :shift, :effective_time, :metadata, :error_details) do
+      def initialize(type:, status:, message:, shift: nil, effective_time: nil, metadata: [], error_details: nil)
         super
       end
     end
 
     # Result for poop events
-    PoopEventResult = Data.define(:type, :status, :message, :shift, :poop_time, :timezone, :error_details) do
-      def initialize(type:, status:, message:, shift: nil, poop_time: nil, timezone: nil, error_details: nil)
+    PoopEventResult = Data.define(:type, :status, :message, :shift, :poop_time, :timezone, :metadata, :error_details) do
+      def initialize(type:, status:, message:, shift: nil, poop_time: nil, timezone: nil, metadata: [], error_details: nil)
         super
       end
     end

data/lib/toilet_tracker/parsers/base_parser.rb

@@ -98,6 +98,21 @@ module ToiletTracker
         time_diff = (message_time - event_time).abs
         (time_diff > 30.days) ? :alert : :ok
       end
+
+      def parse_metadata(metadata_string)
+        return [] if metadata_string.nil? || metadata_string.strip.empty?
+
+        metadata_string.grapheme_clusters
+          .reject { |char| char.match?(/\s/) }
+          .select { |char| metadata_emoji?(char) }
+      end
+
+      def metadata_emoji?(char)
+        return false if char.match?(/\A[\p{ASCII}]\z/)
+        return false if %w[💩 🚽].include?(char)
+
+        char.match?(/\p{Emoji}/) && !char.match?(/\A\d\z/)
+      end
     end
   end
 end

data/lib/toilet_tracker/parsers/message_parser.rb

@@ -96,7 +96,7 @@ module ToiletTracker
       def parse_poop_type(type, match, message)
         case type
         when :event_now
-          parse_poop_live(message)
+          parse_poop_live(match, message)
         when :event_now_shifted
           parse_poop_live_shift(match, message)
         when :event_at_time
@@ -111,20 +111,23 @@ module ToiletTracker
       end
 
       def parse_toilet_shift(match, message)
-        shift = parse_shift(match[1])
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
 
         Core::ToiletShiftResult.new(
           type: :shift_set,
           status: :ok,
           message: message,
           shift: shift,
-          effective_time: message.timestamp
+          effective_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_toilet_shift_with_time(match, message)
-        shift = parse_shift(match[1])
-        effective_time = parse_datetime(match[2], @current_message)
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
+        effective_time = parse_datetime(match[3], @current_message)
 
         status = determine_status(effective_time, message.timestamp)
 
@@ -133,12 +136,14 @@ module ToiletTracker
           status: status,
           message: message,
           shift: shift,
-          effective_time: effective_time
+          effective_time: effective_time,
+          metadata: metadata
         )
       end
 
       def parse_toilet_timezone(match, message)
-        timezone_str = match[1]
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
         shift = calculate_shift_from_timezone(timezone_str)
 
         Core::ToiletShiftResult.new(
@@ -146,13 +151,15 @@ module ToiletTracker
           status: :ok,
           message: message,
           shift: shift,
-          effective_time: message.timestamp
+          effective_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_toilet_timezone_with_time(match, message)
-        timezone_str = match[1]
-        datetime_str = match[2]
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
+        datetime_str = match[3]
 
         effective_time = parse_datetime(datetime_str, @current_message)
         status = determine_status(effective_time, message.timestamp)
@@ -163,7 +170,8 @@ module ToiletTracker
           status: status,
           message: message,
           shift: shift,
-          effective_time: effective_time
+          effective_time: effective_time,
+          metadata: metadata
         )
       end
 
@@ -176,30 +184,36 @@ module ToiletTracker
         (shift == shift.to_i) ? shift.to_i : shift
       end
 
-      def parse_poop_live(message)
+      def parse_poop_live(match, message)
+        metadata = parse_metadata(match[1])
+
         Core::PoopEventResult.new(
           type: :event_now,
           status: :ok,
           message: message,
           shift: 0,
-          poop_time: message.timestamp
+          poop_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_poop_live_shift(match, message)
-        shift = parse_shift(match[1])
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
 
         Core::PoopEventResult.new(
           type: :event_now_shifted,
           status: :ok,
           message: message,
           shift: shift,
-          poop_time: message.timestamp
+          poop_time: message.timestamp,
+          metadata: metadata
         )
       end
 
       def parse_poop_past(match, message)
-        poop_time = parse_datetime(match[1], @current_message)
+        metadata = parse_metadata(match[1])
+        poop_time = parse_datetime(match[2], @current_message)
         status = determine_status(poop_time, message.timestamp)
 
         Core::PoopEventResult.new(
@@ -207,13 +221,15 @@ module ToiletTracker
           status: status,
           message: message,
           shift: 0,
-          poop_time: poop_time
+          poop_time: poop_time,
+          metadata: metadata
         )
       end
 
       def parse_poop_past_with_shift(match, message)
-        shift = parse_shift(match[1])
-        poop_time = parse_datetime(match[2], @current_message)
+        metadata = parse_metadata(match[1])
+        shift = parse_shift(match[2])
+        poop_time = parse_datetime(match[3], @current_message)
         status = determine_status(poop_time, message.timestamp)
 
         Core::PoopEventResult.new(
@@ -221,25 +237,29 @@ module ToiletTracker
           status: status,
           message: message,
           shift: shift,
-          poop_time: poop_time
+          poop_time: poop_time,
+          metadata: metadata
         )
       end
 
       def parse_poop_timezone(match, message)
-        timezone_str = match[1]
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
 
         Core::PoopEventResult.new(
           type: :event_in_timezone,
           status: :ok,
           message: message,
           poop_time: message.timestamp,
-          timezone: timezone_str
+          timezone: timezone_str,
+          metadata: metadata
         )
       end
 
       def parse_poop_timezone_with_time(match, message)
-        timezone_str = match[1]
-        poop_time = parse_datetime(match[2], @current_message)
+        metadata = parse_metadata(match[1])
+        timezone_str = match[2]
+        poop_time = parse_datetime(match[3], @current_message)
         status = determine_status(poop_time, message.timestamp)
 
         Core::PoopEventResult.new(
@@ -247,7 +267,8 @@ module ToiletTracker
           status: status,
           message: message,
           poop_time: poop_time,
-          timezone: timezone_str
+          timezone: timezone_str,
+          metadata: metadata
         )
       end
     end

data/lib/toilet_tracker/parsers/whatsapp_parser.rb

@@ -41,16 +41,23 @@ module ToiletTracker
       end
 
       def parse_whatsapp_timestamp(day, month, year, time)
-        # Convert YY to full year (assuming 2000s)
-        full_year = "20#{year}"
-        datetime_string = "#{day}/#{month}/#{full_year} #{time}"
+        datetime_string = "#{day}/#{month}/#{expand_year(year)} #{time}"
 
         # Parse in the default timezone
-        config.default_timezone_object.strptime(datetime_string, "%d/%m/%Y %H:%M:%S")
+        config.default_timezone_object.strptime(datetime_string, timestamp_format(time))
       rescue ArgumentError => e
         raise Core::InvalidDateTime, "#{day}/#{month}/#{year} #{time}: #{e.message}"
       end
 
+      # Convert YY to full year (assuming 2000s), leave YYYY untouched
+      def expand_year(year)
+        year.length == 2 ? "20#{year}" : year
+      end
+
+      def timestamp_format(time)
+        time.count(":") > 1 ? "%d/%m/%Y %H:%M:%S" : "%d/%m/%Y %H:%M"
+      end
+
       def clean_content(content)
         return "" if content.nil?
 

data/lib/toilet_tracker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ToiletTracker
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toilet_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - NetherSoul
@@ -13,16 +13,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.2.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -41,16 +47,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -152,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Parse WhatsApp messages for toilet tracking with emoji-based commands
 test_files: []