diff --git a/docker-compose.yml b/docker-compose.yml index 5bcec7e89..2759a7900 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,8 +20,8 @@ services: #- HCAPTCHA_SITEKEY=3435tdfsdudebussylmaoxxt43 - HCAPTCHA_SECRET=3435tdfsdudebussylmaoxxt43 - YOUTUBE_KEY=3435tdfsdudebussylmaoxxt43 + #- PUSHER_ID=3435tdfsdudebussylmaoxxt43 - PUSHER_KEY=3435tdfsdudebussylmaoxxt43 - - PUSHER_ID=3435tdfsdudebussylmaoxxt43 - IMGUR_KEY=3435tdfsdudebussylmaoxxt43 - SPAM_SIMILARITY_THRESHOLD=0.5 - SPAM_URL_SIMILARITY_THRESHOLD=0.1 diff --git a/files/assets/images/Drama/banner.webp b/files/assets/images/Drama/banner.webp deleted file mode 100644 index 9d8146877..000000000 Binary files a/files/assets/images/Drama/banner.webp and /dev/null differ diff --git a/files/assets/images/Drama/banners/1.webp b/files/assets/images/Drama/banners/1.webp index 2f7339251..a79f24d1a 100644 Binary files a/files/assets/images/Drama/banners/1.webp and b/files/assets/images/Drama/banners/1.webp differ diff --git a/files/assets/images/Drama/banners/10.webp b/files/assets/images/Drama/banners/10.webp index 2d5247fca..1d0123d71 100644 Binary files a/files/assets/images/Drama/banners/10.webp and b/files/assets/images/Drama/banners/10.webp differ diff --git a/files/assets/images/Drama/banners/11.webp b/files/assets/images/Drama/banners/11.webp index 8384785b1..939fb2824 100644 Binary files a/files/assets/images/Drama/banners/11.webp and b/files/assets/images/Drama/banners/11.webp differ diff --git a/files/assets/images/Drama/banners/12.webp b/files/assets/images/Drama/banners/12.webp index 5638f3259..3244784f4 100644 Binary files a/files/assets/images/Drama/banners/12.webp and b/files/assets/images/Drama/banners/12.webp differ diff --git a/files/assets/images/Drama/banners/13.webp b/files/assets/images/Drama/banners/13.webp index 1aaa0c769..b51601baa 100644 Binary files a/files/assets/images/Drama/banners/13.webp and b/files/assets/images/Drama/banners/13.webp differ diff --git a/files/assets/images/Drama/banners/14.webp b/files/assets/images/Drama/banners/14.webp index f2a16dac3..2d2c7158d 100644 Binary files a/files/assets/images/Drama/banners/14.webp and b/files/assets/images/Drama/banners/14.webp differ diff --git a/files/assets/images/Drama/banners/15.webp b/files/assets/images/Drama/banners/15.webp index 647522718..a9c7e9d53 100644 Binary files a/files/assets/images/Drama/banners/15.webp and b/files/assets/images/Drama/banners/15.webp differ diff --git a/files/assets/images/Drama/banners/16.webp b/files/assets/images/Drama/banners/16.webp index 014caadb0..94ddeb2e0 100644 Binary files a/files/assets/images/Drama/banners/16.webp and b/files/assets/images/Drama/banners/16.webp differ diff --git a/files/assets/images/Drama/banners/17.webp b/files/assets/images/Drama/banners/17.webp index 542576d5c..59cb757d7 100644 Binary files a/files/assets/images/Drama/banners/17.webp and b/files/assets/images/Drama/banners/17.webp differ diff --git a/files/assets/images/Drama/banners/18.webp b/files/assets/images/Drama/banners/18.webp index 1d3ec3ac8..b1a1cc901 100644 Binary files a/files/assets/images/Drama/banners/18.webp and b/files/assets/images/Drama/banners/18.webp differ diff --git a/files/assets/images/Drama/banners/19.webp b/files/assets/images/Drama/banners/19.webp index 685fbc683..2e303906a 100644 Binary files a/files/assets/images/Drama/banners/19.webp and b/files/assets/images/Drama/banners/19.webp differ diff --git a/files/assets/images/Drama/banners/2.webp b/files/assets/images/Drama/banners/2.webp index 6a874de53..61e7d2217 100644 Binary files a/files/assets/images/Drama/banners/2.webp and b/files/assets/images/Drama/banners/2.webp differ diff --git a/files/assets/images/Drama/banners/20.webp b/files/assets/images/Drama/banners/20.webp index b34e2225e..50d7e705e 100644 Binary files a/files/assets/images/Drama/banners/20.webp and b/files/assets/images/Drama/banners/20.webp differ diff --git a/files/assets/images/Drama/banners/21.webp b/files/assets/images/Drama/banners/21.webp index 211cc44b0..d2204b61c 100644 Binary files a/files/assets/images/Drama/banners/21.webp and b/files/assets/images/Drama/banners/21.webp differ diff --git a/files/assets/images/Drama/banners/22.webp b/files/assets/images/Drama/banners/22.webp index ed9038f22..32a544cdc 100644 Binary files a/files/assets/images/Drama/banners/22.webp and b/files/assets/images/Drama/banners/22.webp differ diff --git a/files/assets/images/Drama/banners/23.webp b/files/assets/images/Drama/banners/23.webp index 0fe26d782..95d144046 100644 Binary files a/files/assets/images/Drama/banners/23.webp and b/files/assets/images/Drama/banners/23.webp differ diff --git a/files/assets/images/Drama/banners/24.webp b/files/assets/images/Drama/banners/24.webp index be36feaa9..2d8748439 100644 Binary files a/files/assets/images/Drama/banners/24.webp and b/files/assets/images/Drama/banners/24.webp differ diff --git a/files/assets/images/Drama/banners/25.webp b/files/assets/images/Drama/banners/25.webp index 1d10b86bb..534723285 100644 Binary files a/files/assets/images/Drama/banners/25.webp and b/files/assets/images/Drama/banners/25.webp differ diff --git a/files/assets/images/Drama/banners/26.webp b/files/assets/images/Drama/banners/26.webp index 86a419401..a4db39767 100644 Binary files a/files/assets/images/Drama/banners/26.webp and b/files/assets/images/Drama/banners/26.webp differ diff --git a/files/assets/images/Drama/banners/27.webp b/files/assets/images/Drama/banners/27.webp index 2230cf0d9..94f13ed55 100644 Binary files a/files/assets/images/Drama/banners/27.webp and b/files/assets/images/Drama/banners/27.webp differ diff --git a/files/assets/images/Drama/banners/28.webp b/files/assets/images/Drama/banners/28.webp index d487c37b9..cecec906c 100644 Binary files a/files/assets/images/Drama/banners/28.webp and b/files/assets/images/Drama/banners/28.webp differ diff --git a/files/assets/images/Drama/banners/29.webp b/files/assets/images/Drama/banners/29.webp index 4534b005f..13d11c1f9 100644 Binary files a/files/assets/images/Drama/banners/29.webp and b/files/assets/images/Drama/banners/29.webp differ diff --git a/files/assets/images/Drama/banners/3.webp b/files/assets/images/Drama/banners/3.webp index eea35385b..9c01d0666 100644 Binary files a/files/assets/images/Drama/banners/3.webp and b/files/assets/images/Drama/banners/3.webp differ diff --git a/files/assets/images/Drama/banners/30.webp b/files/assets/images/Drama/banners/30.webp index 59d03dc46..7bfe69b5a 100644 Binary files a/files/assets/images/Drama/banners/30.webp and b/files/assets/images/Drama/banners/30.webp differ diff --git a/files/assets/images/Drama/banners/31.webp b/files/assets/images/Drama/banners/31.webp index 442081210..1bb42349c 100644 Binary files a/files/assets/images/Drama/banners/31.webp and b/files/assets/images/Drama/banners/31.webp differ diff --git a/files/assets/images/Drama/banners/32.webp b/files/assets/images/Drama/banners/32.webp index c8395e48a..53fb4efa3 100644 Binary files a/files/assets/images/Drama/banners/32.webp and b/files/assets/images/Drama/banners/32.webp differ diff --git a/files/assets/images/Drama/banners/33.webp b/files/assets/images/Drama/banners/33.webp index 14b7ec3ee..4dc13b557 100644 Binary files a/files/assets/images/Drama/banners/33.webp and b/files/assets/images/Drama/banners/33.webp differ diff --git a/files/assets/images/Drama/banners/34.webp b/files/assets/images/Drama/banners/34.webp index 163f37cfe..a50074539 100644 Binary files a/files/assets/images/Drama/banners/34.webp and b/files/assets/images/Drama/banners/34.webp differ diff --git a/files/assets/images/Drama/banners/35.webp b/files/assets/images/Drama/banners/35.webp index 0116c09ff..9504cc7ae 100644 Binary files a/files/assets/images/Drama/banners/35.webp and b/files/assets/images/Drama/banners/35.webp differ diff --git a/files/assets/images/Drama/banners/36.webp b/files/assets/images/Drama/banners/36.webp index bf2d1d84f..dbf7fe87e 100644 Binary files a/files/assets/images/Drama/banners/36.webp and b/files/assets/images/Drama/banners/36.webp differ diff --git a/files/assets/images/Drama/banners/37.webp b/files/assets/images/Drama/banners/37.webp index 45e808424..2c38084e4 100644 Binary files a/files/assets/images/Drama/banners/37.webp and b/files/assets/images/Drama/banners/37.webp differ diff --git a/files/assets/images/Drama/banners/38.webp b/files/assets/images/Drama/banners/38.webp index cbf4c4375..0bb439b67 100644 Binary files a/files/assets/images/Drama/banners/38.webp and b/files/assets/images/Drama/banners/38.webp differ diff --git a/files/assets/images/Drama/banners/39.webp b/files/assets/images/Drama/banners/39.webp index e57a53781..a00013906 100644 Binary files a/files/assets/images/Drama/banners/39.webp and b/files/assets/images/Drama/banners/39.webp differ diff --git a/files/assets/images/Drama/banners/4.webp b/files/assets/images/Drama/banners/4.webp index 48826f996..323abdf06 100644 Binary files a/files/assets/images/Drama/banners/4.webp and b/files/assets/images/Drama/banners/4.webp differ diff --git a/files/assets/images/Drama/banners/5.webp b/files/assets/images/Drama/banners/5.webp index 0381299a0..7a144d587 100644 Binary files a/files/assets/images/Drama/banners/5.webp and b/files/assets/images/Drama/banners/5.webp differ diff --git a/files/assets/images/Drama/banners/6.webp b/files/assets/images/Drama/banners/6.webp index 3a59d8fff..a9e447366 100644 Binary files a/files/assets/images/Drama/banners/6.webp and b/files/assets/images/Drama/banners/6.webp differ diff --git a/files/assets/images/Drama/banners/7.webp b/files/assets/images/Drama/banners/7.webp index 4ae8f3161..b7be622b3 100644 Binary files a/files/assets/images/Drama/banners/7.webp and b/files/assets/images/Drama/banners/7.webp differ diff --git a/files/assets/images/Drama/banners/8.webp b/files/assets/images/Drama/banners/8.webp index bf82a686a..604911be9 100644 Binary files a/files/assets/images/Drama/banners/8.webp and b/files/assets/images/Drama/banners/8.webp differ diff --git a/files/assets/images/Drama/banners/9.webp b/files/assets/images/Drama/banners/9.webp index 7ce19bd09..7d17f6962 100644 Binary files a/files/assets/images/Drama/banners/9.webp and b/files/assets/images/Drama/banners/9.webp differ diff --git a/files/assets/images/Drama/sidebar/1.webp b/files/assets/images/Drama/sidebar/1.webp new file mode 100644 index 000000000..2f7339251 Binary files /dev/null and b/files/assets/images/Drama/sidebar/1.webp differ diff --git a/files/assets/images/Drama/sidebar/10.webp b/files/assets/images/Drama/sidebar/10.webp new file mode 100644 index 000000000..2d5247fca Binary files /dev/null and b/files/assets/images/Drama/sidebar/10.webp differ diff --git a/files/assets/images/Drama/banners/100.webp b/files/assets/images/Drama/sidebar/100.webp similarity index 100% rename from files/assets/images/Drama/banners/100.webp rename to files/assets/images/Drama/sidebar/100.webp diff --git a/files/assets/images/Drama/banners/101.webp b/files/assets/images/Drama/sidebar/101.webp similarity index 100% rename from files/assets/images/Drama/banners/101.webp rename to files/assets/images/Drama/sidebar/101.webp diff --git a/files/assets/images/Drama/banners/102.webp b/files/assets/images/Drama/sidebar/102.webp similarity index 100% rename from files/assets/images/Drama/banners/102.webp rename to files/assets/images/Drama/sidebar/102.webp diff --git a/files/assets/images/Drama/banners/103.webp b/files/assets/images/Drama/sidebar/103.webp similarity index 100% rename from files/assets/images/Drama/banners/103.webp rename to files/assets/images/Drama/sidebar/103.webp diff --git a/files/assets/images/Drama/banners/104.webp b/files/assets/images/Drama/sidebar/104.webp similarity index 100% rename from files/assets/images/Drama/banners/104.webp rename to files/assets/images/Drama/sidebar/104.webp diff --git a/files/assets/images/Drama/banners/105.webp b/files/assets/images/Drama/sidebar/105.webp similarity index 100% rename from files/assets/images/Drama/banners/105.webp rename to files/assets/images/Drama/sidebar/105.webp diff --git a/files/assets/images/Drama/banners/106.webp b/files/assets/images/Drama/sidebar/106.webp similarity index 100% rename from files/assets/images/Drama/banners/106.webp rename to files/assets/images/Drama/sidebar/106.webp diff --git a/files/assets/images/Drama/banners/107.webp b/files/assets/images/Drama/sidebar/107.webp similarity index 100% rename from files/assets/images/Drama/banners/107.webp rename to files/assets/images/Drama/sidebar/107.webp diff --git a/files/assets/images/Drama/banners/108.webp b/files/assets/images/Drama/sidebar/108.webp similarity index 100% rename from files/assets/images/Drama/banners/108.webp rename to files/assets/images/Drama/sidebar/108.webp diff --git a/files/assets/images/Drama/banners/109.webp b/files/assets/images/Drama/sidebar/109.webp similarity index 100% rename from files/assets/images/Drama/banners/109.webp rename to files/assets/images/Drama/sidebar/109.webp diff --git a/files/assets/images/Drama/sidebar/11.webp b/files/assets/images/Drama/sidebar/11.webp new file mode 100644 index 000000000..8384785b1 Binary files /dev/null and b/files/assets/images/Drama/sidebar/11.webp differ diff --git a/files/assets/images/Drama/banners/110.webp b/files/assets/images/Drama/sidebar/110.webp similarity index 100% rename from files/assets/images/Drama/banners/110.webp rename to files/assets/images/Drama/sidebar/110.webp diff --git a/files/assets/images/Drama/banners/111.webp b/files/assets/images/Drama/sidebar/111.webp similarity index 100% rename from files/assets/images/Drama/banners/111.webp rename to files/assets/images/Drama/sidebar/111.webp diff --git a/files/assets/images/Drama/banners/112.webp b/files/assets/images/Drama/sidebar/112.webp similarity index 100% rename from files/assets/images/Drama/banners/112.webp rename to files/assets/images/Drama/sidebar/112.webp diff --git a/files/assets/images/Drama/banners/113.webp b/files/assets/images/Drama/sidebar/113.webp similarity index 100% rename from files/assets/images/Drama/banners/113.webp rename to files/assets/images/Drama/sidebar/113.webp diff --git a/files/assets/images/Drama/banners/114.webp b/files/assets/images/Drama/sidebar/114.webp similarity index 100% rename from files/assets/images/Drama/banners/114.webp rename to files/assets/images/Drama/sidebar/114.webp diff --git a/files/assets/images/Drama/banners/115.webp b/files/assets/images/Drama/sidebar/115.webp similarity index 100% rename from files/assets/images/Drama/banners/115.webp rename to files/assets/images/Drama/sidebar/115.webp diff --git a/files/assets/images/Drama/banners/116.webp b/files/assets/images/Drama/sidebar/116.webp similarity index 100% rename from files/assets/images/Drama/banners/116.webp rename to files/assets/images/Drama/sidebar/116.webp diff --git a/files/assets/images/Drama/banners/117.webp b/files/assets/images/Drama/sidebar/117.webp similarity index 100% rename from files/assets/images/Drama/banners/117.webp rename to files/assets/images/Drama/sidebar/117.webp diff --git a/files/assets/images/Drama/banners/118.webp b/files/assets/images/Drama/sidebar/118.webp similarity index 100% rename from files/assets/images/Drama/banners/118.webp rename to files/assets/images/Drama/sidebar/118.webp diff --git a/files/assets/images/Drama/banners/119.webp b/files/assets/images/Drama/sidebar/119.webp similarity index 100% rename from files/assets/images/Drama/banners/119.webp rename to files/assets/images/Drama/sidebar/119.webp diff --git a/files/assets/images/Drama/sidebar/12.webp b/files/assets/images/Drama/sidebar/12.webp new file mode 100644 index 000000000..5638f3259 Binary files /dev/null and b/files/assets/images/Drama/sidebar/12.webp differ diff --git a/files/assets/images/Drama/banners/120.webp b/files/assets/images/Drama/sidebar/120.webp similarity index 100% rename from files/assets/images/Drama/banners/120.webp rename to files/assets/images/Drama/sidebar/120.webp diff --git a/files/assets/images/Drama/banners/121.webp b/files/assets/images/Drama/sidebar/121.webp similarity index 100% rename from files/assets/images/Drama/banners/121.webp rename to files/assets/images/Drama/sidebar/121.webp diff --git a/files/assets/images/Drama/banners/122.webp b/files/assets/images/Drama/sidebar/122.webp similarity index 100% rename from files/assets/images/Drama/banners/122.webp rename to files/assets/images/Drama/sidebar/122.webp diff --git a/files/assets/images/Drama/banners/123.webp b/files/assets/images/Drama/sidebar/123.webp similarity index 100% rename from files/assets/images/Drama/banners/123.webp rename to files/assets/images/Drama/sidebar/123.webp diff --git a/files/assets/images/Drama/banners/124.webp b/files/assets/images/Drama/sidebar/124.webp similarity index 100% rename from files/assets/images/Drama/banners/124.webp rename to files/assets/images/Drama/sidebar/124.webp diff --git a/files/assets/images/Drama/banners/125.webp b/files/assets/images/Drama/sidebar/125.webp similarity index 100% rename from files/assets/images/Drama/banners/125.webp rename to files/assets/images/Drama/sidebar/125.webp diff --git a/files/assets/images/Drama/banners/126.webp b/files/assets/images/Drama/sidebar/126.webp similarity index 100% rename from files/assets/images/Drama/banners/126.webp rename to files/assets/images/Drama/sidebar/126.webp diff --git a/files/assets/images/Drama/banners/127.webp b/files/assets/images/Drama/sidebar/127.webp similarity index 100% rename from files/assets/images/Drama/banners/127.webp rename to files/assets/images/Drama/sidebar/127.webp diff --git a/files/assets/images/Drama/banners/128.webp b/files/assets/images/Drama/sidebar/128.webp similarity index 100% rename from files/assets/images/Drama/banners/128.webp rename to files/assets/images/Drama/sidebar/128.webp diff --git a/files/assets/images/Drama/banners/129.webp b/files/assets/images/Drama/sidebar/129.webp similarity index 100% rename from files/assets/images/Drama/banners/129.webp rename to files/assets/images/Drama/sidebar/129.webp diff --git a/files/assets/images/Drama/sidebar/13.webp b/files/assets/images/Drama/sidebar/13.webp new file mode 100644 index 000000000..1aaa0c769 Binary files /dev/null and b/files/assets/images/Drama/sidebar/13.webp differ diff --git a/files/assets/images/Drama/banners/130.webp b/files/assets/images/Drama/sidebar/130.webp similarity index 100% rename from files/assets/images/Drama/banners/130.webp rename to files/assets/images/Drama/sidebar/130.webp diff --git a/files/assets/images/Drama/banners/131.webp b/files/assets/images/Drama/sidebar/131.webp similarity index 100% rename from files/assets/images/Drama/banners/131.webp rename to files/assets/images/Drama/sidebar/131.webp diff --git a/files/assets/images/Drama/banners/132.webp b/files/assets/images/Drama/sidebar/132.webp similarity index 100% rename from files/assets/images/Drama/banners/132.webp rename to files/assets/images/Drama/sidebar/132.webp diff --git a/files/assets/images/Drama/banners/133.webp b/files/assets/images/Drama/sidebar/133.webp similarity index 100% rename from files/assets/images/Drama/banners/133.webp rename to files/assets/images/Drama/sidebar/133.webp diff --git a/files/assets/images/Drama/banners/134.webp b/files/assets/images/Drama/sidebar/134.webp similarity index 100% rename from files/assets/images/Drama/banners/134.webp rename to files/assets/images/Drama/sidebar/134.webp diff --git a/files/assets/images/Drama/banners/135.webp b/files/assets/images/Drama/sidebar/135.webp similarity index 100% rename from files/assets/images/Drama/banners/135.webp rename to files/assets/images/Drama/sidebar/135.webp diff --git a/files/assets/images/Drama/banners/136.webp b/files/assets/images/Drama/sidebar/136.webp similarity index 100% rename from files/assets/images/Drama/banners/136.webp rename to files/assets/images/Drama/sidebar/136.webp diff --git a/files/assets/images/Drama/banners/137.webp b/files/assets/images/Drama/sidebar/137.webp similarity index 100% rename from files/assets/images/Drama/banners/137.webp rename to files/assets/images/Drama/sidebar/137.webp diff --git a/files/assets/images/Drama/banners/138.webp b/files/assets/images/Drama/sidebar/138.webp similarity index 100% rename from files/assets/images/Drama/banners/138.webp rename to files/assets/images/Drama/sidebar/138.webp diff --git a/files/assets/images/Drama/banners/139.webp b/files/assets/images/Drama/sidebar/139.webp similarity index 100% rename from files/assets/images/Drama/banners/139.webp rename to files/assets/images/Drama/sidebar/139.webp diff --git a/files/assets/images/Drama/sidebar/14.webp b/files/assets/images/Drama/sidebar/14.webp new file mode 100644 index 000000000..f2a16dac3 Binary files /dev/null and b/files/assets/images/Drama/sidebar/14.webp differ diff --git a/files/assets/images/Drama/banners/140.webp b/files/assets/images/Drama/sidebar/140.webp similarity index 100% rename from files/assets/images/Drama/banners/140.webp rename to files/assets/images/Drama/sidebar/140.webp diff --git a/files/assets/images/Drama/banners/141.webp b/files/assets/images/Drama/sidebar/141.webp similarity index 100% rename from files/assets/images/Drama/banners/141.webp rename to files/assets/images/Drama/sidebar/141.webp diff --git a/files/assets/images/Drama/banners/142.webp b/files/assets/images/Drama/sidebar/142.webp similarity index 100% rename from files/assets/images/Drama/banners/142.webp rename to files/assets/images/Drama/sidebar/142.webp diff --git a/files/assets/images/Drama/banners/143.webp b/files/assets/images/Drama/sidebar/143.webp similarity index 100% rename from files/assets/images/Drama/banners/143.webp rename to files/assets/images/Drama/sidebar/143.webp diff --git a/files/assets/images/Drama/banners/144.webp b/files/assets/images/Drama/sidebar/144.webp similarity index 100% rename from files/assets/images/Drama/banners/144.webp rename to files/assets/images/Drama/sidebar/144.webp diff --git a/files/assets/images/Drama/banners/145.webp b/files/assets/images/Drama/sidebar/145.webp similarity index 100% rename from files/assets/images/Drama/banners/145.webp rename to files/assets/images/Drama/sidebar/145.webp diff --git a/files/assets/images/Drama/banners/146.webp b/files/assets/images/Drama/sidebar/146.webp similarity index 100% rename from files/assets/images/Drama/banners/146.webp rename to files/assets/images/Drama/sidebar/146.webp diff --git a/files/assets/images/Drama/banners/147.webp b/files/assets/images/Drama/sidebar/147.webp similarity index 100% rename from files/assets/images/Drama/banners/147.webp rename to files/assets/images/Drama/sidebar/147.webp diff --git a/files/assets/images/Drama/banners/148.webp b/files/assets/images/Drama/sidebar/148.webp similarity index 100% rename from files/assets/images/Drama/banners/148.webp rename to files/assets/images/Drama/sidebar/148.webp diff --git a/files/assets/images/Drama/banners/149.webp b/files/assets/images/Drama/sidebar/149.webp similarity index 100% rename from files/assets/images/Drama/banners/149.webp rename to files/assets/images/Drama/sidebar/149.webp diff --git a/files/assets/images/Drama/sidebar/15.webp b/files/assets/images/Drama/sidebar/15.webp new file mode 100644 index 000000000..647522718 Binary files /dev/null and b/files/assets/images/Drama/sidebar/15.webp differ diff --git a/files/assets/images/Drama/banners/150.webp b/files/assets/images/Drama/sidebar/150.webp similarity index 100% rename from files/assets/images/Drama/banners/150.webp rename to files/assets/images/Drama/sidebar/150.webp diff --git a/files/assets/images/Drama/banners/151.webp b/files/assets/images/Drama/sidebar/151.webp similarity index 100% rename from files/assets/images/Drama/banners/151.webp rename to files/assets/images/Drama/sidebar/151.webp diff --git a/files/assets/images/Drama/banners/152.webp b/files/assets/images/Drama/sidebar/152.webp similarity index 100% rename from files/assets/images/Drama/banners/152.webp rename to files/assets/images/Drama/sidebar/152.webp diff --git a/files/assets/images/Drama/banners/153.webp b/files/assets/images/Drama/sidebar/153.webp similarity index 100% rename from files/assets/images/Drama/banners/153.webp rename to files/assets/images/Drama/sidebar/153.webp diff --git a/files/assets/images/Drama/banners/154.webp b/files/assets/images/Drama/sidebar/154.webp similarity index 100% rename from files/assets/images/Drama/banners/154.webp rename to files/assets/images/Drama/sidebar/154.webp diff --git a/files/assets/images/Drama/banners/155.webp b/files/assets/images/Drama/sidebar/155.webp similarity index 100% rename from files/assets/images/Drama/banners/155.webp rename to files/assets/images/Drama/sidebar/155.webp diff --git a/files/assets/images/Drama/banners/156.webp b/files/assets/images/Drama/sidebar/156.webp similarity index 100% rename from files/assets/images/Drama/banners/156.webp rename to files/assets/images/Drama/sidebar/156.webp diff --git a/files/assets/images/Drama/banners/157.webp b/files/assets/images/Drama/sidebar/157.webp similarity index 100% rename from files/assets/images/Drama/banners/157.webp rename to files/assets/images/Drama/sidebar/157.webp diff --git a/files/assets/images/Drama/banners/158.webp b/files/assets/images/Drama/sidebar/158.webp similarity index 100% rename from files/assets/images/Drama/banners/158.webp rename to files/assets/images/Drama/sidebar/158.webp diff --git a/files/assets/images/Drama/banners/159.webp b/files/assets/images/Drama/sidebar/159.webp similarity index 100% rename from files/assets/images/Drama/banners/159.webp rename to files/assets/images/Drama/sidebar/159.webp diff --git a/files/assets/images/Drama/sidebar/16.webp b/files/assets/images/Drama/sidebar/16.webp new file mode 100644 index 000000000..014caadb0 Binary files /dev/null and b/files/assets/images/Drama/sidebar/16.webp differ diff --git a/files/assets/images/Drama/banners/160.webp b/files/assets/images/Drama/sidebar/160.webp similarity index 100% rename from files/assets/images/Drama/banners/160.webp rename to files/assets/images/Drama/sidebar/160.webp diff --git a/files/assets/images/Drama/banners/161.webp b/files/assets/images/Drama/sidebar/161.webp similarity index 100% rename from files/assets/images/Drama/banners/161.webp rename to files/assets/images/Drama/sidebar/161.webp diff --git a/files/assets/images/Drama/banners/162.webp b/files/assets/images/Drama/sidebar/162.webp similarity index 100% rename from files/assets/images/Drama/banners/162.webp rename to files/assets/images/Drama/sidebar/162.webp diff --git a/files/assets/images/Drama/banners/163.webp b/files/assets/images/Drama/sidebar/163.webp similarity index 100% rename from files/assets/images/Drama/banners/163.webp rename to files/assets/images/Drama/sidebar/163.webp diff --git a/files/assets/images/Drama/banners/164.webp b/files/assets/images/Drama/sidebar/164.webp similarity index 100% rename from files/assets/images/Drama/banners/164.webp rename to files/assets/images/Drama/sidebar/164.webp diff --git a/files/assets/images/Drama/banners/165.webp b/files/assets/images/Drama/sidebar/165.webp similarity index 100% rename from files/assets/images/Drama/banners/165.webp rename to files/assets/images/Drama/sidebar/165.webp diff --git a/files/assets/images/Drama/banners/166.webp b/files/assets/images/Drama/sidebar/166.webp similarity index 100% rename from files/assets/images/Drama/banners/166.webp rename to files/assets/images/Drama/sidebar/166.webp diff --git a/files/assets/images/Drama/banners/167.webp b/files/assets/images/Drama/sidebar/167.webp similarity index 100% rename from files/assets/images/Drama/banners/167.webp rename to files/assets/images/Drama/sidebar/167.webp diff --git a/files/assets/images/Drama/banners/168.webp b/files/assets/images/Drama/sidebar/168.webp similarity index 100% rename from files/assets/images/Drama/banners/168.webp rename to files/assets/images/Drama/sidebar/168.webp diff --git a/files/assets/images/Drama/banners/169.webp b/files/assets/images/Drama/sidebar/169.webp similarity index 100% rename from files/assets/images/Drama/banners/169.webp rename to files/assets/images/Drama/sidebar/169.webp diff --git a/files/assets/images/Drama/sidebar/17.webp b/files/assets/images/Drama/sidebar/17.webp new file mode 100644 index 000000000..542576d5c Binary files /dev/null and b/files/assets/images/Drama/sidebar/17.webp differ diff --git a/files/assets/images/Drama/banners/170.webp b/files/assets/images/Drama/sidebar/170.webp similarity index 100% rename from files/assets/images/Drama/banners/170.webp rename to files/assets/images/Drama/sidebar/170.webp diff --git a/files/assets/images/Drama/banners/171.webp b/files/assets/images/Drama/sidebar/171.webp similarity index 100% rename from files/assets/images/Drama/banners/171.webp rename to files/assets/images/Drama/sidebar/171.webp diff --git a/files/assets/images/Drama/banners/172.webp b/files/assets/images/Drama/sidebar/172.webp similarity index 100% rename from files/assets/images/Drama/banners/172.webp rename to files/assets/images/Drama/sidebar/172.webp diff --git a/files/assets/images/Drama/banners/173.webp b/files/assets/images/Drama/sidebar/173.webp similarity index 100% rename from files/assets/images/Drama/banners/173.webp rename to files/assets/images/Drama/sidebar/173.webp diff --git a/files/assets/images/Drama/banners/174.webp b/files/assets/images/Drama/sidebar/174.webp similarity index 100% rename from files/assets/images/Drama/banners/174.webp rename to files/assets/images/Drama/sidebar/174.webp diff --git a/files/assets/images/Drama/banners/175.webp b/files/assets/images/Drama/sidebar/175.webp similarity index 100% rename from files/assets/images/Drama/banners/175.webp rename to files/assets/images/Drama/sidebar/175.webp diff --git a/files/assets/images/Drama/banners/176.webp b/files/assets/images/Drama/sidebar/176.webp similarity index 100% rename from files/assets/images/Drama/banners/176.webp rename to files/assets/images/Drama/sidebar/176.webp diff --git a/files/assets/images/Drama/banners/177.webp b/files/assets/images/Drama/sidebar/177.webp similarity index 100% rename from files/assets/images/Drama/banners/177.webp rename to files/assets/images/Drama/sidebar/177.webp diff --git a/files/assets/images/Drama/banners/178.webp b/files/assets/images/Drama/sidebar/178.webp similarity index 100% rename from files/assets/images/Drama/banners/178.webp rename to files/assets/images/Drama/sidebar/178.webp diff --git a/files/assets/images/Drama/sidebar/18.webp b/files/assets/images/Drama/sidebar/18.webp new file mode 100644 index 000000000..1d3ec3ac8 Binary files /dev/null and b/files/assets/images/Drama/sidebar/18.webp differ diff --git a/files/assets/images/Drama/sidebar/19.webp b/files/assets/images/Drama/sidebar/19.webp new file mode 100644 index 000000000..685fbc683 Binary files /dev/null and b/files/assets/images/Drama/sidebar/19.webp differ diff --git a/files/assets/images/Drama/sidebar/2.webp b/files/assets/images/Drama/sidebar/2.webp new file mode 100644 index 000000000..6a874de53 Binary files /dev/null and b/files/assets/images/Drama/sidebar/2.webp differ diff --git a/files/assets/images/Drama/sidebar/20.webp b/files/assets/images/Drama/sidebar/20.webp new file mode 100644 index 000000000..b34e2225e Binary files /dev/null and b/files/assets/images/Drama/sidebar/20.webp differ diff --git a/files/assets/images/Drama/sidebar/21.webp b/files/assets/images/Drama/sidebar/21.webp new file mode 100644 index 000000000..211cc44b0 Binary files /dev/null and b/files/assets/images/Drama/sidebar/21.webp differ diff --git a/files/assets/images/Drama/sidebar/22.webp b/files/assets/images/Drama/sidebar/22.webp new file mode 100644 index 000000000..ed9038f22 Binary files /dev/null and b/files/assets/images/Drama/sidebar/22.webp differ diff --git a/files/assets/images/Drama/sidebar/23.webp b/files/assets/images/Drama/sidebar/23.webp new file mode 100644 index 000000000..0fe26d782 Binary files /dev/null and b/files/assets/images/Drama/sidebar/23.webp differ diff --git a/files/assets/images/Drama/sidebar/24.webp b/files/assets/images/Drama/sidebar/24.webp new file mode 100644 index 000000000..be36feaa9 Binary files /dev/null and b/files/assets/images/Drama/sidebar/24.webp differ diff --git a/files/assets/images/Drama/sidebar/25.webp b/files/assets/images/Drama/sidebar/25.webp new file mode 100644 index 000000000..1d10b86bb Binary files /dev/null and b/files/assets/images/Drama/sidebar/25.webp differ diff --git a/files/assets/images/Drama/sidebar/26.webp b/files/assets/images/Drama/sidebar/26.webp new file mode 100644 index 000000000..86a419401 Binary files /dev/null and b/files/assets/images/Drama/sidebar/26.webp differ diff --git a/files/assets/images/Drama/sidebar/27.webp b/files/assets/images/Drama/sidebar/27.webp new file mode 100644 index 000000000..2230cf0d9 Binary files /dev/null and b/files/assets/images/Drama/sidebar/27.webp differ diff --git a/files/assets/images/Drama/sidebar/28.webp b/files/assets/images/Drama/sidebar/28.webp new file mode 100644 index 000000000..d487c37b9 Binary files /dev/null and b/files/assets/images/Drama/sidebar/28.webp differ diff --git a/files/assets/images/Drama/sidebar/29.webp b/files/assets/images/Drama/sidebar/29.webp new file mode 100644 index 000000000..4534b005f Binary files /dev/null and b/files/assets/images/Drama/sidebar/29.webp differ diff --git a/files/assets/images/Drama/sidebar/3.webp b/files/assets/images/Drama/sidebar/3.webp new file mode 100644 index 000000000..eea35385b Binary files /dev/null and b/files/assets/images/Drama/sidebar/3.webp differ diff --git a/files/assets/images/Drama/sidebar/30.webp b/files/assets/images/Drama/sidebar/30.webp new file mode 100644 index 000000000..59d03dc46 Binary files /dev/null and b/files/assets/images/Drama/sidebar/30.webp differ diff --git a/files/assets/images/Drama/sidebar/31.webp b/files/assets/images/Drama/sidebar/31.webp new file mode 100644 index 000000000..442081210 Binary files /dev/null and b/files/assets/images/Drama/sidebar/31.webp differ diff --git a/files/assets/images/Drama/sidebar/32.webp b/files/assets/images/Drama/sidebar/32.webp new file mode 100644 index 000000000..c8395e48a Binary files /dev/null and b/files/assets/images/Drama/sidebar/32.webp differ diff --git a/files/assets/images/Drama/sidebar/33.webp b/files/assets/images/Drama/sidebar/33.webp new file mode 100644 index 000000000..14b7ec3ee Binary files /dev/null and b/files/assets/images/Drama/sidebar/33.webp differ diff --git a/files/assets/images/Drama/sidebar/34.webp b/files/assets/images/Drama/sidebar/34.webp new file mode 100644 index 000000000..163f37cfe Binary files /dev/null and b/files/assets/images/Drama/sidebar/34.webp differ diff --git a/files/assets/images/Drama/sidebar/35.webp b/files/assets/images/Drama/sidebar/35.webp new file mode 100644 index 000000000..0116c09ff Binary files /dev/null and b/files/assets/images/Drama/sidebar/35.webp differ diff --git a/files/assets/images/Drama/sidebar/36.webp b/files/assets/images/Drama/sidebar/36.webp new file mode 100644 index 000000000..bf2d1d84f Binary files /dev/null and b/files/assets/images/Drama/sidebar/36.webp differ diff --git a/files/assets/images/Drama/sidebar/37.webp b/files/assets/images/Drama/sidebar/37.webp new file mode 100644 index 000000000..45e808424 Binary files /dev/null and b/files/assets/images/Drama/sidebar/37.webp differ diff --git a/files/assets/images/Drama/sidebar/38.webp b/files/assets/images/Drama/sidebar/38.webp new file mode 100644 index 000000000..cbf4c4375 Binary files /dev/null and b/files/assets/images/Drama/sidebar/38.webp differ diff --git a/files/assets/images/Drama/sidebar/39.webp b/files/assets/images/Drama/sidebar/39.webp new file mode 100644 index 000000000..e57a53781 Binary files /dev/null and b/files/assets/images/Drama/sidebar/39.webp differ diff --git a/files/assets/images/Drama/sidebar/4.webp b/files/assets/images/Drama/sidebar/4.webp new file mode 100644 index 000000000..48826f996 Binary files /dev/null and b/files/assets/images/Drama/sidebar/4.webp differ diff --git a/files/assets/images/Drama/banners/40.webp b/files/assets/images/Drama/sidebar/40.webp similarity index 100% rename from files/assets/images/Drama/banners/40.webp rename to files/assets/images/Drama/sidebar/40.webp diff --git a/files/assets/images/Drama/banners/41.webp b/files/assets/images/Drama/sidebar/41.webp similarity index 100% rename from files/assets/images/Drama/banners/41.webp rename to files/assets/images/Drama/sidebar/41.webp diff --git a/files/assets/images/Drama/banners/42.webp b/files/assets/images/Drama/sidebar/42.webp similarity index 100% rename from files/assets/images/Drama/banners/42.webp rename to files/assets/images/Drama/sidebar/42.webp diff --git a/files/assets/images/Drama/banners/43.webp b/files/assets/images/Drama/sidebar/43.webp similarity index 100% rename from files/assets/images/Drama/banners/43.webp rename to files/assets/images/Drama/sidebar/43.webp diff --git a/files/assets/images/Drama/banners/44.webp b/files/assets/images/Drama/sidebar/44.webp similarity index 100% rename from files/assets/images/Drama/banners/44.webp rename to files/assets/images/Drama/sidebar/44.webp diff --git a/files/assets/images/Drama/banners/45.webp b/files/assets/images/Drama/sidebar/45.webp similarity index 100% rename from files/assets/images/Drama/banners/45.webp rename to files/assets/images/Drama/sidebar/45.webp diff --git a/files/assets/images/Drama/banners/46.webp b/files/assets/images/Drama/sidebar/46.webp similarity index 100% rename from files/assets/images/Drama/banners/46.webp rename to files/assets/images/Drama/sidebar/46.webp diff --git a/files/assets/images/Drama/banners/47.webp b/files/assets/images/Drama/sidebar/47.webp similarity index 100% rename from files/assets/images/Drama/banners/47.webp rename to files/assets/images/Drama/sidebar/47.webp diff --git a/files/assets/images/Drama/banners/48.webp b/files/assets/images/Drama/sidebar/48.webp similarity index 100% rename from files/assets/images/Drama/banners/48.webp rename to files/assets/images/Drama/sidebar/48.webp diff --git a/files/assets/images/Drama/banners/49.webp b/files/assets/images/Drama/sidebar/49.webp similarity index 100% rename from files/assets/images/Drama/banners/49.webp rename to files/assets/images/Drama/sidebar/49.webp diff --git a/files/assets/images/Drama/sidebar/5.webp b/files/assets/images/Drama/sidebar/5.webp new file mode 100644 index 000000000..0381299a0 Binary files /dev/null and b/files/assets/images/Drama/sidebar/5.webp differ diff --git a/files/assets/images/Drama/banners/50.webp b/files/assets/images/Drama/sidebar/50.webp similarity index 100% rename from files/assets/images/Drama/banners/50.webp rename to files/assets/images/Drama/sidebar/50.webp diff --git a/files/assets/images/Drama/banners/51.webp b/files/assets/images/Drama/sidebar/51.webp similarity index 100% rename from files/assets/images/Drama/banners/51.webp rename to files/assets/images/Drama/sidebar/51.webp diff --git a/files/assets/images/Drama/banners/52.webp b/files/assets/images/Drama/sidebar/52.webp similarity index 100% rename from files/assets/images/Drama/banners/52.webp rename to files/assets/images/Drama/sidebar/52.webp diff --git a/files/assets/images/Drama/banners/53.webp b/files/assets/images/Drama/sidebar/53.webp similarity index 100% rename from files/assets/images/Drama/banners/53.webp rename to files/assets/images/Drama/sidebar/53.webp diff --git a/files/assets/images/Drama/banners/54.webp b/files/assets/images/Drama/sidebar/54.webp similarity index 100% rename from files/assets/images/Drama/banners/54.webp rename to files/assets/images/Drama/sidebar/54.webp diff --git a/files/assets/images/Drama/banners/55.webp b/files/assets/images/Drama/sidebar/55.webp similarity index 100% rename from files/assets/images/Drama/banners/55.webp rename to files/assets/images/Drama/sidebar/55.webp diff --git a/files/assets/images/Drama/banners/56.webp b/files/assets/images/Drama/sidebar/56.webp similarity index 100% rename from files/assets/images/Drama/banners/56.webp rename to files/assets/images/Drama/sidebar/56.webp diff --git a/files/assets/images/Drama/banners/57.webp b/files/assets/images/Drama/sidebar/57.webp similarity index 100% rename from files/assets/images/Drama/banners/57.webp rename to files/assets/images/Drama/sidebar/57.webp diff --git a/files/assets/images/Drama/banners/58.webp b/files/assets/images/Drama/sidebar/58.webp similarity index 100% rename from files/assets/images/Drama/banners/58.webp rename to files/assets/images/Drama/sidebar/58.webp diff --git a/files/assets/images/Drama/banners/59.webp b/files/assets/images/Drama/sidebar/59.webp similarity index 100% rename from files/assets/images/Drama/banners/59.webp rename to files/assets/images/Drama/sidebar/59.webp diff --git a/files/assets/images/Drama/sidebar/6.webp b/files/assets/images/Drama/sidebar/6.webp new file mode 100644 index 000000000..3a59d8fff Binary files /dev/null and b/files/assets/images/Drama/sidebar/6.webp differ diff --git a/files/assets/images/Drama/banners/60.webp b/files/assets/images/Drama/sidebar/60.webp similarity index 100% rename from files/assets/images/Drama/banners/60.webp rename to files/assets/images/Drama/sidebar/60.webp diff --git a/files/assets/images/Drama/banners/61.webp b/files/assets/images/Drama/sidebar/61.webp similarity index 100% rename from files/assets/images/Drama/banners/61.webp rename to files/assets/images/Drama/sidebar/61.webp diff --git a/files/assets/images/Drama/banners/62.webp b/files/assets/images/Drama/sidebar/62.webp similarity index 100% rename from files/assets/images/Drama/banners/62.webp rename to files/assets/images/Drama/sidebar/62.webp diff --git a/files/assets/images/Drama/banners/63.webp b/files/assets/images/Drama/sidebar/63.webp similarity index 100% rename from files/assets/images/Drama/banners/63.webp rename to files/assets/images/Drama/sidebar/63.webp diff --git a/files/assets/images/Drama/banners/64.webp b/files/assets/images/Drama/sidebar/64.webp similarity index 100% rename from files/assets/images/Drama/banners/64.webp rename to files/assets/images/Drama/sidebar/64.webp diff --git a/files/assets/images/Drama/banners/65.webp b/files/assets/images/Drama/sidebar/65.webp similarity index 100% rename from files/assets/images/Drama/banners/65.webp rename to files/assets/images/Drama/sidebar/65.webp diff --git a/files/assets/images/Drama/banners/66.webp b/files/assets/images/Drama/sidebar/66.webp similarity index 100% rename from files/assets/images/Drama/banners/66.webp rename to files/assets/images/Drama/sidebar/66.webp diff --git a/files/assets/images/Drama/banners/67.webp b/files/assets/images/Drama/sidebar/67.webp similarity index 100% rename from files/assets/images/Drama/banners/67.webp rename to files/assets/images/Drama/sidebar/67.webp diff --git a/files/assets/images/Drama/banners/68.webp b/files/assets/images/Drama/sidebar/68.webp similarity index 100% rename from files/assets/images/Drama/banners/68.webp rename to files/assets/images/Drama/sidebar/68.webp diff --git a/files/assets/images/Drama/banners/69.webp b/files/assets/images/Drama/sidebar/69.webp similarity index 100% rename from files/assets/images/Drama/banners/69.webp rename to files/assets/images/Drama/sidebar/69.webp diff --git a/files/assets/images/Drama/sidebar/7.webp b/files/assets/images/Drama/sidebar/7.webp new file mode 100644 index 000000000..4ae8f3161 Binary files /dev/null and b/files/assets/images/Drama/sidebar/7.webp differ diff --git a/files/assets/images/Drama/banners/70.webp b/files/assets/images/Drama/sidebar/70.webp similarity index 100% rename from files/assets/images/Drama/banners/70.webp rename to files/assets/images/Drama/sidebar/70.webp diff --git a/files/assets/images/Drama/banners/71.webp b/files/assets/images/Drama/sidebar/71.webp similarity index 100% rename from files/assets/images/Drama/banners/71.webp rename to files/assets/images/Drama/sidebar/71.webp diff --git a/files/assets/images/Drama/banners/72.webp b/files/assets/images/Drama/sidebar/72.webp similarity index 100% rename from files/assets/images/Drama/banners/72.webp rename to files/assets/images/Drama/sidebar/72.webp diff --git a/files/assets/images/Drama/banners/73.webp b/files/assets/images/Drama/sidebar/73.webp similarity index 100% rename from files/assets/images/Drama/banners/73.webp rename to files/assets/images/Drama/sidebar/73.webp diff --git a/files/assets/images/Drama/banners/74.webp b/files/assets/images/Drama/sidebar/74.webp similarity index 100% rename from files/assets/images/Drama/banners/74.webp rename to files/assets/images/Drama/sidebar/74.webp diff --git a/files/assets/images/Drama/banners/75.webp b/files/assets/images/Drama/sidebar/75.webp similarity index 100% rename from files/assets/images/Drama/banners/75.webp rename to files/assets/images/Drama/sidebar/75.webp diff --git a/files/assets/images/Drama/banners/76.webp b/files/assets/images/Drama/sidebar/76.webp similarity index 100% rename from files/assets/images/Drama/banners/76.webp rename to files/assets/images/Drama/sidebar/76.webp diff --git a/files/assets/images/Drama/banners/77.webp b/files/assets/images/Drama/sidebar/77.webp similarity index 100% rename from files/assets/images/Drama/banners/77.webp rename to files/assets/images/Drama/sidebar/77.webp diff --git a/files/assets/images/Drama/banners/78.webp b/files/assets/images/Drama/sidebar/78.webp similarity index 100% rename from files/assets/images/Drama/banners/78.webp rename to files/assets/images/Drama/sidebar/78.webp diff --git a/files/assets/images/Drama/banners/79.webp b/files/assets/images/Drama/sidebar/79.webp similarity index 100% rename from files/assets/images/Drama/banners/79.webp rename to files/assets/images/Drama/sidebar/79.webp diff --git a/files/assets/images/Drama/sidebar/8.webp b/files/assets/images/Drama/sidebar/8.webp new file mode 100644 index 000000000..bf82a686a Binary files /dev/null and b/files/assets/images/Drama/sidebar/8.webp differ diff --git a/files/assets/images/Drama/banners/80.webp b/files/assets/images/Drama/sidebar/80.webp similarity index 100% rename from files/assets/images/Drama/banners/80.webp rename to files/assets/images/Drama/sidebar/80.webp diff --git a/files/assets/images/Drama/banners/81.webp b/files/assets/images/Drama/sidebar/81.webp similarity index 100% rename from files/assets/images/Drama/banners/81.webp rename to files/assets/images/Drama/sidebar/81.webp diff --git a/files/assets/images/Drama/banners/82.webp b/files/assets/images/Drama/sidebar/82.webp similarity index 100% rename from files/assets/images/Drama/banners/82.webp rename to files/assets/images/Drama/sidebar/82.webp diff --git a/files/assets/images/Drama/banners/83.webp b/files/assets/images/Drama/sidebar/83.webp similarity index 100% rename from files/assets/images/Drama/banners/83.webp rename to files/assets/images/Drama/sidebar/83.webp diff --git a/files/assets/images/Drama/banners/84.webp b/files/assets/images/Drama/sidebar/84.webp similarity index 100% rename from files/assets/images/Drama/banners/84.webp rename to files/assets/images/Drama/sidebar/84.webp diff --git a/files/assets/images/Drama/banners/85.webp b/files/assets/images/Drama/sidebar/85.webp similarity index 100% rename from files/assets/images/Drama/banners/85.webp rename to files/assets/images/Drama/sidebar/85.webp diff --git a/files/assets/images/Drama/banners/86.webp b/files/assets/images/Drama/sidebar/86.webp similarity index 100% rename from files/assets/images/Drama/banners/86.webp rename to files/assets/images/Drama/sidebar/86.webp diff --git a/files/assets/images/Drama/banners/87.webp b/files/assets/images/Drama/sidebar/87.webp similarity index 100% rename from files/assets/images/Drama/banners/87.webp rename to files/assets/images/Drama/sidebar/87.webp diff --git a/files/assets/images/Drama/banners/88.webp b/files/assets/images/Drama/sidebar/88.webp similarity index 100% rename from files/assets/images/Drama/banners/88.webp rename to files/assets/images/Drama/sidebar/88.webp diff --git a/files/assets/images/Drama/banners/89.webp b/files/assets/images/Drama/sidebar/89.webp similarity index 100% rename from files/assets/images/Drama/banners/89.webp rename to files/assets/images/Drama/sidebar/89.webp diff --git a/files/assets/images/Drama/sidebar/9.webp b/files/assets/images/Drama/sidebar/9.webp new file mode 100644 index 000000000..7ce19bd09 Binary files /dev/null and b/files/assets/images/Drama/sidebar/9.webp differ diff --git a/files/assets/images/Drama/banners/90.webp b/files/assets/images/Drama/sidebar/90.webp similarity index 100% rename from files/assets/images/Drama/banners/90.webp rename to files/assets/images/Drama/sidebar/90.webp diff --git a/files/assets/images/Drama/banners/91.webp b/files/assets/images/Drama/sidebar/91.webp similarity index 100% rename from files/assets/images/Drama/banners/91.webp rename to files/assets/images/Drama/sidebar/91.webp diff --git a/files/assets/images/Drama/banners/92.webp b/files/assets/images/Drama/sidebar/92.webp similarity index 100% rename from files/assets/images/Drama/banners/92.webp rename to files/assets/images/Drama/sidebar/92.webp diff --git a/files/assets/images/Drama/banners/93.webp b/files/assets/images/Drama/sidebar/93.webp similarity index 100% rename from files/assets/images/Drama/banners/93.webp rename to files/assets/images/Drama/sidebar/93.webp diff --git a/files/assets/images/Drama/banners/94.webp b/files/assets/images/Drama/sidebar/94.webp similarity index 100% rename from files/assets/images/Drama/banners/94.webp rename to files/assets/images/Drama/sidebar/94.webp diff --git a/files/assets/images/Drama/banners/95.webp b/files/assets/images/Drama/sidebar/95.webp similarity index 100% rename from files/assets/images/Drama/banners/95.webp rename to files/assets/images/Drama/sidebar/95.webp diff --git a/files/assets/images/Drama/banners/96.webp b/files/assets/images/Drama/sidebar/96.webp similarity index 100% rename from files/assets/images/Drama/banners/96.webp rename to files/assets/images/Drama/sidebar/96.webp diff --git a/files/assets/images/Drama/banners/97.webp b/files/assets/images/Drama/sidebar/97.webp similarity index 100% rename from files/assets/images/Drama/banners/97.webp rename to files/assets/images/Drama/sidebar/97.webp diff --git a/files/assets/images/Drama/banners/98.webp b/files/assets/images/Drama/sidebar/98.webp similarity index 100% rename from files/assets/images/Drama/banners/98.webp rename to files/assets/images/Drama/sidebar/98.webp diff --git a/files/assets/images/Drama/banners/99.webp b/files/assets/images/Drama/sidebar/99.webp similarity index 100% rename from files/assets/images/Drama/banners/99.webp rename to files/assets/images/Drama/sidebar/99.webp diff --git a/files/helpers/const.py b/files/helpers/const.py index 91c0a8585..6048a84f1 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -122,7 +122,7 @@ def torture_ap(body, username): LONGPOST_REPLIES = ('Wow, you must be a JP fan.', 'This is one of the worst posts I have EVER seen. Delete it.', "No, don't reply like this, please do another wall of unhinged rant please.", '# 😴😴😴', "Ma'am we've been over this before. You need to stop.", "I've known more coherent downies.", "Your pulitzer's in the mail", "That's great and all, but I asked for my burger without cheese.", 'That degree finally paying off', "That's nice sweaty. Why don't you have a seat in the time out corner with Pizzashill until you calm down, then you can have your Capri Sun.", "All them words won't bring your pa back.", "You had a chance to not be completely worthless, but it looks like you threw it away. At least you're consistent.", 'Some people are able to display their intelligence by going on at length on a subject and never actually saying anything. This ability is most common in trades such as politics, public relations, and law. You have impressed me by being able to best them all, while still coming off as an absolute idiot.', "You can type 10,000 characters and you decided that these were the one's that you wanted.", 'Have you owned the libs yet?', "I don't know what you said, because I've seen another human naked.", 'Impressive. Normally people with such severe developmental disabilities struggle to write much more than a sentence or two. He really has exceded our expectations for the writing portion. Sadly the coherency of his writing, along with his abilities in the social skills and reading portions, are far behind his peers with similar disabilities.', "This is a really long way of saying you don't fuck.", "Sorry ma'am, looks like his delusions have gotten worse. We'll have to admit him.", ':#marseywoah:', 'If only you could put that energy into your relationships', 'Posts like this is why I do Heroine.', 'still unemployed then?', 'K', 'look im gunna have 2 ask u 2 keep ur giant dumps in the toilet not in my replys 😷😷😷', "Mommy is soooo proud of you, sweaty. Let's put this sperg out up on the fridge with all your other failures.", "Good job bobby, here's a star", "That was a mistake. You're about to find out the hard way why.", 'You sat down and wrote all this shit. You could have done so many other things with your life. What happened to your life that made you decide writing novels of bullshit on rdrama.net was the best option?', "I don't have enough spoons to read this shit", "All those words won't bring daddy back.", 'OUT!', "Damn, you're really mad over this, but thanks for the effort you put into typing that all out! Sadly I won't read it all.", "Jesse what the fuck are you talking about??") -AGENDAPOSTER_PHRASE = 'black lives matter' +AGENDAPOSTER_PHRASE = 'trans lives matter' AGENDAPOSTER_MSG = """Hi @{username},\n\nYour {type} has been automatically removed because you forgot to include `{AGENDAPOSTER_PHRASE}`.\n\nDon't worry, we're here to help! We @@ -787,3 +787,4 @@ NOTIFIED_USERS = { } num_banners = len(listdir('files/assets/images/Drama/banners')) + 1 +num_sidebar = len(listdir('files/assets/images/Drama/sidebar')) + 1 \ No newline at end of file diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py index 42c926ab4..be6a35949 100644 --- a/files/helpers/jinja2.py +++ b/files/helpers/jinja2.py @@ -24,4 +24,4 @@ def post_embed(id, v): @app.context_processor def inject_constants(): - return {"num_banners":num_banners, "environ":environ, "SITE_NAME":SITE_NAME, "AUTOJANNY_ID": AUTOJANNY_ID, "NOTIFICATIONS_ID": NOTIFICATIONS_ID, "PUSHER_ID": PUSHER_ID} \ No newline at end of file + return {"num_banners":num_banners, "num_sidebar":num_sidebar, "environ":environ, "SITE_NAME":SITE_NAME, "AUTOJANNY_ID": AUTOJANNY_ID, "NOTIFICATIONS_ID": NOTIFICATIONS_ID, "PUSHER_ID": PUSHER_ID} \ No newline at end of file diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index b99e83d42..b9683cf08 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -245,10 +245,12 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False): htmlsource += '">' sanitized = sanitized.replace(replacing, htmlsource) - for i in re.finditer('>(https://.*?\.(mp4|webm|mov))

