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

564 Commits (e809758a758c1fd87b77f7404d0605cce6059b7c)

Author SHA1 Message Date
justcool393 b79a89560f
add requested kind to set if not present 
fixes issue where the kind wouldn't show up on the list and cause a error in template rendering
 2022-10-02 00:50:59 -07:00
Snakes cd0b564401
Add 'added' column to /marseys. 2022-10-01 18:27:51 -04:00
Aevann1 a7acbe9831 show our email to loggedout visitors in /contact 2022-10-01 12:14:46 +02:00
Aevann1 7e7c14fe22 fix bug in /live 2022-10-01 11:43:16 +02:00
justcool393 fc623b7201 get id fix for sbs 2022-09-30 22:16:15 -07:00
justcool393 f9d6976202
include shadowbanned users here 2022-09-30 22:08:18 -07:00
Aevann1 d9a57cf201 debug /live 2022-10-01 01:38:07 +02:00
Aevann1 08fc034973 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-30 23:07:56 +02:00
Aevann1 30d4f5e902 allow carp and snakes to see /patrons 2022-09-30 23:07:53 +02:00
justcool393 7e3f43c9ab
unperson shadowbanned users (#373) 
* unperson shadowbanned users
if a shadowbanned user copes, does anyone hear them seethe?

* unperson shadowbanned users (by id)

* don't import that

* Add include_blocks.
We don't always want to request blocks from the db when we have a user set

* block shadowbanned users from hole mod tools

* don't allow awarding shadowbanned things

* fix conflict

* gracefully use get_account when specified and also add include_blocks flag to get_account as well
 2022-09-30 14:00:58 -07:00
Aevann1 4a1865742a fix bad code in /live 2022-09-30 14:19:48 +02:00
Aevann1 7b7092b5f5 better syntax in /live 2022-09-29 20:29:44 +02:00
Aevann1 5b1e873e54 fix /live 2022-09-29 20:25:01 +02:00
Aevann1 2f16510183 specify which error it was in process_streamer() 2022-09-29 08:08:40 +02:00
Snakes f05ec93b95
Add gambling wager badge logic. 
This commit touches more files than it ought to because this change
required untangling some circular imports, notably a lingering import
of files.helpers.slots in helpers.actions (presumably from old Snappy
gambling logic) and the User.active_blackjack_game accessor. Otherwise,
the logic is fairly straightforward.
 2022-09-29 00:26:50 -04:00
justcool393 6c8faf6de7
add API version of stats page (#378) 
statsmaxxing
 2022-09-28 10:14:40 +02:00
Snakes 528d26b094
Fix /marseys missing listdir import. 
Apparently the /marseys route was getting its listdir from one of
the `from os import listdir` removed in fa4dee419d. static.py
already has an import os, so we just use the fully qualified
os.listdir.
 2022-09-26 21:44:34 -04:00
Aevann1 e474a5f42d go from dutch to greek in /live 2022-09-26 07:08:29 +02:00
Aevann1 37e1f25624 make using proxies only happen in 3 circumstances again 2022-09-26 06:01:25 +02:00
Aevann1 fea1f276d9 log /live errors 2022-09-26 04:46:56 +02:00
Aevann1 3339baee54 fixing /live 2022-09-25 13:28:53 +02:00
Aevann1 5a97a6f6e6 allow pcm /live to enter channel link 2022-09-25 08:45:19 +02:00
Aevann1 8a85c2413c add consent 2022-09-25 08:31:46 +02:00
Aevann1 a28a4664c2 huh? 2022-09-25 08:30:49 +02:00
Aevann1 9d9783fe0e fix 2022-09-25 08:27:58 +02:00
Aevann1 10d09f076c fix 2022-09-25 08:18:03 +02:00
Aevann1 c79067f7f1 make it possible to add channels by name 2022-09-25 08:14:21 +02:00
Aevann1 8d6937e237 add obese 2022-09-25 07:46:02 +02:00
Aevann1 13a3d5c27e fix 2022-09-25 07:45:02 +02:00
Aevann1 f8fccd34db allow me to add channels 2022-09-25 07:43:44 +02:00
Aevann1 4ebd8fb552 limit adding channels to kip 2022-09-25 07:42:29 +02:00
Aevann1 92bdd67884 debug 2022-09-25 07:31:55 +02:00
Aevann1 fc2758df50 fix 2022-09-25 07:24:59 +02:00
Aevann1 63a7183f7e fix /live regex 2022-09-25 06:53:53 +02:00
Aevann1 2b0a798fec fix 2022-09-25 06:40:19 +02:00
Aevann1 5d30c3a632 fix 2022-09-25 06:38:43 +02:00
Aevann1 78f0721bb0 fix 2022-09-25 06:37:16 +02:00
Aevann1 695fca5d35 fix 2022-09-25 06:35:56 +02:00
Aevann1 015074c4ca the fuck 2022-09-25 06:33:55 +02:00
Aevann1 97b2e09b65 fix 2022-09-25 06:31:59 +02:00
Aevann1 351a7ca17b fix 2022-09-25 06:27:28 +02:00
Aevann1 230b71c19b same as last commit 2022-09-25 06:22:33 +02:00
Aevann1 4212cfa0b2 testing on pcm 2022-09-25 06:11:06 +02:00
Aevann1 ea7803ef44 testing 2022-09-25 05:43:57 +02:00
Aevann1 9ebea2c6e9 fix 2022-09-25 05:36:54 +02:00
Aevann1 a83821ebdb testin on devrama 2022-09-25 05:36:11 +02:00
Aevann1 8ce942dcc0 testing on devrama 2022-09-25 05:34:28 +02:00
Aevann1 8319aefe1c get it ready for pcm 2022-09-25 05:29:38 +02:00
Aevann1 c2a189012b redirect instead of rendering 2022-09-25 05:21:41 +02:00
Aevann1 962cf66bcd flush printed shit 2022-09-25 05:17:15 +02:00
Aevann1 ae3b81bb82 fix 2022-09-25 05:11:18 +02:00
Aevann1 f4b41f0049 make addition and removal of channels happen instantly (testing in devrama) 2022-09-25 05:08:44 +02:00
Aevann1 677a31f80d strip input [/live] 2022-09-24 02:21:32 +02:00
Aevann1 b32a399925 fix 2022-09-24 02:11:40 +02:00
Aevann1 b0d1b1f157 fix /live ordering 2022-09-23 23:09:19 +02:00
Aevann1 84f4256c81 fix last commit 2022-09-23 23:01:38 +02:00
Aevann1 1b3fa8a63e same as last commit 2022-09-23 22:59:45 +02:00
Aevann1 a63d4940ae fix PCM /live list 2022-09-23 22:58:10 +02:00
Snakes 1cf5ec9e0d Revert "PCM: update live list in background." 
This reverts commit 3acdb44a98.
 2022-09-23 15:41:04 -04:00
Snakes 3acdb44a98
PCM: update live list in background. 2022-09-22 19:39:26 -04:00
Aevann1 495cc60a26 fix /live 2022-09-23 00:27:38 +02:00
Aevann1 ada5ab61a6 validate inputted channel id 2022-09-23 00:02:15 +02:00
Aevann1 2ef91698f4
allow PCM chadmins to add or remove channels (#365) 
* testing on devrama

* fix for devrama

* fix

* fix

* fix

* fix

* fix

* fix

* test

* fix

* test

* test

* commit
 2022-09-22 23:40:32 +02:00
Aevann1 5c7ff17512 remove "/live" from url for offline streamesr 2022-09-22 20:26:06 +02:00
Aevann1 553218aaa5 make /live a cached cron job 2022-09-22 04:33:45 +02:00
Aevann1 59f7a7655b remove ordering as a test 2022-09-22 04:29:50 +02:00
Aevann1 71309f86fb order by viewer count 2022-09-22 04:22:21 +02:00
Aevann1 c20fc34704 dfs 2022-09-22 04:20:47 +02:00
Aevann1 d55438afad
Live (#364) 
* test on devrama

* fix prev commit

* fix prev commit

* try some shit

* try some shit

* try some shit

* fix

* make it easier to change notif colors with custom css

* de

* t

* fgddfg

* fds

* fix

* fds

* dfs

* pain

* sdfsdf

* df

* xcv

* fd

* vxc

* xcv

* c

* fgdfgd

* sdf

* fsd

* fds

* sfd

* fdsf

* fd

* fds

* fds

* fsd

* fds

* fds

* fds

* fds

* fsd

* fds

* df

* fds

* dfs

* fd

* fsd

* fsd

* dfs

* sdf

* fsd

* fsd

* df

* dfs

* fd

* fsd

* dfs

* sdf

* sdf

* sdf

* fsd

* fds

* sfd

* sdf

* fds

* dfs

* df

* sdf

* sdf

* /live
 2022-09-22 04:17:02 +02:00
Aevann1 fb1b1279fe dont give me modmail notifs in WPD 2022-09-21 21:38:29 +02:00
Aevann1 61c586d7cc make 3 routes auth_required instead of auth_desired 2022-09-20 02:54:10 +02:00
Aevann1 7d39cdb520 minor auth_desired refactor 2022-09-20 02:51:01 +02:00
Aevann1 696423d174 add /donate page 2022-09-20 01:59:24 +02:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 bb28d2d2a3 delete /order 2022-09-19 19:13:24 +02:00
Aevann1 4519db0e57 make me get notifs for modmail again 2022-09-19 19:10:37 +02:00
Aevann1 6bd0043248 sneed 2022-09-18 00:06:29 +02:00
Aevann1 566c5b19e3 fuck sake 2022-09-14 13:02:46 +02:00
Aevann1 a6ce6135d8 fix 2022-09-14 13:00:46 +02:00
Aevann1 c2f397df40 show the original file in /marseys 2022-09-14 12:55:35 +02:00
outruncolors 3ebccf35d1
Add order page (#353) 
* Add order page route

* Initial backend post route

* Move to static and prevent logged in users

* Update files/routes/static.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Make requested changes

* Last snake changes

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-13 21:21:25 -05:00
Aevann1 cc0f2059c3 more descriptive success messages 2022-09-12 07:23:08 +02:00
Aevann1 cefd68755d stop the print spam 2022-09-11 03:56:47 +02:00
Snakes 0950dc81b8
Move asset submission routes out of static.py. 2022-09-10 03:56:37 -04:00
Aevann1 0ddacad599 add prefixes for asset_submissions 2022-09-10 07:49:39 +02:00
Aevann1 1a64ba3db8 hat submission UI 2022-09-10 07:37:11 +02:00
Aevann1 faac45b425 allow carp to change marsey name 2022-09-10 06:36:24 +02:00
Aevann1 89f4a88f04 .strip() 2022-09-10 05:04:58 +02:00
Aevann1 efc0ea205b fix missing import 2022-09-10 03:09:33 +02:00
Aevann1 10ce1fe122 keep OG images 2022-09-10 02:52:52 +02:00
Aevann1 216b0c33f6 fix retarded /transfers logic for API users 2022-09-10 02:30:25 +02:00
Aevann1 8943024e17 cosmetic change 2022-09-10 02:18:52 +02:00
Aevann1 c638c8be80 restore error codes 2022-09-10 02:17:31 +02:00
Aevann1 7a8395fefb better feedback in /submit/marseys 2022-09-10 02:07:17 +02:00
Aevann1 fbbb2c2ceb marsey submission stuff 2022-09-10 01:41:54 +02:00
Aevann1 9419032201 useless commit 2022-09-09 11:41:08 +02:00
Aevann1 500c1ba3c1 check filetype (thx drT) 2022-09-09 11:31:11 +02:00
Aevann1 91f3069001 more marsey shit 2022-09-09 11:21:17 +02:00
Aevann1 b8cde6ca60 restrict approving and rejecting marseys to the fish 2022-09-09 11:15:16 +02:00
Aevann1 47890d771d add Marsey Submission UI 2022-09-09 11:13:50 +02:00