From 485d21037399f84104f772ca709af3aa5a93d3c2 Mon Sep 17 00:00:00 2001 From: Aevann Date: Wed, 17 Apr 2024 17:53:49 +0200 Subject: [PATCH] refactor bday event --- .../images/banners/WPD}/1.webp | Bin .../images/banners/rDrama/.1st/1.webp} | Bin .../images/banners/rDrama/.1st/10.webp} | Bin .../images/banners/rDrama/.1st/11.webp} | Bin .../images/banners/rDrama/.1st/2.webp} | Bin .../images/banners/rDrama/.1st/3.webp} | Bin .../images/banners/rDrama/.1st/4.webp} | Bin .../images/banners/rDrama/.1st/5.webp} | Bin .../images/banners/rDrama/.1st/6.webp} | Bin .../images/banners/rDrama/.1st/7.webp} | Bin .../images/banners/rDrama/.1st/8.webp} | Bin .../images/banners/rDrama/.1st/9.webp} | Bin .../images/banners/rDrama/.2nd/1.webp} | Bin .../images/banners/rDrama/.2nd/10.webp} | Bin .../images/banners/rDrama/.2nd/11.webp} | Bin .../images/banners/rDrama/.2nd/12.webp} | Bin .../images/banners/rDrama/.2nd/13.webp} | Bin .../images/banners/rDrama/.2nd/14.webp} | Bin .../images/banners/rDrama/.2nd/15.webp} | Bin .../images/banners/rDrama/.2nd/16.webp} | Bin .../images/banners/rDrama/.2nd/17.webp} | Bin .../images/banners/rDrama/.2nd/18.webp} | Bin .../images/banners/rDrama/.2nd/19.webp} | Bin .../images/banners/rDrama/.2nd/2.webp} | Bin .../images/banners/rDrama/.2nd/20.webp} | Bin .../images/banners/rDrama/.2nd/21.webp} | Bin .../images/banners/rDrama/.2nd/22.webp} | Bin .../images/banners/rDrama/.2nd/23.webp} | Bin .../images/banners/rDrama/.2nd/24.webp} | Bin .../images/banners/rDrama/.2nd/25.webp} | Bin .../images/banners/rDrama/.2nd/26.webp} | Bin .../images/banners/rDrama/.2nd/27.webp} | Bin .../images/banners/rDrama/.2nd/3.webp} | Bin .../images/banners/rDrama/.2nd/4.webp} | Bin .../images/banners/rDrama/.2nd/5.webp} | Bin .../images/banners/rDrama/.2nd/6.webp} | Bin .../images/banners/rDrama/.2nd/7.webp} | Bin .../images/banners/rDrama/.2nd/8.webp} | Bin .../images/banners/rDrama/.2nd/9.webp} | Bin .../images/banners/rDrama}/1.webp | Bin .../images/banners/rDrama/10.webp} | Bin .../images/banners/rDrama/11.webp} | Bin .../images/banners/rDrama/12.webp} | Bin .../images/banners/rDrama/13.webp} | Bin .../images/banners/rDrama/14.webp} | Bin .../images/banners/rDrama/15.webp} | Bin .../images/banners/rDrama/16.webp} | Bin .../images/banners/rDrama/17.webp} | Bin .../images/banners/rDrama/18.webp} | Bin .../images/banners/rDrama/19.webp} | Bin .../images/banners/rDrama}/2.webp | Bin .../images/banners/rDrama/20.webp} | Bin .../images/banners/rDrama/21.webp} | Bin .../images/banners/rDrama/22.webp} | Bin .../images/banners/rDrama/3.webp} | Bin .../images/banners/rDrama/4.webp} | Bin .../images/banners/rDrama/5.webp} | Bin .../images/banners/rDrama/6.webp} | Bin .../images/banners/rDrama/7.webp} | Bin .../images/banners/rDrama/8.webp} | Bin .../images/banners/rDrama/9.webp} | Bin .../images/sidebar/WPD}/1.webp | Bin .../images/sidebar/WPD}/2.webp | Bin .../images/sidebar/WPD}/3.webp | Bin .../images/sidebar/WPD}/4.webp | Bin .../images/sidebar/WPD}/5.webp | Bin .../images/sidebar/WPD}/6.webp | Bin .../images/sidebar/WPD}/7.webp | Bin .../images/sidebar/rDrama}/.1st/1.webp | Bin .../images/sidebar/rDrama}/1.webp | Bin files/helpers/config/awards.py | 6 ++-- files/helpers/config/const.py | 26 ++++++++++-------- files/routes/jinja2.py | 5 ++-- files/routes/settings.py | 2 +- files/routes/wrappers.py | 2 +- files/templates/awards.html | 2 +- files/templates/default.html | 6 ++-- files/templates/header.html | 7 +++++ files/templates/settings/advanced.html | 2 +- files/templates/sidebar_WPD.html | 4 +-- files/templates/sidebar_rDrama.html | 4 +-- 81 files changed, 39 insertions(+), 27 deletions(-) rename files/assets/events/{birthdead/images/banners => bday/images/banners/WPD}/1.webp (100%) rename files/assets/events/{birthgay/images/banners/.1st/3.webp => bday/images/banners/rDrama/.1st/1.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/21.webp => bday/images/banners/rDrama/.1st/10.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/24.webp => bday/images/banners/rDrama/.1st/11.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/5.webp => bday/images/banners/rDrama/.1st/2.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/7.webp => bday/images/banners/rDrama/.1st/3.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/10.webp => bday/images/banners/rDrama/.1st/4.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/11.webp => bday/images/banners/rDrama/.1st/5.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/12.webp => bday/images/banners/rDrama/.1st/6.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/16.webp => bday/images/banners/rDrama/.1st/7.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/17.webp => bday/images/banners/rDrama/.1st/8.webp} (100%) rename files/assets/events/{birthgay/images/banners/.1st/18.webp => bday/images/banners/rDrama/.1st/9.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/355.webp => bday/images/banners/rDrama/.2nd/1.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/370.webp => bday/images/banners/rDrama/.2nd/10.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/371.webp => bday/images/banners/rDrama/.2nd/11.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/372.webp => bday/images/banners/rDrama/.2nd/12.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/373.webp => bday/images/banners/rDrama/.2nd/13.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/375.webp => bday/images/banners/rDrama/.2nd/14.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/391.webp => bday/images/banners/rDrama/.2nd/15.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/393.webp => bday/images/banners/rDrama/.2nd/16.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/394.webp => bday/images/banners/rDrama/.2nd/17.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/395.webp => bday/images/banners/rDrama/.2nd/18.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/396.webp => bday/images/banners/rDrama/.2nd/19.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/357.webp => bday/images/banners/rDrama/.2nd/2.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/397.webp => bday/images/banners/rDrama/.2nd/20.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/398.webp => bday/images/banners/rDrama/.2nd/21.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/399.webp => bday/images/banners/rDrama/.2nd/22.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/400.webp => bday/images/banners/rDrama/.2nd/23.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/401.webp => bday/images/banners/rDrama/.2nd/24.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/403.webp => bday/images/banners/rDrama/.2nd/25.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/412.webp => bday/images/banners/rDrama/.2nd/26.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/413.webp => bday/images/banners/rDrama/.2nd/27.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/358.webp => bday/images/banners/rDrama/.2nd/3.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/359.webp => bday/images/banners/rDrama/.2nd/4.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/360.webp => bday/images/banners/rDrama/.2nd/5.webp} (100%) rename files/assets/events/{birthgay/images/banners/362.webp => bday/images/banners/rDrama/.2nd/6.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/363.webp => bday/images/banners/rDrama/.2nd/7.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/365.webp => bday/images/banners/rDrama/.2nd/8.webp} (100%) rename files/assets/events/{birthgay/images/banners/.2nd/368.webp => bday/images/banners/rDrama/.2nd/9.webp} (100%) rename files/assets/events/{birthgay/images/banners => bday/images/banners/rDrama}/1.webp (100%) rename files/assets/events/{birthgay/images/banners/19.webp => bday/images/banners/rDrama/10.webp} (100%) rename files/assets/events/{birthgay/images/banners/20.webp => bday/images/banners/rDrama/11.webp} (100%) rename files/assets/events/{birthgay/images/banners/22.webp => bday/images/banners/rDrama/12.webp} (100%) rename files/assets/events/{birthgay/images/banners/23.webp => bday/images/banners/rDrama/13.webp} (100%) rename files/assets/events/{birthgay/images/banners/25.webp => bday/images/banners/rDrama/14.webp} (100%) rename files/assets/events/{birthgay/images/banners/356.webp => bday/images/banners/rDrama/15.webp} (100%) rename files/assets/events/{birthgay/images/banners/364.webp => bday/images/banners/rDrama/16.webp} (100%) rename files/assets/events/{birthgay/images/banners/366.webp => bday/images/banners/rDrama/17.webp} (100%) rename files/assets/events/{birthgay/images/banners/369.webp => bday/images/banners/rDrama/18.webp} (100%) rename files/assets/events/{birthgay/images/banners/392.webp => bday/images/banners/rDrama/19.webp} (100%) rename files/assets/events/{birthgay/images/banners => bday/images/banners/rDrama}/2.webp (100%) rename files/assets/events/{birthgay/images/banners/402.webp => bday/images/banners/rDrama/20.webp} (100%) rename files/assets/events/{birthgay/images/banners/411.webp => bday/images/banners/rDrama/21.webp} (100%) rename files/assets/events/{birthgay/images/banners/414.webp => bday/images/banners/rDrama/22.webp} (100%) rename files/assets/events/{birthgay/images/banners/4.webp => bday/images/banners/rDrama/3.webp} (100%) rename files/assets/events/{birthgay/images/banners/6.webp => bday/images/banners/rDrama/4.webp} (100%) rename files/assets/events/{birthgay/images/banners/8.webp => bday/images/banners/rDrama/5.webp} (100%) rename files/assets/events/{birthgay/images/banners/9.webp => bday/images/banners/rDrama/6.webp} (100%) rename files/assets/events/{birthgay/images/banners/13.webp => bday/images/banners/rDrama/7.webp} (100%) rename files/assets/events/{birthgay/images/banners/14.webp => bday/images/banners/rDrama/8.webp} (100%) rename files/assets/events/{birthgay/images/banners/15.webp => bday/images/banners/rDrama/9.webp} (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/1.webp (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/2.webp (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/3.webp (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/4.webp (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/5.webp (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/6.webp (100%) rename files/assets/events/{birthdead/images/sidebar => bday/images/sidebar/WPD}/7.webp (100%) rename files/assets/events/{birthgay/images/sidebar => bday/images/sidebar/rDrama}/.1st/1.webp (100%) rename files/assets/events/{birthgay/images/sidebar => bday/images/sidebar/rDrama}/1.webp (100%) diff --git a/files/assets/events/birthdead/images/banners/1.webp b/files/assets/events/bday/images/banners/WPD/1.webp similarity index 100% rename from files/assets/events/birthdead/images/banners/1.webp rename to files/assets/events/bday/images/banners/WPD/1.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/3.webp b/files/assets/events/bday/images/banners/rDrama/.1st/1.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/3.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/1.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/21.webp b/files/assets/events/bday/images/banners/rDrama/.1st/10.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/21.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/10.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/24.webp b/files/assets/events/bday/images/banners/rDrama/.1st/11.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/24.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/11.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/5.webp b/files/assets/events/bday/images/banners/rDrama/.1st/2.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/5.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/2.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/7.webp b/files/assets/events/bday/images/banners/rDrama/.1st/3.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/7.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/3.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/10.webp b/files/assets/events/bday/images/banners/rDrama/.1st/4.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/10.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/4.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/11.webp b/files/assets/events/bday/images/banners/rDrama/.1st/5.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/11.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/5.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/12.webp b/files/assets/events/bday/images/banners/rDrama/.1st/6.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/12.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/6.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/16.webp b/files/assets/events/bday/images/banners/rDrama/.1st/7.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/16.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/7.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/17.webp b/files/assets/events/bday/images/banners/rDrama/.1st/8.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/17.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/8.webp diff --git a/files/assets/events/birthgay/images/banners/.1st/18.webp b/files/assets/events/bday/images/banners/rDrama/.1st/9.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.1st/18.webp rename to files/assets/events/bday/images/banners/rDrama/.1st/9.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/355.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/1.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/355.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/1.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/370.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/10.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/370.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/10.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/371.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/11.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/371.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/11.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/372.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/12.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/372.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/12.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/373.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/13.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/373.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/13.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/375.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/14.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/375.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/14.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/391.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/15.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/391.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/15.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/393.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/16.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/393.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/16.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/394.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/17.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/394.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/17.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/395.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/18.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/395.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/18.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/396.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/19.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/396.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/19.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/357.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/2.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/357.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/2.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/397.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/20.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/397.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/20.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/398.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/21.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/398.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/21.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/399.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/22.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/399.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/22.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/400.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/23.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/400.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/23.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/401.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/24.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/401.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/24.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/403.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/25.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/403.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/25.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/412.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/26.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/412.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/26.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/413.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/27.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/413.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/27.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/358.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/3.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/358.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/3.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/359.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/4.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/359.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/4.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/360.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/5.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/360.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/5.webp diff --git a/files/assets/events/birthgay/images/banners/362.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/6.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/362.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/6.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/363.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/7.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/363.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/7.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/365.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/8.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/365.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/8.webp diff --git a/files/assets/events/birthgay/images/banners/.2nd/368.webp b/files/assets/events/bday/images/banners/rDrama/.2nd/9.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/.2nd/368.webp rename to files/assets/events/bday/images/banners/rDrama/.2nd/9.webp diff --git a/files/assets/events/birthgay/images/banners/1.webp b/files/assets/events/bday/images/banners/rDrama/1.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/1.webp rename to files/assets/events/bday/images/banners/rDrama/1.webp diff --git a/files/assets/events/birthgay/images/banners/19.webp b/files/assets/events/bday/images/banners/rDrama/10.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/19.webp rename to files/assets/events/bday/images/banners/rDrama/10.webp diff --git a/files/assets/events/birthgay/images/banners/20.webp b/files/assets/events/bday/images/banners/rDrama/11.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/20.webp rename to files/assets/events/bday/images/banners/rDrama/11.webp diff --git a/files/assets/events/birthgay/images/banners/22.webp b/files/assets/events/bday/images/banners/rDrama/12.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/22.webp rename to files/assets/events/bday/images/banners/rDrama/12.webp diff --git a/files/assets/events/birthgay/images/banners/23.webp b/files/assets/events/bday/images/banners/rDrama/13.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/23.webp rename to files/assets/events/bday/images/banners/rDrama/13.webp diff --git a/files/assets/events/birthgay/images/banners/25.webp b/files/assets/events/bday/images/banners/rDrama/14.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/25.webp rename to files/assets/events/bday/images/banners/rDrama/14.webp diff --git a/files/assets/events/birthgay/images/banners/356.webp b/files/assets/events/bday/images/banners/rDrama/15.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/356.webp rename to files/assets/events/bday/images/banners/rDrama/15.webp diff --git a/files/assets/events/birthgay/images/banners/364.webp b/files/assets/events/bday/images/banners/rDrama/16.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/364.webp rename to files/assets/events/bday/images/banners/rDrama/16.webp diff --git a/files/assets/events/birthgay/images/banners/366.webp b/files/assets/events/bday/images/banners/rDrama/17.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/366.webp rename to files/assets/events/bday/images/banners/rDrama/17.webp diff --git a/files/assets/events/birthgay/images/banners/369.webp b/files/assets/events/bday/images/banners/rDrama/18.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/369.webp rename to files/assets/events/bday/images/banners/rDrama/18.webp diff --git a/files/assets/events/birthgay/images/banners/392.webp b/files/assets/events/bday/images/banners/rDrama/19.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/392.webp rename to files/assets/events/bday/images/banners/rDrama/19.webp diff --git a/files/assets/events/birthgay/images/banners/2.webp b/files/assets/events/bday/images/banners/rDrama/2.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/2.webp rename to files/assets/events/bday/images/banners/rDrama/2.webp diff --git a/files/assets/events/birthgay/images/banners/402.webp b/files/assets/events/bday/images/banners/rDrama/20.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/402.webp rename to files/assets/events/bday/images/banners/rDrama/20.webp diff --git a/files/assets/events/birthgay/images/banners/411.webp b/files/assets/events/bday/images/banners/rDrama/21.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/411.webp rename to files/assets/events/bday/images/banners/rDrama/21.webp diff --git a/files/assets/events/birthgay/images/banners/414.webp b/files/assets/events/bday/images/banners/rDrama/22.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/414.webp rename to files/assets/events/bday/images/banners/rDrama/22.webp diff --git a/files/assets/events/birthgay/images/banners/4.webp b/files/assets/events/bday/images/banners/rDrama/3.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/4.webp rename to files/assets/events/bday/images/banners/rDrama/3.webp diff --git a/files/assets/events/birthgay/images/banners/6.webp b/files/assets/events/bday/images/banners/rDrama/4.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/6.webp rename to files/assets/events/bday/images/banners/rDrama/4.webp diff --git a/files/assets/events/birthgay/images/banners/8.webp b/files/assets/events/bday/images/banners/rDrama/5.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/8.webp rename to files/assets/events/bday/images/banners/rDrama/5.webp diff --git a/files/assets/events/birthgay/images/banners/9.webp b/files/assets/events/bday/images/banners/rDrama/6.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/9.webp rename to files/assets/events/bday/images/banners/rDrama/6.webp diff --git a/files/assets/events/birthgay/images/banners/13.webp b/files/assets/events/bday/images/banners/rDrama/7.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/13.webp rename to files/assets/events/bday/images/banners/rDrama/7.webp diff --git a/files/assets/events/birthgay/images/banners/14.webp b/files/assets/events/bday/images/banners/rDrama/8.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/14.webp rename to files/assets/events/bday/images/banners/rDrama/8.webp diff --git a/files/assets/events/birthgay/images/banners/15.webp b/files/assets/events/bday/images/banners/rDrama/9.webp similarity index 100% rename from files/assets/events/birthgay/images/banners/15.webp rename to files/assets/events/bday/images/banners/rDrama/9.webp diff --git a/files/assets/events/birthdead/images/sidebar/1.webp b/files/assets/events/bday/images/sidebar/WPD/1.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/1.webp rename to files/assets/events/bday/images/sidebar/WPD/1.webp diff --git a/files/assets/events/birthdead/images/sidebar/2.webp b/files/assets/events/bday/images/sidebar/WPD/2.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/2.webp rename to files/assets/events/bday/images/sidebar/WPD/2.webp diff --git a/files/assets/events/birthdead/images/sidebar/3.webp b/files/assets/events/bday/images/sidebar/WPD/3.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/3.webp rename to files/assets/events/bday/images/sidebar/WPD/3.webp diff --git a/files/assets/events/birthdead/images/sidebar/4.webp b/files/assets/events/bday/images/sidebar/WPD/4.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/4.webp rename to files/assets/events/bday/images/sidebar/WPD/4.webp diff --git a/files/assets/events/birthdead/images/sidebar/5.webp b/files/assets/events/bday/images/sidebar/WPD/5.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/5.webp rename to files/assets/events/bday/images/sidebar/WPD/5.webp diff --git a/files/assets/events/birthdead/images/sidebar/6.webp b/files/assets/events/bday/images/sidebar/WPD/6.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/6.webp rename to files/assets/events/bday/images/sidebar/WPD/6.webp diff --git a/files/assets/events/birthdead/images/sidebar/7.webp b/files/assets/events/bday/images/sidebar/WPD/7.webp similarity index 100% rename from files/assets/events/birthdead/images/sidebar/7.webp rename to files/assets/events/bday/images/sidebar/WPD/7.webp diff --git a/files/assets/events/birthgay/images/sidebar/.1st/1.webp b/files/assets/events/bday/images/sidebar/rDrama/.1st/1.webp similarity index 100% rename from files/assets/events/birthgay/images/sidebar/.1st/1.webp rename to files/assets/events/bday/images/sidebar/rDrama/.1st/1.webp diff --git a/files/assets/events/birthgay/images/sidebar/1.webp b/files/assets/events/bday/images/sidebar/rDrama/1.webp similarity index 100% rename from files/assets/events/birthgay/images/sidebar/1.webp rename to files/assets/events/bday/images/sidebar/rDrama/1.webp diff --git a/files/helpers/config/awards.py b/files/helpers/config/awards.py index eddccb58b..bd6a7cf08 100644 --- a/files/helpers/config/awards.py +++ b/files/helpers/config/awards.py @@ -89,7 +89,7 @@ AWARDS = { "deflectable": True, "cosmetic": False, "ghost": False, - "enabled": IS_EVENT() and SITE_NAME == "rDrama", + "enabled": IS_MUSICAL_EVENT() and SITE_NAME == "rDrama", "negative": False, "included_in_lootbox": False, }, @@ -392,7 +392,7 @@ AWARDS = { "included_in_lootbox": False, }, - ### Birthgay/Birthdead + ### Birthday "confetti": { "kind": "confetti", "title": "Confetti", @@ -403,7 +403,7 @@ AWARDS = { "deflectable": False, "cosmetic": True, "ghost": True, - "enabled": IS_BIRTHGAY() or IS_BIRTHDEAD(), + "enabled": IS_BDAY(), "negative": False, "included_in_lootbox": False, }, diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 59fe8347a..5d8a54c1d 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -1042,15 +1042,15 @@ dkd_end = datetime.datetime.strptime(f'10/4/{t.year}', '%d/%m/%Y') def IS_DKD(): return SITE_NAME == 'rDrama' and dkd_begin < datetime.datetime.now() < dkd_end -birthgay_begin = datetime.datetime.strptime(f'20/5/{t.year}', '%d/%m/%Y') -birthgay_end = datetime.datetime.strptime(f'22/5/{t.year}', '%d/%m/%Y') -def IS_BIRTHGAY(): - return SITE_NAME == 'rDrama' and birthgay_begin < datetime.datetime.now() < birthgay_end -birthdead_begin = datetime.datetime.strptime(f'26/4/{t.year}', '%d/%m/%Y') -birthdead_end = datetime.datetime.strptime(f'28/4/{t.year}', '%d/%m/%Y') -def IS_BIRTHDEAD(): - return SITE_NAME == 'WPD' and birthdead_begin < datetime.datetime.now() < birthdead_end +if SITE_NAME == 'rDrama': + bday_begin = datetime.datetime.strptime(f'20/5/{t.year}', '%d/%m/%Y') + bday_end = datetime.datetime.strptime(f'22/5/{t.year}', '%d/%m/%Y') +else: + bday_begin = datetime.datetime.strptime(f'26/4/{t.year}', '%d/%m/%Y') + bday_end = datetime.datetime.strptime(f'28/4/{t.year}', '%d/%m/%Y') +def IS_BDAY(): + return bday_begin < datetime.datetime.now() < bday_end def IS_EVENT(): if IS_FISTMAS(): @@ -1059,12 +1059,14 @@ def IS_EVENT(): return "homoween" elif IS_DKD(): return "DKD" - elif IS_BIRTHGAY(): - return "birthgay" - elif IS_BIRTHDEAD(): - return "birthdead" + elif IS_BDAY(): + return "bday" + return None +def IS_MUSICAL_EVENT(): + return IS_FISTMAS() or IS_HOMOWEEN() or IS_DKD() + fourth_begin = datetime.datetime.strptime(f'4/7/{t.year}', '%d/%m/%Y') fourth_end = datetime.datetime.strptime(f'5/7/{t.year}', '%d/%m/%Y') def IS_FOURTH(): diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index af9df8be4..497305ad5 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -89,6 +89,7 @@ def selected_tab(request): @app.template_filter("seeded_random") def seeded_random(choices, p): + choices = [x for x in choices if not x.startswith('.')] if request.path.startswith('/post/') and p: random.seed(p.id) chosen = random.choice(choices) @@ -196,8 +197,8 @@ def inject_constants(): "git_head":git_head, "max_days":max_days, "EMOJI_KINDS":EMOJI_KINDS, "BIO_FRIENDS_ENEMIES_LENGTH_LIMIT":BIO_FRIENDS_ENEMIES_LENGTH_LIMIT, "SITE_FULL_IMAGES": SITE_FULL_IMAGES, - "IS_EVENT":IS_EVENT, "IS_FISTMAS":IS_FISTMAS, "IS_HOMOWEEN":IS_HOMOWEEN, - "IS_DKD":IS_DKD, "IS_BIRTHGAY":IS_BIRTHGAY, "IS_BIRTHDEAD":IS_BIRTHDEAD, "IS_FOURTH":IS_FOURTH, + "IS_EVENT":IS_EVENT, "IS_MUSICAL_EVENT":IS_MUSICAL_EVENT, "IS_FISTMAS":IS_FISTMAS, "IS_HOMOWEEN":IS_HOMOWEEN, + "IS_DKD":IS_DKD, "IS_BDAY":IS_BDAY, "IS_FOURTH":IS_FOURTH, "CHUD_PHRASES":CHUD_PHRASES, "hasattr":hasattr, "calc_users":calc_users, "HOLE_INACTIVITY_DELETION":HOLE_INACTIVITY_DELETION, "LIGHT_THEMES":LIGHT_THEMES, "DARK_THEMES":DARK_THEMES, "NSFW_EMOJIS":NSFW_EMOJIS, "HOLES":HOLES, "CARP_ID":CARP_ID, "MAX_IMAGE_AUDIO_SIZE_MB":MAX_IMAGE_AUDIO_SIZE_MB, "MAX_IMAGE_AUDIO_SIZE_MB_PATRON":MAX_IMAGE_AUDIO_SIZE_MB_PATRON, diff --git a/files/routes/settings.py b/files/routes/settings.py index 82b9ce5e8..8b9f49031 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -199,7 +199,7 @@ def settings_personal_post(v): updated = True session["nsfw_warnings"] = int(request.values.get("nsfw_warnings") == 'true') - elif not updated and IS_EVENT() and request.values.get("event_music", v.event_music) != v.event_music: + elif not updated and IS_MUSICAL_EVENT() and request.values.get("event_music", v.event_music) != v.event_music: if not v.grinch: abort(403, "You need to award yourself the grinch award to be able to disable event music!") updated = True diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py index 5e2e2dc48..4de5bd583 100644 --- a/files/routes/wrappers.py +++ b/files/routes/wrappers.py @@ -118,7 +118,7 @@ def get_logged_in_user(): g.is_tor = (request.headers.get("cf-ipcountry") == "T1" and not (v and v.truescore >= 1000)) - if v and not IS_EVENT(): + if v and not IS_MUSICAL_EVENT(): session.pop("event_music", None) g.show_nsfw = SITE_NAME == 'WPD' or (v and not v.nsfw_warnings) or session.get('nsfw_cookies', 0) >= int(time.time()) diff --git a/files/templates/awards.html b/files/templates/awards.html index 1299a3c63..64d8364fd 100644 --- a/files/templates/awards.html +++ b/files/templates/awards.html @@ -29,7 +29,7 @@ {{stackable_award('firework')}} {% endif %} - {% if p.award_count("confetti", v) and (IS_BIRTHGAY() or IS_BIRTHDEAD()) %} + {% if p.award_count("confetti", v) and IS_BDAY() %}
{% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index bf9ecda13..30426fc52 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -26,8 +26,10 @@ {% set src = macros.random_image("assets/images/" ~ SITE_NAME ~ "/orgy_banners") %} {% set href = "/chat/1" %} {% set expand = false %} - {% elif IS_DKD() or IS_BIRTHGAY() or IS_BIRTHDEAD() %} + {% elif IS_DKD() %} {% set src = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/banners") %} + {% elif IS_BDAY() %} + {% set src = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/banners/" ~ SITE_NAME) %} {% elif IS_FOURTH() %} {% set src = SITE_FULL_IMAGES ~ '/i/rDrama/4th-of-july-banner.webp' %} {% elif SITE_NAME == "rDrama" %} @@ -137,7 +139,7 @@ {% endif %} {% endif %} - {% if IS_EVENT() and not (SITE_NAME == 'WPD' and not v) and (not v or v.event_music) and not (hole and hole.name == 'music') and not (u and u.song) and not (IS_HOMOWEEN() and p and p.award_count("haunt", v)) and not (p and p.embed and p.domain == 'twitter.com') %} + {% if IS_MUSICAL_EVENT() and not (SITE_NAME == 'WPD' and not v) and (not v or v.event_music) and not (hole and hole.name == 'music') and not (u and u.song) and not (IS_HOMOWEEN() and p and p.award_count("haunt", v)) and not (p and p.embed and p.domain == 'twitter.com') %} {% set path = "assets/events/" ~ IS_EVENT() ~ "/music" %} {% set song = SITE_FULL ~ "/" ~ path ~ "/" ~ listdir('files/'~path)|seeded_random(id) ~ '?x=45' %} diff --git a/files/templates/header.html b/files/templates/header.html index f5dd6d267..805892d02 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -93,6 +93,13 @@ 'marseypilgrim', 'carppilgrim', ] -%} + {% elif IS_BDAY() %} + {%- set icons = [ + 'marseyparty', + 'marseyballoon3', + 'marseyballoons', + 'marseycupcake', + ] -%} {% elif IS_DKD() %} {%- set icons = [ 'diddykongstand', diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html index 6d4f3a451..85e7e7c59 100644 --- a/files/templates/settings/advanced.html +++ b/files/templates/settings/advanced.html @@ -7,7 +7,7 @@
{# note: not using the thing from common just because of how much stuff there is in here #}
Device-specific Settings
- {% if IS_EVENT() %} + {% if IS_MUSICAL_EVENT() %} {{common.toggle_section('Event Music', 'event_music_switch', 'event_music', v.event_music, 'Toggle event music.', false)}} {% endif %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 9b3bd1339..58bb2705f 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -21,8 +21,8 @@ {% if hole and hole.sidebarurls %} {% set image = hole.random_sidebar %} - {% elif IS_FISTMAS() %} - {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME ) %} + {% elif IS_FISTMAS() or IS_BDAY() %} + {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME) %} {% elif IS_EVENT() %} {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar") %} {% else %} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 816416e65..e104a9e92 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -17,8 +17,8 @@ {% if hole and hole.sidebarurls %} {% set image = hole.random_sidebar %} - {% elif IS_FISTMAS() %} - {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME ) %} + {% elif IS_FISTMAS() or IS_BDAY() %} + {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar/" ~ SITE_NAME) %} {% elif IS_EVENT() %} {% set image = macros.random_image("assets/events/" ~ IS_EVENT() ~ "/images/sidebar") %} {% elif v and v.chud %}