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

4514 Commits (08f904581886930ddb11e5b415ae162c5e588a44)

Author SHA1 Message Date
Aevann1 f9d1df54bf make pin and unpin award work on a basic of 6 hours (unlike posts which is 1 hour) 2022-09-23 16:41:56 +02:00
Aevann1 ebf83048be add /blockers (thx JC <3) 2022-09-23 14:58:33 +02:00
Aevann1 340f9e31fe limit asset perms and generate modlog for updating 2022-09-23 14:51:57 +02:00
Aevann1 ce4d2ada9e fix the @tax situation 2022-09-23 14:36:10 +02:00
Aevann1 d1bc2f3468 integrate check_ban_evade into check_for_alts 2022-09-23 14:33:58 +02:00
Aevann1 7392b37d86 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-23 14:09:35 +02:00
Aevann1 80f661f7fb remove unnecessary check 2022-09-23 14:09:33 +02:00
justcool393 376566e723
return 404 if oauth app doesn't exist (#366) 
fixes an AttributeError if the oauth app doesn't exist
 2022-09-23 14:08:54 +02:00
Aevann1 4f637d9538 fix 500 error 2022-09-23 14:08:31 +02: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 c12f7a5f9a commit before rendering 2022-09-22 22:20:29 +02:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 5c7ff17512 remove "/live" from url for offline streamesr 2022-09-22 20:26:06 +02:00
Aevann1 0df33c86a4 remove unnecessary deprected behavior in /distribute 2022-09-22 20:23:18 +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
scitzocel 610e1fbada
Sneed (#362) 
* MARSEYANTISCHIZO

Fixed betting that was fucked

* Update admin.py
 2022-09-22 02:22:08 +02:00
Aevann1 d22d60b5f7 fix typos 2022-09-22 01:52:39 +02:00
Aevann1 eb12464d43 make award immunity only in rdrama 2022-09-22 00:30:12 +02:00
Aevann1 955cee3f83 revise award immunity 2022-09-22 00:28:58 +02:00
Aevann1 201208e673 make deflector not stack 2022-09-22 00:28:35 +02:00
Aevann1 f17bce610d make chud award generate a mod log item when used by JL3 2022-09-21 22:55:34 +02:00
Aevann1 302a852de3 make carp immune to awards 2022-09-21 22:38:59 +02:00
Aevann1 61739b765e made spider award not give any notifs 2022-09-21 22:27:12 +02:00
Aevann1 5526bcf79d make pcm jannies able to give all badges 2022-09-21 21:43:57 +02:00
Aevann1 fb1b1279fe dont give me modmail notifs in WPD 2022-09-21 21:38:29 +02:00
Aevann1 f79d65973c fix 500 error on granting awards 2022-09-21 20:53:42 +02:00
Aevann1 85b72109a3 increase badge width from 200px to 400px 2022-09-20 20:05:36 +02:00
Aevann1 272e39ebf2 add spider award 2022-09-20 19:52:52 +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 3e8c618804 testing on devrama 2022-09-20 00:59:38 +02:00
Aevann1 5e6fe2e27d testing on devrama 2022-09-20 00:58:55 +02:00
Aevann1 6ab873fb76 small shadowbanning tweak 2022-09-19 22:24:40 +02:00
Aevann1 ff7a54e842 Revert "test ratelimiting on devrama" 
This reverts commit 1d83412545.
 2022-09-19 21:43:47 +02:00
Aevann1 1d83412545 test ratelimiting on devrama 2022-09-19 21:35:58 +02:00
Aevann1 a40c367e88 remove marsify badge when user turns it off in the settings 2022-09-19 20:54:09 +02:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 f7727f1029 refactor sigs 2022-09-19 19:51:40 +02:00
Aevann1 bb28d2d2a3 delete /order 2022-09-19 19:13:24 +02:00
Aevann1 2026a1a9c7 restore the 10 award limit for me 2022-09-19 19:10:52 +02:00
Aevann1 4519db0e57 make me get notifs for modmail again 2022-09-19 19:10:37 +02:00
Aevann1 db9622565f tweak last commit 2022-09-19 01:36:48 +02:00