From 4c7213a0f5d83f4cbf0e4a05e7ad4ca3d9f5f2f7 Mon Sep 17 00:00:00 2001 From: Luis Mayo Valbuena Date: Thu, 13 Jan 2022 22:23:26 +0100 Subject: [PATCH] Added music --- main.py | 6 +++--- objection_engine | 2 +- render.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index c478030..a384bc7 100644 --- a/main.py +++ b/main.py @@ -121,7 +121,7 @@ async def queue(context): clean([], filename) @courtBot.command() -async def render(context, numberOfMessages: int): +async def render(context, numberOfMessages: int, music: str = 'pwr'): global renderQueue feedbackMessage = await context.send(content="`Fetching messages...`") try: @@ -152,7 +152,7 @@ async def render(context, numberOfMessages: int): if len(courtMessages) < 1: raise Exception("There should be at least one person in the conversation.") - newRender = Render(State.QUEUED, context, feedbackMessage, courtMessages) + newRender = Render(State.QUEUED, context, feedbackMessage, courtMessages, music) renderQueue.append(newRender) except Exception as exception: @@ -302,7 +302,7 @@ def renderThread(): if render.getState() == State.QUEUED: render.setState(State.INPROGRESS) try: - render_comment_list(render.getMessages(), render.getOutputFilename()) + render_comment_list(render.getMessages(), render.getOutputFilename(), music_code=render.music_code) render.setState(State.RENDERED) except Exception as exception: print(f"Error: {exception}") diff --git a/objection_engine b/objection_engine index c1294c8..d66a47c 160000 --- a/objection_engine +++ b/objection_engine @@ -1 +1 @@ -Subproject commit c1294c8daffecb231a21bb33b0bfb3892aece1fe +Subproject commit d66a47ca54005478859541a5e53ad6cfc76d0614 diff --git a/render.py b/render.py index d96cc22..d954971 100644 --- a/render.py +++ b/render.py @@ -15,12 +15,13 @@ class State(Enum): DONE = 5 class Render: - def __init__(self, state: State, discordContext: Context, feedbackMessage: Message, messages: List[Comment]): + def __init__(self, state: State, discordContext: Context, feedbackMessage: Message, messages: List[Comment], music: str): self.state = state self.discordContext = discordContext self.feedbackMessage = feedbackMessage self.messages = messages self.outputFilename = f"{str(discordContext.message.id)}.mp4" + self.music_code = music def getStateString(self): if self.state == State.QUEUED: