From 55282dff20f242a3f8d2421314fc2661a932e0fa Mon Sep 17 00:00:00 2001 From: Benjamin Kyd Date: Sun, 19 Jul 2020 02:34:11 +0100 Subject: [PATCH] Do not run - most basic form of embedbuilder --- ServerMain | 39 +++++++++++++++++++++++++++++++++++++ ServerMain.pub | 1 + src/discordcommands.js | 10 +++++++++- src/discordembedbuilder.js | 40 ++++++++++++++++++++++++++++++++++++++ src/discordevents.js | 6 +++--- src/discordmiddleware.js | 0 6 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 ServerMain create mode 100644 ServerMain.pub create mode 100644 src/discordmiddleware.js diff --git a/ServerMain b/ServerMain new file mode 100644 index 0000000..5c953aa --- /dev/null +++ b/ServerMain @@ -0,0 +1,39 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABBhlxt6eL +Bs6RwE8O3pyvJ4AAAAEAAAAAEAAAGXAAAAB3NzaC1yc2EAAAADAQABAAABgQCnyKyQ8Oks +NDRTZGp63ow6ZdTWvyMpo53eEeB34gA4Fj10riu4nBN+tnhzLF8JcGc6RDRfEkvNpBNl3W +SSrlYgAEm1U97hbliYu1Gwf8JzK5wyq6P/PQJsMo21we5uwqsqujdrY8zuQlixizSTQaLM +N8Mj0xMngQ9QBOXfiTmI1IPBOM5D5vo6YBxJGB5/RiBzfQ2GP7mqu0818dE/soGxHYlReP +s69GlCTjOlXfZQrcEQiTLrnbkOwj2NjFechCx7/r36unEBBBlGqMZW1McAyr7JrcSdd9GC +b/O2/mKpvv1DzfsWhLlMC30wiz2zcYDmB9BvR+0ZPmdEX+VZNm3hJeNCKCqYxJg3I3CvBl +vvVmdv3xdZzzqi6MtDyx3h6MMFHBTIBpRz2j9DAiGQUSlokNzQ8EEqa2epxLY1FVgOEQUr +6q5sA/ekmh9n2guA6QkfXZQ0D8JTu927SSZsJ5BUa9FzKvgiVqFMTgcd7d9enPuv8uD++x +mtM2bSBiFDzP0AAAWQIgGzhPfQqzsSixZDLwgvEeIXKYaWezQW8mOvXXNyClDq6XVfvNXE +6V5xDvlgd0lXPZtV+zoFCARhVwhUwcFm7DD9mGEuB8o3i/LJd18f6UuhwP7y23jVFcPeOr +xsO6Ush773UedpdP0Mri2pM9o7LTshNB+NLWrryTHmNFlLP78HfBBUUBfeoBDOZt0OPPQD +lKuBYhbDirZHOmErHUwWqCPP+LvSd2l2Y9RthNwThKjQzbHvsA8fhQdiX8gn93slscZJVX +YTGXT9zzlvYYG8zSI3ltHp+CmF9qAN28yJFAjFkDbDpjISEHuNn15dLgrt7/2l8qFgvndo +0LrqnT/9ZkDR5nuec+AkvcOnVcAZ/WhQU/EhBuedHo9wVo+dBk7tYcdcRohIqwqY+dbDab +D020sUpjiWDhLvxUT6PUvJukXABlTMGGe43hbm975dIvGdf4PoasbuktPAUUa5uNJcCbls +ajDdq0np70cfppYTZdZvf8eJ0/S1Faox69RrxPmXHS42DZckXtAdqctWFN/eHNA3I7nHYw +H3MEdYBQVg5UHKmG4tIjDnVB0vFRLWGLY8TLl3NRqDKAT7vOe6BhuRwfN95OBQtoslCWL4 +GtF8wBaKW3BOx906LBMBU9WxXzPHzFpd2LdRiKV/F+Eveu/S7bFXg6TGBy8Qn7VUH/m6EV +tLr+89GaLol047U+lB7G6YRZ5+Ge93oNZUkm4tSsc8keCDXhGHXvC8EaGGuR7+RHpSHJyV +HYy8HVJ5V2dU+sjYZHSYYDsCaU3OHc3ovOIfpBmeXOAcEPlpT/pIN2WrzQoOOrpy7dQFy2 +A8+zrHN9DppzAuIy8qhlp5Zgq9G4GyYcgfOqQl+8YQ0SJlol/bM2UBGhPbSpyf2GzX1ak2 +9W2tBK+k/QrfKw8IL/mrVeO6AaJISwNwTazw4kWDvHrozY8odX+urAAdC7zexrfV+i49HU +j6PWIdKWboaTq4BP/q28EG4rpj7BVpyOd/+nmqNc+b/7w11SZjc/nngk/oBJdNGz02sl5i +E2ztICko0Fdwitw4c4W7BJz/gsW5RP/zEIYRqe6xKqm+Ie33U/GSRybMn2F08YPFOM3MmZ +8ay2LYJtHotIxtaoNmCeW9QgVVmVkAOKxF2aV1xG1PYyyXnGuch8c7joqToTiKp8gJ1l1v +/6bpY61//+ZgXdKWGbiIegthjofQqENz6j8JyeHVSdoJSY8HA42yb8KioHyjAFa8n/4Dev +ccNXXW/vVqWYamol+40k3gtMKNjGukmQjBBxifhl4vEPoaNzMx0fZy3UrDLk0h+k3sx4LZ +Owh5AjAfCdmK+5tP5KRsbvMMR1pzn+fH3PRuVEvYxj98XZH5Q8bro8pOEsRR90zgrLhZSX +HU2Ogd3I+YaD+MYWQ9XSoIpGTfOE6z8dMkajOyXVkQoa9vkdhgE8zaGUTQfFkT4w74mpb2 +L/539OlPf/Wz6o5BHqTSeXcQijKb14jpksoNzPQxW+y1Vx5KXBVp+SGWSl41FE3RZvvHnE +HtbYTfbe+NhTusmmwYHvRwFny/WjQMH/keFDz9a3mSV7vNwp9hkfglVbwZyGHcPnpsNGuq +1Z1XDolPqoRWMi4N2X4PfrXjttWApT1uFZmrZgXXkWVcyGyxGQn/ZHFFt1s7wdDAW1h58t +mG3i33N6bLA/ebyQi25gIPVudGGvCJVtEbLepYAhZ3eAUNFLMfXWCqj26atrdqD/VaPzYV +ClKQpht+AsvTXW25TAHm0y1fMsxA/raGfvh+2RecEaVrByR+HjYrWJ6JKuqjIgYU8Khl3C +CbHBbFuytU8ld/5kVVu5pWqbwes/hWAc7u7sY9u5ttaXHuNBCGMCNQc+WoiHUTDEkF4THr +Ic0Zcijf75QiZGOIFyjLTP6gpes= +-----END OPENSSH PRIVATE KEY----- diff --git a/ServerMain.pub b/ServerMain.pub new file mode 100644 index 0000000..35fe6e9 --- /dev/null +++ b/ServerMain.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCnyKyQ8OksNDRTZGp63ow6ZdTWvyMpo53eEeB34gA4Fj10riu4nBN+tnhzLF8JcGc6RDRfEkvNpBNl3WSSrlYgAEm1U97hbliYu1Gwf8JzK5wyq6P/PQJsMo21we5uwqsqujdrY8zuQlixizSTQaLMN8Mj0xMngQ9QBOXfiTmI1IPBOM5D5vo6YBxJGB5/RiBzfQ2GP7mqu0818dE/soGxHYlRePs69GlCTjOlXfZQrcEQiTLrnbkOwj2NjFechCx7/r36unEBBBlGqMZW1McAyr7JrcSdd9GCb/O2/mKpvv1DzfsWhLlMC30wiz2zcYDmB9BvR+0ZPmdEX+VZNm3hJeNCKCqYxJg3I3CvBlvvVmdv3xdZzzqi6MtDyx3h6MMFHBTIBpRz2j9DAiGQUSlokNzQ8EEqa2epxLY1FVgOEQUr6q5sA/ekmh9n2guA6QkfXZQ0D8JTu927SSZsJ5BUa9FzKvgiVqFMTgcd7d9enPuv8uD++xmtM2bSBiFDzP0= ben@ben-MANJARO diff --git a/src/discordcommands.js b/src/discordcommands.js index a489abd..7c0d2ce 100644 --- a/src/discordcommands.js +++ b/src/discordcommands.js @@ -2,6 +2,7 @@ const Logger = require('./logger.js'); const Database = require('./database.js'); const Discord = require('./discord.js'); const DiscordHelpers = require('./discordhelpers.js'); +const DiscordEmbed = require('./discordembedbuilder.js'); let Commands = []; @@ -32,7 +33,8 @@ module.exports.registerCommands = async function() module.exports.newMessage = async function(message) { - // console.log(message.content); + // dont respond to bots lol + if (message.author.bot) return; // If there is no guild in the prefix cache if (!GuildsAndPrefixs[message.guildID]) @@ -54,6 +56,12 @@ module.exports.newMessage = async function(message) } } + // THIS IS JUST FOR TESTING + let content = {}; + content.embed = new DiscordEmbed({title:message.content}).GetSendableObject + let logchannel = (await Database.FetchGuild(message.guildID)).logchannel; + Discord.bot.createMessage(logchannel, content); + const msg = message.content.split(' '); // does the message start with the prefix diff --git a/src/discordembedbuilder.js b/src/discordembedbuilder.js index e69de29..3cd640d 100644 --- a/src/discordembedbuilder.js +++ b/src/discordembedbuilder.js @@ -0,0 +1,40 @@ + +// Discord embed bulilder seeing as eris doesn't specify that +// the webserver and thus the thing will be written in go(?) +// regardless, this just builds embeds and im not sure why +// im defining webserver behaviour here +class RichEmbed +{ + + constructor(e) + { + // defines that it's a richembed + // which is all i'll be supporting + // because nothing else is really needed lol + this._type = 'rich'; + + e.title ? this._title = e.title : this._title = 'Title Undefined'; + + } + + get GetSendableObject() + { + return { + title: this._title, + type: this._type, + description: "BRUH", + // url: this._url, + // timestamp: this._timestamp, + // color: this._color, + // footer: this._footer, + // image: this._image, + // thumbnail: this._thumbnail, + // video: this._video, + // provider: this._provider, + // author: this._author, + // fields: this._fields + } + } +} + +module.exports = RichEmbed; diff --git a/src/discordevents.js b/src/discordevents.js index b901b55..b1fbdd1 100644 --- a/src/discordevents.js +++ b/src/discordevents.js @@ -6,9 +6,9 @@ module.exports.setup = async function() { Logger.info('Setting up discord listeners'); - Discord.bot.on('channelCreate', async (channel) => {}); - Discord.bot.on('channelDelete', async (channel) => {}); - Discord.bot.on('channelPinUpdate', async (channel, timestamp, oldtimestamp) => {}); + Discord.bot.on('channelCreate', async (channel) => {ChannelCreate(channel)}); + Discord.bot.on('channelDelete', async (channel) => {ChannelDelete(channel)}); + Discord.bot.on('channelPinUpdate', async (channel, timestamp, oldtimestamp) => {ChannelPinUpdate()}); Discord.bot.on('channelUpdate', async (channel, oldchannel) => {}); Discord.bot.on('guildBanAdd', async (guild, user) => {}); Discord.bot.on('guildBanRemove', async (guild, user) => {}); diff --git a/src/discordmiddleware.js b/src/discordmiddleware.js new file mode 100644 index 0000000..e69de29