diff --git a/app/models/feed-data.js b/app/models/feed-data.js index ae78fc5..99f745e 100644 --- a/app/models/feed-data.js +++ b/app/models/feed-data.js @@ -85,13 +85,24 @@ module.exports = class FeedData { const channel = guild.channels.get(this.channelID), role = guild.roles.get(this.roleID); - channel.send((role ? role + " " : "") + latest) + channel.send((role || "") + formatPost(articles[0])) .catch(err => DiscordUtil.dateError(`Error posting in ${channel.id}: ${err.message || err}`)); } }); } }; +function formatPost(article) { + let message = ""; + if (article.title) + message += `\n**${article.title}**`; + if (article.content) + message += `\n${article.content}`; + if (article.link) + message += `\n\n${normaliseUrl(article.link)}`; + return message; +} + function normaliseUrl(url) { url = url.replace("https://", "http://"); //hacky way to treat http and https the same diff --git a/discord-bot-core/HandleMessage.js b/discord-bot-core/HandleMessage.js index 2b36987..2b83d33 100644 --- a/discord-bot-core/HandleMessage.js +++ b/discord-bot-core/HandleMessage.js @@ -1,6 +1,7 @@ -// @ts-ignore const Discord = require("discord.js"); +// @ts-ignore const ParentPackageJSON = require("../package.json"); +// @ts-ignore const InternalConfig = require("./internal-config.json"); /**@param param*/