MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity
6,900 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

642 Commits (c2c3b495c81a2e17c090ee70272cd39f25706b9e)

Author SHA1 Message Date
Aevann1 3d0a742200 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-10-17 18:27:18 +02:00
Aevann1 86b666abb7 fds 2021-10-17 18:27:15 +02:00
Yo Mama 1892f294f6 Shotgun Marsey now is the same height as other emojis when in the middle of text. 
Fixed some mixed indentation in const.py
 2021-10-17 15:53:05 +02:00
Yo Mama ef687bd7af Corrected type information 2021-10-17 14:08:07 +02:00
Yo Mama 8dd79e5368 Corrected specific Uppercase slur replacement 2021-10-17 01:58:10 +02:00
Yo Mama ea21b9818f Adapted the new slurs and added a description of how the cesoring works to help when adding new words 2021-10-16 23:28:40 +02:00
Yo Mama a831a24aa4 Merge branch 'master' into regex-censor 
# Conflicts:
#	.gitignore
#	docker-compose.yml
#	files/classes/comment.py
#	files/classes/submission.py
#	files/helpers/const.py
#	requirements.txt
 2021-10-16 21:29:36 +02:00
Yo Mama b345cedf2a Fixed not passing the logged user to the censor 2021-10-16 20:56:12 +02:00
Yo Mama 58c74dbdaf Compact slurs dict and added support for word censor 2021-10-16 20:42:00 +02:00
Yo Mama 5f7824b6c7 First 'working' version of the word-censor 2021-10-16 20:06:21 +02:00
Yo Mama 7e1e9ccc5b Initial working version of word censor 2021-10-16 19:04:08 +02:00
Aevann1 92828b759e dffd 2021-10-16 16:01:07 +02:00
Aevann1 120a7c026c fdfd 2021-10-16 15:12:04 +02:00
Aevann1 623c691a99 sfdfds 2021-10-16 11:53:07 +02:00
Aevann1 17d20dd1ea Update const.py 2021-10-16 10:23:10 +02:00
Aevann1 4249412f55 ghfgf 2021-10-15 16:39:32 +02:00
Aevann1 efa408ab2c fd 2021-10-15 16:08:27 +02:00
carpathianflorist 8b3f805c6f Update const.py 
substantial initial upgrade to the word filter
 2021-10-14 20:27:52 -04:00
Aevann1 912ad9aaa7 fdsfds 2021-10-13 15:16:50 +02:00
Aevann1 d8cfae2402 fdsfsd 2021-10-13 15:10:07 +02:00
Aevann1 241ef545a0 fdssfd 2021-10-13 15:05:58 +02:00
Aevann1 a75a95fcf8 dfs 2021-10-12 15:42:10 +02:00
Aevann1 1f8cf9fc1c gfdfg 2021-10-12 08:00:24 +02:00
Aevann1 ec768f5d22 gfgf 2021-10-12 07:52:41 +02:00
Aevann1 728e4d1130 dfsdsf 2021-10-10 16:10:46 +02:00
Aevann1 db0a8e0390 dfsdfs 2021-10-10 07:57:38 +02:00
Aevann1 940e47370e fdsdfs 2021-10-10 07:57:08 +02:00
Aevann1 060b1734bc dsffds 2021-10-10 07:56:42 +02:00
Aevann1 d0a3565997 dfsfds 2021-10-10 07:55:53 +02:00
Aevann1 07d23493f9 dfssfd 2021-10-10 07:54:32 +02:00
Aevann1 9817a644a9 dsfsfd 2021-10-10 07:51:30 +02:00
Aevann1 bb0cf8c6c2 fdsdfs 2021-10-10 06:10:45 +02:00
Aevann1 05b6b8a0ea dfsfsd 2021-10-08 16:47:31 +02:00
Aevann1 c56ac8e8fa dsfsdf 2021-10-08 16:14:30 +02:00
Aevann1 e81215995e fgdfg 2021-10-08 15:28:57 +02:00
Aevann1 036eaf1afd fdsfds 2021-10-08 15:20:32 +02:00
Aevann1 9d1a2e8b40 fgdg 2021-10-08 09:46:00 +02:00
Aevann1 e69dbd0ed1 gdfsd 2021-10-08 04:14:54 +02:00
Aevann1 3dc9a13d32 dRevert "dffsd" 
This reverts commit af609a50bd.
 2021-10-07 23:10:40 +02:00
