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

1465 Commits (73ab9fa4fffd7ab62700b4b60cc2baeff83acfe5)

Author SHA1 Message Date
justcool393 1fd100d28c watermark: disable temporarily (#74) 
it's borked on most of the themes we need to do some proper checking
will be reenabled and fixed by #46

Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#74
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-15 21:39:43 +00:00
justcool393 34ce953884 Fix DM and modmail replies 404ing (#65) 
messages got borked completely by this commit

this reverts commit b649a16b46.

---

Snakes note: DM and modmail replies 404'd because dispatched
to the wrong endpoint. The fix to that affected cancel buttons
in some contexts, so this PR also fixes those. Cancel button
presence and behavior should be same as it was a ~week ago
(i.e. correct), and all reply everywhere seem to work right.

Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#65
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-14 04:16:43 +00:00
Aevann1 36fca9caab minor bugfix 2022-12-13 20:50:38 +02:00
Aevann1 b649a16b46 fix cancel button 2022-12-13 20:26:25 +02:00
Aevann1 fa30af6e5c fix "undelete" button on comments not removing the yellow 2022-12-13 20:17:04 +02:00
Aevann1 2258b18566 show the votes button to logged-out niggas 2022-12-11 21:32:30 +02:00
Aevann1 59e0beebb2 minor change 2022-12-11 21:19:10 +02:00
Aevann1 06e1195189 restore "cancel" button JC removed 2022-12-10 18:55:39 +02:00
Aevann1 cfb49da217 fix prev commit 2022-12-09 14:07:37 +02:00
Aevann1 1f99bb0aa6 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3211375?context=8#context 2022-12-09 14:03:11 +02:00
Aevann1 ca4e0f5e66 do this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3210978?context=8#context 2022-12-09 12:54:29 +02:00
Aevann a0a8535ec3 fix standard urls for w3.org (#57) 
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Reviewed-on: rDrama/rDrama#57
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-09 05:41:53 +00:00
justcool393 f848f68799 walls: remove duplication among routes/templates (#52) 
removes a bunch of duplicated code in commenting and userpages

Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#52
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-09 03:35:28 +00:00
Aevann1 cff9249572 watermark 2022-12-07 21:05:52 +02:00
Aevann1 93063516ce tie transparent theme to backgrounds 2022-12-07 19:53:29 +02:00
Aevann 81267ef1c6 do this https://stupidpol.site/h/countryclub/post/79285/tired-of-some-cute-twink-jannies/3194721?context=8#context (#53) 
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Reviewed-on: rDrama/rDrama#53
 2022-12-07 16:51:51 +00:00
Aevann1 ede58dd886 fix margins 2022-12-05 17:23:41 +02:00
Aevann1 c0169d0dab fix voting on profile wall 2022-12-05 08:18:37 +02:00
Aevann1 1fead79a86 fix 2022-12-05 08:15:13 +02:00
Aevann1 af3b028ca5 add links to individuals comments in walls + fix awards for wall comments 2022-12-05 05:01:50 +02:00
Aevann1 6cfe0fceb4 hide another broken button 2022-12-05 04:33:42 +02:00
Aevann1 29d1d08eb8 hide 2 broken buttons 2022-12-05 04:27:30 +02:00
Aevann1 e9f4f88f24 fix notifs for profile wall replies 2022-12-05 04:19:51 +02:00
Aevann1 111832a7d2 fix 500 error 2022-12-05 04:04:14 +02:00
Aevann1 bfb8eba832 dont do relationship query when not necessary 2022-12-05 03:59:31 +02:00
Aevann1 492c377e8e show "profile wall" above wall notifs 2022-12-05 03:37:44 +02:00
Aevann1 cb4d941fd0
add profile wall 2022-12-04 20:05:45 -05:00
Aevann e105035272 remove country club system and replace it with a 3 tier thing: (#41) 
- /h/masterbaiters: 1 TS - for gayops

- /h/countryclub: 1000 TS - for anything requiring secrecy and doesnt need critical mass - have to make it a rule that u cant post gayops in /h/countryclub

- /h/chudrama: 5000 TS - for chad+stud posts

EDIT: i removed the /h/masterbaiters gate, but u can bring it back if u want
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#41
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-04 18:39:06 +00:00
Aevann1 c0676e198c convert "var" to "let" and "const" 2022-12-04 17:40:32 +02:00
Aevann1 323061bc86 add missing space 2022-11-28 06:43:15 +02:00
Aevann1 c9f44b5777 rename data-click to data-click2 2022-11-28 06:35:33 +02:00
Aevann 5d49821e7a use https whenever u can 2022-11-28 00:53:37 +02:00
Aevann 7fe42fc104 fix ids in transparent theme 2022-11-27 22:36:36 +02:00
Aevann1 36f6b89a1a make "unmark +18" green 2022-11-27 03:28:20 +02:00
Aevann1 08d0fd605e tweak API App button 2022-11-26 06:34:04 +02:00
Aevann1 3ddeba7e8d disable user.newtab for PWA users 2022-11-23 00:05:31 +02:00
Snakes 6e1f03f480
Make comment removal UI consistent desktop/mobile. 2022-11-21 20:22:18 -05:00
justcool393 272e2ee936
sneed (rename procoins to marseybux) (#472) 
* sneed (rename procoins to marseybux)

* literally unusable

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 18:08:29 -05:00
Aevann1 2f31fdfdd7 Revert "remove User.newtab and see if anyone complains" 
This reverts commit 787c89961f.
 2022-11-21 18:55:13 +02:00
Aevann1 787c89961f remove User.newtab and see if anyone complains 2022-11-21 16:36:17 +02:00
Aevann1 5288d7a7dc remove android app and replace with instructions on how to install PWA 2022-11-20 00:04:08 +02:00
Aevann1 44aa666a4d fix improper redirect URLs 2022-11-19 23:33:59 +02:00
Aevann1 0e10dd6b32 use postToast in delete_comment_modal 2022-11-18 23:27:53 +02:00
Aevann1 4d2a2937e9 fix this https://rdrama.life/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3072105?context=8#context 2022-11-18 22:53:54 +02:00
Aevann1 fe154554c6 make sure all /login and /signup link have redirect 2022-11-18 22:13:06 +02:00
Aevann1 ce24c24e1d put js files not made by us in a folder 2022-11-18 21:16:44 +02:00
justcool393 255d5b2453 security: fix mute bypass 
modmail: constantify user ID
 2022-11-17 16:50:06 -06:00
justcool393 83963470e8
user can_view functions (#460) 
* user: move can_see_to user class

* stub out can_see in comments and posts

* make can_see a classmethod so it's usable for loggedoutfriends

* test

* kill me now

* threelargeclassesmating

* dfdfdfdfdfdfd

* sdsdsdsd

* classmethod should be above i think

* Revert "classmethod should be above i think"

This reverts commit df1772eb9e7e71bf7b89123f6277b648de2b1af3.

* Revert "Revert "classmethod should be above i think""

This reverts commit 32883406c2e2916fc6c436611376a1817c16cb84.

* test rewritnig thing

* go home python

* what the fuck python

* fix AttributeError

* sdsdsdsdsdsd

* lazy and user and stuff

* test

* Revert "test"

This reverts commit 45af5bb3d45f3ec17126ab117d494ec978062a38.

* merge

* newline

* test

* test 2

* Revert "test"

This reverts commit 196dae677e2ee8cd29261c93dcb747087cb399b6.

* revert test

* fix merge error

* fix import error ciruclation i think

* sdsd

* add type annotations back

* deleted_utc

* isinstance

* user_can_see in jinja and remove unnecessary things

* a bunch of stuff
remove can_see from comment and post
expand can_see to messages

* antiannoyingamountsofwhitespace

* fix for chudrama

* improve prev
 2022-11-17 16:02:08 -05:00
Snakes 7feddc42f0 Unify template helpers and macros, fix header. 
The need for sidebars to have access to macros.random_image means
all templates that include header.html (most templates) need to have
access to `macros`, because header.html includes sidebar_{SITE_NAME}.

Because of how sparse helpers was, we instead unify the two and
replace it since I know we had helpers in every top-level template.
 2022-11-16 12:07:23 -05:00
justcool393 e1634d0940 modals: move all modals to a modals dir 2022-11-15 17:15:53 -05:00