carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
22,442 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

584 Commits (5fdec63e8cf7e467ecf23ebb5248e74e0e75fd67)

Author SHA1 Message Date
justcool393 c6e3df3340 settings: fix NSFW toggle 2022-11-06 23:45:21 -06:00
Aevann1 14b19ac950 add two words to the message 2022-11-07 07:15:46 +02:00
justcool393 771f1972aa fix custom filters 2022-11-06 22:50:45 -06:00
justcool393 af696a2f9c verified fixes again 2022-11-06 22:31:38 -06:00
justcool393 0c7d8f0da1 fkjdhfkjdhfdkjfhdkf 2022-11-06 20:06:37 -08:00
justcool393 424e9bc0ae sanity check 2022-11-06 20:06:37 -08:00
justcool393 54fecd99e5 fix poor, fix 500, sanitize fun stuff 2022-11-06 20:06:37 -08:00
justcool393 7de3bb064c make API message better 
also make unchecking the box hide the permalink
 2022-11-06 20:06:37 -08:00
justcool393 57df202cfa don't disable flags 2022-11-06 20:06:37 -08:00
justcool393 657c00244a sanitize, fix bug with update_flag, and update copy for low tsfriends 2022-11-06 20:06:37 -08:00
justcool393 502314ad3c colors: filter properly 2022-11-06 20:06:37 -08:00
justcool393 c2350d36bf add patronage message and message for when it's enabled permanently 2022-11-06 20:06:37 -08:00
justcool393 06736dfb75 fix badge id 2022-11-06 20:06:37 -08:00
justcool393 4d2f429954 enable permanence code and fix some bugs with setting frontsize and some other things 2022-11-06 20:06:37 -08:00
justcool393 d26294de5c don't attempt to set the filter if not in the request 2022-11-06 20:06:37 -08:00
justcool393 edc969e2cd use /settings/personal instead of /settings/profile 2022-11-06 20:06:37 -08:00
justcool393 78c53c1954 debug 2022-11-06 20:06:37 -08:00
justcool393 c10b3e4262 fix prev commit 2022-11-06 20:06:37 -08:00
justcool393 83fe77c039 settings: implement backend logic for permanent filters 2022-11-06 20:06:37 -08:00
justcool393 72da55fd61 settings: implement front end for perma-filters 2022-11-06 20:06:37 -08:00
justcool393 511ed26574 settings: add new settings pages to API 
settings: remove old settings pages from API
settings: delete unused settings template
 2022-11-06 20:06:37 -08:00
justcool393 c6675ff037 houses: make price a constant 
houses: warn founders that switching houses will delete their founder status
 2022-11-05 01:00:02 -05:00
justcool393 1008c3b71f houses: don't allow users to pick the same house 2022-11-05 00:49:12 -05:00
justcool393 339d5fe8f1 users: add profanity filter to censor our gosh darned potty mouthes 2022-11-03 17:59:18 -05:00
Aevann1 111c9ab208 fix this https://rdrama.life/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3007141?context=8#context 2022-11-02 05:22:16 +02:00
justcool393 6caebac946 actions: move user-only actions to useractions, which gets rid of a circular dependency 2022-11-01 18:46:56 -05:00
justcool393 6d636e4e42 use charge_account everywhere 2022-11-01 00:25:19 -05:00
Aevann1 fbeac461ca refactor poorcel mode 2022-10-25 18:07:44 +02:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
Aevann1 cdff11424f use charge_account everywhere 2022-10-12 18:33:00 +02:00
Aevann1 cdfbbd0217 fix wrong name for feature 2022-10-12 06:06:11 +02:00
Aevann1 466867afd1 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-11 18:41:12 +02:00
Aevann1 e3a3cbd358 add "hot" comment sorting 2022-10-11 18:41:09 +02:00
justcool393 39e49a508f add 409 to errors 
* also move check for AUTOJANNY_ID to before has_blocked
 2022-10-11 08:40:19 -07:00
justcool393 c0acb1722b abort a bunch of stuff where we manually returned JSON 2022-10-11 08:40:19 -07:00
justcool393 b398420246 i'm gonna hit sneks with a giant foam s 2022-10-11 00:52:01 -07:00
justcool393 456dd43bba replace "if not FEATURES" with wrapper 2022-10-11 00:33:23 -07:00
justcool393 75e593da00 Revert "feature required wrapper" 
This reverts commit 8700bcc5ee.
 2022-10-10 02:54:47 -07:00
