Skip to content

Commit 1fb3048

Browse files
committed
Tickets now ping genius role, nerf gun shows current player
1 parent e492b57 commit 1fb3048

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

modules/genius/genius.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from dis_snek.http_requests.channels import ChannelRequests
1818

1919
from storage.genius import Genius
20-
from utils.config import GUILD, PARTICIPANT_ROLE, MAX_TICKETS, ADMIN_ROLE
20+
from utils.config import GUILD, PARTICIPANT_ROLE, MAX_TICKETS, ADMIN_ROLE, GENIUS_ROLE
2121
from utils.embeds import GENIUS_BAR
2222
from utils.perms import NOT_EVERYBODY, ADMIN_ONLY, BOT_DEV_ONLY
2323

@@ -261,7 +261,7 @@ async def create_ticket(self, userId):
261261
)
262262

263263
msg = await tc.send(
264-
f"Hey <@{userId}>! Welcome to your support channel! Please explain your issue here and someone will help you shortly. Alternatively, join your assigned vc. To add your teammates to this ticket, type /add <name>. Remember to close the ticket after you're done!", # This text was definitely not stolen ;)
264+
f"<@&900761364426027059> bar\nHey <@{userId}>! Welcome to your support channel! Please explain your issue here and someone will help you shortly. Alternatively, join your assigned vc. \nTo add your teammates to this ticket, type /add <name>. Remember to close the ticket after you're done!", # This text was definitely not stolen ;)
265265
components=[button3]
266266
)
267267
await msg.pin()

modules/nerfgun/nerfgun.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,14 @@ async def get_out_queue(self, ctx):
156156
await ctx.send("You are already not in the queue :(", ephemeral=True)
157157

158158
async def _update_queue(self):
159-
text = "\n\n```\n"
160-
159+
text = "\n\n```\nNow playing:"
160+
if self.now_playing_user:
161+
text += f"{self.now_playing_user.display_name}\n\n"
162+
else:
163+
text += f"Nobody :(\n\n"
164+
161165
if self.nerf.queue_is_empty():
162-
text += "The queue is currently empty!"
166+
text += "\n\nThe queue is currently empty!"
163167
else:
164168
for index, user in enumerate(self.nerf.queue):
165169
u = await self.bot.get_user(user)

sample.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ ADMIN_ROLE=
44
BOT_DEV_ROLE=
55
LOGGING_LEVEL=
66
PARTICIPANT_ROLE=
7-
MAX_TICKETS=
7+
MAX_TICKETS=
8+
GENIUS_ROLE=

utils/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@
1515
LOGGING_LEVEL: int = int(environ.get("LOGGING_LEVEL", logging.DEBUG))
1616
PARTICIPANT_ROLE = environ.get("PARTICIPANT_ROLE")
1717
MAX_TICKETS: int = int(environ.get("MAX_TICKETS")) #This is probably a bad way to do this :)
18+
GENIUS_ROLE = environ.get("GENIUS_ROLE")

0 commit comments

Comments
 (0)