File tree Expand file tree Collapse file tree 3 files changed +22
-17
lines changed Expand file tree Collapse file tree 3 files changed +22
-17
lines changed Original file line number Diff line number Diff line change @@ -19,25 +19,22 @@ def ok_check(msg: str):
19
19
20
20
21
21
class Challenge :
22
- """Representation of a challenge an user is doing."""
23
-
24
- def __init__ (self , bot : Red , member : discord .Member , data : dict ):
22
+ """Representation of a challenge a user is doing."""
23
+
24
+ def __init__ (
25
+ self ,
26
+ bot : Red ,
27
+ member : discord .Member ,
28
+ channel : Union [discord .TextChannel , discord .DMChannel ],
29
+ config : dict ,
30
+ ):
25
31
self .bot : Red = bot
26
32
27
33
self .member : discord .Member = member
28
34
self .guild : discord .Guild = member .guild
29
- self .config : dict = data # Will contain the config of the guild.
35
+ self .config : dict = config # Will contain the config of the guild.
30
36
31
- self .channel : Union [discord .TextChannel , discord .DMChannel ]
32
- if not self .config ["channel" ]:
33
- raise MissingRequiredValueError ("Missing channel for verification." )
34
- if self .config .get ("channel" ) == "dm" :
35
- if not self .member .dm_channel :
36
- self .channel = await self .member .create_dm ()
37
- else :
38
- self .channel = self .member .dm_channel ()
39
- else :
40
- self .channel = bot .get_channel (self .config ["channel" ])
37
+ self .channel = channel
41
38
if not self .channel :
42
39
raise MissingRequiredValueError ("Missing channel for verification." )
43
40
Original file line number Diff line number Diff line change @@ -145,11 +145,19 @@ async def basic_check(self, member: discord.Member) -> bool:
145
145
146
146
async def create_challenge_for (self , member : discord .Member ) -> Challenge :
147
147
"""
148
- Create a Challenge class for an user and append it to the running challenges.
148
+ Create a Challenge class for a user and append it to the running challenges.
149
149
"""
150
150
if member .id in self .running :
151
151
raise AlreadyHaveCaptchaError ("The user already have a captcha object running." )
152
- captcha = Challenge (self .bot , member , await self .data .guild (member .guild ).all ())
152
+ config = await self .data .guild (member .guild ).all ()
153
+ channel = config ["channel" ]
154
+ if not channel :
155
+ raise MissingRequiredValueError ("Missing channel for verification." )
156
+ if channel == "dm" :
157
+ channel = member .dm_channel or await member .create_dm ()
158
+ else :
159
+ channel = self .bot .get_channel (channel )
160
+ captcha = Challenge (self .bot , member , channel , config )
153
161
self .running [member .id ] = captcha
154
162
return captcha
155
163
Original file line number Diff line number Diff line change 1
1
__author__ = ["Predeactor" , "Kreusada" , "Fixator10" ]
2
- __version__ = "1.0.4 "
2
+ __version__ = "1.0.5 "
3
3
4
4
__patchnote__ = (
5
5
"Hello, this cog is (once again) moving of repository. It'll be now hosted by Fixator10 at \n "
You can’t perform that action at this time.
0 commit comments