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

1515 Commits (1769c762b000155ea226d7dea0515dfd92396737)

Author SHA1 Message Date
Snakes e896aaa1f7
Fix comment rendering when pin.level > 1. 2022-11-15 05:29:47 -05:00
justcool393 26c725b2cd fix comment bug 2022-11-15 03:31:37 -06: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
Aevann1 2ab126ef33 adjust "mute" and "unmute" margins to accomodate switching 2022-11-14 19:06:59 +02:00
justcool393 24678ab7af reorder buttons per pool 2022-11-13 06:18:09 -06:00
Aevann1 cf40574b7d remove double spaces 2022-11-12 20:02:02 +02:00
justcool393 3c8559d741 contact: make mute button red like on userpage 2022-11-12 05:03:01 -06:00
Aevann1 42e40c1691 split off muting and unmuting 2022-11-12 11:11:34 +02:00
Aevann1 bac4745164 remove repeated ":not" from the css 2022-11-11 16:06:28 +02:00
Aevann1 05b7e79b76 remove the code i added for rdrama.com 2022-11-11 15:52:18 +02:00
Aevann1 dda1c88f4f fix margins 2022-11-08 12:05:07 +02:00
Aevann1 87d5a0de46 improve ban modal and add chud modal 2022-11-05 04:12:22 +02:00
Aevann1 a733056124 remove a bunch of double spaces 2022-11-05 04:12:22 +02:00
Aevann1 d4a99c05e9 rename postToast -> postToastSwitch and postToastCallback -> postToast for clarity 2022-11-03 21:08:22 +02:00
Aevann1 07a12380de accomodate alt domain 2022-11-03 17:29:14 +02:00
Aevann1 f73c6d46df accomodate rdrama.com users 2022-11-02 08:31:04 +02:00
Aevann1 30144c46a4 cosmetic fix to !slots 2022-11-01 20:57:29 +02:00
justcool393 f326b9d5d7 port self removal from spooky-22 2022-11-01 04:01:51 -05:00
Aevann1 915967ddd0 constantify BAN_EVASION_DOMAIN 2022-10-30 20:01:01 +02:00
Aevann1 2ba1a1e86e remove postToast compatability function 2022-10-30 17:10:07 +02:00
Aevann1 d52216beda restore historical blackjack games 2022-10-30 02:40:35 +02:00
Aevann1 f09ec0ca17 restore slot gambling in comments 2022-10-30 02:36:23 +02:00
Aevann1 06314f92b1 remove referrer from html tags 2022-10-29 23:42:30 +02:00
Aevann1 6451572139 remove refererrs from profile images 2022-10-29 23:16:43 +02:00
Aevann1 1b56fc22bb hide reply buttons on deleted comments and posts for consistency 2022-10-29 19:24:22 +02:00
Aevann1 aec78a3b05 get rid of all header classes 2022-10-29 02:55:49 +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 5eb2eb5035 remove role="button" from all <a> tags 2022-10-29 01:32:31 +02:00
Aevann1 2019f68217 same as last commit 2022-10-29 01:31:39 +02:00
Aevann1 582a29232b convert all <a> tags without a href, except 2 in award_modal.html 2022-10-29 01:27:38 +02:00
Aevann1 6c32916f1a convert more <a> tags to <button> tags 2022-10-29 00:51:10 +02:00
Aevann1 062e2523b5 change some <a> tags to <button> 2022-10-28 22:08:37 +02:00
Aevann1 aadd054bc3 remove role="button" from button HTML tags 2022-10-28 21:30:08 +02:00
Aevann1 4a43bc239d remove formatting buttons (useless bloat) 2022-10-28 21:09:56 +02:00
Aevann1 6271588056 small cosmetic change 2022-10-28 19:59:56 +02:00
Aevann1 5d9ddcc0f4 fix quoting on selection 2022-10-28 01:19:44 +02:00
Aevann1 a25169cbea remove makeQuote() from reply buttons 2022-10-25 23:16:34 +02:00
justcool393 f9343d3db1 full_name -> fullname 2022-10-25 15:05:37 -05:00
justcool393 56c1b64ec2 via @Aevann1: add selection quoting feature to mobile 2022-10-25 14:57:43 -05:00
Aevann1 03cd4246ff switch the position of "reply" and "mute" 2022-10-24 22:39:48 +02:00
Aevann1 2d0879ec3e allow admins to unmute users from modmail 2022-10-24 22:38:54 +02:00
Aevann1 b563b7af30 stop using "d-none d-md-block" 2022-10-23 19:57:38 +02:00
Aevann1 25e50be552 same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 eafbebbdf1 same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 e99aa6fd0e same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 a040b6779b same as last commit 2022-10-23 18:24:21 +02:00
Aevann1 9b47ad166b small refactor to approving psots and comments 2022-10-23 17:51:49 +02:00
Aevann1 3e45e9da67 add a bigger margin between "reply" and "mute" 2022-10-18 15:57:56 +02:00
Aevann1 661bf3af67 remove unnecessary margin in /transfers 2022-10-14 17:31:35 +02:00
Aevann1 4cbe5c41eb even higher margins 2022-10-14 17:31:02 +02:00
Aevann1 efe0ff091a increase margins in log 2022-10-14 17:28:07 +02:00
Aevann1 73bd39835b fix cursor on comment and post scores 2022-10-13 16:44:05 +02:00
Aevann1 86d5da7de6 fix this https://rdrama.net/post/112582/chudded-award-now-destroys-hours-of 2022-10-13 13:55:29 +02:00
Aevann1 2aa281e8c8 refactor sorting again (untested) 2022-10-12 09:03:28 +02:00
Aevann1 e1ee9a69e4 refactor seeing shadowbanned shit (untested) 2022-10-12 08:24:30 +02:00
Aevann1 83aa914865 more consistency in templates 2022-10-10 07:23:02 +02:00
Aevann1 acbfbb07ce rework "are you sure?" and make it work on subscribing to posts and reverting admin actions 2022-10-08 08:06:46 +02:00
Aevann1 137fa7c6d6 remove unused blocks + allow banners to be expandable everywhere 2022-10-08 04:04:46 +02:00
Aevann1 b608a514e4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-07 05:25:37 +02:00
Aevann1 2d2a35d7ca make giving awards not refresh the page 2022-10-07 05:25:34 +02:00
justcool393 931cee2393 fix syntax error 2022-10-06 02:41:03 -07:00
justcool393 eeca9617bd post comment moderation tools visible permission 2022-10-06 02:33:46 -07:00
justcool393 397cf68abd view vote buttons on user page 2022-10-06 01:14:32 -07:00
justcool393 02d0e2043e rename APPS_MODERATE to APPS_MODERATION 2022-10-06 00:40:36 -07:00
justcool393 767093d060 add perms for things we don't really know what they are 2022-10-06 00:32:05 -07:00
justcool393 f5be49c336 some template end stuff 
i feel like this one is ehhhh and might have to be fixed at some point
i'm not sure where some of these things are used, the templates really need to be refactored
 2022-10-06 00:17:12 -07:00
