From eb19f62c4674106f03ca2cd019d30ed4138d354d Mon Sep 17 00:00:00 2001
From: ghost <localhost>
Date: Mon, 19 Feb 2024 21:37:28 +0200
Subject: [PATCH] update post format method

---
 src/controller/room.php | 49 +++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/controller/room.php b/src/controller/room.php
index 1d01239..fd4dba4 100644
--- a/src/controller/room.php
+++ b/src/controller/room.php
@@ -508,12 +508,37 @@ class Room
         ?int &$time = 0
     ): ?string
     {
+        // Validate required data
+        if (empty($data['txid']))
+        {
+            return null;
+        }
+
+        if (empty($data['key']))
+        {
+            return null;
+        }
+
+        if (empty($data['value']))
+        {
+            return null;
+        }
+
         // Skip values with meta keys
         if (str_starts_with($data['key'], '_'))
         {
             return null;
         }
 
+        // Legacy key format support (protocol v1 contain timestamp in prefix)
+        if (preg_match('/^([\d]+)@([A-z0-9\.\:\[\]]+)/', $data['key'], $matches))
+        {
+            if (!empty($matches[2]))
+            {
+                $data['key'] = $matches[2];
+            }
+        }
+
         // Validate value format allowed in settings
         if (!preg_match((string) $this->_config->kevachat->post->value->regex, $data['value']))
         {
@@ -521,40 +546,32 @@ class Room
         }
 
         // Validate key format allowed in settings
-        if (!preg_match($this->_config->kevachat->post->key->regex, $data['key'], $matches))
+        if (!preg_match($this->_config->kevachat->post->key->regex, $data['key']))
         {
             return null;
         }
 
-        // Timestamp required in key
-        if (empty($matches[1]))
+        // Get time from raw transaction
+        if (!$transaction = $this->_kevacoin->getRawTransaction($data['txid']))
         {
             return null;
         }
 
-        // Username required in key
-        if (empty($matches[2]))
+        // Make sure time available
+        if (empty($transaction['time']))
         {
             return null;
         }
 
-        // Return timestamp
-        $time = $matches[1];
-
         // Is raw field request
         if ($field)
         {
             return isset($data[$field]) ? $data[$field] : null;
         }
 
-        // Legacy usernames backport
-        if (!preg_match((string) $this->_config->kevachat->user->name->regex, $matches[2]))
-        {
-            $matches[2] = 'anon';
-        }
-
         // Try to find related quote value
         $quote = null;
+
         if (preg_match(self::PARENT_REGEX, $data['value'], $mention))
         {
             // Message starts with mention
@@ -665,11 +682,11 @@ class Room
                 [
                     // time
                     $this->_ago(
-                        $matches[1]
+                        $transaction['time']
                     ),
 
                     // author
-                    $matches[2],
+                    $data['key'],
 
                     // quote
                     $quote,