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

526 Commits (45f40f32b7eff1c341236bf3b8ccb8a9164465cf)

Author SHA1 Message Date
justcool393 039fa606d6 streamer permissions 2022-10-05 23:22:42 -07:00
justcool393 6401f9e9c2 shadowban log 2022-10-05 22:56:19 -07:00
justcool393 047013f92b patron perm and also move them around 2022-10-05 22:48:55 -07:00
justcool393 dc5a132583 mop visibility, WPD notifications, and a fix with shadowbans 2022-10-05 22:25:45 -07:00
justcool393 38f3c7ed55 view sorted admin list and message blocked users 2022-10-05 22:16:09 -07:00
justcool393 68851ed986 profile views and modmail/hole creation notifications 2022-10-05 22:07:38 -07:00
justcool393 2fc3044d5b shadowban perms and stuff 2022-10-05 19:24:37 -07:00
Aevann1 67d6d7e2de [PCM] allow all jannies to add streamers 2022-10-06 00:20:09 +02:00
Aevann1 08d6a9c901 Revert "add nginx to docker" 
This reverts commit 7c1eb4c6e3.
 2022-10-04 21:35:02 +02:00
Aevann1 7c1eb4c6e3 add nginx to docker 2022-10-04 03:06:57 +02:00
Snakes e05b1197c6
Identify benefactors in listing. 2022-10-02 15:37:22 -04:00
Snakes 81dda4f6cc
Serve static user content with nginx. 2022-10-02 14:27:18 -04:00
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