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

1416 Commits (d7d8220a3f4199e2e893f0ff216a1138a27f22d1)

Author SHA1 Message Date
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
Aevann1 a4b2a69689 make "more comments" button work on the whole chain 2022-07-08 14:19:35 +02:00
Snakes 6ad935e12a Permission flags UI visibility; start PERMS dict. 
Original work started for WPD and LGB, who wish to restrict flags
visibility in the UI based on admin_level. To support this change and
upcoming changes, `const.PERMS: string -> int` was created.
Potentially targetting a future design where Permissions is a proper
business object integrated with the User model; however, for now just
looking toward getting admin_level magic numbers centralized.

This commit applies PERMS to: create_hole, flags visibility in UI,
flag removal in UI & backend. Flag visibility in Comment & Submission
json_raw methods is unaffected to avoid needing a user object to
build the JSON.
 2022-07-06 23:45:33 -04:00
Aevann1 4ccead8439 Revert "refactor "view more comments"" 
This reverts commit 68da93ec02.
 2022-07-04 05:37:48 +02:00
Aevann1 1528d91ea3 fix quoting comments 2022-07-04 05:06:43 +02:00
Aevann1 ed86ec1c14 more query optimization v3 2022-07-03 13:56:40 +02:00
Aevann1 57e424af5b revert the "defer" thing 2022-07-03 12:10:04 +02:00
Aevann1 68da93ec02 refactor "view more comments" 2022-07-03 11:11:18 +02:00
Aevann1 a49325ba14 defer all scripts (this won't change anything for us since we use rocketloader, but it will fix javascript on localhost) 2022-07-03 09:42:33 +02:00
Aevann1 d0d15c319a Poll rework (#312) 
* poll rework

* forgot to do joinedload on comments

* Fix logic errors with voting, SQL syntax.

Kitchen sink commit from review of poll-rework changes:
  1. Fix seed-db.sql syntax error.
  2. Fix SQL patch file duplication of *submissions* tables rather
     than one set of submissions and one for comments.
  3. Start makeshift SQL patch folder, since this is a large change
     that contributors may wish to apply to their local instances.
  4. Fix checkbox (non-`exclusive`) polls being unable to be
     unchecked. For consistency with `exclusive` polls, they should.
  5. Fix changing the option of an `exclusive` poll when both
     exclusive and non-exclusive options are present in one comment/
     post causing the non-exclusive options to become unchecked.
     (which, by my reading of SQLAlchemy `Query.one_or_none()`
     really could break quite badly in some cases).

* link relationships with their counterparts

* small modification to poll unchecking

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-07-02 08:48:04 +02:00
Snakes 1b9237ceaf Add assetcache.asset_siteimg, has_logo. 
Commit began by changing the duplicated SITE_NAME conditional in the
header to use a `has_logo` param, much like the recent `has_sidebar`.
From there, a need to include site-specific assets in assetcache was
revealed, adding the `asset_siteimg(...)` macro. This was applied
quite broadly, though not comprehensively.
 2022-07-01 01:55:53 -04:00
Aevann1 070945d98a cut down on the number of queries 2022-06-29 09:22:18 +02:00
Aevann1 aac17a6daa show the username of the janny who banned 2022-06-28 02:59:08 +02:00
Aevann1 cd811d7b9d consistent lottershe naming 2022-06-28 02:54:44 +02:00
Aevann1 4fae28a2a2 fix child comment highlighting 2022-06-28 02:41:25 +02:00
Aevann1 6bd4efa61f Revert "make small text less small" 
This reverts commit 42b0f37034.
 2022-06-27 04:33:38 +02:00
Aevann1 42b0f37034 make small text less small 2022-06-27 04:18:14 +02:00
Aevann1 b1ef8e4c62 add poorcel mode 2022-06-27 04:14:53 +02:00
Aevann1 667355b952 don't highlight voted comments as "unread" 2022-06-26 23:57:02 +02:00
Aevann1 5e745e38d3 revert the saving and subscription shit 2022-06-26 08:11:38 +02:00
Aevann1 afdc9605ca make checking if a comment is saved less retarded 2022-06-26 07:48:39 +02:00
Aevann1 3b8188fd67 fixed version of d83d47e280 2022-06-26 03:22:05 +02:00
Aevann1 a1b137447e Revert "reduce query volume #1" 
This reverts commit d83d47e280.
 2022-06-26 03:12:31 +02:00
Aevann1 d83d47e280 reduce query volume #1 2022-06-26 02:50:47 +02:00
Aevann1 bc7185b5af order awards by the time they were awarded 2022-06-25 22:33:51 +02:00
Aevann1 ffd0d9ed31 show duration on ban icon tooltip 2022-06-25 02:11:00 +02:00
Aevann1 55ebd98f40 add confirmation dialog when u close tab while text is in commentbox/messagebox 2022-06-25 00:58:15 +02:00
Aevann1 a64dd729e8 escape asterick when quoting 2022-06-24 18:25:21 +02:00
Aevann1 4fc8520e24 remove post_toast2() and post_toast3() and incorporate them into post_toast() 2022-06-24 01:07:47 +02:00
Aevann1 b17333b2a0 fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2046517?context=8#context 2022-06-24 00:46:07 +02:00
Aevann1 80db653d3f fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2130416?context=8#context 2022-06-23 23:25:07 +02:00
Aevann1 2d306bbba7 pause videos on comment collapse 2022-06-23 23:01:20 +02:00
Aevann1 38a5bf25c5 fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2133621?context=8#context 2022-06-23 22:14:41 +02:00
Aevann1 7e6e04b231 sneed 2022-06-23 01:13:21 +02:00
Aevann1 b8321fd18d fix removing and approving comments on desktop 2022-06-22 23:06:06 +02:00
Aevann1 8ecb4582d0 refactor sorting comments 2022-06-22 21:50:20 +02:00
Aevann1 aa403d5a3a fix intended quotes being turned into greentext 2022-06-22 19:26:29 +02:00
Aevann1 d704592bdd cache-bust all previously broken images 2022-06-22 17:59:47 +02:00
Aevann1 20585ca543 add a shortened endpoint for static images and rename loading.webp to l.webp (to save bytes) 2022-06-22 17:51:19 +02:00
Snakes b561ca413c Hide names on reports in ghost threads. 2022-06-22 03:37:09 -04:00
Aevann1 d9cdbd0015 return to only allowing images/videos/audio 2022-06-19 18:56:45 +02:00
Aevann1 8eaacff14b switch "chaptraphouse.club" with "rdrama.lol" 2022-06-18 18:32:43 +02:00
Aevann1 ccdabcba29 allow uploading of all types of files (using lain.la) 
+ allow multiple file upload in bios and messaging admins
 2022-06-18 17:53:34 +02:00
Aevann1 d4260138f5 Revert "de-nerf tilt award on mobile" 
This reverts commit 3985a58815.
 2022-06-16 14:37:23 +02:00
Snakes a8155d964a Kitchen sink: emoji content, assert, assetcache. 
These are all minor and uncontroversial enough it just felt gross
making multiple commits.
  - Adds marseymummified.
  - Changes the new `raise ValueError(...)` in badge_grant to
    an `assert`.
  - Expands assetcache to a convenient grab bag of JS files.
 2022-06-15 17:17:31 -04:00
Aevann1 cd5f8a528b in the preview, dont replace '\n' with '\n\n' if the text 
has "```" or "<pre>" (to match backend behavior)
 2022-06-15 22:12:03 +02:00
Aevann1 3985a58815 de-nerf tilt award on mobile 2022-06-15 19:05:04 +02:00
Aevann1 29d2a549c4 remove !important from tilt award css 2022-06-13 21:08:57 +02:00
Aevann1 8f72407f84 show the party hat in the header too 2022-06-13 19:46:40 +02:00
Snakes acde2c856b Enable JL2 viewing shadowbanned comments. 2022-06-12 05:48:27 -04:00
Aevann1 30f71855f4 fix 5e9297b78f 2022-06-11 16:50:26 +02:00
Aevann1 5e9297b78f rename "Lottershe" to "Lottery" on other sites 2022-06-11 16:44:13 +02:00
Aevann1 12a9307ab3 don't restrict file extensions on the frontend side (leave it to the backend) 2022-06-11 13:38:45 +02:00
Aevann1 a082105ab8 remove weird trailing tabs 2022-06-11 11:56:16 +02:00
Aevann1 358ce08544 don't collapse gambling comments when viewing a comment 2022-06-11 11:30:46 +02:00
Aevann1 f548c2077d show names of all files when pasting instead of just the first file 2022-06-11 00:37:55 +02:00