diff --git a/commands/chat.js b/commands/chat.js index 956cafb..4edb234 100644 --- a/commands/chat.js +++ b/commands/chat.js @@ -2,7 +2,7 @@ const { submitPromptTransaction } = require("../controllers/chatGptController"); const { SlashCommandBuilder } = require('discord.js'); const { DebugBuilder } = require("../utilities/debugBuilder"); const log = new DebugBuilder("server", "chat"); -const { EmbedBuilder } = require('discord.js'); +const { EmmeliaEmbedBuilder } = require('../libUtils'); module.exports = { @@ -39,7 +39,7 @@ module.exports = { submitPromptTransaction(promptText, temperature, maxTokens, discordAccountId, async (err, result) => { if (err) throw err; - const gptEmbed = new EmbedBuilder() + const gptEmbed = new EmmeliaEmbedBuilder() .setColor(0x0099FF) .setTitle(`New GPT response`) .setDescription(`${interaction.member.user} sent: '${promptText}'`) @@ -47,8 +47,7 @@ module.exports = { { name: 'Generated Text', value: result.promptResult }, ) .addFields({ name: 'Tokens Used', value: `${result.totalTokens}`, inline: true }) - .setTimestamp() - .setFooter({ text: 'Brought to you by Emmelia.' }); + .setTimestamp() await interaction.editReply({ embeds: [gptEmbed], ephemeral: false }); }); diff --git a/libCore.js b/libCore.js index e1c6728..e6f1322 100644 --- a/libCore.js +++ b/libCore.js @@ -95,7 +95,7 @@ exports.updateFeeds = async (client) => { if (parsedFeed?.items){ for (const post of parsedFeed.items){ - log.VERBOSE("Post from feed: ", post); + //log.VERBOSE("Post from feed: ", post); if (post.title && post.link && post.content && ( post.postId || post.guid || post.id ) && post.pubDate){ post.postId = post.postId ?? post.guid ?? post.id; postStorage.getRecordBy('post_guid', post.postId, (err, existingRecord) => { @@ -103,7 +103,7 @@ exports.updateFeeds = async (client) => { log.DEBUG("Existing post record: ", existingRecord); if (!existingRecord){ const channel = client.channels.cache.get(source.channel_id); - libUtils.sendPost(post, channel, (err, sendResults) =>{ + libUtils.sendPost(post, source, channel, (err, sendResults) =>{ if (err) throw err; if (sendResults){ diff --git a/libUtils.js b/libUtils.js index d252e7d..a06956e 100644 --- a/libUtils.js +++ b/libUtils.js @@ -3,6 +3,13 @@ const { DebugBuilder } = require("./utilities/debugBuilder"); const log = new DebugBuilder("server", "libUtils"); const { NodeHtmlMarkdown } = require('node-html-markdown'); +exports.EmmeliaEmbedBuilder = class PostEmbedBuilder extends EmbedBuilder { + constructor() { + super() + this.setFooter({ text: 'Brought to you by Emmelia.' }); + } +} + /** * sleep - sleep/wait * @constructor @@ -61,22 +68,27 @@ exports.onError = (error) => { } } -exports.sendPost = (post, channel, callback) => { - const title = post.title; - const link = post.link; - const content = NodeHtmlMarkdown.translate(post.content); +exports.sendPost = (post, source, channel, callback) => { + const postTitle = post.title; + const postLink = post.link; + const postContent = NodeHtmlMarkdown.translate(post.content); const postId = post.postId; - const pubDate = new Date(post.pubDate).toISOString() ?? new Date().toISOString(); - log.DEBUG("Sending an RSS post to discord", title, postId) + const postPubDate = new Date(post.pubDate).toISOString() ?? new Date().toISOString(); + var postSourceLink = new URL(source.link); + postSourceLink = postSourceLink.hostname; + const postImage = post.image ?? undefined; + log.DEBUG("Sending an RSS post to discord", postTitle, postId) - const rssMessage = new EmbedBuilder() + const rssMessage = new this.EmmeliaEmbedBuilder() .setColor(0x0099FF) - .setTitle(title) - .setURL(link) - .setDescription(`${content}`) - .addFields({ name: 'Published', value: pubDate, inline: true }) - .setTimestamp() - .setFooter({ text: 'Brought to you by Emmelia.' }); + .setTitle(postTitle) + .setURL(postLink) + .addFields({ name: "Post Content", value: postContent, inline: false }) + .addFields({ name: 'Published', value: postPubDate, inline: true }) + .addFields({ name: 'Source', value: postSourceLink, inline: true }) + .setTimestamp() + + if (postImage) rssMessage.setImage(postImage); try{ channel.send({ embeds: [rssMessage] });