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

960 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann 3a67c1647d fix bug with pasting in /submit + dedup 2023-03-04 21:54:06 +02:00
Aevann fa2066117c remove unnecessary for attribute 2023-03-03 09:23:05 +02:00
Aevann 24c298f329 do this https://stupidpol.site/h/countryclub/post/79285/-/3681172#context 2023-02-28 21:36:14 +02:00
Aevann 3d40cab998 fix bug affecting main picture in /submit 2023-02-27 19:28:20 +02:00
Aevann c6dcb2e93d add progress bar to comments 2023-02-27 19:25:38 +02:00
Aevann 5b71b0a81a refactor file upload 2023-02-27 17:02:35 +02:00
Aevann 6ac9b32834 allow positioning of files 2023-02-26 14:08:37 +02:00
Aevann fd4b2037fc remove excessive empty space at the bottom in /submit 2023-02-25 20:10:18 +02:00
Aevann 44a80f0492 make under_attack a setting and use it in /submit for WPD 2023-02-09 05:50:30 +02:00
Aevann fa8a787f40 deploy CORS uploading 2023-02-08 18:54:55 +02:00
Aevann 4a44ff99c6 same as last commit 2023-02-08 18:17:36 +02:00
Aevann f22f0dd760 same as last commit 2023-02-08 18:16:50 +02:00
Aevann c8360e586c test using videos.watchpeopledie.tv for posting 2023-02-08 18:15:10 +02:00
Aevann 81cb280990 require flair on frontend too 2023-02-08 09:30:29 +02:00
Aevann 104c6f1b89 keep "Post" button disabled 2023-02-08 09:21:52 +02:00
Aevann c4394316fb add upload progressbar in /submit 2023-02-08 09:15:37 +02:00
Aevann d5c0686496 remove leftover upload-filelist 2023-02-08 09:14:35 +02:00
Aevann 99fb404ada add upload progress bar 2023-02-08 06:19:23 +02:00
Aevann b896efcf82 reposition formatting help 2023-02-06 06:57:09 +02:00
Aevann 59fe09d0af disable NSFW marking in WPD 2023-02-01 20:52:34 +02:00
Aevann 5502715122 replace type="hidden" with hidden 2023-01-24 07:10:16 +02:00
Aevann 445371c4cd fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3342093#context 2023-01-01 17:49:43 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 8a1343e739 Revert "remove all accessibility attributes" 
This reverts commit e3a8fe85e3.
 2023-01-01 13:12:35 +02:00
Aevann e3a8fe85e3 remove all accessibility attributes 2023-01-01 13:05:39 +02:00
Aevann 3b71e5dba4 fix this https://rdrama.net/h/meta/post/134631/im-too-lazy-to-test-so/3311747#context 2022-12-30 19:41:29 +02:00
Aevann 01f0f8c59a remove weird html shit 2022-12-30 19:20:10 +02:00
Aevann f0b20cad55 the worst fucking code you'll ever see 2022-12-30 14:14:18 +02:00
Aevann 1bfa5f5747 style change for format buttons 2022-12-30 10:20:09 +02:00
Aevann 93e9a42fa3 stop using inline style/script elements 2022-12-29 16:20:27 +02:00
Aevann 6114111654 tighten CSP 2022-12-27 03:22:39 +02:00
Aevann 070a22d02e remove accessiblity shit 2022-12-25 04:10:56 +02:00
Aevann e6803f93e9 rework gif modal 2022-12-25 03:45:24 +02:00
Aevann1 3ae5292ce4 remove pcm from code 2022-12-21 14:42:41 +02:00
Aevann1 a7eb0f4d5b fix bug on submit 2022-12-15 23:43:20 +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 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
justcool393 37c8d77f3f submit: don't disable submit button by default 
this doesn't create an issue because HTML form validation does work here
 2022-11-25 13:18:43 -06:00
