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

1344 Commits (591e6342bbbedaa01242f3e8588abdcba0d523bf)

Author SHA1 Message Date
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
Aevann1 cda275c194 replace \n with \n\n in previews (to match the backend behavior) 2022-06-10 21:45:48 +02:00
Aevann1 b2b86abfd0 trim selection on quoting 2022-06-10 21:43:39 +02:00
Aevann1 10ffa90167 make the javascript use 1 linefeed instead of 2 
we don't need it to do 2 linefeeds anymore
because the backend handles that before sanitizng
 2022-06-10 20:05:54 +02:00
Aevann1 f9a0cff350 make the page always jump to the comment you wanna view 2022-06-10 20:01:12 +02:00
Aevann1 e483accffb fixed this https://files.catbox.moe/qdcbvd.png 2022-06-10 16:47:34 +02:00
Snakes cb5f9d05c6 templates: Fix improper plurals, create helpers. 
Previously, the three instances of 'Report[s]' and one instance of
'Coin[s]' in the UI templates were always pluralized, even when they
referred to a singular instance. This has been corrected by creating
a `plural` helper macro.

Additionally, this was used as impetus to create `utils/helpers.html`
to eventually move more recurring template logic into macros.
 2022-06-07 05:26:22 -04:00
Snakes 6b9a133204 Kitchen sink commit, misc. content updates. 
- Increment cache version on popover badges.
- Add comments+submission_listing.js to assetcache to support ^.
- Append new words to wordle list.
- Cache bust assorted assets for recent PRs.
 2022-06-02 19:32:13 -04:00
