joan/Haha-Yes
1
0
Fork 0
forked from Supositware/Haha-Yes
Code Pull requests Activity

Merge branch 'master' of https://gitlab.com/loicbersier/discordbot

Browse source
This commit is contained in:
loicbersier 2020-04-27 19:39:45 +02:00
commit 6365ed6003
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
commands/general/tweet.js
View file

@ -172,9 +172,10 @@ class tweetCommand extends Command {
.addField('Link', `https://twitter.com/i/status/${tweetid}`, true) .addField('Link', `https://twitter.com/i/status/${tweetid}`, true)
.addField('Tweet ID', tweetid, true) .addField('Tweet ID', tweetid, true)
.addField('Author', `${message.author.username} (${message.author.id})`, true) .addField('Author', `${message.author.username} (${message.author.id})`, true)
.addField('Guild', `${message.guild.name} (${message.guild.id})`, true)
.setTimestamp(); .setTimestamp();
if (message.guild) Embed.addField('Guild', `${message.guild.name} (${message.guild.id})`, true);
if (Attachment[0]) Embed.setImage(Attachment[0].url); if (Attachment[0]) Embed.setImage(Attachment[0].url);
channel = client.channels.resolve(twiChannel); channel = client.channels.resolve(twiChannel);

28
commands/utility/about.js
View file

@ -1,5 +1,7 @@
const { Command } = require('discord-akairo'); const { Command } = require('discord-akairo');
const donator = require('../../models').donator; const donator = require('../../models').donator;
const util = require('util');
const exec = util.promisify(require('child_process').exec);
class aboutCommand extends Command { class aboutCommand extends Command {
constructor() { constructor() {
@ -28,18 +30,22 @@ class aboutCommand extends Command {
description += 'No one :('; description += 'No one :(';
} }
exec('git rev-parse --short HEAD')
.then(out => {
console.log(out);
const aboutEmbed = this.client.util.embed()
.setColor(message.member ? message.member.displayHexColor : 'NAVY')
.setAuthor(this.client.user.username, this.client.user.avatarURL())
.setTitle('About me')
.setDescription(description)
.addField('Current commit', out.stdout)
.addField('Current owner: ', `${this.client.users.resolve(this.client.ownerID).username}#${this.client.users.resolve(this.client.ownerID).discriminator} (${this.client.ownerID})`)
.addField('Gitlab', 'https://gitlab.com/LoicBersier/DiscordBot', true)
.addField('Github', 'https://github.com/loicbersier/Haha-yes', true)
.setFooter(`Original bot made by ${this.client.users.resolve('267065637183029248').username}#${this.client.users.resolve('267065637183029248').discriminator} (267065637183029248)`); // Please don't change the "original bot made by"
const aboutEmbed = this.client.util.embed() message.channel.send(aboutEmbed);
.setColor(message.member ? message.member.displayHexColor : 'NAVY') });
.setAuthor(this.client.user.username, this.client.user.avatarURL())
.setTitle('About me')
.setDescription(description)
.addField('Current owner: ', `${this.client.users.resolve(this.client.ownerID).username}#${this.client.users.resolve(this.client.ownerID).discriminator} (${this.client.ownerID})`)
.addField('Gitlab', 'https://gitlab.com/LoicBersier/DiscordBot', true)
.addField('Github', 'https://github.com/loicbersier/Haha-yes', true)
.setFooter(`Original bot made by ${this.client.users.resolve('267065637183029248').username}#${this.client.users.resolve('267065637183029248').discriminator} (267065637183029248)`); // Please don't change the "original bot made by"
message.channel.send(aboutEmbed);
} }
} }