Skip to content

Updated to v12 code #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Ep_14/commands/fun/fortnite.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");

const Client = require("fortnite");
Expand All @@ -15,7 +15,7 @@ module.exports = {
if (args[0].toLowerCase() === "store") {
const store = await ft.store();

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("#9d4dbb")
.setFooter("Fortnite store", message.author.displayAvatarURL)
.setTimestamp();
Expand Down Expand Up @@ -56,11 +56,11 @@ module.exports = {
const duo = search.stats.duo;
const squad = search.stats.squad;

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setTitle(`${search.username} (${search.platform})`)
.setURL(search.url)
.setColor("#9d4dbb")
.setFooter(`Fortnite stats`, message.author.displayAvatarURL)
.setFooter(`Fortnite stats`, message.author.displayAvatarURL())
.setTimestamp()
.addField("Solo:", stripIndents`**- Wins:** ${solo.wins}
**- KD:** ${solo.kd}
Expand Down
4 changes: 2 additions & 2 deletions Ep_14/commands/fun/love.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { getMember } = require("../../functions.js");

module.exports = {
Expand All @@ -21,7 +21,7 @@ module.exports = {
const loveIndex = Math.floor(love / 10);
const loveLevel = "💖".repeat(loveIndex) + "💔".repeat(10 - loveIndex);

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("#ffb6c1")
.addField(`☁ **${person.displayName}** loves **${message.member.displayName}** this much:`,
`💟 ${Math.floor(love)}%\n\n${loveLevel}`);
Expand Down
4 changes: 2 additions & 2 deletions Ep_14/commands/fun/meme.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const randomPuppy = require("random-puppy");

module.exports = {
Expand All @@ -10,7 +10,7 @@ module.exports = {
const random = subReddits[Math.floor(Math.random() * subReddits.length)];

const img = await randomPuppy(random);
const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("RANDOM")
.setImage(img)
.setTitle(`From /r/${random}`)
Expand Down
6 changes: 3 additions & 3 deletions Ep_14/commands/fun/rps.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { promptMessage } = require("../../functions.js");

const chooseArr = ["🗻", "📰", "✂"];
Expand All @@ -9,9 +9,9 @@ module.exports = {
description: "Rock Paper Scissors game. React to one of the emojis to play the game.",
usage: "rps",
run: async (client, message, args) => {
const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("#ffffff")
.setFooter(message.guild.me.displayName, client.user.displayAvatarURL)
.setFooter(message.guild.me.displayName, client.user.displayAvatarURL())
.setDescription("Add a reaction to one of these emojis to play the game!")
.setTimestamp();

Expand Down
6 changes: 3 additions & 3 deletions Ep_14/commands/info/help.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");

module.exports = {
Expand All @@ -17,7 +17,7 @@ module.exports = {
}

function getAll(client, message) {
const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("RANDOM")

const commands = (category) => {
Expand All @@ -35,7 +35,7 @@ function getAll(client, message) {
}

function getCMD(client, message, input) {
const embed = new RichEmbed()
const embed = new MessageEmbed()

const cmd = client.commands.get(input.toLowerCase()) || client.commands.get(client.aliases.get(input.toLowerCase()));

Expand Down
4 changes: 2 additions & 2 deletions Ep_14/commands/info/instagram.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");

const fetch = require("node-fetch");
Expand Down Expand Up @@ -30,7 +30,7 @@ module.exports = {

const account = res.graphql.user;

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("RANDOM")
.setTitle(account.full_name)
.setURL(`https://instagram.com/${name}`)
Expand Down
8 changes: 4 additions & 4 deletions Ep_14/commands/info/whois.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");
const { getMember, formatDate } = require("../../functions.js");

Expand All @@ -19,9 +19,9 @@ module.exports = {
// User variables
const created = formatDate(member.user.createdAt);

const embed = new RichEmbed()
.setFooter(member.displayName, member.user.displayAvatarURL)
.setThumbnail(member.user.displayAvatarURL)
const embed = new MessageEmbed()
.setFooter(member.displayName, member.user.displayAvatarURL())
.setThumbnail(member.user.displayAvatarURL())
.setColor(member.displayHexColor === '#000000' ? '#ffffff' : member.displayHexColor)

.addField('Member information:', stripIndents`**- Display name:** ${member.displayName}
Expand Down
14 changes: 7 additions & 7 deletions Ep_14/commands/moderation/ban.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");
const { promptMessage } = require("../../functions.js");

Expand All @@ -8,7 +8,7 @@ module.exports = {
description: "bans the member",
usage: "<id | mention>",
run: async (client, message, args) => {
const logChannel = message.guild.channels.find(c => c.name === "logs") || message.channel;
const logChannel = message.guild.channels.cache.find(c => c.name === "logs") || message.channel;

if (message.deletable) message.delete();

Expand Down Expand Up @@ -36,7 +36,7 @@ module.exports = {
.then(m => m.delete(5000));
}

const toBan = message.mentions.members.first() || message.guild.members.get(args[0]);
const toBan = message.mentions.members.first() || message.guild.members.cache.get(args[0]);

// No member found
if (!toBan) {
Expand All @@ -56,16 +56,16 @@ module.exports = {
.then(m => m.delete(5000));
}

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("#ff0000")
.setThumbnail(toBan.user.displayAvatarURL)
.setFooter(message.member.displayName, message.author.displayAvatarURL)
.setThumbnail(toBan.user.displayAvatarURL())
.setFooter(message.member.displayName, message.author.displayAvatarURL())
.setTimestamp()
.setDescription(stripIndents`**- baned member:** ${toBan} (${toBan.id})
**- baned by:** ${message.member} (${message.member.id})
**- Reason:** ${args.slice(1).join(" ")}`);

const promptEmbed = new RichEmbed()
const promptEmbed = new MessageEmbed()
.setColor("GREEN")
.setAuthor(`This verification becomes invalid after 30s.`)
.setDescription(`Do you want to ban ${toBan}?`)
Expand Down
14 changes: 7 additions & 7 deletions Ep_14/commands/moderation/kick.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");
const { promptMessage } = require("../../functions.js");

Expand All @@ -8,7 +8,7 @@ module.exports = {
description: "Kicks the member",
usage: "<id | mention>",
run: async (client, message, args) => {
const logChannel = message.guild.channels.find(c => c.name === "logs") || message.channel;
const logChannel = message.guild.channels.cache.find(c => c.name === "logs") || message.channel;

if (message.deletable) message.delete();

Expand Down Expand Up @@ -36,7 +36,7 @@ module.exports = {
.then(m => m.delete(5000));
}

const toKick = message.mentions.members.first() || message.guild.members.get(args[0]);
const toKick = message.mentions.members.first() || message.guild.members.cache.get(args[0]);

// No member found
if (!toKick) {
Expand All @@ -56,16 +56,16 @@ module.exports = {
.then(m => m.delete(5000));
}

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("#ff0000")
.setThumbnail(toKick.user.displayAvatarURL)
.setFooter(message.member.displayName, message.author.displayAvatarURL)
.setThumbnail(toKick.user.displayAvatarURL())
.setFooter(message.member.displayName, message.author.displayAvatarURL())
.setTimestamp()
.setDescription(stripIndents`**- Kicked member:** ${toKick} (${toKick.id})
**- Kicked by:** ${message.member} (${message.member.id})
**- Reason:** ${args.slice(1).join(" ")}`);

const promptEmbed = new RichEmbed()
const promptEmbed = new MessageEmbed()
.setColor("GREEN")
.setAuthor(`This verification becomes invalid after 30s.`)
.setDescription(`Do you want to kick ${toKick}?`)
Expand Down
12 changes: 6 additions & 6 deletions Ep_14/commands/moderation/report.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");
const { stripIndents } = require("common-tags");

module.exports = {
Expand All @@ -9,7 +9,7 @@ module.exports = {
run: async (client, message, args) => {
if (message.deletable) message.delete();

let rMember = message.mentions.members.first() || message.guild.members.get(args[0]);
let rMember = message.mentions.members.first() || message.guild.members.cache.get(args[0]);

if (!rMember)
return message.reply("Couldn't find that person?").then(m => m.delete(5000));
Expand All @@ -20,16 +20,16 @@ module.exports = {
if (!args[1])
return message.channel.send("Please provide a reason for the report").then(m => m.delete(5000));

const channel = message.guild.channels.find(c => c.name === "reports")
const channel = message.guild.channels.cache.find(c => c.name === "reports")

if (!channel)
return message.channel.send("Couldn't find a `#reports` channel").then(m => m.delete(5000));

const embed = new RichEmbed()
const embed = new MessageEmbed()
.setColor("#ff0000")
.setTimestamp()
.setFooter(message.guild.name, message.guild.iconURL)
.setAuthor("Reported member", rMember.user.displayAvatarURL)
.setFooter(message.guild.name, message.guild.iconURL())
.setAuthor("Reported member", rMember.user.displayAvatarURL())
.setDescription(stripIndents`**- Member:** ${rMember} (${rMember.user.id})
**- Reported by:** ${message.member}
**- Reported in:** ${message.channel}
Expand Down
4 changes: 2 additions & 2 deletions Ep_14/commands/moderation/say.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { RichEmbed } = require("discord.js");
const { MessageEmbed } = require("discord.js");

module.exports = {
name: "say",
Expand All @@ -17,7 +17,7 @@ module.exports = {
const roleColor = message.guild.me.highestRole.hexColor;

if (args[0].toLowerCase() === "embed") {
const embed = new RichEmbed()
const embed = new MessageEmbed()
.setDescription(args.slice(1).join(" "))
.setColor(roleColor === "#000000" ? "#ffffff" : roleColor);

Expand Down
4 changes: 2 additions & 2 deletions Ep_14/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ module.exports = {
getMember: function(message, toFind = '') {
toFind = toFind.toLowerCase();

let target = message.guild.members.get(toFind);
let target = message.guild.members.cache.get(toFind);

if (!target && message.mentions.members)
target = message.mentions.members.first();

if (!target && toFind) {
target = message.guild.members.find(member => {
target = message.guild.members.cache.find(member => {
return member.displayName.toLowerCase().includes(toFind) ||
member.user.tag.toLowerCase().includes(toFind)
});
Expand Down