diff --git a/example_settings.ini b/example_settings.ini index 0ffa5e0..79935a5 100644 --- a/example_settings.ini +++ b/example_settings.ini @@ -8,4 +8,3 @@ nsfw_blacklist = blacklisted_users = sudo_users = bot_name = a name like jeff -lydia_key = lydia API key diff --git a/requirements.txt b/requirements.txt index 0c36408..465374a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ aiodns aiohttp cchardet -coffeehouse cryptg gTTS hachoir diff --git a/ubot/modules/fun.py b/ubot/modules/fun.py index 6b5c1a9..a24e805 100644 --- a/ubot/modules/fun.py +++ b/ubot/modules/fun.py @@ -25,41 +25,40 @@ moo_answers = [ ] -if not ldr.settings.get_config("lydia_key"): - @ldr.add(f"{bot_name}(,|) (are|am|is|will|should|can|have|was|were|does|did|may|do)", simple_pattern=True, hide_help=True) - async def ask_bot(event): - if event.args: - await event.reply(choice(yesno_answers)) +@ldr.add(f"{bot_name}(,|) (are|am|is|will|should|can|have|was|were|does|did|may|do)", simple_pattern=True, hide_help=True) +async def ask_bot(event): + if event.args: + await event.reply(choice(yesno_answers)) - @ldr.add(f"{bot_name}(,|) say", simple_pattern=True, hide_help=True) - async def say_something(event): - if event.args: - if event.is_reply: - reply = await event.get_reply_message() - await reply.reply(event.args) - else: - await event.client.send_message(event.chat, event.args) +@ldr.add(f"{bot_name}(,|) say", simple_pattern=True, hide_help=True) +async def say_something(event): + if event.args: + if event.is_reply: + reply = await event.get_reply_message() + await reply.reply(event.args) + else: + await event.client.send_message(event.chat, event.args) + + try: + await event.delete() + except: + pass + + +@ldr.add(f"{bot_name}(,|) edit to", simple_pattern=True, hide_help=True, sudo=True) +async def edit_message(event): + if event.args: + if event.is_reply: + reply = await event.get_reply_message() try: + await reply.edit(event.args) await event.delete() except: pass - @ldr.add(f"{bot_name}(,|) edit to", simple_pattern=True, hide_help=True, sudo=True) - async def edit_message(event): - if event.args: - if event.is_reply: - reply = await event.get_reply_message() - - try: - await reply.edit(event.args) - await event.delete() - except: - pass - - @ldr.add(f"let the bodies hit the", simple_pattern=True, hide_help=True) async def floor(event): if not event.args: diff --git a/ubot/modules/lydia.py b/ubot/modules/lydia.py deleted file mode 100644 index 7b3edbf..0000000 --- a/ubot/modules/lydia.py +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -from functools import partial - -from coffeehouse import LydiaAI - -from ubot.micro_bot import ldr - -bot_name = ldr.settings.get_config("bot_name") or "bot" - -if ldr.settings.get_config("lydia_key"): - lydia_ai = LydiaAI(ldr.settings.get_config("lydia_key")) - session = lydia_ai.create_session("en") - - @ldr.add(f"{bot_name}(,|)", simple_pattern=True, hide_help=True) - async def talk_to_lydia(event): - if event.args: - thought_text = await event.client.loop.run_in_executor(ldr.thread_pool, partial(async_think, event.args)) - await event.reply(thought_text) - - def async_think(text): - return_text = session.think_thought(text) - return return_text