forked from MarseyWorld/MarseyWorld
fds
parent
ad0c050cc3
commit
c7d3401b62
|
@ -573,21 +573,6 @@ class User(Base):
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|
||||||
def deletepfp(self):
|
|
||||||
if self.highres and '/images/' in self.highres:
|
|
||||||
image = '/images/' + self.highres.split('/images/')[1]
|
|
||||||
if path.exists(image): remove(image)
|
|
||||||
if self.profileurl and '/images/' in self.profileurl:
|
|
||||||
image = '/images/' + self.profileurl.split('/images/')[1]
|
|
||||||
if path.exists(image): remove(image)
|
|
||||||
self.highres = None
|
|
||||||
self.profileurl = None
|
|
||||||
|
|
||||||
def deletebanner(self):
|
|
||||||
if self.bannerurl and '/images/' in self.bannerurl:
|
|
||||||
image = '/images/' + self.bannerurl.split('/images/')[1]
|
|
||||||
if path.exists(image): remove(image)
|
|
||||||
self.bannerurl = None
|
|
||||||
|
|
||||||
def ban(self, admin=None, reason=None, days=0):
|
def ban(self, admin=None, reason=None, days=0):
|
||||||
if days:
|
if days:
|
||||||
|
|
|
@ -810,8 +810,8 @@ approved_embed_hosts = [
|
||||||
|
|
||||||
hosts = "|".join(approved_embed_hosts).replace('.','\.')
|
hosts = "|".join(approved_embed_hosts).replace('.','\.')
|
||||||
|
|
||||||
image_check_regex = re.compile(f'!\[\]\(((?!(https:\/\/([a-z0-9-]*\.)*({hosts}))?\/).*?)\)', flags=re.A)
|
image_check_regex = re.compile(f'!\[\]\(((?!(https:\/\/([a-z0-9-]+\.)*({hosts}))?\/).*?)\)', flags=re.A)
|
||||||
|
|
||||||
embed_check_regex = regex.compile(f'(?<!<(code|pre|a)>)(https:\/\/([a-z0-9-]*\.)*({hosts}))?\/[\w:~,()\-.#&\/=?@%;+]*', flags=regex.A)
|
embed_check_regex = regex.compile(f'(?<!<(code|pre|a)>)(https:\/\/([a-z0-9-]+\.)*({hosts}))?\/[\w:~,()\-.#&\/=?@%;+]*', flags=regex.A)
|
||||||
|
|
||||||
video_regex = regex.compile(f'((?<!<(code|pre|a)>)(https:\/\/([a-z0-9-]*\.)*({hosts}))?\/[\w:~,()\-.#&\/=?@%;+]*?\.(mp4|webm|mov))', flags=regex.A)
|
video_regex = regex.compile(f'((?<!<(code|pre|a)>)(https:\/\/([a-z0-9-]+\.)*({hosts}))?\/[\w:~,()\-.#&\/=?@%;+]*?\.(mp4|webm|mov))', flags=regex.A)
|
Loading…
Reference in New Issue