Skip to content

Commit 6a82491

Browse files
Merge pull request #43 from Skyward-Brawlhalla/skyward-clan-member-role-bug-fix
Fix bug where qss always returns nothing in skyward server.
2 parents 4574180 + f3477cf commit 6a82491

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed
59 Bytes
Binary file not shown.

command_discord_update.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import discord
22
import json
33

4-
clan_member_role_name = '💧 Dair 💧'
5-
64
class DiscordAccount:
75
def __init__(self, id, name):
86
self.id = id
97
self.name = name
108

119

1210
async def update_discord_data(ctx):
11+
if ctx.guild.name == "Dair":
12+
clan_member_role_name = '💧 Dair 💧'
13+
elif ctx.guild.name == "Skyward":
14+
clan_member_role_name = 'Clan Member'
1315
guild = ctx.guild
1416
msg = ''
1517
num = 1

data_clan_Skyward.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"clan_id": 84648, "clan_name": "Skyward", "clan_create_date": 1469763610, "clan_xp": "14690311", "clan": [{"brawlhalla_id": 6433263, "name": "Zwergennest", "rank": "Member", "join_date": 1618333318, "xp": 240527}, {"brawlhalla_id": 49936771, "name": "Hunter", "rank": "Officer", "join_date": 1618949986, "xp": 590587}, {"brawlhalla_id": 9316238, "name": "~N\u00c3\u00bfm?!\u00e2\u0084\u00a2", "rank": "Officer", "join_date": 1630749984, "xp": 211866}, {"brawlhalla_id": 71428893, "name": "zDisigma", "rank": "Member", "join_date": 1631063079, "xp": 250580}, {"brawlhalla_id": 6202261, "name": "Linox", "rank": "Member", "join_date": 1633609381, "xp": 240928}, {"brawlhalla_id": 5708299, "name": "55p", "rank": "Member", "join_date": 1638807175, "xp": 103779}, {"brawlhalla_id": 8615459, "name": "Hidetsu?!", "rank": "Member", "join_date": 1644348435, "xp": 56881}, {"brawlhalla_id": 35913608, "name": "rufus", "rank": "Member", "join_date": 1645191275, "xp": 92680}, {"brawlhalla_id": 43227947, "name": "Mogzy", "rank": "Member", "join_date": 1646239755, "xp": 56374}, {"brawlhalla_id": 26358569, "name": "Uncle Timmy", "rank": "Member", "join_date": 1646239982, "xp": 65298}, {"brawlhalla_id": 74662063, "name": "Roddd", "rank": "Leader", "join_date": 1647024356, "xp": 28138}, {"brawlhalla_id": 84499165, "name": "Kaizaar", "rank": "Member", "join_date": 1649621274, "xp": 68057}, {"brawlhalla_id": 2658232, "name": "gonconist", "rank": "Member", "join_date": 1650631486, "xp": 14671}, {"brawlhalla_id": 61355963, "name": "EARFQUAKE", "rank": "Officer", "join_date": 1651247127, "xp": 21660}, {"brawlhalla_id": 40660695, "name": "twitch.tv/friendlyherobrn", "rank": "Member", "join_date": 1653504781, "xp": 59538}, {"brawlhalla_id": 47231784, "name": "Fochino", "rank": "Member", "join_date": 1653659995, "xp": 33208}, {"brawlhalla_id": 9317622, "name": "Hitaku", "rank": "Member", "join_date": 1653661551, "xp": 7177}, {"brawlhalla_id": 10202957, "name": "Kolibric", "rank": "Member", "join_date": 1653863883, "xp": 18591}, {"brawlhalla_id": 54509175, "name": "RicoDelPablo", "rank": "Member", "join_date": 1653863893, "xp": 59299}, {"brawlhalla_id": 56177224, "name": "EvilGaming69", "rank": "Member", "join_date": 1654464708, "xp": 32233}, {"brawlhalla_id": 2148597, "name": "Guffe", "rank": "Member", "join_date": 1654515637, "xp": 10021}, {"brawlhalla_id": 54489626, "name": "RealPordenone728", "rank": "Member", "join_date": 1654696669, "xp": 14296}, {"brawlhalla_id": 3577224, "name": "Zerk", "rank": "Member", "join_date": 1654950412, "xp": 32071}, {"brawlhalla_id": 42952335, "name": "Domagoj_playz", "rank": "Member", "join_date": 1655117007, "xp": 32736}, {"brawlhalla_id": 24642609, "name": "Marwini", "rank": "Member", "join_date": 1655138202, "xp": 27888}, {"brawlhalla_id": 79985611, "name": "klopj", "rank": "Member", "join_date": 1655656388, "xp": 4214}, {"brawlhalla_id": 55666789, "name": "bring me the horizon", "rank": "Member", "join_date": 1655713688, "xp": 17347}, {"brawlhalla_id": 33893717, "name": "professional_gamer09(french)", "rank": "Member", "join_date": 1656361020, "xp": 32099}, {"brawlhalla_id": 7124064, "name": "woven", "rank": "Member", "join_date": 1657367800, "xp": 8642}, {"brawlhalla_id": 39794122, "name": "Dex", "rank": "Member", "join_date": 1658439015, "xp": 11003}, {"brawlhalla_id": 6244176, "name": "Abdul Rahman Der 2th", "rank": "Member", "join_date": 1658523838, "xp": 35986}, {"brawlhalla_id": 56793941, "name": "G\u00c3\u00b8d-s\u00c3\u00b1\u00c3\u00aep\u00c3\u00aar", "rank": "Member", "join_date": 1659878282, "xp": 19203}, {"brawlhalla_id": 1042492, "name": "Nin", "rank": "Member", "join_date": 1660216439, "xp": 3362}, {"brawlhalla_id": 74627743, "name": "Pseudo", "rank": "Member", "join_date": 1660568890, "xp": 7945}, {"brawlhalla_id": 28054305, "name": "hah, balls", "rank": "Member", "join_date": 1661082788, "xp": 8316}, {"brawlhalla_id": 8774115, "name": "\u00f0\u009f\u008c\u009fpolar bear", "rank": "Member", "join_date": 1661433540, "xp": 6264}, {"brawlhalla_id": 3038693, "name": "e n e r g y z ?", "rank": "Member", "join_date": 1661524659, "xp": 4709}, {"brawlhalla_id": 57803303, "name": "Tayson", "rank": "Member", "join_date": 1661525294, "xp": 2709}, {"brawlhalla_id": 71629540, "name": "space", "rank": "Member", "join_date": 1661687066, "xp": 2922}, {"brawlhalla_id": 85781996, "name": "noregion", "rank": "Member", "join_date": 1661706905, "xp": 2808}]}
1+
{"clan_id": 84648, "clan_name": "Skyward", "clan_create_date": 1469763610, "clan_xp": "14703000", "clan": [{"brawlhalla_id": 6433263, "name": "Zwergennest", "rank": "Member", "join_date": 1618333318, "xp": 240925}, {"brawlhalla_id": 49936771, "name": "Hunter", "rank": "Officer", "join_date": 1618949986, "xp": 590868}, {"brawlhalla_id": 9316238, "name": "~N\u00c3\u00bfm?!\u00e2\u0084\u00a2", "rank": "Officer", "join_date": 1630749984, "xp": 212623}, {"brawlhalla_id": 71428893, "name": "zDisigma", "rank": "Member", "join_date": 1631063079, "xp": 250904}, {"brawlhalla_id": 6202261, "name": "Linox", "rank": "Member", "join_date": 1633609381, "xp": 241656}, {"brawlhalla_id": 5708299, "name": "55p", "rank": "Member", "join_date": 1638807175, "xp": 104483}, {"brawlhalla_id": 8615459, "name": "Hidetsu?!", "rank": "Member", "join_date": 1644348435, "xp": 57534}, {"brawlhalla_id": 35913608, "name": "rufus", "rank": "Member", "join_date": 1645191275, "xp": 92680}, {"brawlhalla_id": 43227947, "name": "Mogzy", "rank": "Member", "join_date": 1646239755, "xp": 56374}, {"brawlhalla_id": 26358569, "name": "Uncle Timmy", "rank": "Member", "join_date": 1646239982, "xp": 65298}, {"brawlhalla_id": 74662063, "name": "Roddd", "rank": "Leader", "join_date": 1647024356, "xp": 28138}, {"brawlhalla_id": 84499165, "name": "Kaizaar", "rank": "Member", "join_date": 1649621274, "xp": 68300}, {"brawlhalla_id": 2658232, "name": "gonconist", "rank": "Member", "join_date": 1650631486, "xp": 14671}, {"brawlhalla_id": 61355963, "name": "EARFQUAKE", "rank": "Officer", "join_date": 1651247127, "xp": 22016}, {"brawlhalla_id": 40660695, "name": "twitch.tv/friendlyherobrn", "rank": "Member", "join_date": 1653504781, "xp": 59538}, {"brawlhalla_id": 47231784, "name": "Fochino", "rank": "Member", "join_date": 1653659995, "xp": 33208}, {"brawlhalla_id": 9317622, "name": "Hitaku", "rank": "Member", "join_date": 1653661551, "xp": 7177}, {"brawlhalla_id": 10202957, "name": "Kolibric", "rank": "Member", "join_date": 1653863883, "xp": 18591}, {"brawlhalla_id": 54509175, "name": "RicoDelPablo", "rank": "Member", "join_date": 1653863893, "xp": 60252}, {"brawlhalla_id": 56177224, "name": "EvilGaming69", "rank": "Member", "join_date": 1654464708, "xp": 32233}, {"brawlhalla_id": 2148597, "name": "Guffe", "rank": "Member", "join_date": 1654515637, "xp": 10021}, {"brawlhalla_id": 54489626, "name": "RealPordenone728", "rank": "Member", "join_date": 1654696669, "xp": 14296}, {"brawlhalla_id": 3577224, "name": "Zerk", "rank": "Member", "join_date": 1654950412, "xp": 32607}, {"brawlhalla_id": 42952335, "name": "Domagoj_playz", "rank": "Member", "join_date": 1655117007, "xp": 32736}, {"brawlhalla_id": 24642609, "name": "Marwini", "rank": "Member", "join_date": 1655138202, "xp": 27888}, {"brawlhalla_id": 79985611, "name": "klopj", "rank": "Member", "join_date": 1655656388, "xp": 4214}, {"brawlhalla_id": 55666789, "name": "bring me the horizon", "rank": "Member", "join_date": 1655713688, "xp": 17347}, {"brawlhalla_id": 33893717, "name": "professional_gamer09(french)", "rank": "Member", "join_date": 1656361020, "xp": 32530}, {"brawlhalla_id": 7124064, "name": "woven", "rank": "Member", "join_date": 1657367800, "xp": 8642}, {"brawlhalla_id": 39794122, "name": "Dex", "rank": "Member", "join_date": 1658439015, "xp": 11003}, {"brawlhalla_id": 6244176, "name": "sukaroo?!", "rank": "Member", "join_date": 1658523838, "xp": 36291}, {"brawlhalla_id": 56793941, "name": "G\u00c3\u00b8d-s\u00c3\u00b1\u00c3\u00aep\u00c3\u00aar", "rank": "Member", "join_date": 1659878282, "xp": 19939}, {"brawlhalla_id": 1042492, "name": "Nin", "rank": "Member", "join_date": 1660216439, "xp": 3362}, {"brawlhalla_id": 74627743, "name": "Pseudo", "rank": "Member", "join_date": 1660568890, "xp": 9758}, {"brawlhalla_id": 28054305, "name": "syntq", "rank": "Member", "join_date": 1661082788, "xp": 8672}, {"brawlhalla_id": 8774115, "name": "\u00f0\u009f\u008c\u009fpolar bear", "rank": "Member", "join_date": 1661433540, "xp": 6661}, {"brawlhalla_id": 3038693, "name": "e n e r g y z ?", "rank": "Member", "join_date": 1661524659, "xp": 6337}, {"brawlhalla_id": 57803303, "name": "Tayson", "rank": "Member", "join_date": 1661525294, "xp": 2709}, {"brawlhalla_id": 71629540, "name": "space", "rank": "Member", "join_date": 1661687066, "xp": 3244}, {"brawlhalla_id": 85781996, "name": "noregion", "rank": "Member", "join_date": 1661706905, "xp": 3576}]}

