Skip to content

Commit b59b540

Browse files
committed
Update: Classrole ID´s
1 parent 5328ee9 commit b59b540

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

plugins/calender.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from array import array
2-
from operator import contains
32
import hikari
43
import miru
54
import lightbulb
@@ -36,7 +35,7 @@ def getRaidMember(raid: dict):
3635
if member == []:
3736
raid_member = "**Currently no member joined**"
3837
break
39-
raid_member += "**"+str(member) + "**, "
38+
raid_member += "**"+str(member[:-2]) + "**, "
4039
print(raid_member)
4140
return raid_member
4241

@@ -78,17 +77,14 @@ def setRaidMember(id, member):
7877
def LoadRaidTerms(id):
7978
with open(RAID_TERMS_PATH+str(id)+'.txt','rb') as f:
8079
loaded_dict = pickle.load(f)
81-
print(loaded_dict)
8280
return loaded_dict
8381

84-
8582
@calendar_plugin.command
8683
@lightbulb.command('calendar', 'All Calendar relevant commands')
8784
@lightbulb.implements(lightbulb.SlashCommandGroup)
8885
async def calendarCommands(ctx):
8986
pass
9087

91-
9288
@calendarCommands.child
9389
@lightbulb.option('id', 'The UNIQUE ID for the Raid you looking for.', modifier=lightbulb.OptionModifier.CONSUME_REST, required=True, autocomplete=True)
9490
@lightbulb.command('show', 'shows the current calendar entrys', auto_defer= True, pass_options = True)
@@ -160,10 +156,12 @@ async def joinRaid(ctx: lightbulb.Context, id):
160156
async def showAllRaids(ctx: lightbulb.Context):
161157
raids = getRaidEvents()
162158
raid_string = ""
163-
for raid in raids:
164-
raid_string += "**"+ str(raid['id']) + ")**"+f"\tRaid: {raid['raid']} | Start: {raid['time']}pm @ {raid['date']}\n------------ Members: {len(raid['member'])} / 25\n"
165-
raid_string +='#############################################\n'
166-
159+
if len(raids) > 0:
160+
for raid in raids:
161+
raid_string += "**"+ str(raid['id']) + ")**"+f"\tRaid: {raid['raid']} | Start: {raid['time']}pm @ {raid['date']}\n------------ Members: {len(raid['member'])} / 25\n"
162+
raid_string +='#############################################\n'
163+
else:
164+
raid_string += "**No raids planned.**\n\nYou can create a new raid with '/calendar create'"
167165
new_embed = hikari.Embed(
168166
title="All current raid entry.",
169167
description="*The follow entrys exists:*\n\n"

plugins/config.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ def load_bot_setting():
5858
WARRIOR_LIST = './data/warrior_list.txt'
5959

6060
ROLE_DIC = {
61-
"Druid":"1081268640718004304",
62-
"DH": "1081610496681201798",
63-
"DK": "1081610633281286365",
64-
"Hunter": "1081611852049563760",
65-
"Mage": "1081269261512753243",
66-
"Monk":"1081610954074230866",
67-
"Shaman": "1081269599854661764",
68-
"Paladin": "1081268906020327445",
69-
"Priest": "1081610897878962207",
70-
"Rogue": "1081269600999706636",
71-
"Walock": "1081611096584114266",
72-
"Warrior": "1081610735207059547"
61+
"Druid":"1089202685070295072",
62+
"DH": "1089202682713096192",
63+
"DK": "1089202684013334689",
64+
"Hunter": "1089202688740298873",
65+
"Mage": "1089202690212511804",
66+
"Monk":"1089202691248492637",
67+
"Shaman": "1089202697728696411",
68+
"Paladin": "1089202692871704586",
69+
"Priest": "1089202694092243105",
70+
"Rogue": "1089202696122290319",
71+
"Walock": "1089202698596925542",
72+
"Warrior": "1089202699788111933"
7373
}
7474

7575

0 commit comments

Comments
 (0)