Skip to content

Commit

Permalink
fixed farewell aliases, added member logging
Browse files Browse the repository at this point in the history
  • Loading branch information
sabattle committed Sep 2, 2020
1 parent dc96253 commit e6db32a
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/commands/admin/setfarewellchannel.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = class SetFarewellChannelCommand extends Command {
constructor(client) {
super(client, {
name: 'setfarewellchannel',
aliases: ['setlc', 'slc'],
aliases: ['setfc', 'sfc'],
usage: 'setfarewellchannel <channel mention/ID>',
description: oneLine`
Sets the farewell message text channel for your server.
Expand Down
2 changes: 1 addition & 1 deletion src/commands/admin/setfarewellmessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = class SetFarewellMessageCommand extends Command {
constructor(client) {
super(client, {
name: 'setfarewellmessage',
aliases: ['setfarewellmsg', 'setlm', 'slm'],
aliases: ['setfarewellmsg', 'setfm', 'sfm'],
usage: 'setfarewellmessage <message>',
description: oneLine`
Sets the message Calypso will say when someone leaves your server.
Expand Down
23 changes: 23 additions & 0 deletions src/events/guildMemberAdd.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
const { MessageEmbed } = require('discord.js');
const moment = require('moment');
const { stripIndent } = require('common-tags');

module.exports = async (client, member) => {

client.logger.info(`${member.guild.name}: ${member.user.tag} has joined the server`);

/** ------------------------------------------------------------------------------------------------
* MEMBER LOG
* ------------------------------------------------------------------------------------------------ */
// Get member log
const memberLogId = client.db.settings.selectMemberLogId.pluck().get(member.guild.id);
const memberLog = member.guild.channels.cache.get(memberLogId);
if (
memberLog &&
memberLog.viewable &&
memberLog.permissionsFor(member.guild.me).has(['SEND_MESSAGES', 'EMBED_LINKS'])
) {
const embed = new MessageEmbed()
.setTitle('Member Joined')
.setAuthor(`${member.guild.name}`, member.guild.iconURL({ dynamic: true }))
.setThumbnail(member.user.displayAvatarURL({ dynamic: true }))
.setDescription(`${member} (**${member.user.tag}**)`)
.addField('Account created on', moment(member.user.createdAt).format('dddd, MMMM Do YYYY'))
.setTimestamp()
.setColor(member.guild.me.displayHexColor);
memberLog.send(embed);
}

/** ------------------------------------------------------------------------------------------------
* AUTO ROLE
* ------------------------------------------------------------------------------------------------ */
Expand Down
21 changes: 21 additions & 0 deletions src/events/guildMemberRemove.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,27 @@ module.exports = (client, member) => {

client.logger.info(`${member.guild.name}: ${member.user.tag} has left the server`);

/** ------------------------------------------------------------------------------------------------
* MEMBER LOG
* ------------------------------------------------------------------------------------------------ */
// Get member log
const memberLogId = client.db.settings.selectMemberLogId.pluck().get(member.guild.id);
const memberLog = member.guild.channels.cache.get(memberLogId);
if (
memberLog &&
memberLog.viewable &&
memberLog.permissionsFor(member.guild.me).has(['SEND_MESSAGES', 'EMBED_LINKS'])
) {
const embed = new MessageEmbed()
.setTitle('Member Left')
.setAuthor(`${member.guild.name}`, member.guild.iconURL({ dynamic: true }))
.setThumbnail(member.user.displayAvatarURL({ dynamic: true }))
.setDescription(`${member} (**${member.user.tag}**)`)
.setTimestamp()
.setColor(member.guild.me.displayHexColor);
memberLog.send(embed);
}

/** ------------------------------------------------------------------------------------------------
* FAREWELL MESSAGES
* ------------------------------------------------------------------------------------------------ */
Expand Down
5 changes: 1 addition & 4 deletions src/events/messageDeleteBulk.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ module.exports = (client, messages) => {

const embed = new MessageEmbed()
.setTitle('Message Update: `Bulk Delete`')
.setAuthor(
`${message.guild.name}`,
message.guild.iconURL({ dynamic: true })
)
.setAuthor(`${message.guild.name}`, message.guild.iconURL({ dynamic: true }))
.setDescription(`**${messages.size} messages** in ${message.channel} were deleted.`)
.setTimestamp()
.setColor(message.guild.me.displayHexColor);
Expand Down

0 comments on commit e6db32a

Please sign in to comment.