From ebb3da0fdd1ea6bee608ddd6385d7d10f6b22c7e Mon Sep 17 00:00:00 2001 From: iandrice <128861127+uncleiansreadyrice@users.noreply.github.com> Date: Thu, 26 Oct 2023 09:26:31 -0400 Subject: [PATCH 1/4] Fixing spelling errors --- scnewsbot/bot.py | 10 +++++----- scnewsbot/extensions/announcements.py | 2 +- scnewsbot/extensions/templates.py | 8 ++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scnewsbot/bot.py b/scnewsbot/bot.py index ec7581f..da4f421 100644 --- a/scnewsbot/bot.py +++ b/scnewsbot/bot.py @@ -43,7 +43,7 @@ class CoreCog(commands.Cog, name="Core"): @commands.Cog.listener() async def on_ready(self) -> None: - print("The bot is now ready.") + print("The SC News Bot is now ready.") @commands.Cog.listener() async def on_message(self, message: discord.Message) -> None: @@ -61,11 +61,11 @@ class CoreCog(commands.Cog, name="Core"): embed = discord.Embed( color=self.bot.config.embed_color, title="Info", - description="SCNewsBot is a Discord bot created for the r/starcitizen\n Discord server to help with writing news posts.", - ) - embed.add_field( - name="Version", value=f"v{self.bot.version}+{self._get_version()}" + description="Empire Report is an instance of the SC News Bot created for the r/starcitizen Org Hub\n Discord server to help with writing news posts.", ) +# embed.add_field( +# name="Version", value=f"v{self.bot.version}+{self._get_version()}" +# ) embed.add_field( name="Library", value=f"discord.py v{discord.__version__}", inline=False ) diff --git a/scnewsbot/extensions/announcements.py b/scnewsbot/extensions/announcements.py index b562eb7..3313205 100644 --- a/scnewsbot/extensions/announcements.py +++ b/scnewsbot/extensions/announcements.py @@ -7,7 +7,7 @@ import discord from utils import can_publish_announcements ANNOUNCEMENT_BUILDER_TIMEOUT = 1200 -ANNOUNCEMENT_EMOJI = "👍" # <:upvote:354233015842635776> +ANNOUNCEMENT_EMOJI = "<:upvote:354233015842635776>" # <:upvote:354233015842635776> DEFAULT_IMAGE_URL = "https://media.discordapp.net/attachments/1062905729532571719/1123340546979676311/NewsDefault.jpg?width=810&height=180" INSTRUCTIONS = """\ 1. Title should not use any formatting. diff --git a/scnewsbot/extensions/templates.py b/scnewsbot/extensions/templates.py index 29ff4f2..67dd88a 100644 --- a/scnewsbot/extensions/templates.py +++ b/scnewsbot/extensions/templates.py @@ -40,16 +40,20 @@ PING_PREVIEWS = """\ - JP: `Jump Point` """ IDS = """\ -**Channels** +__**Channels:**__ +Server News - `1113146864804573285` Patch Notes - `585952222853201941` SC News - `569635458183856149` General News - `803341100618219540` -**Roles** +__**Roles:**__ Server News - `1113152142300156004` Patch Notes - `620025894559547412` SC News - `620025828079697920` General News - `803343410794594385` + +__**Where to post what:**__ +[Check here](https://discord.com/channels/82210263440306176/611922107345141760/1113905662217441330) for a guide on what post types go where. """ From f76b86416ac950bfe2baa015bf19898dc0eca309 Mon Sep 17 00:00:00 2001 From: Ian Date: Sun, 10 Mar 2024 00:21:05 -0500 Subject: [PATCH 2/4] Initial Commit --- scnewsbot/bot.py | 19 +++++++++++++++++-- scnewsbot/extensions/announcements.py | 4 ++-- scnewsbot/extensions/templates.py | 26 ++++++++++++++------------ 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/scnewsbot/bot.py b/scnewsbot/bot.py index da4f421..311dcc1 100644 --- a/scnewsbot/bot.py +++ b/scnewsbot/bot.py @@ -56,12 +56,27 @@ class CoreCog(commands.Cog, name="Core"): except discord.Forbidden: pass +# @commands.Cog.listener() +# async def on_message(self, message): +# if message.channel.id == 649390966259580929 and message.author.id != 1091116499936223252: +# if message.embeds: +# for embed in message.embeds: +# reply_channel = self.bot.get_channel(611922107345141760) +# if "Patch Notes" in embed.title: +# await reply_channel.send(f"<@&159107041896562688> CIG has published new [Patch Notes](<{embed.url}>).") +# elif "Galactapedia" in embed.title: +# await reply_channel.send(f"<@&159107041896562688> CIG has published a new [Galactapedia update](<{embed.url}>).") +# elif "This Week in Star Citizen" in embed.title: +# await reply_channel.send(f"<@&159107041896562688> CIG has published a new [TWISC](<{embed.url}>).") +# elif "Monthly Report" in embed.title: +# await reply_channel.send(f"<@&159107041896562688> CIG has published a new [Monthly Report](<{embed.url}>).") + @commands.hybrid_command(description="Shows you some info about the bot.") async def info(self, ctx: commands.Context) -> None: embed = discord.Embed( color=self.bot.config.embed_color, title="Info", - description="Empire Report is an instance of the SC News Bot created for the r/starcitizen Org Hub\n Discord server to help with writing news posts.", + description="The SC News Bot is a bot created for the r/starcitizen Discord server to help with writing news posts.", ) # embed.add_field( # name="Version", value=f"v{self.bot.version}+{self._get_version()}" @@ -71,7 +86,7 @@ class CoreCog(commands.Cog, name="Core"): ) embed.add_field( name="Authors", - value=f"Ian (<@1088892000348151839>), and mudkip (<@998070081709932654>)", + value=f"Ian (<@288522211164160010>), and mudkip (<@998070081709932654>)", ) view = discord.ui.View() view.add_item( diff --git a/scnewsbot/extensions/announcements.py b/scnewsbot/extensions/announcements.py index 3313205..15c0bc3 100644 --- a/scnewsbot/extensions/announcements.py +++ b/scnewsbot/extensions/announcements.py @@ -7,8 +7,8 @@ import discord from utils import can_publish_announcements ANNOUNCEMENT_BUILDER_TIMEOUT = 1200 -ANNOUNCEMENT_EMOJI = "<:upvote:354233015842635776>" # <:upvote:354233015842635776> -DEFAULT_IMAGE_URL = "https://media.discordapp.net/attachments/1062905729532571719/1123340546979676311/NewsDefault.jpg?width=810&height=180" +ANNOUNCEMENT_EMOJI = "<:upvote:354233015842635776>" +DEFAULT_IMAGE_URL = "https://cdn.discordapp.com/attachments/1113146864804573285/1214590384001515560/41bannerEisenlowe.png?ex=65f9aa71&is=65e73571&hm=1cd99b04925a778d05b6d1cd1ae804af083760b0c11cc7ae96d44491b1fcb3ff&" INSTRUCTIONS = """\ 1. Title should not use any formatting. 2. "Video" should only be used for YouTube or video links with pretty embeds. diff --git a/scnewsbot/extensions/templates.py b/scnewsbot/extensions/templates.py index 67dd88a..3f46636 100644 --- a/scnewsbot/extensions/templates.py +++ b/scnewsbot/extensions/templates.py @@ -33,6 +33,7 @@ PING_PREVIEWS = """\ - Dynamic Event: `Event Name PU/PTU` **General News** +- This Week in Star Citizen: 'This Week in Star Citizen' - Sneak Peek: `Weekly Sneak Peek` - Lore Post: `Lore Post: Name` - Dev Reply: `Dev Reply` @@ -40,19 +41,20 @@ PING_PREVIEWS = """\ - JP: `Jump Point` """ IDS = """\ -__**Channels:**__ -Server News - `1113146864804573285` -Patch Notes - `585952222853201941` -SC News - `569635458183856149` -General News - `803341100618219540` +__**Server News:**__ +Channel - `1113146864804573285` +Role - `1113152142300156004` +__**Patch Notes:**__ +Channel - `585952222853201941` +Role - `620025894559547412` +__**SC News:**__ +Channel - `569635458183856149` +Role - `620025828079697920` +__**General News:**__ +Channel - `803341100618219540` +Role - `803343410794594385` -__**Roles:**__ -Server News - `1113152142300156004` -Patch Notes - `620025894559547412` -SC News - `620025828079697920` -General News - `803343410794594385` - -__**Where to post what:**__ +__**Posting Locations:**__ [Check here](https://discord.com/channels/82210263440306176/611922107345141760/1113905662217441330) for a guide on what post types go where. """ From eb05229e347f6befffc2bc946bfa0832b718d100 Mon Sep 17 00:00:00 2001 From: Ian Date: Sun, 10 Mar 2024 00:24:49 -0500 Subject: [PATCH 3/4] readme update --- README.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 98624bf..f688f2c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ -# scnewsbot -A bot for the r/starcitizen Discord server. +# SC News Bot +The production version of the SC News Bot used by the r/StarCitizen Discord server for the production of news posts. -## Installation -1. Make sure you have installed [Python](https://python.org) (>=3.11), [Git](https://git-scm.org), and [Poetry](https://pypi.org/project/poetry). -2. Clone the repository to your hard drive. (`git clone https://github.com/mudkipdev/scnewsbot`) -3. Run `cd scnewsbot` and `poetry install` to install the required dependencies. -4. Copy the `example.config.toml` and `example.env` files to `config.toml` and `.env` respectively. -5. Edit the config files to your liking, then run the bot using `poetry run python scnewsbot` (This might also be `py`, `python3` or `python3.11` depending on your operating system). +## Details +- Coded by Ian (hencaric) and mudkip +- Original Code: https://github.com/mudkipdev/scnewsbot +- Join https://discord.gg/starcitizen for the best Star Citizen community on the internet -![](https://i.pinimg.com/originals/a8/3a/54/a83a543f8f669534b93eb503d0cb9e3d.jpg) + +![](https://cdn.discordapp.com/attachments/1113146864804573285/1214590384001515560/41bannerEisenlowe.png?ex=65f9aa71&is=65e73571&hm=1cd99b04925a778d05b6d1cd1ae804af083760b0c11cc7ae96d44491b1fcb3ff&) From d184bfe6ea944918ce67b7161c75d69eace93a28 Mon Sep 17 00:00:00 2001 From: Ian Date: Sun, 10 Mar 2024 00:41:23 -0500 Subject: [PATCH 4/4] Readme Update --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f688f2c..ac422ef 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,15 @@ # SC News Bot The production version of the SC News Bot used by the r/StarCitizen Discord server for the production of news posts. -## Details -- Coded by Ian (hencaric) and mudkip -- Original Code: https://github.com/mudkipdev/scnewsbot - Join https://discord.gg/starcitizen for the best Star Citizen community on the internet +## Version +3.1.0 + +## Authors +- Ian (hencaric) +https://github.com/hencaric +- mudkip +https://github.com/mudkipdev ![](https://cdn.discordapp.com/attachments/1113146864804573285/1214590384001515560/41bannerEisenlowe.png?ex=65f9aa71&is=65e73571&hm=1cd99b04925a778d05b6d1cd1ae804af083760b0c11cc7ae96d44491b1fcb3ff&)