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

1471 Commits (ed323817f51b90fc48930887bba5d343694a2cd0)

Author SHA1 Message Date
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
Aevann1 68918ea4a9 specify height for treasure images 2022-08-18 22:48:14 +02:00
Aevann1 d4435a2a27 lazy loading for hats 2022-08-18 22:29:00 +02:00
Aevann1 16f949e38d pure rage 2022-08-11 15:09:39 +02:00
Aevann1 b462deb159 fix missing " 2022-08-11 13:56:53 +02:00
Aevann1 a9b5413fb1 fix missing ")" 2022-08-11 13:45:04 +02:00
Aevann1 f563d6b932 fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2402363?context=8#context 2022-08-11 13:39:38 +02:00
Aevann1 320d5ca690 remove "reply" button top margin 2022-08-11 12:56:53 +02:00
Snakes 249c593379 Hats: frontend interface, migrate cakeday. 
Getting the basic hats frontend changes into master so my branch stops
diverging from the templates. Migrates the existing cakeday partyhat
functionality to the new system also.

Establishes a (hopefully) static interface for PFP hat display:
  - Hat image assets are 100px w x 130px h and anchored to the bottom-
    left corner of pfps.
  - User.hat_active provides either empty string or the internal
    string identifier for active user hat.
  - User.hat_tooltip provides mouseover text. Likely only to be used
    for cakeday hats on one's cakeday.

Additionally, per discussion with Carp, PFPs in comments and posts
increased from 25px diameter to 30px.
 2022-08-11 03:30:43 -04:00
Aevann1 1000f9c45e Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-11 06:05:26 +02:00
Aevann1 cfa17aaf68 rename some retarded ruqqus terminology 2022-08-11 06:04:41 +02:00
Snakes 1411018f8d Add post categories. 
Implemented for LGB but can likely be used for WPD and other future
sites. Similar to a reddit post flair. Provides:
  - Admin panel for Category management.
  - Category selection on post submission.
  - 'Recategorize' post action.
 2022-08-07 02:57:30 -04:00
Aevann1 d1cb115ada fix comment editting bug 2022-08-06 16:04:34 +02:00
Aevann1 846a7f4537 fix collapsing jannied comments 2022-08-05 22:32:36 +02:00
Aevann1 c8ea663833 remove filename when commenting 2022-08-05 22:00:16 +02:00
Aevann1 3b6f3b5bfb sneed 2022-07-29 02:45:34 +02:00
Aevann1 db10272e1b delete contents of preview when submitting comments 2022-07-23 11:19:47 +02:00
Aevann1 f543abaaab fix 46786e117b 2022-07-23 11:08:02 +02:00
Aevann1 a4444c9402 make form a const 2022-07-23 10:57:53 +02:00
Aevann1 29a2bc0123 allow ppl to click on the reply icon again to hide the reply box 2022-07-23 10:53:43 +02:00
Aevann1 46786e117b allow ppl to make multiple comments to the same parents without reloading the page 2022-07-23 10:53:17 +02:00
Snakes f418bf4333
Fix voting when FEATURES['AWARDS'] false. 
Apparently we stick the voting javascript in awards_modal.js, which
is included with awards_modal.html. While this makes sense as a proxy
for logged-in post-actions, it unfortunately means disabling inclusion
of the (otherwise unused) modal templates when FEATURES['AWARDS']
is disabled breaks other things.
 2022-07-22 23:25:05 -04:00
Snakes b4fdf248ef LGB: disable profile bio, banner, song. 2022-07-19 21:20:52 -04:00
Snakes 3225a2a3d4
LGB: disable awards, badges. 2022-07-19 19:59:39 -04:00
Snakes 0c43deeee6
FEATURES: pronouns, kys, chat, house, /vote perm. 2022-07-18 02:43:20 -04:00
Aevann1 8af9b8a339 wipe cringetopia 2022-07-18 04:46:03 +02:00
Nekobit bde47271d7
Allow Inline Emoji modal in more areas (#318) 
* Sneed

* Bust cache
 2022-07-17 07:42:03 +02:00
Aevann1 6ccdfeab67 change ban evasion domain 2022-07-17 07:32:16 +02:00
Aevann1 309b23a005 fix neko's PR 2022-07-17 07:10:55 +02:00
Nekobit 4b47faa1ed
Inline Emojo Picker (#317) 
* Inline emoji picker

* Inline text editor
 2022-07-17 07:02:22 +02:00
Aevann1 1088e38f34 order saved posts, comments and subscribed post by newest to oldest 2022-07-16 20:51:48 +02:00
Aevann1 aacaf50928 change pronoun design 2022-07-15 22:21:42 +02:00
Aevann1 c514ef720b fix "api app" button v2 2022-07-13 20:45:03 +02:00
Aevann1 a081673458 fix api app button 2022-07-13 20:44:21 +02:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 4a3693c1b3 fix transfer log links appearing on normal comments (lol) 2022-07-13 17:22:25 +02:00
Aevann1 f6bf7400c3 do this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2298056?context=8#context 2022-07-13 17:20:10 +02:00
Aevann1 093c83d7c9 tweaking bannedfor column 2022-07-12 22:00:19 +02:00
Aevann1 7cf7725ef5 fix replying to modmail being broken 2022-07-11 22:15:48 +02:00
Aevann1 ee11a28636 fix flag filtering 2022-07-11 20:13:00 +02:00
Aevann1 20a659da73 hide reports made by shadowbanned niggas 2022-07-11 20:04:35 +02:00
Aevann1 6428dd08c5 add pronouns 2022-07-11 18:46:08 +02:00
Aevann1 a1fbe62c88 make the "clear notifgications" button universal 2022-07-08 21:45:38 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 b617321529 move all env-getting to .const 2022-07-08 18:21:13 +02:00