From ce127c87829122b920d310d75342af170d42142a Mon Sep 17 00:00:00 2001
From: derpystuff <3515180-derpystuff@users.noreply.gitlab.com>
Date: Wed, 15 Jun 2022 22:03:00 +0200
Subject: [PATCH] fix fetching users with old ids

---
 commands/message/info/guild.js | 2 +-
 commands/message/info/user.js  | 4 ++--
 labscore/utils/users.js        | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/commands/message/info/guild.js b/commands/message/info/guild.js
index cea6b50..68bcf4e 100644
--- a/commands/message/info/guild.js
+++ b/commands/message/info/guild.js
@@ -33,7 +33,7 @@ module.exports = {
       const g = context.guild
       // Guild Card
       let guildCard = createEmbed("default", context, {
-        description: `${icon("house")} **${g.name}** ${highlight(`(${g.id})`)}\n\n${icon("calendar")} **Created at: **${timestamp(g.createdAt)}\n\n<:lc_guild_owner:674652779406426122> **Server Owner: **<@${g.owner.id}>`,
+        description: `${icon("house")} **${g.name}** ${highlight(`(${g.id})`)}\n\n${icon("calendar")} **Created at: **${timestamp(g.createdAt, "f")}\n\n<:lc_guild_owner:674652779406426122> **Server Owner: **<@${g.owner.id}>`,
         thumbnail: {
           url: g.iconUrl + `?size=4096`
         },
diff --git a/commands/message/info/user.js b/commands/message/info/user.js
index bf67f70..30949b4 100644
--- a/commands/message/info/user.js
+++ b/commands/message/info/user.js
@@ -40,7 +40,7 @@ module.exports = {
         },
         fields: [{
           name: `${icon("calendar")} Dates`,
-          value: `**Account Created: **${timestamp(u.createdAt)}`,
+          value: `**Account Created: **${timestamp(u.createdAt, "f")}`,
           inline: false
         }]
       })
@@ -48,7 +48,7 @@ module.exports = {
 
       // Guild Container
       if(m){
-        userCard.fields[0].value = userCard.fields[0].value + `\n**Joined Guild: **${timestamp(m.joinedAt)}`
+        userCard.fields[0].value = userCard.fields[0].value + `\n**Joined Guild: **${timestamp(m.joinedAt, "f")}`
         let guildFields = []
         
         // TODO: make this an icon()
diff --git a/labscore/utils/users.js b/labscore/utils/users.js
index c57deb3..760bfb0 100644
--- a/labscore/utils/users.js
+++ b/labscore/utils/users.js
@@ -1,8 +1,8 @@
 async function getUser(context, query){
   let user;
   let member;
-  if(/[0-9]{18}/.test(query)){
-    let uid = query.match(/[0-9]{18}/)
+  if(/[0-9]{17,18}/.test(query)){
+    let uid = query.match(/[0-9]{17,18}/)
     try{
       user = await context.client.rest.fetchUser(uid)
       if(context.guild) member = await getMember(context, user.id)
@@ -18,8 +18,8 @@ async function getUser(context, query){
 
 async function getMember(context, query){
   if(!context.guild) return;
-  if(/[0-9]{18}/.test(query)){
-    let uid = query.match(/[0-9]{18}/)
+  if(/[0-9]{17,18}/.test(query)){
+    let uid = query.match(/[0-9]{17,18}/)
     try{
       member = await context.guild.fetchMember(uid)
       return member;