From 940b9ad6dbb0c0a47c0914a62a0c668a87e3af08 Mon Sep 17 00:00:00 2001
From: Mirco Wittrien <mirco.wittrien@gmail.com>
Date: Thu, 15 Feb 2024 05:53:47 +0100
Subject: [PATCH] Update CompleteTimestamps.plugin.js

---
 .../CompleteTimestamps/CompleteTimestamps.plugin.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Plugins/CompleteTimestamps/CompleteTimestamps.plugin.js b/Plugins/CompleteTimestamps/CompleteTimestamps.plugin.js
index 001f9f2f8d..6de7879a8a 100644
--- a/Plugins/CompleteTimestamps/CompleteTimestamps.plugin.js
+++ b/Plugins/CompleteTimestamps/CompleteTimestamps.plugin.js
@@ -2,7 +2,7 @@
  * @name CompleteTimestamps
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 1.6.7
+ * @version 1.6.8
  * @description Replaces Timestamps with your own custom Timestamps
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -190,13 +190,13 @@ module.exports = (_ => {
 				if (!tooltipWrapper) return;
 				let childClassName = BDFDB.ObjectUtils.get(e, "instance.props.children.props.className");
 				if (childClassName && childClassName.indexOf(BDFDB.disCN.messageedited) > -1) {
-					if (this.settings.tooltips.edit) tooltipWrapper.props.text = this.formatTimestamp(this.settings.dates.tooltipDate, e.instance.props.timestamp._i);
+					if (this.settings.tooltips.edit) tooltipWrapper.props.text = this.formatTimestamp(this.settings.dates.tooltipDate, e.instance.props.timestamp._i || e.instance.props.timestamp);
 				}
 				else {
 					if (!e.instance.props.cozyAlt) {
 						if (this.settings.places.chat) {
 							if (tooltipIsSame) tooltipWrapper.props.delay = 99999999999999999999;
-							let timestamp = this.formatTimestamp(this.settings.dates.timestampDate, e.instance.props.timestamp._i);
+							let timestamp = this.formatTimestamp(this.settings.dates.timestampDate, e.instance.props.timestamp._i || e.instance.props.timestamp);
 							let renderChildren = tooltipWrapper.props.children;
 							tooltipWrapper.props.children = BDFDB.TimeUtils.suppress((...args) => {
 								let renderedChildren = renderChildren(...args);
@@ -209,7 +209,7 @@ module.exports = (_ => {
 						}
 					}
 					if (this.settings.tooltips.chat) {
-						let timestamp = this.formatTimestamp(this.settings.dates.tooltipDate, e.instance.props.timestamp._i);
+						let timestamp = this.formatTimestamp(this.settings.dates.tooltipDate, e.instance.props.timestamp._i || e.instance.props.timestamp);
 						if (tooltipWrapper.props.text && tooltipWrapper.props.text.props && BDFDB.ArrayUtils.is(tooltipWrapper.props.text.props.children)) tooltipWrapper.props.text.props.children[0] = timestamp;
 						else tooltipWrapper.props.text = timestamp;
 					}
@@ -233,8 +233,8 @@ module.exports = (_ => {
 				let process = returnvalue => {
 					let [children, index] = BDFDB.ReactUtils.findParent(returnvalue, {props: [["className", BDFDB.disCN.embedfootertext]]});
 					if (index > -1) {
-						if (BDFDB.ArrayUtils.is(children[index].props.children)) children[index].props.children[children[index].props.children.length - 1] = this.formatTimestamp(this.settings.dates.timestampDate, e.instance.props.embed.timestamp._i);
-						else children[index].props.children = this.formatTimestamp(this.settings.dates.timestampDate, e.instance.props.embed.timestamp._i);
+						if (BDFDB.ArrayUtils.is(children[index].props.children)) children[index].props.children[children[index].props.children.length - 1] = this.formatTimestamp(this.settings.dates.timestampDate, e.instance.props.embed.timestamp._i || e.instance.props.embed.timestamp);
+						else children[index].props.children = this.formatTimestamp(this.settings.dates.timestampDate, e.instance.props.embed.timestamp._i || e.instance.props.embed.timestamp);
 					}
 				};
 				if (typeof e.returnvalue.props.children == "function") {