Merge 8b541cbed3 into 096d06c9d2

src/client.ts

@@ -43,6 +43,7 @@ export default class TClient extends Discord.Client {
   public ytChannels: YouTubeChannelsSvc = new YouTubeChannelsSvc();
   public repeatedMessages: IRepeatedMessages = {};
   public crosspostSpam: ICrosspostSpam = {};
+  public memberJoinDates: Map<Discord.Snowflake, string> = new Map();
 
   constructor() {
     super({

src/events/guildBanAdd.ts

@@ -6,14 +6,17 @@ export default class GuildBanAdd {
     const banLog = (await member.guild.fetchAuditLogs({ limit: 1, type: Discord.AuditLogEvent.MemberBanAdd })).entries.first();
     if (!banLog) return console.log(`Member was banned from ${member.guild.name} but no audit log for this member.`)
     const {executor, target, reason } = banLog;
+    const members_joindate = client.memberJoinDates.get(member.user.id);
     if (target.id === member.user.id) {
       const embed = new client.embed().setColor(client.config.embedColorRed).setTimestamp().setThumbnail(member.user.displayAvatarURL({size: 2048}))
       .setTitle(`Member Banned: ${target.username}`).addFields(
         {name: '🔹 Moderator', value: `<@${executor.id}>\n\`${executor.id}\``},
+        {name: '🔹 Server Join Date', value: members_joindate ? `<t:${members_joindate}>\n<t:${members_joindate}:R>` : '*Unknown timestamp*'},
         {name: '🔹 Reason', value: reason === null ? 'Reason unspecified': reason}
       );
       if (!await client.userLevels.fetchUser(member.user.id)) embed.setFooter({text: 'Rank data has been wiped.'});
-      (client.channels.resolve(client.config.dcServer.channels.logs) as Discord.TextChannel).send({embeds: [embed]})
+      (client.channels.resolve(client.config.dcServer.channels.logs) as Discord.TextChannel).send({embeds: [embed]});
+      client.memberJoinDates.delete(member.user.id);
     } else console.log(`User was banned from "${member.guild.name}" but no audit log could be fetched.`)
   }
 }

src/events/guildMemberRemove.ts

@@ -4,10 +4,8 @@ export default class GuildMemberRemove {
   static async run(client:TClient, member:Discord.GuildMember) {
     if (!client.config.botSwitches.logs) return;
     if (!member.joinedTimestamp || member.guild?.id != client.config.dcServer.id) return;
-    if (client.guilds.cache.get(client.config.dcServer.id).bans.cache.has(member.id)) {
-      (client.channels.resolve(client.config.dcServer.channels.logs) as Discord.TextChannel).send(`**${member.user.username}**'s join date is <t:${Math.round(member.joinedTimestamp/1000)}>`)
-      return await client.userLevels.deleteUser(member.id);
-    };
+    client.memberJoinDates.set(member.user.id, `${Math.round(member.joinedTimestamp/1000)}`);
+    if (client.guilds.cache.get(client.config.dcServer.id).bans.cache.has(member.id)) return await client.userLevels.deleteUser(member.id);
     let isBot = 'Bot';
     if (!member.user.bot) isBot = 'Member';
     const levelData = await client.userLevels.fetchUser(member.id);

src/events/messageCreate.ts

@@ -76,10 +76,9 @@ export default class MessageCreate {
         guildBoost: ['Thanks for boosting our server!', 'Thanks for the boost!', 'We appreciate the boost!', `Thank you for the kind boost, <@${message.author.id}>!`],
       }
       const GeneralChatID = ConfigHelper.isDevMode() ? '929807948748832801' : '468835415093411863';
-      Response.create(message, GeneralChatID, 'morning');
-      Response.create(message, GeneralChatID, 'afternoon');
-      Response.create(message, GeneralChatID, 'evening');
-      Response.create(message, GeneralChatID, 'night');
+
+      const times_of_day = ['morning', 'afternoon', 'evening', 'night'];
+      for (let i = 0; i < times_of_day.length; i++) Response.create(message, GeneralChatID, times_of_day[i]);
 
       CmdTrigger.registerCmds(client, message, 'register');
       CmdTrigger.MFPwTrigger(message, 'farmpw');