r/thaldrin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

am dumb

Browse source
This commit is contained in:
codepupper 2019-11-11 18:08:27 +01:00
parent 30a1644d10
commit 314c1847ed
7 changed files with 52 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

27
DiscordModules/Roleplay/hug.js
View file

@ -23,13 +23,18 @@ module.exports = class Hug extends Command {
if (ctx.msg.mentions.members.first().id === ctx.author.id)
return ctx.send(`Don't you want to hug someone other than yourself?`);
const LineFromUtils = ctx.utils.int.hug[parseInt(Math.random() * ctx.utils.int.hug.length)];
let Line = LineFromUtils.replace(/0/g, ctx.utils.format.bold(ctx.author.username)).replace(
/1/g,
ctx.utils.format.bold(ctx.msg.mentions.members.first().user.username)
);
const Server = await ctx.db.servers.get(ctx.guild.id);
let Line;
if (Server === null) {
const LineFromUtils = ctx.utils.int.hug[parseInt(Math.random() * ctx.utils.int.hug.length)];
Line = LineFromUtils.replace(/0/g, ctx.utils.format.bold(ctx.author.username)).replace(
/1/g,
ctx.utils.format.bold(ctx.msg.mentions.members.first().user.username)
);
} else {
Line = undefined;
}
let Settings;
if (Server === null) {
Settings = ctx.utils.db.defaults.server;
@ -43,11 +48,17 @@ module.exports = class Hug extends Command {
if (Settings.embeds) {
Message = new MessageEmbed()
.setColor(ctx.config.color)
.setDescription(Line)
.setImage(req)
.setFooter(`${ctx.client.user.username} - Provided by furry.bot`, ctx.client.user.avatarURL());
if (Line) {
Message.setDescription(Line);
}
} else {
Message = `${req}`;
if (Line) {
Message = `${Line}\n${req}`;
} else {
Message = `${req}`;
}
}
ctx.send(Message);
}

10
DiscordModules/Roleplay/kiss.js
View file

@ -48,11 +48,17 @@ module.exports = class Kiss extends Command {
if (Settings.embeds) {
Message = new MessageEmbed()
.setColor(ctx.config.color)
.setDescription(Line)
.setImage(req)
.setFooter(`${ctx.client.user.username} - Provided by furry.bot`, ctx.client.user.avatarURL());
if (Line) {
Message.setDescription(Line);
}
} else {
Message = `${req}`;
if (Line) {
Message = `${Line}\n${req}`;
} else {
Message = `${req}`;
}
}
ctx.send(Message);
}

4
DiscordModules/Roleplay/nkiss.js
View file

@ -22,7 +22,8 @@ module.exports = class nKiss extends Command {
return ctx.send("Don't kiss me! Kiss someone else!");
if (ctx.msg.mentions.members.first().id === ctx.author.id)
return ctx.send(`Don't you want to kiss someone other than yourself?`);
const Server = await ctx.db.servers.get(ctx.guild.id);
let Line;
if (Server.rp_text) {
const LineFromUtils = ctx.utils.int.kiss[parseInt(Math.random() * ctx.utils.int.kiss.length)];
Line = LineFromUtils.replace(/0/g, ctx.utils.format.bold(ctx.author.username)).replace(
@ -33,7 +34,6 @@ module.exports = class nKiss extends Command {
Line = undefined;
}
const Server = await ctx.db.servers.get(ctx.guild.id);
let Settings;
if (Server === null) {
Settings = ctx.utils.db.defaults.server;

11
DiscordModules/Settings/prefix.js
View file

@ -8,7 +8,8 @@ module.exports = class Prefix extends Command {
module: 'Settings',
cooldown: 10,
guildOnly: true,
developerOnly: false
developerOnly: false,
AuthorPermissions: [ 'MANAGE_GUILD' ]
});
}
@ -32,7 +33,7 @@ module.exports = class Prefix extends Command {
.then(async () => {
let NServer = await ctx.db.servers.get(ctx.guild.id);
PrefixEmbed.setTitle(`Prefixes for ${ctx.guild.name}`);
PrefixEmbed.setDescription(`${NServer.prefix.join(', ') || ctx.db.defaults.server.prefix}`);
PrefixEmbed.setDescription(`${NServer.prefix.join(' | ') || ctx.db.defaults.server.prefix}`);
ctx.send(PrefixEmbed);
})
.catch((err) => ctx.send(err));
@ -42,9 +43,11 @@ module.exports = class Prefix extends Command {
if (ctx.args === [] || ctx.args.join(' ').trim() === '') return ctx.send('No Prefix was given');
ctx.utils.db.prefix
.remove(ctx, Prefix)
.then(async (r) => {
.then(async () => {
let NServer = await ctx.db.servers.get(ctx.guild.id);
ctx.send('Current Prefixes are:\n' + NServer.prefix.join(', '));
PrefixEmbed.setTitle(`Prefixes for ${ctx.guild.name}`);
PrefixEmbed.setDescription(`${NServer.prefix.join(' | ') || ctx.db.defaults.server.prefix}`);
ctx.send(PrefixEmbed);
})
.catch((err) => ctx.send(err));
break;