Readded - and + replacement and removed old file

This commit is contained in:
hencaric
2026-03-14 23:09:38 -04:00
parent d72fb3e7e5
commit beda6368bc
2 changed files with 27 additions and 133 deletions

View File

@@ -54,7 +54,7 @@ class Announcement:
publish: bool = False, publish: bool = False,
): ):
self.title = title self.title = title
self.description = description self.description = self.process_special_chars(description)
self.url = url self.url = url
self.image_url = image_url or DEFAULT_IMAGE_URL self.image_url = image_url or DEFAULT_IMAGE_URL
self.video_url = video_url self.video_url = video_url
@@ -85,6 +85,23 @@ class Announcement:
e.set_image(url=self.image_url) e.set_image(url=self.image_url)
return e return e
# ----------------- New helper -----------------
@staticmethod
def process_special_chars(text: str) -> str:
if not text:
return text
lines = text.splitlines()
processed_lines = []
for line in lines:
stripped = line.lstrip()
if stripped.startswith("-"):
processed_lines.append("" + stripped[1:].lstrip())
elif stripped.startswith("+"):
processed_lines.append("" + stripped[1:].lstrip())
else:
processed_lines.append(line)
return "\n".join(processed_lines)
# MODAL # MODAL
class TextModal(discord.ui.Modal): class TextModal(discord.ui.Modal):
def __init__(self, builder, field: str, label: str, long: bool = False): def __init__(self, builder, field: str, label: str, long: bool = False):
@@ -101,7 +118,14 @@ class TextModal(discord.ui.Modal):
self.add_item(self.input) self.add_item(self.input)
async def on_submit(self, interaction: discord.Interaction): async def on_submit(self, interaction: discord.Interaction):
setattr(self.builder.announcement, self.field, self.input.value) if self.field == "description":
setattr(
self.builder.announcement,
self.field,
Announcement.process_special_chars(self.input.value)
)
else:
setattr(self.builder.announcement, self.field, self.input.value)
self.builder.update_field_buttons() self.builder.update_field_buttons()
await interaction.response.edit_message( await interaction.response.edit_message(
embed=self.builder.announcement.embed(), embed=self.builder.announcement.embed(),
@@ -287,3 +311,4 @@ class Announcements(commands.Cog):
async def setup(bot: commands.Bot): async def setup(bot: commands.Bot):
await bot.add_cog(Announcements(bot)) await bot.add_cog(Announcements(bot))

View File

@@ -1,131 +0,0 @@
from discord.ext import commands
import discord
from extensions.announcements import Announcement
from utils import can_publish_announcements
# TEMPLATES
TEMPLATES: dict[str, Announcement] = {
"isc": Announcement(title="Inside Star Citizen | [topic] - [subtopic]"),
"scl": Announcement(title="Star Citizen Live | [topic] - [subtopic]"),
"tracker": Announcement(title="Progress Tracker Update | [date]"),
"roundup": Announcement(title="Roadmap Roundup | [date]"),
"patchnotes": Announcement(title="Star Citizen Alpha X.XX.X XPTU.XXXXXXX Patch Notes"),
"galactapedia": Announcement(title="Weekly Sneak Peek | [date]"),
"devreply": Announcement(title="Dev Reply | Topic"),
"twisc": Announcement(title="This Week in Star Citizen | Week of [date]"),
}
PING_PREVIEWS = """\
**Patch Notes**
- New Wave: `3.XX Wave X Release`
- PTU/EPTU/Tech-Preview/Evocati Update: `3.XX PTU Update`
- Live Update: `3.XX LIVE Update`
**SC News**
- ISC: `Inside Star Citizen`
- SCL: `Star Citizen Live`
- Progress Tracker: `Progress Tracker Update`
- Roadmap: `Roadmap Roundup`
- SC Monthly Report: `Star Citizen Monthly Report`
- SQ42 Monthly Report: `Squadron 42 Monthly Report`
- 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`
- Subscriber Items: `Month Subscriber Promotions`
- JP: `Jump Point`
"""
IDS = """\
__**Server News:**__
Channel - `1113146864804573285`
Role - `1113152142300156004`
__**Patch Notes:**__
Channel - `585952222853201941`
Role - `620025894559547412`
__**Evocati Patch Notes:**__
Channel - `585952222853201941`
Role - `1305975151858552862`
__**SC News:**__
Channel - `569635458183856149`
Role - `620025828079697920`
__**General News:**__
Channel - `803341100618219540`
Role - `803343410794594385`
__**MOTD:**__
Channel - `803341100618219540`
Role - `1310721100392435797`
__**Ping Previews:**__
[Check here](https://discord.com/channels/82210263440306176/611922107345141760/1228019382454849587)
__**Posting Locations:**__
[Check here](https://discord.com/channels/82210263440306176/611922107345141760/1113905662217441330) for a guide on what post types go where.
"""
# COG
class TemplatesCog(commands.Cog, name="Templates"):
def __init__(self, bot: commands.Bot) -> None:
self.bot = bot
self.templates = TEMPLATES
@commands.guild_only()
@commands.group(
brief="Commands that help with designing embeds for the news system.",
invoke_without_command=True,
)
async def templates(self, ctx: commands.Context) -> None:
await ctx.send_help(ctx.command)
@commands.check(can_publish_announcements)
@templates.command(name="list")
async def _list(self, ctx: commands.Context) -> None:
templates = "\n".join([f"- {template}" for template in self.templates])
await ctx.reply(f"Here are all of the available templates: ```\n{templates}```")
@commands.check(can_publish_announcements)
@templates.command()
async def view(self, ctx: commands.Context, *, template_name: str) -> None:
templates = {name.lower(): value for name, value in self.templates.items()}
template_name = template_name.lower()
template = templates.get(template_name)
if not template:
await ctx.reply(
f"Could not find that template. Use `{ctx.prefix}templates list` to list all available templates."
)
return
embed = template.embed()
embed.remove_author()
await ctx.reply(embed=embed)
@commands.check(can_publish_announcements)
@commands.command(brief='A shortcut to the "templates view" command.')
async def template(self, ctx: commands.Context, *, template_name: str) -> None:
await ctx.invoke(
self.bot.get_command("templates").get_command("view"),
template_name=template_name,
)
@commands.check(can_publish_announcements)
@commands.command(name="previews", brief="Shows all the possible ping previews.")
async def ping_previews(self, ctx: commands.Context) -> None:
await ctx.reply(
embed=discord.Embed(color=self.bot.config.embed_color, description=PING_PREVIEWS),
allowed_mentions=discord.AllowedMentions.none(),
)
@commands.check(can_publish_announcements)
@commands.command(brief="Shows all the channel and role IDs for announcements.")
async def ids(self, ctx: commands.Context) -> None:
await ctx.reply(
embed=discord.Embed(color=self.bot.config.embed_color, description=IDS)
)
# SETUP
async def setup(bot: commands.Bot) -> None:
await bot.add_cog(TemplatesCog(bot))