diff --git a/files/assets/browserconfig.xml b/files/assets/browserconfig.xml index f8073ae1c..5b9464e21 100644 --- a/files/assets/browserconfig.xml +++ b/files/assets/browserconfig.xml @@ -2,7 +2,7 @@ - + #FF459A diff --git a/files/assets/images/rDrama/headericon.webp b/files/assets/images/rDrama/headericon.webp index e0bdfd54e..c3347ce47 100644 Binary files a/files/assets/images/rDrama/headericon.webp and b/files/assets/images/rDrama/headericon.webp differ diff --git a/files/assets/images/rDrama/icon.webp b/files/assets/images/rDrama/icon.webp index e0bdfd54e..0b0615849 100644 Binary files a/files/assets/images/rDrama/icon.webp and b/files/assets/images/rDrama/icon.webp differ diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js index 7557ffa1f..e98b00058 100644 --- a/files/assets/js/chat.js +++ b/files/assets/js/chat.js @@ -46,13 +46,13 @@ function flash(){ alert=false; } else { - icon.href = `/i/${site_name}/icon.webp?x=3` + icon.href = `/i/${site_name}/icon.webp?x=2` alert=true; } setTimeout(flash, 500) } else { - icon.href = `/i/${site_name}/icon.webp?x=3` + icon.href = `/i/${site_name}/icon.webp?x=2` notifs = 0 title.innerHTML = 'Chat'; } diff --git a/files/classes/sub.py b/files/classes/sub.py index e2919c333..cacd433c3 100644 --- a/files/classes/sub.py +++ b/files/classes/sub.py @@ -62,7 +62,7 @@ class Sub(Base): @lazy def marsey_url(self): if self.marseyurl: return self.marseyurl - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=4' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/headericon.webp?x=2' @property @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 2310012b6..eaf3d9918 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -38,9 +38,6 @@ from .sub_logs import * from .subscriptions import * from .userblock import * -if SITE_NAME == 'rDrama': - carps = ('carptroublemaker','carphotep','carphearts','carpthong','carpsad','carpshapiro','carpdracula','carpzoomertarded','carpholyspirit','carpclapping2','carpmerchant','carpdisagree','carpsquirtle','carpdead2','carpmerchant2','carpflorist','carpgossip','carpnoticeme','carpdeadinside','carpwitchtrans','carpwitchtrans2','carprentfree','carpbounce','carpautism','carpclueless','carpdevil','carpwitch2','carpwizard','carpdino','carpincel','carpclapping','carpgigatetard','carpsmug','carppope','carppearlclutch2','carpbane','carpsneed','carpbritish','carpfisherman','carpagree','carp','carpdead','carpblush','carpmermaid','carpdisagreefast','carpstake','carpagreefast','carpvampire','carp41','carpabusivewife','carpasian','carpbeannpc','carpbackstabber','carpbackstab','carpbean','carpblush2','carpbeannpcmad','carpbowler','carpboobs','carpbuff','carpcarphug','carpchud','carpcrying','carpdetermined','carpshy','carpsnipe','carpsleeping','carpsalute','carppearlclutch','carpjannie','carpzoomer','carpembrace','carpunabomber','carpfood','carptrollgun','carpler','carphug2','carpwhip','carpfans','carpjannie2','carpsick2','carpprotest','carptrophy','carpwave','carpghost','carpupset','carpwitch','carphug','carppretty','carplazy','carplove','carporeon') - if SITE == 'devrama.net': DEFAULT_ADMIN_LEVEL = 3 DEFAULT_COINS = 100000000 @@ -848,8 +845,6 @@ class User(Base): @property @lazy def profile_url(self): - if SITE_NAME == 'rDrama': - return f"{SITE_FULL}/e/{random.choice(carps)}.webp" if self.chud: return f"{SITE_FULL}/e/chudsey.webp" if self.rainbow: @@ -878,9 +873,6 @@ class User(Base): @property @lazy def original_usernames_popover(self): - if SITE_NAME == 'rDrama': - return 'Original Usernames: @carpathianflorist' - if self.username == self.original_username: return '' names = {self.original_username} diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py index bbece0395..9383c2cbc 100644 --- a/files/helpers/alerts.py +++ b/files/helpers/alerts.py @@ -223,7 +223,7 @@ def _push_notif_thread(subscriptions, title, body, url): "title": title, "body": body, 'url': url, - 'icon': f'{SITE_FULL}/icon.webp?x=3', + 'icon': f'{SITE_FULL}/icon.webp?x=2', }), vapid_private_key=VAPID_PRIVATE_KEY, vapid_claims={"sub": f"mailto:{EMAIL}"} diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 1a21f5ea5..6a77a80e5 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -48,7 +48,7 @@ def template_change_page(new_page, url): @app.template_filter("asset_siteimg") def template_asset_siteimg(asset_path): # TODO: Add hashing for these using files.helpers.assetcache - return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=4' + return f'{SITE_FULL_IMAGES}/i/{SITE_NAME}/{asset_path}?x=3' @app.template_filter("timestamp") def timestamp(timestamp): diff --git a/files/templates/errors/WPD/404.html b/files/templates/errors/WPD/404.html index 62bb77bf3..2fb0f138e 100644 --- a/files/templates/errors/WPD/404.html +++ b/files/templates/errors/WPD/404.html @@ -11,7 +11,7 @@ - + Not Found - WPD @@ -20,40 +20,40 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -65,12 +65,12 @@