Compare commits
No commits in common. "a2000f8a19e1637c358dee5a986b56fbcb7fe67f" and "1559faeeb78717b7f468da754ea2350664939daf" have entirely different histories.
a2000f8a19
...
1559faeeb7
|
@ -1,6 +1,7 @@
|
|||
class Message {
|
||||
/**
|
||||
* @typedef {Object} MessageFields
|
||||
* @property {import('crypto').UUID} uuid
|
||||
* @property {import('discord.js').Snowflake} serverId
|
||||
* @property {string|null} serverName
|
||||
* @property {import('discord.js').Snowflake} authorId
|
||||
|
@ -9,6 +10,7 @@ class Message {
|
|||
*/
|
||||
|
||||
constructor(){
|
||||
this.uuid = require('crypto').randomUUID();
|
||||
this.serverId = 1;
|
||||
this.serverName = "[No Server]";
|
||||
this.authorId = 1;
|
||||
|
@ -34,6 +36,7 @@ class Message {
|
|||
|
||||
toArray(){
|
||||
return {
|
||||
uuid : this.uuid,
|
||||
serverId : this.serverId,
|
||||
serverName : this.serverName,
|
||||
authorId : this.authorId,
|
||||
|
|
|
@ -7,7 +7,7 @@ const { EmbedBuilder } = require("@discordjs/builders");
|
|||
* @param {Message} message
|
||||
* @param {Client} discord
|
||||
*/
|
||||
const send = (message, database, channelId , uuid , discord) => {
|
||||
const send = (message, database, channelId , discord) => {
|
||||
discord.channels.cache?.get(channelId).send({
|
||||
embeds: [
|
||||
new EmbedBuilder()
|
||||
|
@ -21,16 +21,7 @@ const send = (message, database, channelId , uuid , discord) => {
|
|||
iconURL: discord.user.displayAvatarURL()
|
||||
})
|
||||
]
|
||||
}).catch((error) => {
|
||||
console.log(`Unable to Send Message to Channel [${channelId}]`);
|
||||
}).then((_message) => {
|
||||
database.insert("xan.messageDelivery" ,{
|
||||
channelId: channelId,
|
||||
messageId : _message.id,
|
||||
client: "discord",
|
||||
link: uuid
|
||||
}, (uuid) => {});
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
module.exports = send;
|
|
@ -10,11 +10,11 @@ const initMessageManager = async (
|
|||
database,
|
||||
discord
|
||||
) => {
|
||||
function postMessage(message, uuid){
|
||||
function postMessage(message){
|
||||
database.list("xan.guilds" , {} , (list) => {
|
||||
for(var element of list){
|
||||
|
||||
if(element.client == "discord") discordSend(message , database , element.channelId ,uuid , discord);
|
||||
if(element.client == "discord") discordSend(message , data , element.channelId , discord);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -26,9 +26,6 @@ const initMessageManager = async (
|
|||
serverId : message.guild.id
|
||||
} , async (data) => {
|
||||
if(data !== null){
|
||||
|
||||
message.delete().catch((error) => {});
|
||||
|
||||
var _message = new Message();
|
||||
_message.authorId = message.author.id;
|
||||
_message.authorName = message.author.username;
|
||||
|
@ -36,9 +33,9 @@ const initMessageManager = async (
|
|||
_message.serverName = message.guild.name,
|
||||
_message.message = message.content;
|
||||
|
||||
database.insert("xan.messages" , _message.toArray() , (uuid) => {
|
||||
postMessage(_message.toArray(), uuid);
|
||||
});
|
||||
delete _message.uuid;
|
||||
|
||||
postMessage(_message.toArray());
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue