Minidodo/igncore
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Reduced & updated dependencies.

Browse Source 
By default, messages larger than 2.000 characters (sent via tells) get sent via slaves, if these exist.
Fixes #3
This commit is contained in:
Minidodo
2021-10-18 19:39:14 +02:00
parent dea25b05a5
commit bb445e868d
20 changed files with 124 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/standard/aou/aou_controller.py
+3 -4
View File
@@ -85,8 +85,7 @@ class AOUController:
obj.aou = self.text.make_chatcmd("AO-Universe.com", "/start https://www.ao-universe.com")
obj.text = self.format_bbcode_code(guide_info.text)
self.bot.send_mass_message(request.sender.char_id,
ChatBlob(guide_info.name, self.getresp("module/aou", "guide", {**obj})))
return ChatBlob(guide_info.name, self.getresp("module/aou", "guide", {**obj}))
@command(command="aou", params=[Const("all", is_optional=True), Any("search")], access_level="member",
description="Search for an AO-Universe guides")
@@ -117,9 +116,9 @@ class AOUController:
if count == 0:
return self.getresp("module/aou", "no_guide_search", {"search": search})
else:
self.bot.send_mass_message(request.sender.char_id, ChatBlob(
return ChatBlob(
self.getresp("module/aou", "search_guide_title" + ("_all" if include_all_matches else ""),
{"search": search, "count": count}), blob))
{"search": search, "count": count}), blob)
def retrieve_guide(self, guide_id):
cache_key = "%d.xml" % guide_id
modules/standard/news/mail_controller.py
+8 -10
View File
@@ -74,18 +74,16 @@ class MailController:
@command(command="mail", params=[Const('all', is_optional=True)], description="Show your mails",
access_level="member")
def mail_show(self, sender, const_all):
mails, title = None, "You dont have any unread mails."
if const_all:
mails = self.get_mails(sender.sender.char_id, True)
if mails:
self.bot.send_private_message(sender.sender.char_id, ChatBlob("All your recent Mails", mails))
else:
return "You dont have any mails."
mails, title = self.get_mails(sender.sender.char_id, True), "All your recent Mails"
else:
mails = self.get_mails(sender.sender.char_id)
if mails:
self.bot.send_private_message(sender.sender.char_id, ChatBlob("Your unread mails", mails))
else:
return "You dont have any unread mails."
mails, title = self.get_mails(sender.sender.char_id), "Your unread mails"
if mails:
self.bot.send_private_message(sender.sender.char_id, ChatBlob(title, mails))
else:
return title
@command(command="mail", params=[Options(["read"]), Int("ID")],
description="mark a mail as read", access_level="member")
modules/standard/news/news_controller.py
-35
View File
@@ -85,37 +85,6 @@ hh:mm - DD.MM.YYYY
f" [{self.text.make_chatcmd('orgs', '/tell <myname> orgs')}] " \
f"[{self.text.make_chatcmd('admins', '/tell <myname> admins')}]\n"
@event("connect", "prepare info msg")
def prepare_info(self, _, _1):
self.INFO = ChatBlob("Welcome", f"<font color=CCInfoText>You're getting this message,\n"
f"because you recently joined the clan alliance\n"
f"<highlight>The New Alliance</highlight> or in short "
f"<highlight>TNA</highlight>.\n"
f"I'm <notice><myname></notice>, a bot with the task to "
f"automate a few workflows around here,\n"
f"while making the life of everyone a bit easier.\n"
f"\n"
f"You can see a list of all my orgs by using "
f"{self.text.make_tellcmd('!orgs', 'orgs')}.\n"
f"Whenever you use {self.text.make_tellcmd('!online', 'online')} "
f"I'll show you who's currently around.\n"
f"We've got regular raids, you can view them by using "
f"{self.text.make_tellcmd('!raids', 'raids')}\n"
f"If you'd like to stay out, thats fine. Just turn all settings off here: "
f"{self.text.make_tellcmd('here', 'prefs')}\n"
f"\n"
f"If you encounter any issues, my administrators will help you. just ask them, "
f"you can find them all here: {self.text.make_tellcmd('!admins', 'admins')}\n"
f"\n"
f"<highlight>Thats it already. "
f"Thank you for taking your time to read this note. See you ingame!</highlight>"
f"</font>")
self.INFO = f"\n<yellow>________________\n\n" \
f" No need to <red>PANIC</red>!\n" \
f" [{self.text.paginate_single(self.INFO)}]\n" \
f" to our alliance!\n" \
f"________________</yellow>"
@event(event_type="member_logon", description="Send news to players logging in")
def logon_event(self, _, data):
if not self.bot.is_ready():
@@ -140,10 +109,6 @@ hh:mm - DD.MM.YYYY
discord,
self.preferences.get_pref_view_small(account))
# This one is kinda redudant now that the simple checks get done above, will remove it in the future.
if account.last_seen == 0 and self.setting_service.get_value('is_alliance_bot') == "1":
self.bot.send_mass_message(data.packet.char_id, self.INFO)
@command(command="raids", params=[], description="Show the Raids", access_level="member")
def show_raids(self, _):
with open("data/latest_raids.txt", "r") as f:
modules/standard/timers/timer_controller.py
+1 -1
View File
@@ -89,7 +89,7 @@ class TimerController:
blob += "\n\n<header>Manual Timers</header>\n"
for timer in data:
repeats = ""
if timer.repeating_every >= 0:
if timer.repeating_every > 0:
repeats = f" (Repeats every {self.util.time_to_readable(timer.repeating_every)})"
blob += f"<pagebreak>Name: <highlight>{timer.name}</highlight>\n"
blob += f"Time left: <highlight>" \
modules/standard/whois/character_info_controller.py
+1 -1
View File
@@ -120,7 +120,7 @@ class CharacterInfoController:
msg = ChatBlob(f"Basic Info for {char.name}", blob)
else:
msg = f"Could not find character <highlight>{char.name}</highlight> on RK{dimension:d}."
if request.channel == "msg":
if request.channel == "msg" and request.conn.id == "main":
self.bot.send_mass_message(request.sender.char_id, msg)
else:
request.reply(msg)