Aevann1 af609a50bd dffsd 2021-10-07 10:53:36 +02:00
Aevann1 17cfeb9b6e dgf 2021-10-07 08:26:33 +02:00
Aevann1 de6fc8ff85 sfdfsd 2021-10-07 08:24:59 +02:00
Aevann1 a72552c082 sdfsfd 2021-10-07 07:55:27 +02:00
Aevann1 f3852485fa dfs 2021-10-07 06:09:46 +02:00
Aevann1 22638d7dfe dsf 2021-10-07 00:49:13 +02:00
Aevann1 bed309351f fdssfd 2021-10-06 11:33:04 +02:00
Aevann1 a6bd96258a dfsfdsfsd 2021-10-06 11:23:55 +02:00
Aevann1 be31f1baa7 dsfdfs 2021-10-06 11:19:26 +02:00
Aevann1 aa7b57c60b sfddsf 2021-10-06 11:18:04 +02:00
Aevann1 6c49b72884 dfgd 2021-10-06 11:16:42 +02:00
Aevann1 d7455e3da6 dffds 2021-10-06 11:14:08 +02:00
Aevann1 d563e377e1 fdgf 2021-10-06 11:12:58 +02:00
Aevann1 5479288381 dfsfds 2021-10-06 11:09:14 +02:00
Aevann1 c89b314c05 gfd 2021-10-06 07:40:27 +02:00
Aevann1 559d5b8e3d fdsfd 2021-10-06 07:37:29 +02:00
Aevann1 c47f7a56b2 dfsdfs 2021-10-06 07:37:07 +02:00
Aevann1 40c2c7ec02 sfdfsd 2021-10-06 07:36:18 +02:00
Aevann1 474c2959b0 sdffsd 2021-10-06 07:32:01 +02:00
Aevann1 b7abdf36d6 fdsfsdfds 2021-10-06 07:28:05 +02:00
Aevann1 9594c13e3d fsdsfd 2021-10-06 04:06:07 +02:00
Aevann1 b35c28b216 dfssdf 2021-10-06 02:49:51 +02:00
Aevann1 93bf935d34 dsfsfd 2021-10-06 02:41:58 +02:00
Aevann1 5a2bb1a497 gfgd 2021-10-06 02:28:22 +02:00
Aevann1 0c1ab3b390 gfdg 2021-10-06 02:25:59 +02:00
Aevann1 32cbc010e4 fdsfsd 2021-10-06 02:04:35 +02:00
Aevann1 daf81b864d dsfsfd 2021-10-05 23:56:50 +02:00
Aevann1 b8227ea7be fds 2021-10-05 23:29:04 +02:00
Aevann1 5e951df3b5 sdf 2021-10-05 23:28:24 +02:00
Aevann1 ed8c0f3963 df 2021-10-05 23:26:16 +02:00
Aevann1 c10760980f fddf 2021-10-05 23:17:32 +02:00
Aevann1 3a41e48722 dfsdfs 2021-10-05 23:16:31 +02:00
Aevann1 4bb89033f8 dfs 2021-10-05 22:59:24 +02:00
Aevann1 9c978a133c dfssfd 2021-10-05 22:59:15 +02:00
Aevann1 a27e651744 dfsdfs 2021-10-05 22:48:59 +02:00
Aevann1 cfc6b8a3d4 dfsfsd 2021-10-05 22:48:15 +02:00
Aevann1 5483d2b5d3 dfssfd 2021-10-05 22:46:59 +02:00
Aevann1 d175932599 fgfggf 2021-10-05 22:45:15 +02:00
Aevann1 52a14de6d3 dsfd 2021-10-05 22:38:59 +02:00
Aevann1 5a3ae516ec dsffds 2021-10-05 22:25:27 +02:00
Aevann1 3060ced704 dfssdf 2021-10-05 22:24:43 +02:00
Aevann1 05eea711c2 gfdg 2021-10-05 22:23:31 +02:00
Aevann1 ee3d29e768 dsfsfd 2021-10-05 21:58:04 +02:00
Aevann1 f3d5098740 sdfsdf 2021-10-05 21:54:09 +02:00
Aevann1 05017cd917 dfsfsdfddgf 2021-10-05 21:52:45 +02:00
Aevann1 5d645e2966 sfdfsd 2021-10-05 21:50:41 +02:00
Aevann1 7805b0cfbe dsffsd 2021-10-05 21:22:19 +02:00
Aevann1 04c576909e dfssfd 2021-10-05 21:16:55 +02:00
Aevann1 06a9729931 dfsfsd 2021-10-05 17:04:44 +02:00
Aevann1 b3d73bd215 fg 2021-10-05 16:42:51 +02:00
Aevann1 4ade3ce256 dfsfsd 2021-10-05 16:37:39 +02:00
Aevann1 7905ed0dd9 fdgd 2021-10-03 23:53:26 +02:00
Aevann1 7a1cad5492 dffd 2021-10-03 23:51:39 +02:00
Aevann1 467a236456 fg 2021-10-03 21:18:02 +02:00
Aevann1 32481b5e6e fdsfds 2021-10-03 21:05:59 +02:00
Aevann1 f3fd4dba52 dfsdsf 2021-10-03 04:27:39 +02:00
Aevann1 cbb6410c52 dfs 2021-10-02 22:09:23 +02:00
Aevann1 f3b24c948c df 2021-10-02 21:07:30 +02:00
Aevann1 9fe1b0bda6 dfssfd 2021-10-02 13:34:37 +02:00
Aevann1 f7173d2457 dfssfd\ 2021-10-02 03:17:24 +02:00
Aevann1 2db29aaa9f sdfsfd 2021-10-02 02:36:20 +02:00
Aevann1 aa043d05e3 dfsfsd 2021-10-02 00:02:52 +02:00
Aevann1 ed501dadec fdsfsdgfd 2021-10-01 22:30:05 +02:00
Aevann1 759bc71b44 sdfsdf 2021-10-01 22:28:31 +02:00
Aevann1 f189ea773d dfsfsdsfd 2021-10-01 22:26:30 +02:00
Aevann1 60af5cee8f sfdsdf 2021-10-01 22:25:15 +02:00
Aevann1 bcc5591c4a dfsdfs 2021-10-01 08:37:50 +02:00
Aevann1 03c02f156b dfssfd 2021-10-01 08:29:04 +02:00
Aevann1 90d15361a7 dsffsd 2021-10-01 08:26:59 +02:00
Aevann1 e795aeb716 sfdsdf 2021-10-01 02:26:21 +02:00
Aevann1 c33b5137c0 fdsfds 2021-10-01 02:25:12 +02:00
Aevann1 127b2a0b43 fd 2021-10-01 02:24:39 +02:00
Aevann1 92dc243b14 dfsfds 2021-10-01 02:23:26 +02:00
Aevann1 0864eed0a6 dfssfd 2021-10-01 02:21:33 +02:00
Aevann1 05f4899593 fdsdfs 2021-10-01 02:20:50 +02:00
Aevann1 0c15533f85 dfs 2021-10-01 02:19:19 +02:00
Aevann1 c04baf329e dfs 2021-10-01 02:18:05 +02:00
Aevann1 2fe4d0f370 fdsfds 2021-10-01 02:16:30 +02:00
Aevann1 aea6981946 dfsfs 2021-10-01 02:15:59 +02:00
Aevann1 5875924f9b dsffsd 2021-10-01 02:15:30 +02:00
Aevann1 2eb4c0926b dfsfsd 2021-10-01 02:15:07 +02:00
Aevann1 80b68ae91d dfsfds 2021-10-01 02:13:20 +02:00
Aevann1 be47614c8f dfsfds 2021-10-01 02:12:27 +02:00
Aevann1 22edca3685 dfsfds 2021-10-01 02:11:09 +02:00
Aevann1 6784c40192 dfsfds 2021-10-01 02:10:28 +02:00
Aevann1 368d6890ee dfsfdsfd'dfs 2021-10-01 02:09:25 +02:00
Aevann1 136b2a52eb fsdfsdsf 2021-10-01 02:07:13 +02:00
Aevann1 c43e0bb840 fgfggf 2021-10-01 02:05:56 +02:00
Aevann1 ed49a4d561 dfsfds 2021-10-01 02:05:25 +02:00
Aevann1 4964480c3e dfssdf 2021-10-01 02:03:15 +02:00
Aevann1 be7d00a5f3 dfsdfs 2021-10-01 02:01:28 +02:00
Aevann1 24a9b655d5 dfsfsd 2021-10-01 01:58:22 +02:00
Aevann1 3a910f6b7e fsdfs 2021-10-01 01:57:24 +02:00
Aevann1 42956db805 fdsfs 2021-10-01 01:56:47 +02:00
Aevann1 0276e89885 dfsfsdfsdcvx' 2021-10-01 01:56:07 +02:00
Aevann1 dfbeee1994 fdsfds 2021-10-01 01:46:25 +02:00
Aevann1 1305d279ca dfsfd 2021-10-01 01:45:53 +02:00
Aevann1 390dc2defd sdfsfd 2021-10-01 01:45:07 +02:00
Aevann1 55522eba6a dfsfds 2021-10-01 01:44:34 +02:00
Aevann1 afe8ab131f gfddg 2021-10-01 01:43:35 +02:00
Aevann1 a0ca3e6515 sfdsfd 2021-10-01 01:41:03 +02:00
Aevann1 03588697de fdgdg 2021-10-01 01:38:54 +02:00
Aevann1 17002a41be gfdgd 2021-09-30 23:41:49 +02:00
Aevann1 54acf88a90 sfddsf 2021-09-30 23:36:11 +02:00
Aevann1 f8d4563623 ffg 2021-09-30 23:34:44 +02:00
Aevann1 95c20acbf5 dfssdf 2021-09-30 23:28:48 +02:00
Aevann1 623a8547e7 df 2021-09-30 23:28:13 +02:00
Aevann1 5aa7fe63e6 fds 2021-09-30 23:27:48 +02:00
Aevann1 c02b37db9e dfs 2021-09-30 23:27:03 +02:00
Aevann1 3bf53a9524 fd 2021-09-30 23:26:47 +02:00
Aevann1 4a5b54ff76 fdgd 2021-09-30 23:25:51 +02:00
Aevann1 f878557b77 dfs 2021-09-30 23:24:52 +02:00
Aevann1 57df1ac8b5 fggf 2021-09-30 23:24:20 +02:00
Aevann1 f74eeded31 fdsfds 2021-09-30 23:22:22 +02:00
Aevann1 16c6ddd329 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-09-30 23:17:58 +02:00
Aevann1 dcdea41a1f dsffsd 2021-09-30 23:17:56 +02:00
Aevann1 60b6d35742 Merge pull request #64 from yoMamasDic/master 
Fix emoji being added to the wrong textbox
 2021-09-30 23:15:43 +02:00