outruncolors c2f598a17f Move lottery to own page (#296) 2022-05-30 22:40:38 -04:00
Snakes b85f23becb assetcache: Bust 2dda7529a4, expand. 2022-05-30 20:20:14 -04:00
Snakes 5b6ba1ac82 Merge remote-tracking branch 'mccoxmaul/add-lottershe' into frost 2022-05-29 23:52:04 -04:00
Aevann1 c9ec551657 fixed bug with the comment distinguish button on desktop 2022-05-30 05:48:41 +02:00
Aevann1 5745f73f6c removed leftover meme janny shit 2022-05-30 05:40:39 +02:00
Outrun Colors, LLC c337d0edde Swap gifs for webms 2022-05-29 22:07:44 -05:00
Outrun Colors, LLC db13e0976c Have tickets show up in treasure chests 2022-05-29 21:59:22 -05:00
Outrun Colors, LLC 422ba56b31 Add assets for lottery 2022-05-28 17:24:21 -05:00
Snakes 05fc950004 Add support for distinguishing ghosted. 2022-05-28 00:47:33 -04:00
Aevann1 6b6e2e8253 sfd 2022-05-27 20:28:54 +02:00
Aevann1 66b3efab36 award refactor 2022-05-27 01:08:23 +02:00
Aevann1 2595706b49 fsd 2022-05-26 20:36:37 +02:00
Aevann1 9af50ae9b3 jannies can now block ppl 2022-05-24 22:43:49 +02:00
Snakes cc75375c82 Un-deploy Birthgay event. 
Removes temporary changes for the Birthgay 2022 event, ending
approximately at 2022-05-23 0600Z. Changes:
 - Double XP disabled.
 - Lootboxes disabled.
 - Three event awards given real descriptions and colors.
 - Partyhats: restored to cakeday-only condition and tooltip.
 - Header UI: balloons removed, text visibility outline removed,
   journoid banner reverted, marseyjam as header icon.
 - Birthgay banners: removed from template, moved to new storage dir.

Confetti, though remaining as a permanent award, has been temporarily
removed pending a less performance-intensive implementation and one
that doesn't require maintaining a third-party package in the codebase.
 2022-05-23 01:48:25 -04:00
Aevann1 0a74a98ec5 big ass commit 2022-05-23 00:15:29 +02:00
DrTransmisia 4b6a811e21 Lenewlink (#282) 
* allowing the user to click on profile ANCHOR with special keys

* le epic version bump for le cloudfare chaching, has arrived
 2022-05-22 19:31:27 +02:00
Aevann1 b9316c0073 fsd 2022-05-21 15:19:02 +02:00
Aevann1 cad9952f2b Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-21 14:36:24 +02:00
Aevann1 20cc20d806 fsd 2022-05-21 14:36:22 +02:00
Snakes 6fbaf2f15f Partially revert: cb1bb4e43b, 2737a6ca47. 
cb1bb4e43b40: Server cleaned out schema.sql for some reason and
it was autocommitted by the sneed cron. This is why the tests fail.

2737a6ca479b: Originally pulled from themotte/rDrama @ 309bf44f12ba.
In light of the fact this is breaking comment previews right now and
the actual XSS threat is unclear, given we sanitize serverside,
this is reverted until I find time to look at it.
 2022-05-20 19:15:44 -04:00
Aevann1 2737a6ca47 sfd 2022-05-20 23:41:08 +02:00
Aevann1 0eb39b987c 2022-05-20 00:24:34 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Nekobit 86e90efb90 bump (#272) 
* q

* Update comments.html
 2022-05-17 18:23:44 -04:00
Snakes 1434270975 Cache busting comments_v.js (again). 2022-05-17 17:20:37 -04:00
Aevann1 e7e37cd657 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-17 23:09:39 +02:00
Aevann1 0b28758e16 stole testing from mottechads 2022-05-17 23:09:36 +02:00
Snakes 9677f505a4 Cache busting comments_v.js. 2022-05-17 17:01:11 -04:00
Aevann1 3491c9187d pls review 2022-05-17 21:58:41 +02:00
Aevann1 bf683cf5a2 vxc 2022-05-07 11:23:13 +02:00
TLSM 0447c9c09e Fix remaining emoji-btn clickboxes. (#247) 
In line with 1c363303f0, repeat a similar fix for the four remaining
emoji-btns which had wrong clickboxes.
 2022-05-06 05:38:20 +02:00
geese 02928305ed aaa 2022-05-04 21:29:59 -04:00
Aevann1 2008bc76c1 cakedays 2022-05-05 01:31:11 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
TLSM 8eb86b965c Partially revert self-upvote UI bug fix. (#239) 
Turns out the snippet in templates/comments.html was necessary to
get proper behavior in notifications.

Might come back to debug this later, but people use notifications more
than they deal with edge case self-upvotes, so reverting for now.

The changes to prevent coin fuckery with self-upvoting appear to work
correctly in the wild, so leaving those in place.
 2022-05-02 21:42:28 +02:00
TLSM d1e2926ca3 Fix comment self-upvote removal UI bug. (#236) 
Fixes minor UI bug when removing self-upvote on a comment. Previous
behavior, starting from a new comment:
    - Initial state: score 1 from self-upvote, upvote button shows
      highlighted as `color: var(--primary)`.
    - Click on upvote button to remove self-upvote → button
      unhighlights, score displays as 0.
    - [reload page]
    - Score displays as 0, but button is highlighted.
    - Click on upvote button → button unhighlights, score displays
      as -1. [If you reload the page now, state is score 0 &
      highlighted; no change in serverside votes.]
    - Click on upvote again → button highlights, score displays as 0.
    - [reload page]
    - Score displays as 1, button is highlighted.
Direct cause is `templates/comments.html @ L115-117`. I checked
`api_comment`, though, and it adds a vote on new comments, and that
state change propagates to the template's parameters before it renders,
so I believe the only time this triggers is specifically when a user
has removed their self-upvote. Bug is fixed when testing with L115-117
removed. Is there some other edge case it was meant to solve?

Secondary bugfix: Removing a self-upvote _costs_ you a coin & a
truescore point. I think this is one of the few ways to get negative
dramacoin. I chose to fix it by having self-votes and self-unvotes not
change coins/truecoins. The alternative of having new comments & posts
give the user +1 coin/truecoin would modify site behavior, and you'd
retroactively owe some powerusers thousands of DC & truescore.
 2022-05-02 20:12:28 +02:00
Aevann1 bc2a20cd4b sfd 2022-05-01 23:44:38 +02:00
Aevann1 139a01998b ti 2022-04-25 23:41:46 +02:00
Aevann1 89b49f9337 sdf 2022-04-24 22:52:10 +02:00
Aevann1 c447af6f50 fdssfd 2022-04-22 22:02:47 +02:00
Aevann1 8d268268f1 fds 2022-04-18 19:20:10 +02:00
Aevann1 6c662e351a fds 2022-04-16 21:14:11 +02:00
Aevann1 777baa68eb fds 2022-04-16 17:50:07 +02:00
Aevann1 99cb01d9fc fdsfds 2022-04-15 18:28:08 +02:00
bAWario 8c25a48d0c Glowiefied Checkmark (#226) 
Co-authored-by: Captain <Captain@PC>
 2022-04-14 00:23:46 +02:00
Aevann1 7f865fb4e6 fd 2022-04-13 03:12:38 +02:00
Aevann1 a4c5e2ac96 sfd 2022-04-13 02:10:48 +02:00
Aevann1 e9e9a72921 fds 2022-04-10 20:06:36 +02:00
Aevann1 aa388dabc4 fsd 2022-04-10 19:46:24 +02:00
Aevann1 3b513d0841 gfd 2022-04-10 01:41:36 +02:00
Aevann1 4a4f402c0d g 2022-04-09 20:26:10 +02:00
Aevann1 1f0d46ba66 fds 2022-04-09 20:09:33 +02:00
Aevann1 94658d1edc g 2022-04-09 20:01:36 +02:00
Aevann1 3f94aaa3cf fds 2022-04-09 19:51:37 +02:00
Aevann1 4a4591876e gf 2022-04-09 19:32:55 +02:00
Aevann1 6db737ba03 ds 2022-04-09 18:42:23 +02:00
Aevann1 6993d28e18 hgf 2022-04-07 02:21:38 +02:00
Aevann1 b45de251f5 gdffds 2022-04-07 02:08:17 +02:00
Aevann1 1c7c40b5ca fsd 2022-04-07 01:03:18 +02:00
Aevann1 d495b961d8 fg 2022-04-06 23:01:32 +02:00
Aevann1 b841e7ae12 fds 2022-04-06 21:33:42 +02:00
Aevann1 30c426f0bd gd 2022-04-05 21:51:10 +02:00
Aevann1 82a21c0a5e sfd 2022-04-05 21:48:46 +02:00
Aevann1 83f222b04e fds 2022-04-05 21:47:48 +02:00
Aevann1 99b35847e4 dfs 2022-04-05 20:06:24 +02:00