', sanitized): - sanitized = sanitized.replace(f'

{i.group(1)}

', f'

') - for i in re.finditer('

(https:.*?\.(mp4|webm|mov))

', sanitized): - sanitized = sanitized.replace(i.group(0), f'

') + + if not noimages: + for i in re.finditer('>(https://.*?\.(mp4|webm|mov))

', sanitized): + sanitized = sanitized.replace(f'

{i.group(1)}

', f'

') + for i in re.finditer('

(https:.*?\.(mp4|webm|mov))

', sanitized): + sanitized = sanitized.replace(i.group(0), f'

') for rd in ["://reddit.com", "://new.reddit.com", "://www.reddit.com", "://redd.it", "://libredd.it"]: sanitized = sanitized.replace(rd, "://old.reddit.com") diff --git a/files/routes/comments.py b/files/routes/comments.py index eb881dd88..0a5f6fc6d 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -16,10 +16,7 @@ if site == 'pcmemes.net': cc = "SPLASH MOUNTAIN" else: cc = "COUNTRY CLUB" IMGUR_KEY = environ.get("IMGUR_KEY").strip() -beams_client = PushNotifications( - instance_id=PUSHER_ID, - secret_key=PUSHER_KEY, -) +if PUSHER_ID: beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY) @app.get("/comment/") @app.get("/post///") @@ -161,7 +158,7 @@ def api_comment(v): body = request.values.get("body", "").strip()[:10000] if v.marseyawarded: - marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) + marregex = list(re.finditer("^(:[!#]{0,2}m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You can only type marseys!"}, 403 if v.longpost and len(body) < 280 or ' [](' in body or body.startswith('[]('): return {"error":"You have to type more than 280 characters!"}, 403 @@ -332,7 +329,7 @@ def api_comment(v): g.db.add(c) - body = AGENDAPOSTER_MSG.format(username=v.username, type='comment') + body = AGENDAPOSTER_MSG.format(username=v.username, type='comment', AGENDAPOSTER_PHRASE=AGENDAPOSTER_PHRASE) body_jannied_html = sanitize(body) @@ -465,7 +462,7 @@ def api_comment(v): n = Notification(comment_id=c.id, user_id=x) g.db.add(n) - if parent.author.id != v.id: + if parent.author.id != v.id and PUSHER_ID: if len(c.body) > 500: notifbody = c.body[:500] + '...' else: notifbody = c.body @@ -561,7 +558,7 @@ def edit_comment(cid, v): if body != c.body or request.files.get("file") and request.headers.get("cf-ipcountry") != "T1": if v.marseyawarded: - marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) + marregex = list(re.finditer("^(:[!#]{0,2}m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You can only type marseys!"}, 403 if v.longpost and len(body) < 280 or ' [](' in body or body.startswith('[]('): return {"error":"You have to type more than 280 characters!"}, 403 @@ -674,7 +671,7 @@ def edit_comment(cid, v): g.db.add(c) - body = AGENDAPOSTER_MSG.format(username=v.username, type='comment') + body = AGENDAPOSTER_MSG.format(username=v.username, type='comment', AGENDAPOSTER_PHRASE=AGENDAPOSTER_PHRASE) body_jannied_html = sanitize(body) diff --git a/files/routes/posts.py b/files/routes/posts.py index 61fb2d8e4..bf444bebb 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -403,10 +403,10 @@ def edit_post(pid, v): if len(body) > 10000: return {"error":"Character limit is 10000!"}, 403 if v.marseyawarded: - marregex = list(re.finditer("^(:!?m\w+:\s*)+$", title)) + marregex = list(re.finditer("^(:[!#]{0,2}m\w+:\s*)+$", title)) if len(marregex) == 0: return {"error":"You can only type marseys!"}, 403 if body: - marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) + marregex = list(re.finditer("^(:[!#]{0,2}m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You can only type marseys!"}, 403 if v.longpost and len(body) < 280 or ' [](' in body or body.startswith('[]('): return {"error":"You have to type more than 280 characters!"}, 403 @@ -483,7 +483,7 @@ def edit_post(pid, v): g.db.add(p) - body = AGENDAPOSTER_MSG.format(username=v.username, type='post') + body = AGENDAPOSTER_MSG.format(username=v.username, type='post', AGENDAPOSTER_PHRASE=AGENDAPOSTER_PHRASE) body_jannied_html = sanitize(body) @@ -789,10 +789,10 @@ def submit_post(v): else: render_template("submit.html", v=v, error="500 character limit for titles.", title=title[:500], url=url, body=request.values.get("body", "")), 400 if v.marseyawarded: - marregex = list(re.finditer("^(:!?m\w+:\s*)+$", title)) + marregex = list(re.finditer("^(:[!#]{0,2}m\w+:\s*)+$", title)) if len(marregex) == 0: return {"error":"You can only type marseys!"}, 403 if body: - marregex = list(re.finditer("^(:!?m\w+:\s*)+$", body)) + marregex = list(re.finditer("^(:[!#]{0,2}m\w+:\s*)+$", body)) if len(marregex) == 0: return {"error":"You can only type marseys!"}, 403 if v.longpost and len(body) < 280 or ' [](' in body or body.startswith('[]('): return {"error":"You have to type more than 280 characters!"}, 403 @@ -1013,7 +1013,7 @@ def submit_post(v): new_post.is_banned = True new_post.ban_reason = "AutoJanny" - body = AGENDAPOSTER_MSG.format(username=v.username, type='post') + body = AGENDAPOSTER_MSG.format(username=v.username, type='post', AGENDAPOSTER_PHRASE=AGENDAPOSTER_PHRASE) body_jannied_html = sanitize(body) diff --git a/files/routes/users.py b/files/routes/users.py index 44f1c3d34..4842d0844 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -14,7 +14,7 @@ from collections import Counter site = environ.get("DOMAIN").strip() -beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY) +if PUSHER_ID: beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY) db = db_session() @@ -442,31 +442,32 @@ def message2(v, username): notif = Notification(comment_id=new_comment.id, user_id=user.id) g.db.add(notif) - if len(message) > 500: notifbody = message[:500] + '...' - else: notifbody = message + if PUSHER_ID: + if len(message) > 500: notifbody = message[:500] + '...' + else: notifbody = message - beams_client.publish_to_interests( - interests=[f'{request.host}{user.id}'], - publish_body={ - 'web': { - 'notification': { - 'title': f'New message from @{v.username}', - 'body': notifbody, - 'deep_link': f'https://{site}/notifications?messages=true', - 'icon': f'https://{request.host}/assets/images/{SITE_NAME}/icon.webp', + beams_client.publish_to_interests( + interests=[f'{request.host}{user.id}'], + publish_body={ + 'web': { + 'notification': { + 'title': f'New message from @{v.username}', + 'body': notifbody, + 'deep_link': f'https://{site}/notifications?messages=true', + 'icon': f'https://{request.host}/assets/images/{SITE_NAME}/icon.webp', + } + }, + 'fcm': { + 'notification': { + 'title': f'New message from @{v.username}', + 'body': notifbody, + }, + 'data': { + 'url': 'notifications?messages=true', + } } }, - 'fcm': { - 'notification': { - 'title': f'New message from @{v.username}', - 'body': notifbody, - }, - 'data': { - 'url': 'notifications?messages=true', - } - } - }, - ) + ) g.db.commit() @@ -505,7 +506,7 @@ def messagereply(v): g.db.add(new_comment) g.db.flush() - if user_id != v.id: + if PUSHER_ID and user_id != v.id: notif = Notification(comment_id=new_comment.id, user_id=user_id) g.db.add(notif) diff --git a/files/templates/default.html b/files/templates/default.html index 94c33166a..52a6add5d 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -226,9 +226,17 @@ {% if v %} - - - + + {% if SITE_NAME == 'Drama' %} + + + + {% else %} + + + + {% endif %} + {% else %} diff --git a/files/templates/home.html b/files/templates/home.html index 645eb45af..5440dc6fd 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -165,7 +165,7 @@ {% endif %} -{% if v %} +{% if PUSHER_ID and v %}

{{request.host}}{{v.id}}
{{PUSHER_ID}}
diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html index d98e187fb..dd8e7b973 100644 --- a/files/templates/sidebar_Drama.html +++ b/files/templates/sidebar_Drama.html @@ -1,6 +1,6 @@
- {% set image = "/static/assets/images/" + SITE_NAME + "/banners/" + range(1,num_banners)|random()|string + ".webp?a=15" %} + {% set image = "/static/assets/images/" + SITE_NAME + "/sidebar/" + range(1,num_sidebar)|random()|string + ".webp?a=15" %}