From 4c4f7f8619bd564c7cd2be9db5721e38dd73be5a Mon Sep 17 00:00:00 2001
From: MathMan05 <mathmanrm@gmail.com>
Date: Tue, 3 Sep 2024 11:17:06 -0500
Subject: [PATCH] use more generic function for time conversions

---
 .dist/channel.js   | 6 +++---
 .dist/direct.js    | 3 ++-
 webpage/channel.ts | 6 +++---
 webpage/direct.ts  | 3 ++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.dist/channel.js b/.dist/channel.js
index a029bf9..f535283 100644
--- a/.dist/channel.js
+++ b/.dist/channel.js
@@ -906,14 +906,14 @@ class Channel extends SnowFlake {
         if (!this.lastmessageid || !id)
             return;
         let flake = this.lastmessageid;
-        const time = Number((BigInt(id) >> 22n) + 1420070400000n);
-        let flaketime = Number((BigInt(flake) >> 22n) + 1420070400000n);
+        const time = SnowFlake.stringToUnixTime(id);
+        let flaketime = SnowFlake.stringToUnixTime(flake);
         while (flake && time < flaketime) {
             flake = this.idToPrev.get(flake);
             if (!flake) {
                 return;
             }
-            flaketime = Number((BigInt(flake) >> 22n) + 1420070400000n);
+            flaketime = SnowFlake.stringToUnixTime(flake);
         }
         return flake;
     }
diff --git a/.dist/direct.js b/.dist/direct.js
index 828cfc2..6cd7faf 100644
--- a/.dist/direct.js
+++ b/.dist/direct.js
@@ -3,6 +3,7 @@ import { Channel } from "./channel.js";
 import { Message } from "./message.js";
 import { User } from "./user.js";
 import { Permissions } from "./permissions.js";
+import { SnowFlake } from "./snowflake.js";
 class Direct extends Guild {
     constructor(json, owner) {
         super(-1, owner, null);
@@ -95,7 +96,7 @@ class Group extends Channel {
         this.mentions = 0;
         this.setUpInfiniteScroller();
         if (this.lastmessageid) {
-            this.position = Number((BigInt(this.lastmessageid) >> 22n) + 1420070400000n);
+            this.position = SnowFlake.stringToUnixTime(this.lastmessageid);
         }
         this.position = -Math.max(this.position, this.getUnixTime());
     }
diff --git a/webpage/channel.ts b/webpage/channel.ts
index 5df523d..54e371c 100644
--- a/webpage/channel.ts
+++ b/webpage/channel.ts
@@ -910,15 +910,15 @@ class Channel extends SnowFlake{
 	private findClosest(id:string|undefined){
 		if(!this.lastmessageid||!id)return;
 		let flake:string|undefined=this.lastmessageid;
-		const time=Number((BigInt(id)>>22n)+1420070400000n);
-		let flaketime=Number((BigInt(flake)>>22n)+1420070400000n);
+		const time=SnowFlake.stringToUnixTime(id);
+		let flaketime=SnowFlake.stringToUnixTime(flake);
 		while(flake&&time<flaketime){
 			flake=this.idToPrev.get(flake);
 
 			if(!flake){
 				return;
 			}
-			flaketime=Number((BigInt(flake)>>22n)+1420070400000n);
+			flaketime=SnowFlake.stringToUnixTime(flake);
 		}
 		return flake;
 	}
diff --git a/webpage/direct.ts b/webpage/direct.ts
index 6a353ba..870b5f3 100644
--- a/webpage/direct.ts
+++ b/webpage/direct.ts
@@ -6,6 +6,7 @@ import{User}from"./user.js";
 import{ Member }from"./member.js";
 import{ dirrectjson, memberjson }from"./jsontypes.js";
 import{ Permissions }from"./permissions.js";
+import { SnowFlake } from "./snowflake.js";
 
 class Direct extends Guild{
 	constructor(json:dirrectjson[],owner:Localuser){
@@ -101,7 +102,7 @@ class Group extends Channel{
 		this.mentions=0;
 		this.setUpInfiniteScroller();
 		if(this.lastmessageid){
-			this.position=Number((BigInt(this.lastmessageid)>>22n)+1420070400000n);
+			this.position=SnowFlake.stringToUnixTime(this.lastmessageid);
 		}
 
 		this.position=-Math.max(this.position,this.getUnixTime());