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

253 Commits (f4104aa875cdd871501fac94a22aa42b7df7e565)

Author SHA1 Message Date
Aevann 9a8c986f93 attempt to fix ratelimiting user 2022-12-30 20:33:07 +02:00
Aevann bc453f8057 add missing import 2022-12-26 05:14:02 +02:00
Aevann 40305f01f2 dont lock jannies out of /chat 2022-12-26 04:49:14 +02:00
Aevann c4e4a8d853 give jannies push notifs for chat 2022-12-25 22:30:50 +02:00
Aevann d30d6b8314 limit chat on rdrama to jannoids 2022-12-25 22:13:29 +02:00
Aevann ecfcbaf3df make hat_active return a tuple 2022-12-25 00:21:49 +02:00
Aevann 5d6d108dd5 remove redundant domain bans 2022-12-23 00:25:31 +02:00
justcool393 ab41db22b7 [DO NOT MERGE] multiple sub banners (#59) 
allows multiple sub banners

Snakes note: By request of Carp, especially for WPD.

Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#59
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-11 23:44:34 +00: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 c0f1b875d0 chat: ratelimit chat lol 
apparently we haven't done that xdd
 2022-11-29 19:36:09 -06:00
justcool393 5056f09380 chat: fix 500 on some... weird... state... i think? 
cache: get out of jinja templates
chat: threshold is now a const
 2022-11-29 15:49:23 -06:00
justcool393 ae50cc2772 const: rename constants from LIMIT to MINIMUM 
the new name is much much clearer
 2022-11-26 14:20:44 -06:00
Aevann1 bb153e541d Revert "you posts: constantify truescore requirement" 
This reverts commit 1b721126a2.
 2022-11-26 22:09:07 +02:00
justcool393 1b721126a2 you posts: constantify truescore requirement 2022-11-26 13:39:31 -06:00
Aevann1 caabaf0c6f expand IS_LOCALHOST 2022-11-21 00:16:49 +02:00
justcool393 d1197bac82 chat: sanitize raw body 2022-11-16 08:00:04 -06:00
justcool393 f1bfb87243 chat: permission for mute bypass 2022-11-16 07:00:03 -06:00
justcool393 ee8df1e3f1 chat: mops are unmutable 2022-11-16 06:38:24 -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
Snakes dd912addd1
chat: allow dev envs, clarify error message. 2022-11-13 06:43:08 -05:00
justcool393 d7f07dcd67 chat: allow club users into chat as well 2022-11-13 05:37:53 -06:00
justcool393 681d8b482a chat: impose truescore chat limit 2022-11-13 05:31:48 -06:00
Aevann1 7f2630f4c3 increase chat limit from 100 msgs to 500 (yolo or smth) 2022-11-11 19:19:24 +02:00
Aevann1 05b7e79b76 remove the code i added for rdrama.com 2022-11-11 15:52:18 +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
justcool393 8fe73cb68e refactor blackjack a bit 2022-10-20 19:28:05 -05:00
Snakes 912560327f
Apply anti-grooming logic to chat. 2022-10-16 16:19:13 -04:00
justcool393 53a5343a55 use ban permission for muting and also add a user home permission (wonder if should be the same as mop perm) 2022-10-05 22:54:48 -07:00
justcool393 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
Aevann1 3bf62c6ff0 add missing ban_reason when shadowbanning 2022-10-02 13:31:02 +02:00
Outrun Colors 430cbe676c
Nest if condition in chat 2022-09-27 00:31:23 -05:00
Outrun Colors 300a5164f6
Add DMing to chat 2022-09-27 00:15:22 -05:00
Outrun Colors ba19d3aaa7
Censor quoted text 2022-09-24 22:41:57 -05:00
Outrun Colors b2d185ada0
Fix that 2022-09-24 17:09:54 -05:00
Outrun Colors 695159052b
Add typing debounce/enable quoting 2022-09-24 17:05:50 -05:00
Outrun Colors 6b117decb8
Tick version 2022-09-24 15:36:56 -05:00
Snakes 1fe02b7743
Chat rework deployment infra fixes. 2022-09-24 00:26:44 -04:00
outruncolors 484de39566
[DO NOT MERGE] Chat restructure (#360) 
* Create new subdirectory for chat-related stuff

* Gitignore

* Have new code show up on chat

* Have new code show up on chat

* Fix config issue

* More script stuff

* Create UserInput components

* More chat changes

* More updates to chat

* Add chat:watch script

* Move up state and pass down

* Match up existing functionality entirely

* Match up existing functionality entirely

* Send a message when hitting Enter

* feature based directories

* First crack at emoji drawer

* Leave everything in a fucked up state ugh

* Leave it in a better state

* Stop for the night

* Decouple by abstract chat functionality to provider

* Wait a minute...

* Small chat restructure

* Prepare for notifications

* Add root context

* Flash number of messages

* Read this and u die

* Add quote functionality

* Couple tweaks

* Shallowenize the features dir/

* Add activity list

* Ch-ch-ch-ch-ch-changes

* Enable moving drawer

* Hover style on activities

* UserList changes

* Add emoji processing logic

* Duhhhh

* Scroll to top when changing query

* Put the emoji in the drawer

* Improve emoji drawer

* Add emoji genres

* Do not show activities

* Add feature flag technology

* Fix issue where own messages were triggering notifications

* Adjust startup scripts

* Responsive part 1

* Styling changes for emoji genres

* More emoji drawer styling

* Add QuickEmojis

* Re-add classnames

* Set version

* Modify build script

* Modify build script

* Mild renaming

* Lots of styling changes

* Leggo.
 2022-09-23 22:49:40 -05:00
Aevann1 e315c56f7b fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2737764?context=8#context 2022-09-17 16:39:50 +02:00
Aevann1 2fb4ebdcb0 minor sanitize refactor 2022-09-16 18:30:34 +02:00
Aevann1 41de3c8fab disallow permabanned from seeing chat 2022-09-16 15:06:02 +02:00
Aevann1 18a530a330 wtf 2022-09-10 11:41:59 +02:00
Aevann1 ee630e55c9 testing 2022-09-10 11:40:57 +02:00
Aevann1 8f0b2ea9c3 test on devrama 2022-09-10 11:31:51 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 49bcd0543d add hats to chat, part I 2022-09-05 05:04:48 +02:00
Aevann1 f1d70567e4 remove chat logging 2022-08-26 18:17:12 +02:00
Aevann1 e7b997fd01 testing on prod 2022-08-26 18:11:01 +02:00
Aevann1 bdc0727ac2 testing on prod 2022-08-26 17:53:40 +02:00
Aevann1 bcaa74786e testing on prod 2022-08-26 17:51:13 +02:00
Aevann1 4538f5642f log chat 2022-08-26 17:37:06 +02:00
Aevann1 d15b416397 add "just now" to chat messages delievered by sockets 2022-08-26 01:20:17 +02:00
Aevann1 268216a537 Revert "make chat count 0 in localhost" 
This reverts commit 4a111df278.
 2022-08-23 17:18:59 +02:00
Aevann1 4a111df278 make chat count 0 in localhost 2022-08-22 23:02:20 +02:00
Aevann1 b0321745df fix annoying chat bug (thx CRGD) 2022-08-22 22:47:01 +02:00
Aevann1 734844291c fix bug I introduced 2022-08-20 14:38:46 +02:00
Aevann1 d5b4818d61 trying to fix annoying bug 2022-08-20 14:32:19 +02:00
Aevann1 5234c8ef21 remove weird spaes 2022-08-17 22:30:07 +02:00
Aevann1 4668073364 reset typing indictors on every message 2022-08-15 17:02:19 +02:00
Aevann1 0fa6442846 change chat char limit again 2022-08-14 04:38:07 +02:00
Aevann1 58736f8616 increase num of messages in chat from 50 to 100 2022-08-13 13:08:38 +02:00
Aevann1 dd6f86ce31 fix online count 2022-08-13 12:05:27 +02:00
Aevann1 c4e5c8aefe reduce chat max char limit 2022-08-13 11:45:33 +02:00
Aevann1 b59056fd16 fix muting 2022-08-13 11:24:56 +02:00
Aevann1 38b5492b30 fix chat 2022-08-13 10:39:08 +02:00
Aevann1 9557553508 add chat users-online counter to chat icon on desktop header 2022-08-13 09:42:06 +02:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 aa4ab5b217 sneed 2022-07-13 17:16:53 +02:00
Aevann1 a9e355c804 sneed 2022-07-11 11:52:59 +02:00
Aevann1 cff34fb3a4 reducing query volume, #2 2022-06-26 03:11:02 +02:00
Aevann1 9593dc58dd move regex from helpers.const into its own helper file 2022-06-24 16:30:59 +02:00
Aevann1 969d1898b5 vid refactor 2022-05-22 18:13:19 +02:00
Aevann1 8807ed0d13 fds 2022-05-22 10:58:42 +02:00
Aevann1 47d01ed00b vb 2022-05-03 04:15:35 +02:00
Aevann1 5c1f253e0b dfs 2022-04-26 02:38:52 +02:00
Aevann1 858c53e8e4 fd 2022-04-07 00:54:09 +02:00
Aevann1 312a6b75f7 tre\ 2022-03-28 12:06:57 +02:00
Aevann1 5c34c92c06 fd 2022-03-25 03:50:00 +02:00
Aevann1 f69ecba53c fd 2022-03-25 03:47:07 +02:00
Aevann1 7745adc475 fd 2022-03-24 23:01:04 +02:00
Aevann1 83cdccb963 fsd 2022-03-24 22:17:30 +02:00
Aevann1 eec1738d01 what a mess 2022-03-24 21:44:12 +02:00
Aevann1 cbbeaf209c ff 2022-03-24 05:10:30 +02:00
Aevann1 780e31f1bb c 2022-03-24 05:07:24 +02:00
Aevann1 a20dfd06f9 c 2022-03-24 05:04:23 +02:00
Aevann1 6842b509ab f 2022-03-24 05:00:39 +02:00
Aevann1 7b469947e1 vb 2022-03-24 04:55:19 +02:00
Aevann1 a36eb0b6a3 bastards 2022-03-24 04:47:02 +02:00
Aevann1 afaad50c16 damn im dib 2022-03-24 04:37:48 +02:00
Aevann1 505dc74d23 f 2022-03-24 03:23:29 +02:00
Aevann1 1dc0c3417a fsd 2022-03-23 18:15:59 +02:00
Aevann1 bdb4f4914a f 2022-03-23 18:05:11 +02:00
Aevann1 97c9f0e318 fd 2022-03-23 18:04:46 +02:00
Aevann1 14dc027592 fd 2022-03-23 18:04:20 +02:00
Aevann1 947fbc63f1 fds 2022-03-23 18:04:05 +02:00
Aevann1 dd8c9eb636 fds 2022-03-23 18:01:49 +02:00
Aevann1 b31ffc6de6 far 2022-03-23 18:01:10 +02:00
Aevann1 85cf7cc2a6 fsd 2022-03-22 16:26:42 +02:00
Aevann1 b6e76a7a0b fds 2022-03-22 16:17:43 +02:00
Aevann1 3daf9f7347 fds 2022-03-22 16:14:25 +02:00
Aevann1 93080984c9 fds 2022-03-22 16:11:33 +02:00
Aevann1 5e0f942c94 gsd 2022-03-22 16:10:28 +02:00
Aevann1 683c1152fe fsd 2022-03-22 16:09:02 +02:00
Aevann1 45a59ccb81 fsd 2022-03-22 16:03:18 +02:00
Aevann1 7bc8480015 fds 2022-03-22 15:54:17 +02:00
Aevann1 13d78b4009 fsd 2022-03-22 15:52:09 +02:00
Aevann1 ddf30631e4 sfd 2022-03-22 15:51:32 +02:00
Aevann1 e1c4ea74cc sfd 2022-03-22 15:50:41 +02:00
Aevann1 04b5749aad chat improvements 2022-03-22 07:19:56 +02:00
Aevann1 f0e6fb15d9 fds 2022-03-22 06:14:16 +02:00
Aevann1 4c8cb4b534 fds 2022-03-22 05:38:02 +02:00
Aevann1 4bd2d4e967 fds 2022-03-22 05:32:24 +02:00
Aevann1 d372710613 fds 2022-03-22 05:13:11 +02:00
Aevann1 1646f20d6f fds 2022-03-22 05:11:43 +02:00
Aevann1 c6fd551563 fds 2022-03-22 05:11:10 +02:00
Aevann1 c96f86e056 chat 2022-03-22 04:35:12 +02:00
Aevann1 30c8410500 fds 2022-03-22 02:56:41 +02:00
Aevann1 51f69295ee fds 2022-03-22 02:30:35 +02:00
Aevann1 c92647d6fe fds 2022-03-22 02:30:20 +02:00
Aevann1 f3391f8e9d fsd 2022-03-22 02:24:17 +02:00
Aevann1 102cdbb574 images 2022-03-20 22:41:54 +02:00
Aevann1 90b0cb3454 dfs 2022-03-20 02:16:53 +02:00
Aevann1 98207a1ef5 dfs 2022-03-20 02:13:02 +02:00
Aevann1 6056796be3 fds 2022-03-20 02:11:53 +02:00
Aevann1 2c639d0c0a fds 2022-03-20 02:07:34 +02:00
Aevann1 410b6fac03 fds 2022-03-20 02:05:36 +02:00
Aevann1 00fbb749ca fds 2022-03-20 02:05:21 +02:00
Aevann1 28964f16fe fdsdfs 2022-03-20 02:03:25 +02:00
Aevann1 b4f3809682 fds 2022-03-20 01:57:45 +02:00
Aevann1 c223315cf2 fds 2022-03-20 01:48:43 +02:00
Aevann1 515876c1ef fds 2022-03-20 01:46:15 +02:00
Aevann1 b4cfe0061c fds 2022-03-20 01:44:29 +02:00
Aevann1 b4cf4b0574 fds 2022-03-20 01:33:55 +02:00
Aevann1 cd79cfaa8d fds 2022-03-20 01:32:41 +02:00
Aevann1 95e910c670 fds 2022-03-20 01:31:04 +02:00
Aevann1 63f525c5d6 fds 2022-03-20 01:27:39 +02:00
Aevann1 bd8c090dab fds 2022-03-20 01:24:51 +02:00
Aevann1 f8c7f155b4 gfd 2022-03-20 01:24:24 +02:00
Aevann1 a8c6ca9ab1 fds 2022-03-20 01:04:23 +02:00
Aevann1 a3f9f68391 fds 2022-03-20 00:38:01 +02:00
Aevann1 9ea573177b fgd 2022-03-20 00:36:57 +02:00
Aevann1 c0509d0d31 fd 2022-03-20 00:35:46 +02:00
Aevann1 1e31baf0cf fd 2022-03-20 00:33:00 +02:00
Aevann1 fa702c6bad fds 2022-03-20 00:31:10 +02:00
Aevann1 a192a6f797 fds 2022-03-20 00:30:39 +02:00
Aevann1 90fa5644ef fds 2022-03-20 00:30:04 +02:00
Aevann1 e7965d6923 dfs 2022-03-20 00:29:51 +02:00
Aevann1 6caf3e1a8c fds 2022-03-20 00:29:28 +02:00