diff --git a/files/classes/submission.py b/files/classes/submission.py index 871a64eac..abedf3db6 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -473,12 +473,12 @@ class Submission(Base): @property @lazy def is_video(self): - return self.url and any((self.url.lower().endswith(x) for x in ('.mp4','.webm','.mov'))) + return self.url and any((self.url.lower().endswith(x) for x in ('.mp4','.webm','.mov'))) and embed_fullmatch_regex.fullmatch(self.url) @property @lazy def is_image(self): - if self.url and (self.url.lower().endswith('.webp') or self.url.lower().endswith('.jpg') or self.url.lower().endswith('.png') or self.url.lower().endswith('.gif') or self.url.lower().endswith('.jpeg') or self.url.lower().endswith('?maxwidth=9999') or self.url.lower().endswith('&fidelity=high')) and (self.url.startswith('/') or self.url.startswith(f'{SITE_FULL}/')): + if self.url and (self.url.lower().endswith('.webp') or self.url.lower().endswith('.jpg') or self.url.lower().endswith('.png') or self.url.lower().endswith('.gif') or self.url.lower().endswith('.jpeg') or self.url.lower().endswith('?maxwidth=9999') or self.url.lower().endswith('&fidelity=high')) and (self.url.startswith('/') or self.url.startswith(f'{SITE_FULL}/') or embed_fullmatch_regex.fullmatch(self.url)): return True return False diff --git a/files/helpers/blackjack.py b/files/helpers/blackjack.py index eb86f014b..b3ca87ba3 100644 --- a/files/helpers/blackjack.py +++ b/files/helpers/blackjack.py @@ -3,8 +3,8 @@ import random from math import floor deck_count = 4 -ranks = ["2", "3", "4", "5", "6", "7", "8", "9", "X", "J", "Q", "K", "A"] -suits = ["♠️", "♥️", "♣️", "♦️"] +ranks = ("2", "3", "4", "5", "6", "7", "8", "9", "X", "J", "Q", "K", "A") +suits = ("♠️", "♥️", "♣️", "♦️") coins_command_word = "!blackjack" marseybucks_command_word = "!blackjackmb" minimum_bet = 100 diff --git a/files/helpers/const.py b/files/helpers/const.py index 94066b0cc..b7d959857 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -814,4 +814,6 @@ imgur_regex = re.compile('(https://i\.imgur\.com/([a-z0-9]+))\.(jpg|png|jpeg|web youtube_regex = re.compile('(

[^<]*)(https:\/\/youtube\.com\/watch\?v\=([a-z0-9-_]{5,20})[\w\-.#&/=\?@%+]*)', flags=re.I|re.A) -yt_id_regex = re.compile('[a-z0-9-_]{5,20}', flags=re.I|re.A) \ No newline at end of file +yt_id_regex = re.compile('[a-z0-9-_]{5,20}', flags=re.I|re.A) + +procoins_li = (0,2500,5000,10000,25000,50000,125000,250000) \ No newline at end of file diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index ad117aef5..37945bc13 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -13,9 +13,9 @@ import signal import time import requests -TLDS = ['ac','ad','ae','aero','af','ag','ai','al','am','an','ao','aq','ar','arpa','as','asia','at','au','aw','ax','az','ba','bb','bd','be','bf','bg','bh','bi','biz','bj','bm','bn','bo','br','bs','bt','bv','bw','by','bz','ca','cafe','cat','cc','cd','cf','cg','ch','ci','ck','cl','club','cm','cn','co','com','coop','cr','cu','cv','cx','cy','cz','de','dj','dk','dm','do','dz','ec','edu','ee','eg','er','es','et','eu','fi','fj','fk','fm','fo','fr','ga','gb','gd','ge','gf','gg','gh','gi','gl','gm','gn','gov','gp','gq','gr','gs','gt','gu','gw','gy','hk','hm','hn','hr','ht','hu','id','ie','il','im','in','info','int','io','iq','ir','is','it','je','jm','jo','jobs','jp','ke','kg','kh','ki','km','kn','kp','kr','kw','ky','kz','la','lb','lc','li','lk','lr','ls','lt','lu','lv','ly','ma','mc','md','me','mg','mh','mil','mk','ml','mm','mn','mo','mobi','mp','mq','mr','ms','mt','mu','museum','mv','mw','mx','my','mz','na','name','nc','ne','net','nf','ng','ni','nl','no','np','nr','nu','nz','om','org','pa','pe','pf','pg','ph','pk','pl','pm','pn','post','pr','pro','ps','pt','pw','py','qa','re','ro','rs','ru','rw','sa','sb','sc','sd','se','sg','sh','si','sj','sk','sl','sm','sn','so','social','sr','ss','st','su','sv','sx','sy','sz','tc','td','tel','tf','tg','th','tj','tk','tl','tm','tn','to','tp','tr','travel','tt','tv','tw','tz','ua','ug','uk','us','uy','uz','va','vc','ve','vg','vi','vn','vu','wf','win','ws','xn','xxx','ye','yt','yu','za','zm','zw'] +TLDS = ('ac','ad','ae','aero','af','ag','ai','al','am','an','ao','aq','ar','arpa','as','asia','at','au','aw','ax','az','ba','bb','bd','be','bf','bg','bh','bi','biz','bj','bm','bn','bo','br','bs','bt','bv','bw','by','bz','ca','cafe','cat','cc','cd','cf','cg','ch','ci','ck','cl','club','cm','cn','co','com','coop','cr','cu','cv','cx','cy','cz','de','dj','dk','dm','do','dz','ec','edu','ee','eg','er','es','et','eu','fi','fj','fk','fm','fo','fr','ga','gb','gd','ge','gf','gg','gh','gi','gl','gm','gn','gov','gp','gq','gr','gs','gt','gu','gw','gy','hk','hm','hn','hr','ht','hu','id','ie','il','im','in','info','int','io','iq','ir','is','it','je','jm','jo','jobs','jp','ke','kg','kh','ki','km','kn','kp','kr','kw','ky','kz','la','lb','lc','li','lk','lr','ls','lt','lu','lv','ly','ma','mc','md','me','mg','mh','mil','mk','ml','mm','mn','mo','mobi','mp','mq','mr','ms','mt','mu','museum','mv','mw','mx','my','mz','na','name','nc','ne','net','nf','ng','ni','nl','no','np','nr','nu','nz','om','org','pa','pe','pf','pg','ph','pk','pl','pm','pn','post','pr','pro','ps','pt','pw','py','qa','re','ro','rs','ru','rw','sa','sb','sc','sd','se','sg','sh','si','sj','sk','sl','sm','sn','so','social','sr','ss','st','su','sv','sx','sy','sz','tc','td','tel','tf','tg','th','tj','tk','tl','tm','tn','to','tp','tr','travel','tt','tv','tw','tz','ua','ug','uk','us','uy','uz','va','vc','ve','vg','vi','vn','vu','wf','win','ws','xn','xxx','ye','yt','yu','za','zm','zw') -allowed_tags = ['b','blockquote','br','code','del','em','h1','h2','h3','h4','h5','h6','hr','i','li','ol','p','pre','strong','sub','sup','table','tbody','th','thead','td','tr','ul','marquee','a','span','ruby','rp','rt','spoiler','img','lite-youtube','video','source'] +allowed_tags = ('b','blockquote','br','code','del','em','h1','h2','h3','h4','h5','h6','hr','i','li','ol','p','pre','strong','sub','sup','table','tbody','th','thead','td','tr','ul','marquee','a','span','ruby','rp','rt','spoiler','img','lite-youtube','video','source') def allowed_attributes(tag, name, value): diff --git a/files/routes/admin.py b/files/routes/admin.py index e9a405113..3949cc663 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -408,13 +408,7 @@ def monthly(v): for u in g.db.query(User).filter(User.patron > 0, User.patron_utc == 0).all(): if u.patron > 4 or u.email and u.email.lower() in emails: - if u.patron == 1: procoins = 2500 - elif u.patron == 2: procoins = 5000 - elif u.patron == 3: procoins = 10000 - elif u.patron == 4: procoins = 25000 - elif u.patron == 5: procoins = 50000 - elif u.patron == 6: procoins = 125000 - elif u.patron == 7: procoins = 250000 + procoins = procoins_li[u.patron] u.procoins += procoins g.db.add(u) send_repeatable_notification(u.id, f"@{v.username} has given you {procoins} Marseybux for the month of {month}! You can use them to buy awards in the [shop](/shop).") diff --git a/files/routes/settings.py b/files/routes/settings.py index 884dd9f15..204877521 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -394,17 +394,12 @@ def gumroad(v): existing = g.db.query(User.id).filter(User.email == v.email, User.is_activated == True, User.patron >= tier).one_or_none() if existing: return {"error": f"{patron} rewards already claimed on another account"}, 400 + procoins = procoins_li[tier] - procoins_li[v.patron] + if procoins < 0: return {"error": f"{patron} rewards already claimed"}, 400 + v.patron = tier if v.discord_id: add_role(v, f"{tier}") - if v.patron == 1: procoins = 2500 - elif v.patron == 2: procoins = 5000 - elif v.patron == 3: procoins = 10000 - elif v.patron == 4: procoins = 25000 - elif v.patron == 5: procoins = 50000 - elif v.patron == 6: procoins = 125000 - elif v.patron == 7: procoins = 250000 - v.procoins += procoins send_repeatable_notification(v.id, f"You have received {procoins} Marseybux! You can use them to buy awards in the [shop](/shop).")