justcool393 8700bcc5ee feature required wrapper 2022-10-09 23:16:05 -07:00
Aevann1 9d6dcca07a remove duplicate function 2022-10-07 00:59:50 +02:00
Aevann1 96f4f8499f fix 500 errors 2022-10-06 09:30:38 +02:00
Aevann1 37e1f25624 make using proxies only happen in 3 circumstances again 2022-09-26 06:01:25 +02:00
Snakes b0529716bc Remove voluntary marsify toggle. 2022-09-25 21:32:36 -04:00
justcool393 a8e74d3355
delete the spider badge if unspidering, not the marsify one (#374) 2022-09-25 16:17:11 -04:00
Aevann1 dd0f8fbed7 proxy all requests we make 2022-09-25 05:23:50 +02:00
Aevann1 dd7145410f add spider toggle 2022-09-25 04:44:19 +02:00
Aevann1 a40c367e88 remove marsify badge when user turns it off in the settings 2022-09-19 20:54:09 +02:00
Aevann1 f7727f1029 refactor sigs 2022-09-19 19:51:40 +02:00
Aevann1 0c0a612f53 fix 500 error 2022-09-17 14:12:30 +02:00
Aevann1 73ae8f6e65 give a badge to permenantly marsified users 2022-09-13 20:02:08 +02:00
Aevann1 2fa71a252b kofi integration 2022-09-13 18:53:19 +02:00
Aevann1 0c3cf0128a "That" -> "This" 2022-09-13 11:59:29 +02:00
Aevann1 4abf75edc0 add error codes 2022-09-12 11:52:07 +02:00
Aevann1 ce0b141325 specify the type of color code we want 2022-09-11 12:04:21 +02:00
Aevann1 225e64b91e add marsify toggle in settings 2022-09-05 06:50:27 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Aevann1 e5b2675f0d try to fix db 500 errors on wpd 2022-09-01 21:05:37 +02:00
Snakes 09d95e3e63
Revert unblockable users being unable to block. 
Related commits:
26b2f55e68
356d1ca8a0
 2022-08-30 21:31:48 -04:00
Aevann1 356d1ca8a0 "people" -> "others" 2022-08-30 06:03:53 +02:00
Aevann1 26b2f55e68 make it so ppl with unblockable award cant block others 2022-08-30 05:58:25 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 e0255a0fa4 fix 500 error caused by shit code 2022-08-27 00:01:36 +02:00
Aevann1 ac98f54902 remove .can_gamble 2022-08-26 23:00:17 +02:00
Aevann1 8864748b6b increase block ratelimit from 10/day to 20/day 2022-08-23 17:24:54 +02:00
Aevann1 026d023c43 filter 2 slurs from pronouns 2022-08-16 18:16:04 +02:00
Aevann1 8e48728614 add imginn toggle 2022-08-15 19:45:43 +02:00
Aevann1 8f08db39c5 delete reddit.css 2022-08-06 00:53:38 +02:00
Aevann1 66088d5a5b Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-05 19:22:19 +02:00
Snakes 8b241a765a
Check URI approved embed in all CSS contexts. 2022-08-05 13:09:41 -04:00
Aevann1 2ec5531080 order themes alphabetically 2022-08-05 18:26:44 +02:00
Aevann1 3aab5240f3 fix 500 error 2022-08-05 17:29:40 +02:00
Aevann1 ed36803842 allow uppercase on pronouns 2022-07-23 14:41:49 +02:00
Aevann1 aa644fd208 allow a third pronoun if total character count is 11 or lower 2022-07-23 08:48:32 +02:00
Snakes a2ca535ce3
LGB: extend block & follower vis permissioning. 2022-07-19 22:29:45 -04:00
Snakes b4fdf248ef LGB: disable profile bio, banner, song. 2022-07-19 21:20:52 -04:00
Snakes 0c43deeee6
FEATURES: pronouns, kys, chat, house, /vote perm. 2022-07-18 02:43:20 -04:00
Aevann1 fd87cb3ce2 remove linebreaks from future sigs 2022-07-17 19:24:58 +02:00
Aevann1 86717e37b2 refactor changelog 2022-07-13 23:03:11 +02:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 5fb6bd86f9 remove "warm" sorting 2022-07-13 19:32:31 +02:00
Aevann1 a088a6ec7b censor slurs on flairs 2022-07-12 22:09:59 +02:00
Aevann1 afa2f68804 change pronouns required format from 1-5 to 2-5 2022-07-12 20:28:07 +02:00
Aevann1 6428dd08c5 add pronouns 2022-07-11 18:46:08 +02:00
Aevann1 fecaed8223 fix mp3 songs getting cached 2022-07-10 17:43:27 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 b617321529 move all env-getting to .const 2022-07-08 18:21:13 +02:00
Snakes 9e1a3be278 Fix DMs improperly treating all users as blocked. 
The changes to helpers/get.py @ get_user(...) in a6b7fed2fc resulted
in `is_blocking` no longer being present on all User objects retrieved
via `get_user`. This triggered a latent identifier shadow where the
property method `User.is_blocking` on the User model caused checks for
blocks on objects retrieved via `get_user` to always return True.

Notably: when the get_user return value left `is_blocking` unset and
thus implied False, the following expression yielded True due to the
presence of the first-class function at the same identifier:

    hasattr(user, 'is_blocking') and user.is_blocking
 2022-07-03 13:55:25 -04:00
Aevann1 ab2d9b492d add "warm" sorting - exact same as hot but pinned posts are shown in their normal positions instead of the top 2022-07-03 04:40:57 +02:00
Aevann1 3801189188 fix 2022-07-01 23:24:58 +02:00
Aevann1 d59f346f0b 1 less request, 1 less transaction, 1 less query 2022-07-01 23:10:48 +02:00
Aevann1 52a8a219ae make poorcel-mode device-specific 2022-06-27 05:46:32 +02:00
Aevann1 b1ef8e4c62 add poorcel mode 2022-06-27 04:14:53 +02:00
Aevann1 cff34fb3a4 reducing query volume, #2 2022-06-26 03:11:02 +02:00
Aevann1 c5c21da76f validate colors 2022-06-24 19:32:31 +02:00
Aevann1 9593dc58dd move regex from helpers.const into its own helper file 2022-06-24 16:30:59 +02:00
Aevann1 6f6d01c1c6 actually use the get functions 2022-06-24 15:19:53 +02:00
Aevann1 6803d83af4 fix wrong template being shown on error when changing colors 2022-06-24 00:22:41 +02:00
Aevann1 eba4452d79 fix 500 error 2022-06-18 22:41:00 +02:00
Aevann1 ccdabcba29 allow uploading of all types of files (using lain.la) 
+ allow multiple file upload in bios and messaging admins
 2022-06-18 17:53:34 +02:00
Aevann1 712bb52392 fix 500 error on /settings/gumroad 2022-06-18 03:59:33 +02:00