diff --git a/files/__main__.py b/files/__main__.py index 536e9c419..cdd5c15a6 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -73,7 +73,7 @@ r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_respons limiter = Limiter( app, key_func=get_ipaddr, - default_limits=["3/second;30/minute;200/hour;500/day"], + default_limits=["3/second;30/minute;200/hour;1000/day"], headers_enabled=True, strategy="fixed-window" ) diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 58df0363a..2ca666a0b 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -293,7 +293,7 @@ const EMOJIS_STRINGS = [ "marseycarp2": {"author":"mom", "tags":"harm cutting selfharm cutter reaction carpathianflorist self animated"}, "marseycarp3": {"author":"chapose", "tags":"reaction fish carpathianflorist catfish"}, "marseycarpcrying": {"author":"chapose", "tags":"tear reaction carpathianflorist fish sob tears sad"}, - "marseycarppat": {"author":"unknown", "tags":"petting carpathianflorist fish animated patting"}, + "marseycarppat": {"author":"dramarama", "tags":"petting carpathianflorist fish animated patting"}, "marseycat": {"author":"chiobu", "tags":"fursona skin animal costume furry neko fursuit cat"}, "marseycatgirl": {"author":"chapose", "tags":"uwu waifu anime fursona furry owo weebshit fursuit"}, "marseycatgirl2": {"author":"dramarama", "tags":"anime weebsit"}, @@ -780,7 +780,7 @@ const EMOJIS_STRINGS = [ "marseytinfoil": {"author":"chapose", "tags":"alex jones psycho crazy schizo alexjones conspiracy"}, "marseytinfoil2": {"author":"dramarama", "tags":"alex jones rightoid psycho schizo alexjones conspiracy"}, "marseytoilet": {"author":"altaccountumbreon", "tags":"flush loo bog roll toilet paper swirly"}, - "marseytrad": {"author":"unknown", "tags":"dramarama dress foid tradwife floral girl"}, + "marseytrad": {"author":"dramarama", "tags":"dramarama dress foid tradwife floral girl"}, "marseytrain": {"author":"dramarama", "tags":"troomer tranny transgender trains troid transsexual animated"}, "marseytrans2": {"author":"chapose", "tags":"troon tranny transgender troomer lgbt trannies troid transsexual"}, "marseytrickortreat": {"author":"uwu", "tags":"candy trick or treat halloween holiday"}, @@ -848,7 +848,7 @@ const EMOJIS_STRINGS = [ "mcmarsey": {"author":"dramarama", "tags":"wageslave poor mcdonalds wagecuck maccas antiwork college wagie"}, "mersya": {"author":"dramarama", "tags":"the best adorable aww marsey favorite cute"}, "mersya2": {"author":"dramarama", "tags":"drawing art"}, - "mersyapat": {"author":"unknown", "tags":"petting reaction dramarama animated cute patting"}, + "mersyapat": {"author":"dramarama", "tags":"petting reaction dramarama animated cute patting"}, "mlm": {"author":"chiobu", "tags":"marseylivesmatter marsey lives matter blm"}, "owlsey": {"author":"dramarama", "tags":"bird hoot feathers"}, "plarsy": {"author":"chapose", "tags":"platy crossover platypus marsey plarsey"}, diff --git a/files/classes/user.py b/files/classes/user.py index 00816c675..a1fd32272 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -22,7 +22,7 @@ site = environ.get("DOMAIN").strip() site_name = environ.get("SITE_NAME").strip() defaulttheme = environ.get("DEFAULT_THEME", "midnight").strip() defaultcolor = environ.get("DEFAULT_COLOR", "fff").strip() -defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all").strip() +defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "day").strip() cardview = bool(int(environ.get("CARD_VIEW", 1))) class User(Base): diff --git a/files/routes/front.py b/files/routes/front.py index bad1917eb..45f6a6678 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -3,7 +3,7 @@ from files.helpers.get import * from files.__main__ import app, cache from files.classes.submission import Submission -defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "all").strip() +defaulttimefilter = environ.get("DEFAULT_TIME_FILTER", "day").strip() SITE_NAME = environ.get("SITE_NAME", "").strip() @app.get("/post/") diff --git a/files/templates/comments.html b/files/templates/comments.html index 6b7a8ce13..95d907d16 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -508,7 +508,7 @@ - Comment + Comment Cancel
@@ -533,7 +533,7 @@ Cancel - Reply + Reply