Add means to send to stdin using jsk shell, lints

Author: scarletcafe

jishaku/features/shell.py

@@ -19,6 +19,8 @@
 import tempfile
 import typing
 
+import discord
+from discord import ui
 from discord.ext import commands
 
 from jishaku.codeblocks import Codeblock, codeblock_converter
@@ -70,6 +72,32 @@ class ShellFeature(Feature):
     Feature containing the shell-related commands
     """
 
+    class ShellStandardInputModal(ui.Modal, title="Type input"):
+        """Modal that prompts users for text to provide to stdin"""
+
+        stdin_content: ui.TextInput[ui.Modal] = ui.TextInput(label="Text", style=discord.TextStyle.short)
+
+        def __init__(self, reader: ShellReader, *args: typing.Any, **kwargs: typing.Any):
+            super().__init__(*args, timeout=300, **kwargs)
+            self.reader = reader
+
+        async def on_submit(self, interaction: discord.Interaction, /):
+            value = self.stdin_content.value or ""
+
+            if self.reader.process.stdin and self.reader.process.stdin.writable():
+                self.reader.process.stdin.write(f"{value}\r".encode('utf-8'))
+                self.reader.process.stdin.flush()
+
+                await interaction.response.send_message(
+                    content="Sent into stdin",
+                    ephemeral=True
+                )
+            else:
+                await interaction.response.send_message(
+                    content="Stdin is not writable",
+                    ephemeral=True
+                )
+
     @Feature.Command(parent="jsk", name="shell", aliases=["bash", "sh", "powershell", "ps1", "ps", "cmd", "terminal"])
     async def jsk_shell(self, ctx: ContextA, *, argument: codeblock_converter):  # type: ignore
         """
@@ -90,7 +118,13 @@ async def jsk_shell(self, ctx: ContextA, *, argument: codeblock_converter):  # t
                     paginator = WrappedPaginator(prefix=prefix, max_size=1975)
                     paginator.add_line(f"{reader.ps1} {argument.content}\n")
 
-                    interface = PaginatorInterface(ctx.bot, paginator, owner=ctx.author)
+                    async def send_standard_input(interaction: discord.Interaction):
+                        await interaction.response.send_modal(self.ShellStandardInputModal(reader))
+
+                    stdin_button = ui.Button(label="\N{KEYBOARD} Send standard input")
+                    stdin_button.callback = send_standard_input
+
+                    interface = PaginatorInterface(ctx.bot, paginator, owner=ctx.author, additional_buttons=[stdin_button])
                     self.bot.loop.create_task(interface.send_to(ctx))
 
                     async for line in reader:

jishaku/paginators.py

@@ -250,7 +250,7 @@ def to_component_dict(self) -> 'ButtonComponent':
         return self._underlying.to_dict()
 
 
-class PaginatorInterface(ui.View):  # pylint: disable=too-many-instance-attributes
+class PaginatorInterface(ui.View):  # pylint: disable=too-many-instance-attributes, too-many-public-methods
     """
     A message and reaction based interface for paginators.
 
@@ -287,7 +287,13 @@ class PaginatorInterface(ui.View):  # pylint: disable=too-many-instance-attribut
                 await interface.add_line("I'm still here!")
     """
 
-    def __init__(self, bot: BotT, paginator: commands.Paginator, additional_buttons: typing.Optional[typing.List[ui.Button[typing.Self]]] = None, **kwargs: typing.Any):
+    def __init__(
+        self,
+        bot: BotT,
+        paginator: commands.Paginator,
+        additional_buttons: typing.Optional[typing.List[ui.Button[typing.Self]]] = None,
+        **kwargs: typing.Any
+    ):
         if not isinstance(paginator, commands.Paginator):  # type: ignore
             raise TypeError('paginator must be a commands.Paginator instance')
 