Snakes 31f705e600
Hide mobile navbar covering bottom of /submit. 2022-11-22 18:13:23 -05:00
Aevann1 3ddeba7e8d disable user.newtab for PWA users 2022-11-23 00:05:31 +02: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
justcool393 153fb4e2a2
[DO NOT MERGE] titlesssssssssss (#468) 
* titles

* testing

* self

* Revert "self"

This reverts commit d6c12d5a5ba125feb44673f55e1fdac75f151cb5.

* Revert "testing"

This reverts commit 86d800f9fd552196b31f0e0b3891d4fc072a9bc0.

* testing on devrama

* rewrite the html head

* reference error or smth idk

* tempalte debug

* template debug redux

* default2

* rename default2 -> root, page title

* fix settings2

* include the set_variables block

* root scope variables 2

* test 3

* remove unnecessary set

* add pagetitles to all settings2 pages

* add pagetitle to casino

* remove bloat

* remove duplicate site name thingy

* page titles 2

* page titles 3

* remove duplicate imports and add page titles everywhere iirc

* ok but actually this time

* remove unnecessary newlines

* fix title lol

* >

* fsdfsfsfsfsfs

* fsfs

* template configurations

* fix 500

* reduce login template bloat

* move files and add status codes where needful

* move authfroms to login

* remove 2fa bloat

* verification code

* sign up fixes

* readability

* fssfsfsfs

* move forgot password to login/

* readability

* don't emit comments

* add page titles where needful

* gsgsgs

* modals: move to respective pages

* testing on devrama

* get home garbage out of title

* remove insane amount of icon duplication

* sign up text

* add votes pagetitle

* fix blank lines

* Revert "fix blank lines"

This reverts commit b2c54339970725d00b6fc82bb458c1757909952c.

* Fix blank lines on sign_up.html.

* title: votes.html more meaningful identifier.

* titles: Lottery, Directory, Notifications

* head final in submission.html

* fix missing comma

* >

* test

* title: /comments

* fsfsfsfsf

* titles: user_cards

* head: only load video and audio meta attributes if they actually exist

* titlessssss: /admin/lottery/participants

* titlessssssss: extra quote in search.html

* titlessssss: userpage voters.

* titties: /h/<sub>/{followers,blockers,exilees[sic]}

* test banner

* Revert "test banner"

This reverts commit c3d875d03f3e60d72a60dab7d28bf108554a5826.

* make submit.html inherit from default.html

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 02:52:22 -06:00
Aevann1 0baa32e6eb fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3107571?context=8#context 2022-11-20 18:55:26 +02:00
Aevann1 5288d7a7dc remove android app and replace with instructions on how to install PWA 2022-11-20 00:04:08 +02:00
Snakes b808cf2917
html_head: fix SITE_NAME titles, improve settings2. 2022-11-18 14:44:05 -05:00
Aevann1 ce24c24e1d put js files not made by us in a folder 2022-11-18 21:16:44 +02:00
geese-suck 47658f2897
clean up html head (#461) 
* init (not done)

* asdf

* :marseymop:

* unnecesary

* remove

* Update html_head.html
 2022-11-17 16:08:39 -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
justcool393 8f2f48d6d1
[DO NOT MERGE] import detanglation (#442) 
* move Base definition to files.classes.__init__.py

* fix ImportError

* move userpage listing to users.py

* don't import the app from classes

* consts: set default values to avoid crashes
consts: warn if the secret key is the default config value

* card view: sneed (user db schema)

* cloudflare: use DEFAULT_CONFIG_VALUE

* const: set default values

* decouple media.py from __main__

* pass database to avoid imports

* import cleanup and import request not in const, but in the requests mega import

* move asset_submissions site check to __init__

* asset submissions feature flag

* flag

* g.is_tor

* don't import request where it's not needed

* i think this is fine

* mail: move to own routes and helper

* wrappers

* required wrappers move

* unfuck wrappers a bit

* move snappy quotes and marseys to stateful consts

* marsify

* :pepodrool:

* fix missing import

* import cache

* ...and settings.py

* and static.py

* static needs cache

* route

* lmao all of the jinja shit was in feeds.py amazing

* classes should only import what they need from flask

* import Response

* hdjbjdhbhjf

* ...

* dfdfdfdf

* make get a non-required import

* isort imports (mostly)

* but actually

* configs

* reload config on import

* fgfgfgfg

* config

* config

* initialize snappy and test

* cookie of doom debug

* edfjnkf

* xikscdfd

* debug config

* set session cookie domain, i think this fixes the can't login bug

* sdfbgnhvfdsghbnjfbdvvfghnn

* hrsfxgf

* dump the entire config on a request

* kyskyskyskyskyskyskyskyskys

* duifhdskfjdfd

* dfdfdfdfdfdfdfdfdfdfdfdf

* dfdfdfdf

* imoprt all of the consts beacuse fuck it

* 😭

* dfdfdfdfdfdfsdasdf

* print the entire session

* rffdfdfjkfksj

* fgbhffh

* not the secret keys

* minor bug fixes

* be helpful in the warning

* gfgfgfg

* move warning lower

* isort main imports (i hope this doesn't fuck something up)

* test

* session cookie domain redux

* dfdfdfd

* try only importing Flask

* formkeys fix

* y

* :pepodrool:

* route helper

* remove before flight

* dfdfdfdfdf

* isort classes

* isort helpers

* move check_for_alts to routehelpers and also sort imports and get rid of unused ones

* that previous commit but actkally

* readd the cache in a dozen places they were implicitly imported

* use g.is_tor instead of request.headers. bla bla bla

* upgrade streamers to their own route file

* get rid of unused imports in __main__

* fgfgf

* don't pull in the entire ORM where we don't need it

* features

* explicit imports for the get helper

* explicit imports for the get helper redux

* testing allroutes

* remove unused import

* decouple flask from classes

* syntax fix also remember these have side fx for some reason (why?)

* move side effects out of the class

* posts

* testing on devrama

* settings

* reloading

* settingssdsdsds

* streamer features

* site settings

* testing settings on devrama

* import

* fix modlog

* remove debug stuff

* revert commit 67275b21ab6e2f2520819e84d10bfc1c746a15b6

* archiveorg to _archiveorg

* skhudkfkjfd

* fix cron for PCM

* fix bugs that snekky wants me to

* Fix call to realbody passing db, standardize kwarg

* test

* import check_for_alts from the right place

* cloudflare

* testing on devrama

* fix cron i think

* shadow properly

* tasks

* Remove print which will surely be annoying in prod.

* v and create new session

* use files.classes

* make errors import little and fix rare 500 in /allow_nsfw

* Revert "use files.classes"

This reverts commit 98c10b876cf86ce058b7fb955cf1ec0bfb9996c6.

* pass v to media functions rather than using g

* fix

* dfdfdfdfd

* cleanup, py type checking is dumb so don't use it where it causes issues

* Fix some merge bugs, add DEFAULT_RATELIMIT to main.

* Fix imports on sqlalchemy expressions.

* `from random import random` is an error.

* Fix replies db param.

* errors: fix missing import

* fix rare 500: only send to GIFT_NOTIF_ID if it exists, and send them the right text

* Fix signup formkey.

* fix 2 500s

* propagate db to submissions

* fix replies

* dfdfdfdf

* Fix verifiedcolor.

* is_manual

* can't use getters outside of an app context

* don't attempt to do gumroad on sites where it's not enabled

* don't attempt to do gumraod on sites's where it's unnecessary

* Revert "don't attempt to do gumroad on sites where it's not enabled"

This reverts commit 6f8a6331878655492dfaf1907b27f8be513c14d3.

* fix 500

* validate media type

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-15 03:19:08 -06:00
Snakes 2d6cb193c0
Audio post minor improvements. 
- Make clear on post submission that users can upload audio.
 - Fix a missing closing </div> that was breaking submission.html
   on audio posts.
 2022-11-14 17:26:39 -05:00
justcool393 cbe328e933 submit thing 2022-11-14 11:20:34 -06:00
justcool393 39e7e61bcb posts: make ghost threads cost DC again 
who the hell disabled this
 2022-11-13 19:52:32 -06:00
Snakes 439b73d6ae
Make explicit submission flag behavior. 
Main intention is to allow API users (bots) to benefit from the
defaults typically enforced clientside, and to generally be clearer
about what values do what.
 2022-11-11 00:23:03 -05:00
Aevann1 170959c071 untick "notify followers" checkbox when "ghost thread" checkbox is ticked 2022-11-09 21:26:38 +02:00
Aevann1 6694585434 make ghost threads free again 2022-11-09 21:19:29 +02:00
Snakes be2664b284
Revert "set astolfo background to everyone in drama" 
This reverts commit be1ff23d4d.
 2022-11-01 00:21:32 -04:00
Aevann1 be1ff23d4d set astolfo background to everyone in drama 2022-10-29 22:23:16 +02:00
Aevann1 7915d9f0aa fix bugs resulting from fdd608532b 2022-10-29 03:26:46 +02:00
Aevann1 de8be8dd0e get rid of <pre> being used as vertical spacing 2022-10-29 02:47:48 +02:00
Aevann1 fdd608532b add type="button" to all <button> tags 2022-10-29 01:35:14 +02:00
Aevann1 4a43bc239d remove formatting buttons (useless bloat) 2022-10-28 21:09:56 +02:00
Aevann1 1a35e2ec6a refactor banned domains 2022-10-28 00:37:29 +02:00
justcool393 c4b2c6f3f5
html head refactor (#412) 
* start html head refactor
this is a bit of a doozy tbh and will probably take a while. the templates are very highly duplicated but not duplicated enough to be an easy little thing

oh well, so it goes.

* some easier html head ones

* add chat, html_head, sign_up_failed_ref, sign_up, submit

* CSP: put it in const.py instead of this weird thing we did before

* fix syntax error

* better call the actual macros

* fix prev commit

* import into settings2

* fix prev commit

* set CSP properly if localhost

* some title fixes i think

* login page

* fix prev commit

* hacky thing to get titles to work i think

* {{stylesheets()}}

* fix prev commit

* title stuff

* cries uncontrollably

* submission fixes i think

* fix prev commit i think

* submission fixes ekfjdhfkdjf

* submission fixes 4

* this may fix submissions idk tbh

* default template: make it a little better on post pages

* default template: some efficiency
 2022-10-21 13:39:45 -05:00
justcool393 2559794135 Move stuff we put in bootstrap.js to a new core.js file 2022-10-14 02:50:39 -07:00
Aevann1 aa8e7055fb rework env vars a bit 2022-10-08 02:43:04 +02:00
Aevann1 d1f52447b1 remove old earlylife css code 2022-10-07 01:45:23 +02:00
Aevann1 140db5052c remove shit i accidentially committed :marseybrainlet: 2022-10-06 05:37:52 +02:00
Aevann1 94e441a23b decrrease max-width for a bunch of modals from 90% to 85% 2022-10-06 03:01:52 +02:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Snakes 98936efe60
assetcache: apply to all CSS and JS assets. 2022-09-24 03:04:06 -04:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 2e31b52366 for consistency's sake, don't use {sub.name} inside strings anymore 2022-09-12 07:25:04 +02:00
Aevann1 c1aae95d16 restore "notify followers" checkbox 2022-09-10 09:00:45 +02:00
Aevann1 00b71e0bc5 restore the original emoji icon 2022-09-10 01:52:52 +02:00
Aevann1 e9445efc22 make bootstrap work on localhost 2022-09-08 19:12:46 +02:00
Aevann1 71b5367874 cachebust all css and js 2022-09-05 01:50:43 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Aevann1 3306f94fc5 change default dues from 10 to 0 2022-09-01 21:15:21 +02:00
Aevann1 768a2eda24 clarify CC function in WPD and PCM 2022-09-01 21:12:05 +02:00
Aevann1 c40fa120e8 remove ((( from chud award 2022-08-30 06:03:16 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 d70b6df92b remove the warning 2022-08-19 13:53:56 +02:00
Aevann1 26bbc8b69a perserve the first 4 checkboxes in /submit too 2022-08-15 08:42:59 +02:00
Aevann1 9472f1f980 fix wrong info on /submit 2022-08-13 10:44:13 +02:00
Aevann1 f6729aab33 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2487028?context=8#context 2022-08-11 19:18:53 +02:00
Snakes 1411018f8d Add post categories. 
Implemented for LGB but can likely be used for WPD and other future
sites. Similar to a reddit post flair. Provides:
  - Admin panel for Category management.
  - Category selection on post submission.
  - 'Recategorize' post action.
 2022-08-07 02:57:30 -04:00
Aevann1 b83a16668b re-move bootstrap.js back to the top of documents to fix broken shit 2022-08-06 03:20:25 +02:00
Snakes eb55a6cc01
LGB: disable country club. 2022-07-19 21:50:08 -04:00
Nekobit bde47271d7
Allow Inline Emoji modal in more areas (#318) 
* Sneed

* Bust cache
 2022-07-17 07:42:03 +02:00
Nekobit 4b47faa1ed
Inline Emojo Picker (#317) 
* Inline emoji picker

* Inline text editor
 2022-07-17 07:02:22 +02:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 382df30e1f show ALL timestamps in user's timezone + move scripts to the bottom of HTML templates to mimic rocketloader's behavior on localhost (for testing) 2022-07-09 10:35:47 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 57e424af5b revert the "defer" thing 2022-07-03 12:10:04 +02:00
Aevann1 a49325ba14 defer all scripts (this won't change anything for us since we use rocketloader, but it will fix javascript on localhost) 2022-07-03 09:42:33 +02:00
Aevann1 d59f346f0b 1 less request, 1 less transaction, 1 less query 2022-07-01 23:10:48 +02:00
Aevann1 25e594d673 Revert "no longer stop reposts from being posted" 
This reverts commit 19e6e7f4d9.
 2022-07-01 20:29:12 +02:00
Snakes 1b9237ceaf Add assetcache.asset_siteimg, has_logo. 
Commit began by changing the duplicated SITE_NAME conditional in the
header to use a `has_logo` param, much like the recent `has_sidebar`.
From there, a need to include site-specific assets in assetcache was
revealed, adding the `asset_siteimg(...)` macro. This was applied
quite broadly, though not comprehensively.
 2022-07-01 01:55:53 -04:00