Aevann1 4ed45c6cb7 fsd' 2021-09-30 23:15:10 +02:00
Aevann1 a57958f112 dfs 2021-09-30 23:14:17 +02:00
Aevann1 a1e9460161 fds 2021-09-30 23:13:18 +02:00
Aevann1 92b6d18fc0 fd 2021-09-30 23:10:52 +02:00
Aevann1 19035290bc fsd 2021-09-30 23:09:39 +02:00
Aevann1 3fc67c520f dsf 2021-09-30 23:08:15 +02:00
Yo Mama 7bceab1d15 Fix emoji being added to the wrong textbox 2021-09-30 23:02:50 +02:00
Aevann1 01559a954c sfdsfd 2021-09-30 23:01:52 +02:00
Aevann1 47a0acab80 hfghf 2021-09-30 21:40:33 +02:00
Aevann1 ece31240ca gf 2021-09-30 21:17:16 +02:00
Aevann1 58bceb071a sneed 2021-09-30 19:57:59 +02:00
Aevann1 723ac3eb0b df 2021-09-30 04:22:42 +02:00
Aevann1 1e5a59c4be dsf 2021-09-29 17:42:28 +02:00
Aevann1 dcaefaa2c9 emoji update 2021-09-29 17:38:19 +02:00
Aevann1 513cc3c985 sneed 2021-09-29 03:31:55 +02:00
Aevann1 79e6356b29 dfs 2021-09-28 21:45:17 +02:00
Aevann1 e613f7864f fgg4 2021-09-28 21:39:51 +02:00
Aevann1 800acd97e0 fds 2021-09-28 05:59:33 +02:00
Aevann1 8c04bfd319 squashing 2021-09-28 04:44:47 +02:00
Aevann1 97be0072c0 fsdfd 2021-09-27 23:50:35 +02:00
Aevann1 ca0654b523 fds 2021-09-26 13:49:50 +02:00
Aevann1 adcac95850 gf 2021-09-26 11:04:49 +02:00
Aevann1 08fb1a76fb sfd 2021-09-25 20:12:26 +02:00
Aevann1 a261bf3d16 dfs 2021-09-25 01:37:46 +02:00
Aevann1 7c2a0924ff fsd 2021-09-24 04:21:41 +02:00
Aevann1 0087adbf64 fsd 2021-09-24 00:11:26 +02:00
Aevann1 01074da6d7 gf 2021-09-23 22:43:11 +02:00
Aevann1 9a99c55eba fsd 2021-09-23 18:47:48 +02:00
Aevann1 65263b11a0 dfs 2021-09-23 00:33:25 +02:00
Aevann1 a1863d376c sfd 2021-09-23 00:33:12 +02:00
Aevann1 235e2926b9 fsd 2021-09-23 00:27:09 +02:00
Aevann1 42dc26d4ed fsd 2021-09-23 00:11:48 +02:00
Aevann1 b74f039aed sf 2021-09-23 00:10:18 +02:00
Aevann1 778d5a207c dfsfd 2021-09-23 00:08:07 +02:00
Aevann1 1f1aa3d162 fds 2021-09-23 00:05:04 +02:00
Aevann1 020afb954e sdffs 2021-09-23 00:04:27 +02:00
Aevann1 2f11f56395 sfd 2021-09-23 00:03:28 +02:00
Aevann1 23a9f47287 sfd 2021-09-23 00:02:28 +02:00
Aevann1 48e809640d dsf 2021-09-22 23:56:43 +02:00
Aevann1 6879e80f1d fsd 2021-09-22 23:55:42 +02:00
Aevann1 014f1d7ed2 dfs 2021-09-22 23:54:11 +02:00
Aevann1 23d7ace745 dsffsd 2021-09-22 23:53:12 +02:00
Aevann1 3837ffc9b6 fd 2021-09-22 23:49:48 +02:00
Aevann1 fbc2164d4d fds 2021-09-22 23:47:21 +02:00