@@ -318,13 +324,27 @@ def __init__(self, bot: BotT, paginator: commands.Paginator, additional_buttons:
 
         super().__init__(timeout=self.timeout_length)
 
-        self.button_start: DynamicButton[typing.Self] = DynamicButton(self.button_start_callback, self.button_start_label, style=discord.ButtonStyle.secondary)
-        self.button_previous: DynamicButton[typing.Self] = DynamicButton(self.button_previous_callback, self.button_previous_label, style=discord.ButtonStyle.secondary)
-        self.button_current: DynamicButton[typing.Self] = DynamicButton(self.button_current_callback, self.button_current_label, style=discord.ButtonStyle.primary)
-        self.button_next: DynamicButton[typing.Self] = DynamicButton(self.button_next_callback, self.button_next_label, style=discord.ButtonStyle.secondary)
-        self.button_last: DynamicButton[typing.Self] = DynamicButton(self.button_last_callback, self.button_last_label, style=discord.ButtonStyle.secondary)
-        self.button_goto: DynamicButton[typing.Self] = DynamicButton(self.button_goto_callback, self.button_goto_label, style=discord.ButtonStyle.primary)
-        self.button_close: DynamicButton[typing.Self] = DynamicButton(self.button_close_callback, self.button_close_label, style=discord.ButtonStyle.danger)
+        self.button_start: DynamicButton[typing.Self] = DynamicButton(
+            self.button_start_callback, self.button_start_label, style=discord.ButtonStyle.secondary
+        )
+        self.button_previous: DynamicButton[typing.Self] = DynamicButton(
+            self.button_previous_callback, self.button_previous_label, style=discord.ButtonStyle.secondary
+        )
+        self.button_current: DynamicButton[typing.Self] = DynamicButton(
+            self.button_current_callback, self.button_current_label, style=discord.ButtonStyle.primary
+        )
+        self.button_next: DynamicButton[typing.Self] = DynamicButton(
+            self.button_next_callback, self.button_next_label, style=discord.ButtonStyle.secondary
+        )
+        self.button_last: DynamicButton[typing.Self] = DynamicButton(
+            self.button_last_callback, self.button_last_label, style=discord.ButtonStyle.secondary
+        )
+        self.button_goto: DynamicButton[typing.Self] = DynamicButton(
+            self.button_goto_callback, self.button_goto_label, style=discord.ButtonStyle.primary
+        )
+        self.button_close: DynamicButton[typing.Self] = DynamicButton(
+            self.button_close_callback, self.button_close_label, style=discord.ButtonStyle.danger
+        )
 
         self.additional_buttons = additional_buttons or []
 
@@ -530,6 +550,7 @@ async def button_start_callback(self, interaction: discord.Interaction):  # pyli
         await interaction.response.edit_message(**self.send_kwargs)
 
     def button_start_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Label for returning to the first page (constant)"""
         return f"1 \u200b {self.emojis.start}"
 
     async def button_previous_callback(self, interaction: discord.Interaction):  # pylint: disable=unused-argument
@@ -539,6 +560,7 @@ async def button_previous_callback(self, interaction: discord.Interaction):  # p
         await interaction.response.edit_message(**self.send_kwargs)
 
     def button_previous_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Left arrow label for going to the previous page (constant)"""
         return str(self.emojis.back)
 
     async def button_current_callback(self, interaction: discord.Interaction):  # pylint: disable=unused-argument
@@ -547,6 +569,7 @@ async def button_current_callback(self, interaction: discord.Interaction):  # py
         await interaction.response.edit_message(**self.send_kwargs)
 
     def button_current_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Current page label (changes on page updates)"""
         return str(self.display_page + 1)
 
     async def button_next_callback(self, interaction: discord.Interaction):  # pylint: disable=unused-argument
@@ -556,6 +579,7 @@ async def button_next_callback(self, interaction: discord.Interaction):  # pylin
         await interaction.response.edit_message(**self.send_kwargs)
 
     def button_next_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Right arrow label for going to the next page (constant)"""
         return str(self.emojis.forward)
 
     async def button_last_callback(self, interaction: discord.Interaction):  # pylint: disable=unused-argument
@@ -565,6 +589,7 @@ async def button_last_callback(self, interaction: discord.Interaction):  # pylin
         await interaction.response.edit_message(**self.send_kwargs)
 
     def button_last_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Endstop label for going to the last page (changes on page count)"""
         return f"{self.emojis.end} \u200b {self.page_count}"
 
     class PageChangeModal(ui.Modal, title="Go to page"):
@@ -599,6 +624,7 @@ async def button_goto_callback(self, interaction: discord.Interaction):  # pylin
         await interaction.response.send_modal(self.PageChangeModal(self))
 
     def button_goto_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Label for selecting a page (constant)"""
         return "\N{RIGHTWARDS ARROW WITH HOOK} \u200b Go to page"
 
     async def button_close_callback(self, interaction: discord.Interaction):  # pylint: disable=unused-argument
@@ -613,6 +639,7 @@ async def button_close_callback(self, interaction: discord.Interaction):  # pyli
             await message.delete()
 
     def button_close_label(self, _button: ui.Button[typing.Self]) -> str:
+        """Label for closing the paginator (constant)"""
         return f"{self.emojis.close} \u200b Close paginator"
 
 

jishaku/repl/walkers.py

@@ -43,7 +43,7 @@ def visit_Return(self, node: ast.Return) -> typing.Union[ast.Return, ast.If]:
 
         # Otherwise, replace the return with a yield & valueless return
         return ast.If(
-            test=ast.NameConstant(
+            test=ast.Constant(
                 value=True,  # if True; aka unconditional, will be optimized out
                 lineno=node.lineno,
                 col_offset=node.col_offset
@@ -94,7 +94,7 @@ def visit_Delete(self, node: ast.Delete) -> ast.If:
         """
 
         return ast.If(
-            test=ast.NameConstant(
+            test=ast.Constant(
                 value=True,  # if True; aka unconditional, will be optimized out
                 lineno=node.lineno,
                 col_offset=node.col_offset
@@ -104,8 +104,8 @@ def visit_Delete(self, node: ast.Delete) -> ast.If:
                     # if 'x' in globals():
                     test=ast.Compare(
                         # 'x'
-                        left=ast.Str(
-                            s=target.id,
+                        left=ast.Constant(
+                            value=target.id,
                             lineno=node.lineno,
                             col_offset=node.col_offset
                         ),
@@ -137,8 +137,8 @@ def visit_Delete(self, node: ast.Delete) -> ast.If:
                                 ),
                                 args=[
                                     # 'x'
-                                    ast.Str(
-                                        s=target.id,
+                                    ast.Constant(
+                                        value=target.id,
                                         lineno=node.lineno,
                                         col_offset=node.col_offset
                                     )