fix(bot): 🐛 Cat masks blocking messages from being sent and crashing p.mask.
This commit is contained in:
+34
-2
@@ -162,7 +162,13 @@ class CallUserChannelRelationship(models.Model):
|
|||||||
str: The mask's name.
|
str: The mask's name.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
return constants.Mask(self.mask).name.replace("_", " ").lower().title()
|
try:
|
||||||
|
mask = constants.Mask(self.mask)
|
||||||
|
|
||||||
|
except ValueError:
|
||||||
|
mask = constants.CatMask(self.mask)
|
||||||
|
|
||||||
|
return mask.name.replace("_", " ").lower().title()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def display_name(self) -> str:
|
def display_name(self) -> str:
|
||||||
@@ -186,7 +192,12 @@ class CallUserChannelRelationship(models.Model):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if self.is_masked:
|
if self.is_masked:
|
||||||
|
try:
|
||||||
mask = constants.Mask(self.mask)
|
mask = constants.Mask(self.mask)
|
||||||
|
|
||||||
|
except ValueError:
|
||||||
|
mask = constants.CatMask(self.mask)
|
||||||
|
|
||||||
return f"https://payphone.nyeki.dev/assets/masks/{mask.name.lower().replace("_", "-")}.png"
|
return f"https://payphone.nyeki.dev/assets/masks/{mask.name.lower().replace("_", "-")}.png"
|
||||||
|
|
||||||
return self.profile.avatar_url
|
return self.profile.avatar_url
|
||||||
@@ -199,7 +210,12 @@ class CallUserChannelRelationship(models.Model):
|
|||||||
str: The mask's emoji (<:name:id>).
|
str: The mask's emoji (<:name:id>).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
try:
|
||||||
mask = constants.Mask(self.mask)
|
mask = constants.Mask(self.mask)
|
||||||
|
|
||||||
|
except ValueError:
|
||||||
|
mask = constants.CatMask(self.mask)
|
||||||
|
|
||||||
mask_name = mask.name.lower().replace("_", "")
|
mask_name = mask.name.lower().replace("_", "")
|
||||||
|
|
||||||
return f"<:{mask_name}:{self.mask}>"
|
return f"<:{mask_name}:{self.mask}>"
|
||||||
@@ -251,7 +267,13 @@ class Message(models.Model):
|
|||||||
str: The mask's name.
|
str: The mask's name.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
return constants.Mask(self.mask).name.replace("_", " ").lower().title()
|
try:
|
||||||
|
mask = constants.Mask(self.mask)
|
||||||
|
|
||||||
|
except ValueError:
|
||||||
|
mask = constants.CatMask(self.mask)
|
||||||
|
|
||||||
|
return mask.name.replace("_", " ").lower().title()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def display_name(self) -> str:
|
def display_name(self) -> str:
|
||||||
@@ -275,7 +297,12 @@ class Message(models.Model):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if self.mask is not None:
|
if self.mask is not None:
|
||||||
|
try:
|
||||||
mask = constants.Mask(self.mask)
|
mask = constants.Mask(self.mask)
|
||||||
|
|
||||||
|
except ValueError:
|
||||||
|
mask = constants.CatMask(self.mask)
|
||||||
|
|
||||||
return f"https://payphone.nyeki.dev/assets/masks/{mask.name.lower().replace("_", "-")}.png"
|
return f"https://payphone.nyeki.dev/assets/masks/{mask.name.lower().replace("_", "-")}.png"
|
||||||
|
|
||||||
return self.profile.avatar_url
|
return self.profile.avatar_url
|
||||||
@@ -288,7 +315,12 @@ class Message(models.Model):
|
|||||||
str: The mask's emoji (<:name:id>).
|
str: The mask's emoji (<:name:id>).
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
try:
|
||||||
mask = constants.Mask(self.mask)
|
mask = constants.Mask(self.mask)
|
||||||
|
|
||||||
|
except ValueError:
|
||||||
|
mask = constants.CatMask(self.mask)
|
||||||
|
|
||||||
mask_name = mask.name.lower().replace("_", "")
|
mask_name = mask.name.lower().replace("_", "")
|
||||||
|
|
||||||
return f"<:{mask_name}:{self.mask}>"
|
return f"<:{mask_name}:{self.mask}>"
|
||||||
|
|||||||
Reference in New Issue
Block a user