justcool393 9b8a3f21ab templateend hats, marseys, apps, notifications, etc 2022-10-05 23:56:37 -07:00
justcool393 9bb7b3758f distinguish stuff 2022-10-05 21:19:11 -07:00
justcool393 2fc3044d5b shadowban perms and stuff 2022-10-05 19:24:37 -07:00
justcool393 d5a48871f8 user ban and also fix global hole mod a bit i hope i didn't screw up the templates 2022-10-05 18:58:43 -07:00
justcool393 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
Aevann1 fabbc7a1a3 allow hole jannies to mark posts and comments in their holes as +18 2022-10-04 22:10:59 +02:00
Aevann1 03e925fb3c use ban_reason column as a reason for shadowbanning too 2022-09-29 08:36:59 +02:00
Aevann1 6c1237eaa6 remove hand pointer from exile symbol 2022-09-29 07:53:36 +02:00
Aevann1 a3a7ec6296 improve JC's previous cc PR 2022-09-25 04:32:51 +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
justcool393 a51bfa3d4c
country club leak fix (#370) 2022-09-24 02:37:32 +02:00
Snakes 7b9ac8e13b
Fix Thin badge popover sizing; expand assetcache. 2022-09-23 18:38:53 -04:00
Aevann1 ea34a00571 fix collapsing happening in main notif page 2022-09-23 15:12:20 +02:00
Aevann1 97dc727e22 cachebust 2022-09-20 23:22:58 +02:00
Aevann1 6f28acf4ae fix last commit 2022-09-20 20:58:20 +02:00
Aevann1 c10342e835 fix error in console 2022-09-20 20:54:52 +02:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 dc6f4f8e10 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2723089?context=8#context 2022-09-17 23:45:17 +02:00
Aevann1 94ed6a2d38 blocking adjustments 2022-09-13 12:27:28 +02:00
Aevann1 7e811b47fb reporting improvement 2022-09-12 11:48:01 +02:00
Aevann1 0c1ea35137 make highlights consistent 2022-09-11 11:16:45 +02:00
Aevann1 3b515e0e33 fix notifs margins 2022-09-11 06:10:29 +02:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 b99cc4a8aa remove surgical tools I forgot in the patient's body 2022-09-10 10:42:17 +02:00
Aevann1 30bdee98b2 fix comment level 10 bug, thanks @everyone 2022-09-10 02:47:48 +02:00
Aevann1 00b71e0bc5 restore the original emoji icon 2022-09-10 01:52:52 +02:00
Aevann1 23338e8172 try to fix the wrong method error on giving awards 2022-09-08 21:21:41 +02:00
Aevann1 4791e7b14b revert icon change 2022-09-08 19:24:00 +02:00
Aevann1 e9445efc22 make bootstrap work on localhost 2022-09-08 19:12:46 +02:00
Aevann1 f4e4ff3839 comsetic shit 2022-09-08 17:38:27 +02:00
Aevann1 05bacd1efc change reporting flow 2022-09-07 03:22:40 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 73dbb2dd7e change t2_ and t3_ to p_ and c_ 2022-09-06 00:52:22 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +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
outruncolors 5e1d98a3bf
WIP: Add Casino (Do Not Merge) (#341) 
* Add new /casino route and template

* Consolidate lottery into casino and add initial template for slots

* Change /lottery route to /casino and replace icon with usd symbol and change sitewide const to reflect change

* Hook up new slots method to casino

* Enable Marseybux spending in casino slots

* Add UI for playing blackjack in casino

* First connection of blackjack UI to backend

* Add protective clause thanks to help from carpathianflorist.

* Create new Casino_Game relation and persist inside of blackjack

* Connect new slots behavior to Casino_Game table

* Create UI action management logic

* Add blackjack game status checker which adds persistence for blackjack

* Gonna handle this better, hold on

* Reorganize blackjack helper methods

* Reorganize casino.js to account for new changes

* Connect up to frontend

* Little changes ya know

* Display a message when winning in Blackjack

* Fix some issues with double down and insure

* Revert "remove owoify-py from requirements"

This reverts commit 4454648ea2.

* A little casino styling change

* Reorganize into a casino block

* Smallenize the card'

* Remove references to old game data on comments

* Add sql migration file

* Remove logic to drop old columns

* Fix two forgotten conflicts
 2022-09-04 22:53:34 +02:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02:00
Aevann1 027bad8aeb dudup popover 2022-09-04 01:42:59 +02:00
Aevann1 8f4236a294 fix samsung browser 2022-09-03 21:19:18 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00
Aevann1 0839077838 fix pup mask 2022-09-03 04:48:27 +02:00
Aevann1 8f5e4c3ec6 add .hat class for easier blocking 2022-09-03 03:52:54 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 1de21241bd fix browsers' native dark mode 2022-09-02 19:27:51 +02:00
Aevann1 a1a84670a0 fix issue with deleted and removed posts 2022-09-02 19:03:00 +02:00
Snakes c506ff0c40 Add admin mute for user reports and modmail. 2022-09-01 17:30:15 -04:00
Aevann1 5f7df3fe66 fix minor weird shit in voting js logic 2022-08-30 23:45:52 +02:00
Aevann1 5363cbd721 remove weird spaces 2022-08-30 23:44:04 +02:00
Aevann1 dbd11ad061 tweak "view source" boxes 2022-08-30 07:37:11 +02:00
Aevann1 7fbcec3b82 turns out we didnt need a dedicated ajax variable 2022-08-30 07:26:13 +02:00
Aevann1 1a69b98b72 fix https://rdrama.net/post/98623/chris-chan-escaped/2605690?context=8#context 2022-08-30 07:21:40 +02:00
Aevann1 b036e24005 make sure comments a person makes that have level 10 aren't hidden 2022-08-30 07:17:33 +02:00
Aevann1 5ecc980a27 fix this https://rdrama.org/post/98623/chris-chan-escaped/2605690?context=8#context 2022-08-30 07:14:58 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 8fd3d3a565 dude margins lmao 2022-08-26 02:28:20 +02:00
Aevann1 9032e23182 add patron icons for WPD 2022-08-25 22:34:05 +02:00
Aevann1 ef4f93576a sneed 2022-08-25 20:22:30 +02:00
Aevann1 7308906612 sneed 2022-08-25 15:56:47 +02:00
Aevann1 965febc0a8 sneed 2022-08-25 15:53:24 +02:00
Aevann1 0fe6712b98 Revert "test on my samsung browser" 
This reverts commit b6b3946f41.
 2022-08-25 15:46:13 +02:00
Aevann1 b6b3946f41 test on my samsung browser 2022-08-25 15:39:47 +02:00
Snakes d25a172270
Disable pending frontend fix for Samsung mobile. 2022-08-25 00:52:20 -04:00
Aevann1 0df8aad2cd sneed 2022-08-25 01:20:37 +02:00
Aevann1 af39571820 sneed 2022-08-25 01:19:44 +02:00
Aevann1 dfd0c6fccc sneed 2022-08-25 01:19:25 +02:00
Aevann1 32a3a49a45 sneed 2022-08-25 01:18:37 +02:00
Aevann1 51d1b4f42c revert last commit 2022-08-25 00:37:15 +02:00
Aevann1 db675c9c09 testing on prod 2022-08-25 00:33:42 +02:00
Aevann1 5012ff28f2 Revert "increase margin for mobile comment actions (to match post actions)" 
This reverts commit cf21da2585.
 2022-08-24 23:12:22 +02:00
Aevann1 cf21da2585 increase margin for mobile comment actions (to match post actions) 2022-08-24 18:30:02 +02:00
Aevann1 ce80f8e30e make blocks not work through ghost awards 2022-08-21 16:14:30 +02:00
Aevann1 3fa8db36d9 fix https://rdrama.net/post/95602/latinozoomer-latinx-white-supremacist-and-one/2547694?context=8#context 2022-08-20 13:57:09 +02:00
Aevann1 06c955ff94 Revert "try to fix https://rdrama.net/post/95602/latinozoomer-latinx-white-supremacist-and-one/2547694?context=8#context" 
This reverts commit d550a0e85f.
 2022-08-20 13:56:19 +02:00
Aevann1 d550a0e85f try to fix https://rdrama.net/post/95602/latinozoomer-latinx-white-supremacist-and-one/2547694?context=8#context 2022-08-20 13:40:32 +02:00
Aevann1 e1e7258e7a add def can_see(v) 2022-08-20 00:36:28 +02:00
Aevann1 a88b9d59c4 rename /h/chudtopia to /h/chudrama 2022-08-20 00:20:25 +02:00
Aevann1 4a8220d687 make chudtopians immune to chud effects 2022-08-20 00:12:53 +02:00
Aevann1 9e5ddcbd92 large commit: stealth mode, SubJoin, chudtopia 
dont read if u value ur sanity
 2022-08-19 23:31:26 +02:00