Skip to content

Commit ef2901a

Browse files
committed
BUGFIX:
- Mission upload did not work on mission directories with more then 25 subdirectories
1 parent 7fac2df commit ef2901a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

core/utils/discord.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ async def create_select(self) -> bool:
14591459
select.options = [
14601460
SelectOption(label=os.path.basename(x), value=x)
14611461
for x in sub_dirs if os.path.basename(x)
1462-
]
1462+
][:25]
14631463
return True
14641464
else:
14651465
select.options = [SelectOption(label="None", value="None")]
@@ -1582,7 +1582,8 @@ async def render(self, directory: str, ignore_list: list[str] | None = None) ->
15821582
embed = await view.render(init=True) or discord.utils.MISSING
15831583
try:
15841584
msg = await self.channel.send(embed=embed, view=view)
1585-
except Exception:
1585+
except Exception as ex:
1586+
self.log.exception(ex)
15861587
return None
15871588
try:
15881589
if await view.wait():

plugins/mission/commands.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2160,7 +2160,7 @@ async def on_message(self, message: discord.Message):
21602160
for node_name, node in self.locals.items():
21612161
if node_name == 'commands':
21622162
continue
2163-
if node_name == DEFAULT_TAG:
2163+
elif node_name == DEFAULT_TAG:
21642164
channel = node.get('uploads', {}).get('channel')
21652165
if channel:
21662166
if message.channel.id == channel:
@@ -2190,9 +2190,11 @@ async def on_message(self, message: discord.Message):
21902190
server = await MissionUploadHandler.get_server(message)
21912191

21922192
if not server:
2193+
self.log.debug("Mission upload: No server found, you are in the wrong channel!")
21932194
return
21942195

21952196
try:
2197+
self.log.debug(f"Uploading mission {message.attachments[0].filename} to server {server.name} ...")
21962198
handler = MissionUploadHandler(plugin=self, server=server, message=message, pattern=pattern)
21972199
base_dir = await handler.server.get_missions_dir()
21982200
ignore = ['.dcssb', 'Saves', 'Scripts']

0 commit comments

Comments
 (0)