data_discord_Skyward.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[]
1+
[{"id": 422073717112176640, "name": "kioshi"}, {"id": 399163789397983234, "name": "mamamia"}, {"id": 338392704780075018, "name": "Marwini"}, {"id": 956341910761513000, "name": "nik."}, {"id": 541893326874345483, "name": "hunterX"}, {"id": 793590874378469417, "name": "Tayson"}, {"id": 303279482620346368, "name": "henge"}, {"id": 348134735110995988, "name": "Zerk"}, {"id": 129253606544113664, "name": "Woven"}, {"id": 875447122919567370, "name": "sukaroo"}, {"id": 973613125381275739, "name": "RoD"}, {"id": 345655312126312448, "name": "RicoDelPablo"}, {"id": 777204277231616020, "name": "Fochino"}, {"id": 286891632756785163, "name": "Hidetsu"}, {"id": 557666598853279744, "name": "Kolibric"}, {"id": 509030415496118293, "name": "rufus"}, {"id": 323167164142190593, "name": "Linox"}, {"id": 327058100332789760, "name": "bezy"}, {"id": 442041573383995415, "name": "Nymphe!?"}, {"id": 746433776929734748, "name": "abzyo"}, {"id": 781919783863320577, "name": "\u2325|Uncle Timmy \u1d3f\u1d49\u1da0\u1da6\u1d4d\u02b0"}, {"id": 295944859032748034, "name": "EvilGaming69"}, {"id": 316650709456257044, "name": "Hitaku"}, {"id": 112578107961004032, "name": "Guffe"}, {"id": 661163149067550731, "name": "zDisigma"}, {"id": 950076792469880894, "name": "GrandBetting"}, {"id": 486524035623026688, "name": "murphy"}, {"id": 818465649671274497, "name": "Yami_ThomBozz"}, {"id": 386956936517648384, "name": "Zwergennest"}, {"id": 357148393115746304, "name": "Dex"}, {"id": 341887887995961346, "name": "gonconist"}, {"id": 553716871011106828, "name": "Domagoj_playz"}, {"id": 823299784378548264, "name": "NinGotYou"}, {"id": 552032277803302913, "name": "syntq!?"}, {"id": 507524066840674312, "name": "Fighter22"}, {"id": 645442530577612810, "name": "Mogzy"}, {"id": 885945279977766943, "name": "Kaizaar"}, {"id": 246017232230940673, "name": "energyz"}]

main.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
from ast import alias, arg
22
import random
3-
from tkinter import Y
43
from command_link_remove import delete_link_from_data
54
from command_waitinglist_list import get_waitinglist_list
65
import config
76
import discord
87
import os
98
import json
10-
import time
11-
from ntpath import join
12-
from unittest import result
139
from keep_alive import keep_alive
14-
from pydoc import classname
1510
from discord.ext import commands, tasks
1611
from discord.ext.commands import has_permissions
1712
from command_link_add import get_add_link
@@ -262,7 +257,7 @@ async def missing_question(ctx, error):
262257

263258

264259
# ⬇️ WAITING LIST COMAMNDS ⬇️
265-
# ⬇️ WAITING LIST COMAMNDS ⬇️ **
260+
# ⬇️ WAITING LIST COMAMNDS ⬇️
266261
# ⬇️ WAITING LIST COMAMNDS ⬇️
267262

268263

0 commit comments

Comments
 (0)