diff --git a/files/assets/images/defaultpictures/1.webp b/files/assets/images/defaultpictures/1.webp
deleted file mode 100644
index 2dd5e88be..000000000
Binary files a/files/assets/images/defaultpictures/1.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/10.webp b/files/assets/images/defaultpictures/10.webp
deleted file mode 100644
index 5affacfec..000000000
Binary files a/files/assets/images/defaultpictures/10.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/100.webp b/files/assets/images/defaultpictures/100.webp
deleted file mode 100644
index e09e733ad..000000000
Binary files a/files/assets/images/defaultpictures/100.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/101.webp b/files/assets/images/defaultpictures/101.webp
deleted file mode 100644
index 4952b6db2..000000000
Binary files a/files/assets/images/defaultpictures/101.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/102.webp b/files/assets/images/defaultpictures/102.webp
deleted file mode 100644
index 725469c6a..000000000
Binary files a/files/assets/images/defaultpictures/102.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/103.webp b/files/assets/images/defaultpictures/103.webp
deleted file mode 100644
index 3142bf241..000000000
Binary files a/files/assets/images/defaultpictures/103.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/104.webp b/files/assets/images/defaultpictures/104.webp
deleted file mode 100644
index ef7a364e4..000000000
Binary files a/files/assets/images/defaultpictures/104.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/105.webp b/files/assets/images/defaultpictures/105.webp
deleted file mode 100644
index 8e9d2ba00..000000000
Binary files a/files/assets/images/defaultpictures/105.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/106.webp b/files/assets/images/defaultpictures/106.webp
deleted file mode 100644
index ab31451b9..000000000
Binary files a/files/assets/images/defaultpictures/106.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/107.webp b/files/assets/images/defaultpictures/107.webp
deleted file mode 100644
index f150f50a8..000000000
Binary files a/files/assets/images/defaultpictures/107.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/108.webp b/files/assets/images/defaultpictures/108.webp
deleted file mode 100644
index 8b11fec71..000000000
Binary files a/files/assets/images/defaultpictures/108.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/109.webp b/files/assets/images/defaultpictures/109.webp
deleted file mode 100644
index f6eef251b..000000000
Binary files a/files/assets/images/defaultpictures/109.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/11.webp b/files/assets/images/defaultpictures/11.webp
deleted file mode 100644
index fd2f234bf..000000000
Binary files a/files/assets/images/defaultpictures/11.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/110.webp b/files/assets/images/defaultpictures/110.webp
deleted file mode 100644
index a0708010b..000000000
Binary files a/files/assets/images/defaultpictures/110.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/111.webp b/files/assets/images/defaultpictures/111.webp
deleted file mode 100644
index aacbe2e92..000000000
Binary files a/files/assets/images/defaultpictures/111.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/112.webp b/files/assets/images/defaultpictures/112.webp
deleted file mode 100644
index 4d126730e..000000000
Binary files a/files/assets/images/defaultpictures/112.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/113.webp b/files/assets/images/defaultpictures/113.webp
deleted file mode 100644
index d14f1256c..000000000
Binary files a/files/assets/images/defaultpictures/113.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/114.webp b/files/assets/images/defaultpictures/114.webp
deleted file mode 100644
index 58bcf48c2..000000000
Binary files a/files/assets/images/defaultpictures/114.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/115.webp b/files/assets/images/defaultpictures/115.webp
deleted file mode 100644
index 9de97bd02..000000000
Binary files a/files/assets/images/defaultpictures/115.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/116.webp b/files/assets/images/defaultpictures/116.webp
deleted file mode 100644
index f20a22cd2..000000000
Binary files a/files/assets/images/defaultpictures/116.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/117.webp b/files/assets/images/defaultpictures/117.webp
deleted file mode 100644
index 1d077b421..000000000
Binary files a/files/assets/images/defaultpictures/117.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/118.webp b/files/assets/images/defaultpictures/118.webp
deleted file mode 100644
index baf5270ae..000000000
Binary files a/files/assets/images/defaultpictures/118.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/119.webp b/files/assets/images/defaultpictures/119.webp
deleted file mode 100644
index 7f14fe250..000000000
Binary files a/files/assets/images/defaultpictures/119.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/12.webp b/files/assets/images/defaultpictures/12.webp
deleted file mode 100644
index b423c80e7..000000000
Binary files a/files/assets/images/defaultpictures/12.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/120.webp b/files/assets/images/defaultpictures/120.webp
deleted file mode 100644
index 8d27d27dd..000000000
Binary files a/files/assets/images/defaultpictures/120.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/121.webp b/files/assets/images/defaultpictures/121.webp
deleted file mode 100644
index c871678a9..000000000
Binary files a/files/assets/images/defaultpictures/121.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/122.webp b/files/assets/images/defaultpictures/122.webp
deleted file mode 100644
index 2b9b47604..000000000
Binary files a/files/assets/images/defaultpictures/122.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/123.webp b/files/assets/images/defaultpictures/123.webp
deleted file mode 100644
index 794062dd9..000000000
Binary files a/files/assets/images/defaultpictures/123.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/124.webp b/files/assets/images/defaultpictures/124.webp
deleted file mode 100644
index 722c81401..000000000
Binary files a/files/assets/images/defaultpictures/124.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/125.webp b/files/assets/images/defaultpictures/125.webp
deleted file mode 100644
index b022e65b2..000000000
Binary files a/files/assets/images/defaultpictures/125.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/126.webp b/files/assets/images/defaultpictures/126.webp
deleted file mode 100644
index bae0f005a..000000000
Binary files a/files/assets/images/defaultpictures/126.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/127.webp b/files/assets/images/defaultpictures/127.webp
deleted file mode 100644
index b858d7e70..000000000
Binary files a/files/assets/images/defaultpictures/127.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/128.webp b/files/assets/images/defaultpictures/128.webp
deleted file mode 100644
index 13041a9b7..000000000
Binary files a/files/assets/images/defaultpictures/128.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/129.webp b/files/assets/images/defaultpictures/129.webp
deleted file mode 100644
index 4bb42341d..000000000
Binary files a/files/assets/images/defaultpictures/129.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/13.webp b/files/assets/images/defaultpictures/13.webp
deleted file mode 100644
index 3c09240da..000000000
Binary files a/files/assets/images/defaultpictures/13.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/130.webp b/files/assets/images/defaultpictures/130.webp
deleted file mode 100644
index df515623c..000000000
Binary files a/files/assets/images/defaultpictures/130.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/131.webp b/files/assets/images/defaultpictures/131.webp
deleted file mode 100644
index b3f1e5423..000000000
Binary files a/files/assets/images/defaultpictures/131.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/132.webp b/files/assets/images/defaultpictures/132.webp
deleted file mode 100644
index 50b74570e..000000000
Binary files a/files/assets/images/defaultpictures/132.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/133.webp b/files/assets/images/defaultpictures/133.webp
deleted file mode 100644
index dd5de6211..000000000
Binary files a/files/assets/images/defaultpictures/133.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/134.webp b/files/assets/images/defaultpictures/134.webp
deleted file mode 100644
index 74e5420f6..000000000
Binary files a/files/assets/images/defaultpictures/134.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/135.webp b/files/assets/images/defaultpictures/135.webp
deleted file mode 100644
index dc5a79092..000000000
Binary files a/files/assets/images/defaultpictures/135.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/136.webp b/files/assets/images/defaultpictures/136.webp
deleted file mode 100644
index adf275b30..000000000
Binary files a/files/assets/images/defaultpictures/136.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/137.webp b/files/assets/images/defaultpictures/137.webp
deleted file mode 100644
index bf0235ce3..000000000
Binary files a/files/assets/images/defaultpictures/137.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/138.webp b/files/assets/images/defaultpictures/138.webp
deleted file mode 100644
index 67e9151e7..000000000
Binary files a/files/assets/images/defaultpictures/138.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/139.webp b/files/assets/images/defaultpictures/139.webp
deleted file mode 100644
index 4ea6f0edc..000000000
Binary files a/files/assets/images/defaultpictures/139.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/14.webp b/files/assets/images/defaultpictures/14.webp
deleted file mode 100644
index c02018689..000000000
Binary files a/files/assets/images/defaultpictures/14.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/140.webp b/files/assets/images/defaultpictures/140.webp
deleted file mode 100644
index 76026851b..000000000
Binary files a/files/assets/images/defaultpictures/140.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/141.webp b/files/assets/images/defaultpictures/141.webp
deleted file mode 100644
index 8dfcff7d3..000000000
Binary files a/files/assets/images/defaultpictures/141.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/142.webp b/files/assets/images/defaultpictures/142.webp
deleted file mode 100644
index fab1bab1d..000000000
Binary files a/files/assets/images/defaultpictures/142.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/143.webp b/files/assets/images/defaultpictures/143.webp
deleted file mode 100644
index 265add56e..000000000
Binary files a/files/assets/images/defaultpictures/143.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/144.webp b/files/assets/images/defaultpictures/144.webp
deleted file mode 100644
index 5c1463574..000000000
Binary files a/files/assets/images/defaultpictures/144.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/145.webp b/files/assets/images/defaultpictures/145.webp
deleted file mode 100644
index 345b0fa13..000000000
Binary files a/files/assets/images/defaultpictures/145.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/146.webp b/files/assets/images/defaultpictures/146.webp
deleted file mode 100644
index a7b7faf2e..000000000
Binary files a/files/assets/images/defaultpictures/146.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/147.webp b/files/assets/images/defaultpictures/147.webp
deleted file mode 100644
index 97d276fa6..000000000
Binary files a/files/assets/images/defaultpictures/147.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/148.webp b/files/assets/images/defaultpictures/148.webp
deleted file mode 100644
index b9c3f58ec..000000000
Binary files a/files/assets/images/defaultpictures/148.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/149.webp b/files/assets/images/defaultpictures/149.webp
deleted file mode 100644
index 5a474ed82..000000000
Binary files a/files/assets/images/defaultpictures/149.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/15.webp b/files/assets/images/defaultpictures/15.webp
deleted file mode 100644
index 6fd432146..000000000
Binary files a/files/assets/images/defaultpictures/15.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/150.webp b/files/assets/images/defaultpictures/150.webp
deleted file mode 100644
index 53fae2336..000000000
Binary files a/files/assets/images/defaultpictures/150.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/16.webp b/files/assets/images/defaultpictures/16.webp
deleted file mode 100644
index b5f1ebcb6..000000000
Binary files a/files/assets/images/defaultpictures/16.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/17.webp b/files/assets/images/defaultpictures/17.webp
deleted file mode 100644
index 679583a92..000000000
Binary files a/files/assets/images/defaultpictures/17.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/18.webp b/files/assets/images/defaultpictures/18.webp
deleted file mode 100644
index 69d1c00cb..000000000
Binary files a/files/assets/images/defaultpictures/18.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/19.webp b/files/assets/images/defaultpictures/19.webp
deleted file mode 100644
index 3d1f8be1e..000000000
Binary files a/files/assets/images/defaultpictures/19.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/2.webp b/files/assets/images/defaultpictures/2.webp
deleted file mode 100644
index 69e54975d..000000000
Binary files a/files/assets/images/defaultpictures/2.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/20.webp b/files/assets/images/defaultpictures/20.webp
deleted file mode 100644
index 5ec18904c..000000000
Binary files a/files/assets/images/defaultpictures/20.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/21.webp b/files/assets/images/defaultpictures/21.webp
deleted file mode 100644
index d76e76c4c..000000000
Binary files a/files/assets/images/defaultpictures/21.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/22.webp b/files/assets/images/defaultpictures/22.webp
deleted file mode 100644
index 566ba6012..000000000
Binary files a/files/assets/images/defaultpictures/22.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/23.webp b/files/assets/images/defaultpictures/23.webp
deleted file mode 100644
index 57f14fa1e..000000000
Binary files a/files/assets/images/defaultpictures/23.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/24.webp b/files/assets/images/defaultpictures/24.webp
deleted file mode 100644
index 7f45a2891..000000000
Binary files a/files/assets/images/defaultpictures/24.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/25.webp b/files/assets/images/defaultpictures/25.webp
deleted file mode 100644
index 44d0c1089..000000000
Binary files a/files/assets/images/defaultpictures/25.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/26.webp b/files/assets/images/defaultpictures/26.webp
deleted file mode 100644
index 38fa32218..000000000
Binary files a/files/assets/images/defaultpictures/26.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/27.webp b/files/assets/images/defaultpictures/27.webp
deleted file mode 100644
index f1f89cdc8..000000000
Binary files a/files/assets/images/defaultpictures/27.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/28.webp b/files/assets/images/defaultpictures/28.webp
deleted file mode 100644
index 3358d9705..000000000
Binary files a/files/assets/images/defaultpictures/28.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/29.webp b/files/assets/images/defaultpictures/29.webp
deleted file mode 100644
index 90618ff89..000000000
Binary files a/files/assets/images/defaultpictures/29.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/3.webp b/files/assets/images/defaultpictures/3.webp
deleted file mode 100644
index 6463a0dac..000000000
Binary files a/files/assets/images/defaultpictures/3.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/30.webp b/files/assets/images/defaultpictures/30.webp
deleted file mode 100644
index fea3cf654..000000000
Binary files a/files/assets/images/defaultpictures/30.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/31.webp b/files/assets/images/defaultpictures/31.webp
deleted file mode 100644
index fbf06d421..000000000
Binary files a/files/assets/images/defaultpictures/31.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/32.webp b/files/assets/images/defaultpictures/32.webp
deleted file mode 100644
index 11c3dddf9..000000000
Binary files a/files/assets/images/defaultpictures/32.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/33.webp b/files/assets/images/defaultpictures/33.webp
deleted file mode 100644
index 72895d392..000000000
Binary files a/files/assets/images/defaultpictures/33.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/34.webp b/files/assets/images/defaultpictures/34.webp
deleted file mode 100644
index bb94711f1..000000000
Binary files a/files/assets/images/defaultpictures/34.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/35.webp b/files/assets/images/defaultpictures/35.webp
deleted file mode 100644
index 126dd320b..000000000
Binary files a/files/assets/images/defaultpictures/35.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/36.webp b/files/assets/images/defaultpictures/36.webp
deleted file mode 100644
index f20e90b76..000000000
Binary files a/files/assets/images/defaultpictures/36.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/37.webp b/files/assets/images/defaultpictures/37.webp
deleted file mode 100644
index 16d385e25..000000000
Binary files a/files/assets/images/defaultpictures/37.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/38.webp b/files/assets/images/defaultpictures/38.webp
deleted file mode 100644
index 0169c0981..000000000
Binary files a/files/assets/images/defaultpictures/38.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/39.webp b/files/assets/images/defaultpictures/39.webp
deleted file mode 100644
index 060e54a8f..000000000
Binary files a/files/assets/images/defaultpictures/39.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/4.webp b/files/assets/images/defaultpictures/4.webp
deleted file mode 100644
index dd670666b..000000000
Binary files a/files/assets/images/defaultpictures/4.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/40.webp b/files/assets/images/defaultpictures/40.webp
deleted file mode 100644
index 9b9f3bfe8..000000000
Binary files a/files/assets/images/defaultpictures/40.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/41.webp b/files/assets/images/defaultpictures/41.webp
deleted file mode 100644
index cb85e341d..000000000
Binary files a/files/assets/images/defaultpictures/41.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/42.webp b/files/assets/images/defaultpictures/42.webp
deleted file mode 100644
index 9f9c184ca..000000000
Binary files a/files/assets/images/defaultpictures/42.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/43.webp b/files/assets/images/defaultpictures/43.webp
deleted file mode 100644
index 9b523adac..000000000
Binary files a/files/assets/images/defaultpictures/43.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/44.webp b/files/assets/images/defaultpictures/44.webp
deleted file mode 100644
index 9d355ef1a..000000000
Binary files a/files/assets/images/defaultpictures/44.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/45.webp b/files/assets/images/defaultpictures/45.webp
deleted file mode 100644
index bad92d9f6..000000000
Binary files a/files/assets/images/defaultpictures/45.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/46.webp b/files/assets/images/defaultpictures/46.webp
deleted file mode 100644
index 441ae6f13..000000000
Binary files a/files/assets/images/defaultpictures/46.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/47.webp b/files/assets/images/defaultpictures/47.webp
deleted file mode 100644
index 3543504d2..000000000
Binary files a/files/assets/images/defaultpictures/47.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/48.webp b/files/assets/images/defaultpictures/48.webp
deleted file mode 100644
index 4c2288b7f..000000000
Binary files a/files/assets/images/defaultpictures/48.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/49.webp b/files/assets/images/defaultpictures/49.webp
deleted file mode 100644
index 2a1d0f68c..000000000
Binary files a/files/assets/images/defaultpictures/49.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/5.webp b/files/assets/images/defaultpictures/5.webp
deleted file mode 100644
index f7a62e561..000000000
Binary files a/files/assets/images/defaultpictures/5.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/50.webp b/files/assets/images/defaultpictures/50.webp
deleted file mode 100644
index dd4d90ada..000000000
Binary files a/files/assets/images/defaultpictures/50.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/51.webp b/files/assets/images/defaultpictures/51.webp
deleted file mode 100644
index cea9848fb..000000000
Binary files a/files/assets/images/defaultpictures/51.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/52.webp b/files/assets/images/defaultpictures/52.webp
deleted file mode 100644
index 047485b74..000000000
Binary files a/files/assets/images/defaultpictures/52.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/53.webp b/files/assets/images/defaultpictures/53.webp
deleted file mode 100644
index 694aede26..000000000
Binary files a/files/assets/images/defaultpictures/53.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/54.webp b/files/assets/images/defaultpictures/54.webp
deleted file mode 100644
index 378d035f9..000000000
Binary files a/files/assets/images/defaultpictures/54.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/55.webp b/files/assets/images/defaultpictures/55.webp
deleted file mode 100644
index a1f613e5c..000000000
Binary files a/files/assets/images/defaultpictures/55.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/56.webp b/files/assets/images/defaultpictures/56.webp
deleted file mode 100644
index 9587a5369..000000000
Binary files a/files/assets/images/defaultpictures/56.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/57.webp b/files/assets/images/defaultpictures/57.webp
deleted file mode 100644
index 49a664761..000000000
Binary files a/files/assets/images/defaultpictures/57.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/58.webp b/files/assets/images/defaultpictures/58.webp
deleted file mode 100644
index bbd4aa88f..000000000
Binary files a/files/assets/images/defaultpictures/58.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/59.webp b/files/assets/images/defaultpictures/59.webp
deleted file mode 100644
index 99ed9720b..000000000
Binary files a/files/assets/images/defaultpictures/59.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/6.webp b/files/assets/images/defaultpictures/6.webp
deleted file mode 100644
index 0e5f3b6a8..000000000
Binary files a/files/assets/images/defaultpictures/6.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/60.webp b/files/assets/images/defaultpictures/60.webp
deleted file mode 100644
index e02b5d7e5..000000000
Binary files a/files/assets/images/defaultpictures/60.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/61.webp b/files/assets/images/defaultpictures/61.webp
deleted file mode 100644
index fd35071e2..000000000
Binary files a/files/assets/images/defaultpictures/61.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/62.webp b/files/assets/images/defaultpictures/62.webp
deleted file mode 100644
index 241d121fa..000000000
Binary files a/files/assets/images/defaultpictures/62.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/63.webp b/files/assets/images/defaultpictures/63.webp
deleted file mode 100644
index 94e880827..000000000
Binary files a/files/assets/images/defaultpictures/63.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/64.webp b/files/assets/images/defaultpictures/64.webp
deleted file mode 100644
index 8b5b76526..000000000
Binary files a/files/assets/images/defaultpictures/64.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/65.webp b/files/assets/images/defaultpictures/65.webp
deleted file mode 100644
index 40b23adfb..000000000
Binary files a/files/assets/images/defaultpictures/65.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/66.webp b/files/assets/images/defaultpictures/66.webp
deleted file mode 100644
index a7511fe1b..000000000
Binary files a/files/assets/images/defaultpictures/66.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/67.webp b/files/assets/images/defaultpictures/67.webp
deleted file mode 100644
index 1ab1a7e23..000000000
Binary files a/files/assets/images/defaultpictures/67.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/68.webp b/files/assets/images/defaultpictures/68.webp
deleted file mode 100644
index 73bdee629..000000000
Binary files a/files/assets/images/defaultpictures/68.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/69.webp b/files/assets/images/defaultpictures/69.webp
deleted file mode 100644
index c736dc914..000000000
Binary files a/files/assets/images/defaultpictures/69.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/7.webp b/files/assets/images/defaultpictures/7.webp
deleted file mode 100644
index 33574ea3d..000000000
Binary files a/files/assets/images/defaultpictures/7.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/70.webp b/files/assets/images/defaultpictures/70.webp
deleted file mode 100644
index 9302a2a74..000000000
Binary files a/files/assets/images/defaultpictures/70.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/71.webp b/files/assets/images/defaultpictures/71.webp
deleted file mode 100644
index c034bd463..000000000
Binary files a/files/assets/images/defaultpictures/71.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/72.webp b/files/assets/images/defaultpictures/72.webp
deleted file mode 100644
index 0296d9833..000000000
Binary files a/files/assets/images/defaultpictures/72.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/73.webp b/files/assets/images/defaultpictures/73.webp
deleted file mode 100644
index 5d38496d3..000000000
Binary files a/files/assets/images/defaultpictures/73.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/74.webp b/files/assets/images/defaultpictures/74.webp
deleted file mode 100644
index e5aaba07b..000000000
Binary files a/files/assets/images/defaultpictures/74.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/75.webp b/files/assets/images/defaultpictures/75.webp
deleted file mode 100644
index 25d19c63b..000000000
Binary files a/files/assets/images/defaultpictures/75.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/76.webp b/files/assets/images/defaultpictures/76.webp
deleted file mode 100644
index 4679d1fae..000000000
Binary files a/files/assets/images/defaultpictures/76.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/77.webp b/files/assets/images/defaultpictures/77.webp
deleted file mode 100644
index 0d3da08d0..000000000
Binary files a/files/assets/images/defaultpictures/77.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/78.webp b/files/assets/images/defaultpictures/78.webp
deleted file mode 100644
index 77b8a4eaa..000000000
Binary files a/files/assets/images/defaultpictures/78.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/79.webp b/files/assets/images/defaultpictures/79.webp
deleted file mode 100644
index 7aa6661ec..000000000
Binary files a/files/assets/images/defaultpictures/79.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/8.webp b/files/assets/images/defaultpictures/8.webp
deleted file mode 100644
index c1c4e7bc1..000000000
Binary files a/files/assets/images/defaultpictures/8.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/80.webp b/files/assets/images/defaultpictures/80.webp
deleted file mode 100644
index 025a04890..000000000
Binary files a/files/assets/images/defaultpictures/80.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/81.webp b/files/assets/images/defaultpictures/81.webp
deleted file mode 100644
index c842c8efc..000000000
Binary files a/files/assets/images/defaultpictures/81.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/82.webp b/files/assets/images/defaultpictures/82.webp
deleted file mode 100644
index cc44ead42..000000000
Binary files a/files/assets/images/defaultpictures/82.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/83.webp b/files/assets/images/defaultpictures/83.webp
deleted file mode 100644
index 9920687b5..000000000
Binary files a/files/assets/images/defaultpictures/83.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/84.webp b/files/assets/images/defaultpictures/84.webp
deleted file mode 100644
index 3fb3bc824..000000000
Binary files a/files/assets/images/defaultpictures/84.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/85.webp b/files/assets/images/defaultpictures/85.webp
deleted file mode 100644
index d08da98a7..000000000
Binary files a/files/assets/images/defaultpictures/85.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/86.webp b/files/assets/images/defaultpictures/86.webp
deleted file mode 100644
index 69f2c8540..000000000
Binary files a/files/assets/images/defaultpictures/86.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/87.webp b/files/assets/images/defaultpictures/87.webp
deleted file mode 100644
index 3fc06c387..000000000
Binary files a/files/assets/images/defaultpictures/87.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/88.webp b/files/assets/images/defaultpictures/88.webp
deleted file mode 100644
index bc5be90a5..000000000
Binary files a/files/assets/images/defaultpictures/88.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/89.webp b/files/assets/images/defaultpictures/89.webp
deleted file mode 100644
index 2a74bfac1..000000000
Binary files a/files/assets/images/defaultpictures/89.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/9.webp b/files/assets/images/defaultpictures/9.webp
deleted file mode 100644
index 061124156..000000000
Binary files a/files/assets/images/defaultpictures/9.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/90.webp b/files/assets/images/defaultpictures/90.webp
deleted file mode 100644
index fc761cddb..000000000
Binary files a/files/assets/images/defaultpictures/90.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/91.webp b/files/assets/images/defaultpictures/91.webp
deleted file mode 100644
index 61c1d5978..000000000
Binary files a/files/assets/images/defaultpictures/91.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/92.webp b/files/assets/images/defaultpictures/92.webp
deleted file mode 100644
index 46d7e88d0..000000000
Binary files a/files/assets/images/defaultpictures/92.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/93.webp b/files/assets/images/defaultpictures/93.webp
deleted file mode 100644
index 2956228e6..000000000
Binary files a/files/assets/images/defaultpictures/93.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/94.webp b/files/assets/images/defaultpictures/94.webp
deleted file mode 100644
index dffe15b34..000000000
Binary files a/files/assets/images/defaultpictures/94.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/95.webp b/files/assets/images/defaultpictures/95.webp
deleted file mode 100644
index 73d3174cd..000000000
Binary files a/files/assets/images/defaultpictures/95.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/96.webp b/files/assets/images/defaultpictures/96.webp
deleted file mode 100644
index d54d36380..000000000
Binary files a/files/assets/images/defaultpictures/96.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/97.webp b/files/assets/images/defaultpictures/97.webp
deleted file mode 100644
index 5fe91c6a4..000000000
Binary files a/files/assets/images/defaultpictures/97.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/98.webp b/files/assets/images/defaultpictures/98.webp
deleted file mode 100644
index 02be83078..000000000
Binary files a/files/assets/images/defaultpictures/98.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/99.webp b/files/assets/images/defaultpictures/99.webp
deleted file mode 100644
index 95e6422dc..000000000
Binary files a/files/assets/images/defaultpictures/99.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/1.webp b/files/assets/images/defaultpictures/agendaposter/1.webp
deleted file mode 100644
index 4da49608e..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/1.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/10.webp b/files/assets/images/defaultpictures/agendaposter/10.webp
deleted file mode 100644
index 47cb03363..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/10.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/11.webp b/files/assets/images/defaultpictures/agendaposter/11.webp
deleted file mode 100644
index 6daf94973..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/11.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/12.webp b/files/assets/images/defaultpictures/agendaposter/12.webp
deleted file mode 100644
index c552f4936..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/12.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/13.webp b/files/assets/images/defaultpictures/agendaposter/13.webp
deleted file mode 100644
index c232aba47..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/13.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/14.webp b/files/assets/images/defaultpictures/agendaposter/14.webp
deleted file mode 100644
index 62c86d79a..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/14.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/15.webp b/files/assets/images/defaultpictures/agendaposter/15.webp
deleted file mode 100644
index 127cfe36f..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/15.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/16.webp b/files/assets/images/defaultpictures/agendaposter/16.webp
deleted file mode 100644
index ce2a15a18..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/16.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/17.webp b/files/assets/images/defaultpictures/agendaposter/17.webp
deleted file mode 100644
index cd616b12f..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/17.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/18.webp b/files/assets/images/defaultpictures/agendaposter/18.webp
deleted file mode 100644
index 35d24d376..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/18.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/19.webp b/files/assets/images/defaultpictures/agendaposter/19.webp
deleted file mode 100644
index 53efd3fbb..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/19.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/2.webp b/files/assets/images/defaultpictures/agendaposter/2.webp
deleted file mode 100644
index 24be7473b..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/2.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/20.webp b/files/assets/images/defaultpictures/agendaposter/20.webp
deleted file mode 100644
index d5324a2d6..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/20.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/21.webp b/files/assets/images/defaultpictures/agendaposter/21.webp
deleted file mode 100644
index 3e66f6b9b..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/21.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/22.webp b/files/assets/images/defaultpictures/agendaposter/22.webp
deleted file mode 100644
index a20b70312..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/22.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/23.webp b/files/assets/images/defaultpictures/agendaposter/23.webp
deleted file mode 100644
index 5be03fc33..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/23.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/24.webp b/files/assets/images/defaultpictures/agendaposter/24.webp
deleted file mode 100644
index 3ced589f2..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/24.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/25.webp b/files/assets/images/defaultpictures/agendaposter/25.webp
deleted file mode 100644
index 878bb1c53..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/25.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/26.webp b/files/assets/images/defaultpictures/agendaposter/26.webp
deleted file mode 100644
index 9cd11e9c4..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/26.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/27.webp b/files/assets/images/defaultpictures/agendaposter/27.webp
deleted file mode 100644
index f32f4453b..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/27.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/28.webp b/files/assets/images/defaultpictures/agendaposter/28.webp
deleted file mode 100644
index fbaf9bee5..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/28.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/29.webp b/files/assets/images/defaultpictures/agendaposter/29.webp
deleted file mode 100644
index 82ab1d366..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/29.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/3.webp b/files/assets/images/defaultpictures/agendaposter/3.webp
deleted file mode 100644
index 600e7c238..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/3.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/30.webp b/files/assets/images/defaultpictures/agendaposter/30.webp
deleted file mode 100644
index 37c6d1a66..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/30.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/31.webp b/files/assets/images/defaultpictures/agendaposter/31.webp
deleted file mode 100644
index a466cf2a6..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/31.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/32.webp b/files/assets/images/defaultpictures/agendaposter/32.webp
deleted file mode 100644
index 28a64e791..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/32.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/33.webp b/files/assets/images/defaultpictures/agendaposter/33.webp
deleted file mode 100644
index 83ba9b87d..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/33.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/34.webp b/files/assets/images/defaultpictures/agendaposter/34.webp
deleted file mode 100644
index 5d9853487..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/34.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/35.webp b/files/assets/images/defaultpictures/agendaposter/35.webp
deleted file mode 100644
index c77b1458c..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/35.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/36.webp b/files/assets/images/defaultpictures/agendaposter/36.webp
deleted file mode 100644
index a80ff73c9..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/36.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/37.webp b/files/assets/images/defaultpictures/agendaposter/37.webp
deleted file mode 100644
index a573d3f04..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/37.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/38.webp b/files/assets/images/defaultpictures/agendaposter/38.webp
deleted file mode 100644
index 62b7051ed..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/38.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/39.webp b/files/assets/images/defaultpictures/agendaposter/39.webp
deleted file mode 100644
index 23068cc77..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/39.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/4.webp b/files/assets/images/defaultpictures/agendaposter/4.webp
deleted file mode 100644
index 84e0de6b2..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/4.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/40.webp b/files/assets/images/defaultpictures/agendaposter/40.webp
deleted file mode 100644
index 7aa4e2737..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/40.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/41.webp b/files/assets/images/defaultpictures/agendaposter/41.webp
deleted file mode 100644
index 230e93f8b..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/41.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/42.webp b/files/assets/images/defaultpictures/agendaposter/42.webp
deleted file mode 100644
index 1f1fe0fe7..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/42.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/43.webp b/files/assets/images/defaultpictures/agendaposter/43.webp
deleted file mode 100644
index 1039e29fa..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/43.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/44.webp b/files/assets/images/defaultpictures/agendaposter/44.webp
deleted file mode 100644
index 46746bf01..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/44.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/45.webp b/files/assets/images/defaultpictures/agendaposter/45.webp
deleted file mode 100644
index 23f2af534..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/45.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/46.webp b/files/assets/images/defaultpictures/agendaposter/46.webp
deleted file mode 100644
index 7825b1f15..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/46.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/47.webp b/files/assets/images/defaultpictures/agendaposter/47.webp
deleted file mode 100644
index 5cc06def1..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/47.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/48.webp b/files/assets/images/defaultpictures/agendaposter/48.webp
deleted file mode 100644
index 1b4bfdfa7..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/48.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/49.webp b/files/assets/images/defaultpictures/agendaposter/49.webp
deleted file mode 100644
index 3d319c306..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/49.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/5.webp b/files/assets/images/defaultpictures/agendaposter/5.webp
deleted file mode 100644
index f533c10c0..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/5.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/50.webp b/files/assets/images/defaultpictures/agendaposter/50.webp
deleted file mode 100644
index b18d7dfde..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/50.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/51.webp b/files/assets/images/defaultpictures/agendaposter/51.webp
deleted file mode 100644
index e95bca8b6..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/51.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/6.webp b/files/assets/images/defaultpictures/agendaposter/6.webp
deleted file mode 100644
index 6e5667684..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/6.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/7.webp b/files/assets/images/defaultpictures/agendaposter/7.webp
deleted file mode 100644
index 0d5d577c3..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/7.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/8.webp b/files/assets/images/defaultpictures/agendaposter/8.webp
deleted file mode 100644
index 4175c59e0..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/8.webp and /dev/null differ
diff --git a/files/assets/images/defaultpictures/agendaposter/9.webp b/files/assets/images/defaultpictures/agendaposter/9.webp
deleted file mode 100644
index 23a1796fd..000000000
Binary files a/files/assets/images/defaultpictures/agendaposter/9.webp and /dev/null differ
diff --git a/files/assets/images/emojis/marcerberus.webp b/files/assets/images/emojis/marcerberus.webp
index 88ea63ad9..8adb53f03 100644
Binary files a/files/assets/images/emojis/marcerberus.webp and b/files/assets/images/emojis/marcerberus.webp differ
diff --git a/files/assets/js/new_comments_count.js b/files/assets/js/new_comments_count.js
index 1ede4e54d..d9dec981f 100644
--- a/files/assets/js/new_comments_count.js
+++ b/files/assets/js/new_comments_count.js
@@ -6,10 +6,12 @@ if (typeof showNewCommentCounts === 'undefined') {
if (lastCount) {
const newComments = newTotal - lastCount.c
if (newComments > 0) {
- document.querySelectorAll(`#post-${postId} .new-comments`).forEach(elem => {
+ elems = document.getElementsByClassName(`${postId}-new-comments`)
+ for (const elem of elems)
+ {
elem.textContent = ` (+${newComments})`
elem.classList.remove("d-none")
- })
+ }
}
}
}
diff --git a/files/classes/user.py b/files/classes/user.py
index d01dd7cc9..815190df4 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -477,11 +477,15 @@ class User(Base):
@property
@lazy
def profile_url(self):
- if self.agendaposter: return f"{SITE_FULL}/static/assets/images/defaultpictures/agendaposter/{random.randint(1, 51)}.webp?v=1008"
+ if self.agendaposter: return f"/e/marseychud.webp"
if self.profileurl:
if self.profileurl.startswith('/'): return SITE_FULL + self.profileurl
return self.profileurl
- if SITE_NAME == 'Drama': return f"{SITE_FULL}/static/assets/images/defaultpictures/{random.randint(1, 150)}.webp?v=1008"
+ if SITE_NAME == 'Drama':
+ self.profileurl = '/e/' + random.choice(marseys_const) + '.webp'
+ g.db.add(self)
+ g.db.commit()
+ return self.profileurl
return f"{SITE_FULL}/static/assets/images/default-profile-pic.webp?v=1008"
@lazy
diff --git a/files/helpers/const.py b/files/helpers/const.py
index eb82809fe..1a6424755 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -128,7 +128,7 @@ if SITE in {'rdrama.net','devrama.xyz'}:
A_ID = 1230
KIPPY_ID = 7150
- TAX_NOTIF_ID = 995
+ GIFT_NOTIF_ID = 995
PIZZASHILL_ID = 2424
HIL_ID = 4245
CRAT_ID = 747
@@ -160,7 +160,7 @@ elif SITE == "pcmemes.net":
A_ID = 0
KIPPY_ID = 1592
PIZZASHILL_ID = 0
- TAX_NOTIF_ID = 1592
+ GIFT_NOTIF_ID = 1592
HIL_ID = 0
CRAT_ID = 0
IDIO_ID = 0
@@ -190,7 +190,7 @@ else:
A_ID = 0
KIPPY_ID = 0
- TAX_NOTIF_ID = 9
+ GIFT_NOTIF_ID = 9
PIZZASHILL_ID = 0
HIL_ID = 0
CRAT_ID = 0
@@ -634,7 +634,8 @@ dues = int(environ.get("DUES").strip())
christian_emojis = (':#marseyjesus:',':#marseyimmaculate:',':#marseymothermary:',':#marseyfatherjoseph:',':#gigachadorthodox:',':#marseyorthodox:',':#marseyorthodoxpat:')
db = db_session()
-marseys_const = [x[0] for x in db.query(Marsey.name).all()] + ['a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','0','1','2','3','4','5','6','7','8','9','exclamationpoint','period','questionmark']
+marseys_const = [x[0] for x in db.query(Marsey.name).filter(Marsey.name!='marseychud').all()]
+marseys_const2 = marseys_const + ['marseychud','a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z','0','1','2','3','4','5','6','7','8','9','exclamationpoint','period','questionmark']
db.close()
if SITE_NAME == 'PCM':
@@ -648,9 +649,11 @@ else:
valid_password_regex = re.compile("^.{8,100}$", flags=re.A)
-marsey_regex = re.compile("^(:[!#A-Za-z0-9]{1,30}?:\s*)+$", flags=re.A)
+marseyaward_body_regex = re.compile(">[^<\s+]|[^>\s+]<", flags=re.A)
-marsey_regex2 = re.compile("[a-z0-9]{1,30}", flags=re.A)
+marseyaward_title_regex = re.compile("(
]+>)+", flags=re.A)
+
+marsey_regex = re.compile("[a-z0-9]{1,30}", flags=re.A)
image_regex = re.compile("(^https:\/\/.*\.(png|jpg|jpeg|gif|webp|maxwidth=9999|fidelity=high)($|\s))", flags=re.I|re.M|re.A)
@@ -715,4 +718,6 @@ def torture_ap(body, username):
body = torture_regex2.sub(rf'\1@{username} is ', body)
return body
-YOUTUBE_KEY = environ.get("YOUTUBE_KEY", "").strip()
\ No newline at end of file
+YOUTUBE_KEY = environ.get("YOUTUBE_KEY", "").strip()
+
+ADMIGGERS = (37696,37697,37749,37833,37838)
\ No newline at end of file
diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index 415f71e9f..46fa95a40 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -16,4 +16,4 @@ def post_embed(id, v):
@app.context_processor
def inject_constants():
- return {"environ":environ, "SITE":SITE, "SITE_NAME":SITE_NAME, "SITE_FULL":SITE_FULL, "AUTOJANNY_ID":AUTOJANNY_ID, "NOTIFICATIONS_ID":NOTIFICATIONS_ID, "PUSHER_ID":PUSHER_ID, "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, "config":app.config.get, "DEFAULT_COLOR":DEFAULT_COLOR, "COLORS":COLORS}
\ No newline at end of file
+ return {"environ":environ, "SITE":SITE, "SITE_NAME":SITE_NAME, "SITE_FULL":SITE_FULL, "AUTOJANNY_ID":AUTOJANNY_ID, "NOTIFICATIONS_ID":NOTIFICATIONS_ID, "PUSHER_ID":PUSHER_ID, "CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, "config":app.config.get, "DEFAULT_COLOR":DEFAULT_COLOR, "COLORS":COLORS, "ADMIGGERS":ADMIGGERS}
\ No newline at end of file
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index e71be6a9e..65be0a660 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -233,9 +233,9 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
classes = 'emoji-md'
remoji = emoji
- if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const): classes += ' golden'
+ if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const2): classes += ' golden'
- if remoji == 'marseyrandom': remoji = choice(marseys_const)
+ if remoji == 'marseyrandom': remoji = choice(marseys_const2)
if path.isfile(f'files/assets/images/emojis/{remoji}.webp'):
new = re.sub(f'(?', new, flags=re.I|re.A)
@@ -255,10 +255,10 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
if emoji.startswith("!"):
emoji = emoji[1:]
classes = 'emoji mirrored'
- if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const): classes += ' golden'
+ if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const2): classes += ' golden'
old = emoji
- if emoji == 'marseyrandom': emoji = choice(marseys_const)
+ if emoji == 'marseyrandom': emoji = choice(marseys_const2)
else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
@@ -266,10 +266,10 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
if comment: marseys_used.add(emoji)
else:
classes = 'emoji'
- if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const): classes += ' golden'
+ if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const2): classes += ' golden'
old = emoji
- if emoji == 'marseyrandom': emoji = choice(marseys_const)
+ if emoji == 'marseyrandom': emoji = choice(marseys_const2)
else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
@@ -345,10 +345,10 @@ def filter_emojis_only(title, edit=False, graceful=False):
if emoji.startswith("!"):
emoji = emoji[1:]
classes = 'emoji mirrored'
- if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const): classes += ' golden'
+ if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const2): classes += ' golden'
old = emoji
- if emoji == 'marseyrandom': emoji = choice(marseys_const)
+ if emoji == 'marseyrandom': emoji = choice(marseys_const2)
else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
@@ -356,10 +356,10 @@ def filter_emojis_only(title, edit=False, graceful=False):
else:
classes = 'emoji'
- if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const): classes += ' golden'
+ if not edit and random() < 0.0025 and ('marsey' in emoji or emoji in marseys_const2): classes += ' golden'
old = emoji
- if emoji == 'marseyrandom': emoji = choice(marseys_const)
+ if emoji == 'marseyrandom': emoji = choice(marseys_const2)
else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
diff --git a/files/routes/awards.py b/files/routes/awards.py
index bda8b1e50..f66e45263 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -260,7 +260,7 @@ def award_post(pid, v):
author.ban_reason = f"grass award used by @{v.username} on /post/{post.id}"
author.unban_utc = int(time.time()) + 30 * 86400
link = f"[this post]({post.shortlink})"
- send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!")
+ send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass/snow/sand/ass to get unbanned!")
elif kind == "pin":
if post.stickied and post.stickied_utc:
post.stickied_utc += 3600
@@ -486,7 +486,7 @@ def award_comment(cid, v):
author.ban_reason = f"grass award used by @{v.username} on /comment/{c.id}"
author.unban_utc = int(time.time()) + 30 * 86400
link = f"[this comment]({c.shortlink})"
- send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!")
+ send_repeatable_notification(author.id, f"Your account has been banned permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass/snow/sand/ass to get unbanned!")
elif kind == "pin":
if c.is_pinned and c.is_pinned_utc: c.is_pinned_utc += 3600
else:
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 22fc9802e..1106daff4 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -210,10 +210,7 @@ def api_comment(v):
with open(f"snappy_{SITE_NAME}.txt", "a", encoding="utf-8") as f:
f.write('\n{[para]}\n' + body)
- if v.marseyawarded and parent_post.id not in (37696,37697,37749,37833,37838):
- if not marsey_regex.fullmatch(body): return {"error":"You can only type marseys!"}, 403
-
- if parent_post.id not in (37696,37697,37749,37833,37838):
+ if parent_post.id not in ADMIGGERS:
if v.longpost and (len(body) < 280 or ' [](' in body or body.startswith('[](')):
return {"error":"You have to type more than 280 characters!"}, 403
elif v.bird and len(body) > 140:
@@ -272,7 +269,7 @@ def api_comment(v):
marsey = loads(body.lower())
name = marsey["name"]
- if not marsey_regex2.fullmatch(name):
+ if not marsey_regex.fullmatch(name):
return {"error": "Invalid name!"}, 403
if "author" in marsey: user = get_user(marsey["author"])
@@ -332,7 +329,7 @@ def api_comment(v):
body += f"\n\n{url}"
else: return {"error": "Image/Video files only"}, 400
- if v.agendaposter and not v.marseyawarded and parent_post.id not in (37696,37697,37749,37833,37838):
+ if v.agendaposter and not v.marseyawarded and parent_post.id not in ADMIGGERS:
body = torture_ap(body, v.username)
if '#fortune' in body:
@@ -341,6 +338,9 @@ def api_comment(v):
body_html = sanitize(body, comment=True)
+ if v.marseyawarded and parent_post.id not in ADMIGGERS and marseyaward_body_regex.search(body_html):
+ return {"error":"You can only type marseys!"}, 403
+
bans = filter_comment_html(body_html)
if bans:
@@ -349,7 +349,7 @@ def api_comment(v):
if ban.reason: reason += f" {ban.reason}"
return {"error": reason}, 401
- if parent_post.id not in (37696,37697,37749,37833,37838) and '!slots' not in body.lower() and '!blackjack' not in body.lower() and '!wordle' not in body.lower() and AGENDAPOSTER_PHRASE not in body.lower():
+ if parent_post.id not in ADMIGGERS and '!slots' not in body.lower() and '!blackjack' not in body.lower() and '!wordle' not in body.lower() and AGENDAPOSTER_PHRASE not in body.lower():
existing = g.db.query(Comment.id).filter(Comment.author_id == v.id,
Comment.deleted_utc == 0,
Comment.parent_comment_id == parent_comment_id,
@@ -363,7 +363,7 @@ def api_comment(v):
is_bot = bool(request.headers.get("Authorization"))
- if '!slots' not in body.lower() and '!blackjack' not in body.lower() and '!wordle' not in body.lower() and parent_post.id not in (37696,37697,37749,37833,37838) and not is_bot and not v.marseyawarded and AGENDAPOSTER_PHRASE not in body.lower() and len(body) > 10:
+ if '!slots' not in body.lower() and '!blackjack' not in body.lower() and '!wordle' not in body.lower() and parent_post.id not in ADMIGGERS and not is_bot and not v.marseyawarded and AGENDAPOSTER_PHRASE not in body.lower() and len(body) > 10:
now = int(time.time())
cutoff = now - 60 * 60 * 24
@@ -477,7 +477,7 @@ def api_comment(v):
n = Notification(comment_id=c_based.id, user_id=v.id)
g.db.add(n)
- if parent_post.id not in (37696,37697,37749,37833,37838):
+ if parent_post.id not in ADMIGGERS:
if v.agendaposter and not v.marseyawarded and AGENDAPOSTER_PHRASE not in c.body.lower():
c.is_banned = True
@@ -717,9 +717,6 @@ def edit_comment(cid, v):
return {"error":"You have to actually type something!"}, 400
if body != c.body or request.files.get("file") and request.headers.get("cf-ipcountry") != "T1":
- if v.marseyawarded and not marsey_regex.fullmatch(body):
- 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
elif v.bird and len(body) > 140:
@@ -821,6 +818,9 @@ def edit_comment(cid, v):
body_html = sanitize(body, edit=True)
+ if v.marseyawarded and marseyaward_body_regex.search(body_html):
+ return {"error":"You can only type marseys!"}, 403
+
if len(body_html) > 20000: abort(400)
c.body = body[:10000]
@@ -927,7 +927,8 @@ def pin_comment(cid, v):
if not comment.is_pinned:
if v.id != comment.post.author_id: abort(403)
- comment.is_pinned = v.username + " (OP)"
+ if comment.post.ghost: comment.is_pinned = "(OP)"
+ else: comment.is_pinned = v.username + " (OP)"
g.db.add(comment)
diff --git a/files/routes/front.py b/files/routes/front.py
index 6ed93ca17..46f53772b 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -367,7 +367,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
elif v.subs == 3:
pins = pins.filter(Submission.sub.in_(v.subbed_subs))
elif v.subs == 4:
- pins = pins.filter(Submission.sub.notin_(v.all_blocks))
+ pins = pins.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
if v and v.admin_level < 2:
pins = pins.filter(Submission.author_id.notin_(v.userblocks))
diff --git a/files/routes/login.py b/files/routes/login.py
index f4f41b900..0daa4f0a5 100644
--- a/files/routes/login.py
+++ b/files/routes/login.py
@@ -330,6 +330,8 @@ def sign_up_post(v):
session["history"] = []
else: admin_level=0
+ profileurl = '/e/' + random.choice(marseys_const) + '.webp'
+
new_user = User(
username=username,
original_username = username,
@@ -337,7 +339,8 @@ def sign_up_post(v):
password=request.values.get("password"),
email=email,
referred_by=ref_id or None,
- ban_evade = int(any((x.is_banned or x.shadowbanned) and not x.unban_utc for x in g.db.query(User).filter(User.id.in_(session.get("history", []))).all() if x))
+ ban_evade = int(any((x.is_banned or x.shadowbanned) and not x.unban_utc for x in g.db.query(User).filter(User.id.in_(session.get("history", []))).all() if x)),
+ profileurl=profileurl
)
g.db.add(new_user)
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 2573dd675..af7e4d848 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -20,12 +20,12 @@ import requests
from shutil import copyfile
from sys import stdout
-marseys = [f':#{x}:' for x in marseys_const]
+marseys = [f':#{x}:' for x in marseys_const2]
if path.exists(f'snappy_{SITE_NAME}.txt'):
with open(f'snappy_{SITE_NAME}.txt', "r", encoding="utf-8") as f:
if SITE == 'pcmemes.net': snappyquotes = f.read().split("{[para]}")
- else: snappyquotes = [f.read().split("\n{[para]}\n")] + marseys
+ else: snappyquotes = f.read().split("\n{[para]}\n") + marseys
else: snappyquotes = marseys
IMGUR_KEY = environ.get("IMGUR_KEY").strip()
@@ -464,9 +464,6 @@ def edit_post(pid, v):
if len(body) > 20000: return {"error":"Character limit is 20000!"}, 403
- if v.marseyawarded and (not marsey_regex.fullmatch(title) or body and not marsey_regex.fullmatch(body)):
- 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
elif v.bird and len(body) > 140:
@@ -476,6 +473,10 @@ def edit_post(pid, v):
if v.agendaposter and not v.marseyawarded: title = torture_ap(title, v.username)
title_html = filter_emojis_only(title, edit=True)
+
+ if v.marseyawarded and not marseyaward_title_regex.fullmatch(title_html):
+ return {"error":"You can only type marseys!"}, 403
+
p.title = title[:500]
p.title_html = title_html
@@ -527,6 +528,9 @@ def edit_post(pid, v):
body_html = sanitize(body, edit=True)
+ if v.marseyawarded and marseyaward_body_regex.search(body_html):
+ return {"error":"You can only type marseys!"}, 403
+
bans = filter_comment_html(body_html)
if bans:
ban = bans[0]
@@ -844,6 +848,10 @@ def submit_post(v, sub=None):
if v.agendaposter and not v.marseyawarded: title = torture_ap(title, v.username)
title_html = filter_emojis_only(title, graceful=True)
+
+ if v.marseyawarded and not marseyaward_title_regex.fullmatch(title_html):
+ return {"error":"You can only type marseys!"}, 403
+
if len(title_html) > 1500: return error("Rendered title is too big!")
if v.longpost and (len(body) < 280 or ' [](' in body or body.startswith('[](')):
@@ -940,9 +948,6 @@ def submit_post(v, sub=None):
elif len(title) > 500:
return error("There's a 500 character limit for titles.")
- if v.marseyawarded and (not marsey_regex.fullmatch(title) or body and not marsey_regex.fullmatch(body)):
- return error("You can only type marseys!")
-
dup = g.db.query(Submission).filter(
Submission.author_id == v.id,
Submission.deleted_utc == 0,
@@ -1046,6 +1051,9 @@ def submit_post(v, sub=None):
body_html = sanitize(body)
+ if v.marseyawarded and marseyaward_body_regex.search(body_html):
+ return {"error":"You can only type marseys!"}, 403
+
if len(body_html) > 40000: return error("Submission body too long!")
bans = filter_comment_html(body_html)
diff --git a/files/routes/subs.py b/files/routes/subs.py
index bc5dfdfb5..3813d1b96 100644
--- a/files/routes/subs.py
+++ b/files/routes/subs.py
@@ -82,33 +82,6 @@ def exile_post(v, pid):
-@app.post("/unexile/post/")
-@is_not_permabanned
-def unexile_post(v, pid):
- try: pid = int(pid)
- except: abort(400)
-
- p = get_post(pid)
- sub = p.sub
- if not sub: abort(400)
-
- if not v.mods(sub): abort(403)
-
- u = p.author
-
- if u.exiled_from(sub):
- exile = g.db.query(Exile).filter_by(user_id=u.id, sub=sub).one_or_none()
- g.db.delete(exile)
-
- send_notification(u.id, f"@{v.username} has revoked your exile from /s/{sub}")
-
- g.db.commit()
-
- return {"message": "User unexiled successfully!"}
-
-
-
-
@app.post("/exile/comment/")
@is_not_permabanned
def exile_comment(v, cid):
@@ -136,22 +109,13 @@ def exile_comment(v, cid):
return {"message": "User exiled successfully!"}
-
-
-@app.post("/unexile/comment/")
+@app.post("/s//unexile/")
@is_not_permabanned
-def unexile_comment(v, cid):
- try: cid = int(cid)
- except: abort(400)
-
- c = get_comment(cid)
- sub = c.post.sub
- if not sub: abort(400)
+def unexile(v, sub, uid):
+ u = get_account(uid)
if not v.mods(sub): abort(403)
- u = c.author
-
if u.exiled_from(sub):
exile = g.db.query(Exile).filter_by(user_id=u.id, sub=sub).one_or_none()
g.db.delete(exile)
@@ -160,7 +124,10 @@ def unexile_comment(v, cid):
g.db.commit()
- return {"message": "User unexiled successfully!"}
+
+ if request.headers.get("Authorization") or request.headers.get("xhr"): return {"message": "User unexiled successfully!"}
+ return redirect(f'/s/{sub}/exilees')
+
diff --git a/files/routes/users.py b/files/routes/users.py
index f8e4bbd0d..26452b268 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -220,7 +220,7 @@ def transfer_coins(v, username):
else: tax = 0
log_message = f"@{v.username} has transferred {amount} coins to @{receiver.username}"
- send_repeatable_notification(TAX_NOTIF_ID, log_message)
+ send_repeatable_notification(GIFT_NOTIF_ID, log_message)
receiver.coins += amount-tax
v.coins -= amount
@@ -251,7 +251,7 @@ def transfer_bux(v, username):
if amount < 100: return {"error": "You have to gift at least 100 marseybux."}, 400
log_message = f"@{v.username} has transferred {amount} Marseybux to @{receiver.username}"
- send_repeatable_notification(TAX_NOTIF_ID, log_message)
+ send_repeatable_notification(GIFT_NOTIF_ID, log_message)
receiver.procoins += amount
v.procoins -= amount
@@ -736,7 +736,9 @@ def u_username_comments(username, v=None):
return render_template("userpage_blocked.html", u=u, v=v)
- page = max(int(request.values.get("page", "1")), 1)
+ try: page = max(int(request.values.get("page", "1")), 1)
+ except: page = 1
+
sort=request.values.get("sort","new")
t=request.values.get("t","all")
diff --git a/files/routes/votes.py b/files/routes/votes.py
index 6f2d6ed58..863e5c3e4 100644
--- a/files/routes/votes.py
+++ b/files/routes/votes.py
@@ -19,7 +19,7 @@ def admin_vote_info_get(v):
else: abort(400)
except: abort(400)
- if thing.ghost: abort(403)
+ if thing.ghost and v.id != AEVANN_ID: abort(403)
if not thing.author:
print(thing.id, flush=True)
diff --git a/files/templates/comments.html b/files/templates/comments.html
index fb57d4dda..b04a55ae8 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -265,11 +265,11 @@