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

Compare commits

base: r:9debca0e05b6961c1ac3821e27a3263d310446bd
Branches Tags
r:master
r:v4
...
compare: r:190d690d0376827747718952dece58426c773c3e
Branches Tags
r:v4
r:master

2 commits
9debca0e05 ... 190d690d03

Author SHA1 Message Date
monty
190d690d03 Merge branch 'master' of https://gitdab.com/r/thaldrin 2019-11-20 18:05:45 +01:00
monty
7f10c52bb6 fixing broken things uwu 2019-11-20 18:05:10 +01:00
4 changed files with 10 additions and 5 deletions
Show stats Expand all files Collapse all files

5
DiscordModules/General/help.js
View file

@ -15,6 +15,11 @@ module.exports = class Help extends Command {
}
async command(ctx) {
console.log(ctx.args);
let silent = [ '--nd', '--no-dev' ];
if (ctx.args.includes(silent)) {
console.log('is silent');
}
if (!ctx.args.length) {
const commands = [
[

2
DiscordModules/General/serverinfo.js
View file

@ -55,7 +55,7 @@ module.exports = class ServerInfo extends Command {
true
)
.addField('Region', ctx.utils.emotes.regions[ctx.guild.region] || ctx.guild.region, true)
.addField('Features', features.join(' **|** '));
.addField('Features', features.join(' **|** ') || 'None');
if (ctx.guild.vanityURLCode) {
Embed.addField(
'Vanity URL',

2
DiscordModules/General/userinfo.js
View file

@ -42,7 +42,7 @@ module.exports = class Userinfo extends Command {
Roles.push(`<@&${role[0]}>`);
}
Embed.setTitle(`Info on ${User.nickname}`)
Embed.setTitle(`Info on ${User.nickname || User.user.username}`)
.setColor(ctx.config.color)
.addField('Username', User.user.tag, true)
.addField('ID', User.user.id, true)

6
DiscordModules/Roleplay/nhold.js
View file

@ -43,13 +43,13 @@ module.exports = class nHold extends Command {
let req;
let Message;
await yiff.furrybot.nsfw.hold().then((E) => (req = E));
await yiff.sheri.nsfw.hold().then((E) => (req = E));
if (Settings.embeds) {
Message = new MessageEmbed()
.setColor(ctx.config.color)
.setImage(req)
.setFooter(`${ctx.client.user.username} - Provided by furry.bot`, ctx.client.user.avatarURL());
.setImage(req.url)
.setFooter(`${ctx.client.user.username} - Provided by sheri.bot`, ctx.client.user.avatarURL());
if (Line) {
Message.setDescription(Line);
}