gerudo
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity
15,814 Commits
1 Branch
0 Tags
1.8 GiB
Commit Graph

12449 Commits (469c39dca6e4cfe31dc05cd8cefacbe4ce3f9745)

Author SHA1 Message Date
Snakes da27b16c39 Disable fartmode on non-rDrama sites. 2022-05-25 07:24:34 -04:00
Snakes 67796acc11 Fix chat by setting g.timestamp. 
The users online count recently added to wrappers.py:get_logged_in_user
uses g.timestamp for its calculations. This is primarily set in
__main__.py:before_request. However, chat has requests which do not
trigger @app.before_request. To resolve this, we now set g.timestamp
in the auth_required wrapper before calling get_logged_in_user().

I think this is safe in general; there's no particular harm to setting
the timestamp _more_ frequently.
 2022-05-25 06:49:02 -04:00
Snakes 42d810a5e7 Leaderboard: fix user join for ea48c46b0f. 
After ea48c46b0f adds the leaderboard table for most blocked user,
it appeared that the user profile links did not appear correctly.
As such, it was necessary to join on the appropriate information.
This has been (mostly) resolved, excluding the removal of profile
picture because profile_url has logic in Python.

If someone knows SQLAlchemy better than I do, please redo this and
add the profile pictures back into the template. However, I got tired
of fighting with the ORM when I already knew the damn query.
 2022-05-25 06:09:13 -04:00
Snakes ea48c46b0f Leaderboard: add 'Most Blocked' hiscores. 2022-05-25 05:24:31 -04:00
Snakes 1c7458e111 Sanitize: modularize normalize_url, fix streamable. 
Originally prompted by https://rdrama.net/post/18459/-/1984609 which
noticed that streamable.com/e/ links as posts would have another e/
added to them. This was in spite of logic in posts.py api_is_repost
and submit_post designed to specifically counteract this.
Proximal cause was a copypasta'd url.replace(...) chain which
caused the mistake before the streamable-specific logic had a chance
to avoid making it.

Solution: remove the streamable replacement from the chained statement
and create `helpers.normalize_url(url)` to get rid of the copypasta.
 2022-05-25 04:43:16 -04:00
Snakes 3a2c16a696 Userpage: fix display-none on own profile in 8a400a209b. 
With the changes in 8a400a209b, a bug was accidentally introduced
which resulted in one's own profile being wrapped in a `display: none;`
block due to a template conditional which caused the mobile
<div id="profile--actionbtns"> to not be closed when v.id != u.id
(cf. userpage.html circa L489).

Because the current conditional structure makes it hard to add an
analogous profile--actionbtns div to mobile, it has been removed.
 2022-05-25 03:55:09 -04:00
Snakes 74f8859aa2 Leaderboard: add fixed back-to-top button. 2022-05-25 03:26:33 -04:00
Snakes 8a400a209b Userpage: add id attributes to profile markup. 2022-05-25 03:18:42 -04:00
Snakes f4a5230f21 Leaderboard: add linked table of contents. 2022-05-25 01:24:59 -04:00
Snakes 53a80af241 Restore old agendaposter pfps system, add more. 
Restores agendaposter pfps from 1576fcd57d and adds 52-57.
Also restores code in classes/user.py which implements them.
 2022-05-25 00:41:23 -04:00
Snakes d8fa336d78 User counter: replace globe with marseylowpoly. 
By direct request of Carp. Also shrunk text slightly to match.
In light of the animated icon, it's plenty visually obvious.
Also, the smaller text reduces instances of unsightly text wrapping.
 2022-05-24 23:54:53 -04:00
Snakes bb40bc1c53 User counter: move to sidebar, add flavor. 
After much debate, the user counter will remain in the top banner for
all non-rDrama sites using the codebase, while on rDrama the journoid
banner will remain there and the counter has been moved back to the
sidebar. This partially reverts some recent commits.

In addition to the sidebar move, the rDrama user counter now has
random flavor text, much as reddit sidebars do, though ours is
cooler because it can randomly select from a list.
 2022-05-24 23:37:25 -04:00
Aevann1 061c4936ce fds 2022-05-25 04:58:26 +02:00
Aevann1 0b1c86bbe7 fd 2022-05-25 04:29:39 +02:00
Aevann1 7310c9a1a4 sdf 2022-05-25 03:25:06 +02:00
Aevann1 538a2638ae sfd 2022-05-25 03:23:54 +02:00
Aevann1 b1d57227ff sfd 2022-05-25 03:18:36 +02:00
Aevann1 22ea228dc6 sdf 2022-05-25 03:15:38 +02:00
Aevann1 55bff02309 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-25 03:14:21 +02:00
Aevann1 4e4f667387 journoid 2022-05-25 03:14:18 +02:00
Snakes 7ead30014c Upgrade bleach to 5.0.0. 2022-05-24 20:28:36 -04:00
Aevann1 826f137a5e fsd 2022-05-25 02:22:09 +02:00
Aevann1 1b66095747 dfs 2022-05-25 01:47:28 +02:00
Aevann1 454d5173eb sfd 2022-05-25 01:42:55 +02:00
Aevann1 d9145c76d4 sdf 2022-05-25 01:40:50 +02:00
Aevann1 4f659c093a Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-25 01:26:53 +02:00
Aevann1 b2de1dca52 upload mp3 2022-05-25 01:26:50 +02:00
Snakes 8c3b6cece1 Add 8-ball answers, like fortune & factcheck. 2022-05-24 19:08:41 -04:00
Aevann1 4f02a72d29 fd 2022-05-25 00:43:49 +02:00
Aevann1 1734137dcd sfddsa 2022-05-25 00:29:15 +02:00
gooseman 7ad1030725 Update sidebar_WPD.html 2022-05-24 17:28:16 -04:00
gooseman 9db419fcdf Update sidebar_PCM.html 2022-05-24 17:27:59 -04:00
gooseman eab986be0b Update sidebar_Cringetopia.html 2022-05-24 17:27:47 -04:00
gooseman 7295f414d4 Update sidebar_rDrama.html 2022-05-24 17:27:12 -04:00
Aevann1 e119a8cb48 fds 2022-05-24 22:48:23 +02:00
Aevann1 6631777f76 fds 2022-05-24 22:45:34 +02:00
Aevann1 9af50ae9b3 jannies can now block ppl 2022-05-24 22:43:49 +02:00
Aevann1 e1f298deb8 sfd 2022-05-24 22:27:27 +02:00
Aevann1 ff68e0eb7d sdf 2022-05-24 22:20:00 +02:00
Aevann1 2b9dcb0c6a users here now 2022-05-24 22:19:18 +02:00
Aevann1 ca18dc8bdd webm2 2022-05-24 22:09:45 +02:00
Aevann1 67b4f13d98 webm 2022-05-24 22:07:04 +02:00
Snakes d0d029a78a sanitize: Add more neo-gTLDs to TLDs tuple-list. 
Per https://rdrama.net/post/70341/-/1976650 added more gTLDs that
are actually desired by site users.

Also, hard wrapped the `TLDS` and `allowed_tags` tuple-lists at a
100char hard ruler for my sanity.
 2022-05-24 15:16:55 -04:00
Snakes fdd5704348 Cache bust awards.css for confetti change. 2022-05-24 15:09:42 -04:00
Aevann1 879910d4ec fds 2022-05-24 18:57:40 +02:00
Aevann1 63914d974b Revert "Respect newtab setting for header menu." 
This reverts commit 4847000f67.
 2022-05-24 18:55:24 +02:00
Aevann1 efd122ae86 sfd 2022-05-24 18:53:39 +02:00
Aevann1 02e98b46b0 is_audio 2022-05-24 18:28:12 +02:00
Aevann1 bbd851210e fds 2022-05-24 17:32:49 +02:00
Aevann1 dcf1c794cc fds 2022-05-24 04:48:50 +02:00
Aevann1 7670e3765e fds 2022-05-24 00:22:16 +02:00
Aevann1 484bd02a8e dfs 2022-05-23 22:30:52 +02:00
Aevann1 48d75afd31 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-23 22:10:09 +02:00
Aevann1 d1e64e5450 dfs 2022-05-23 22:09:40 +02:00
Snakes a56ebc39dd Add 'moe' to sanitize TLDS for linkifier. 2022-05-23 16:06:01 -04:00
Aevann1 15418ec1e6 sfd 2022-05-23 21:20:58 +02:00
Aevann1 9599a7e96d fds 2022-05-23 21:13:33 +02:00
Aevann1 0bd15d3914 burgers? 2022-05-23 21:00:14 +02:00
Aevann1 89c27efd79 booba 2022-05-23 20:03:59 +02:00
Aevann1 14f4c69785 fds 2022-05-23 19:57:08 +02:00
Aevann1 77d370f2a6 fsd 2022-05-23 19:38:36 +02:00
Snakes 727f58f159 Fix confetti appearing in awardModal. 
The confetti button in the awardModal had a conflicting ID to the
newly-reimplemented confetti award. This resulted in an amusing bug
where the awardModal was filled with confetti. Conflict has been
resolved by renaming the confetti overlay.

This is what I deserve for writing code at 3AM.
 2022-05-23 11:51:10 -04:00
Aevann1 c5413e9e53 sdf 2022-05-23 17:28:23 +02:00
Aevann1 80fc79cbe3 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-23 17:24:25 +02:00
Aevann1 d211af8cea fds 2022-05-23 17:24:23 +02:00
Snakes 517e5ec3b3 Re-implement confetti award. 
To replace the implementation of the confetti award, we now use an
animated WebP tiled as a background image on a fixed overlay. This
should alleviate the previous performance concerns (no runtime
calculation of confetti mechanics & rendering) and maintainable
concerns.
 2022-05-23 02:57:43 -04:00
Snakes 4847000f67 Respect newtab setting for header menu. 
Fixes https://rdrama.net/post/18459/-/1969386
The appropriate internal links--viz. profile, settings, changelogs,
bug reporting, discord, archives, and contact--in the header menu
respect the User.newtab setting to open internal links in new tabs.
 2022-05-23 02:06:54 -04: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
Snakes 62c85cd314 Fix admiggers assets CF purge requests. 2022-05-23 01:04:59 -04:00
Aevann1 3cec77b4c5 fds 2022-05-23 01:02:06 +02:00
Aevann1 649f8d5323 vdffsd 2022-05-23 00:45:04 +02:00
Aevann1 0805b41394 fds 2022-05-23 00:37:59 +02:00
Aevann1 e5a980d8bd ffds 2022-05-23 00:25:54 +02:00
Aevann1 f0dec0d06d Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-23 00:21:13 +02:00
Aevann1 0a74a98ec5 big ass commit 2022-05-23 00:15:29 +02:00
Snakes 74a66876ef Ricardo: replace gifs with webp anims. 2022-05-22 17:50:04 -04:00
Aevann1 9796d359c4 sdf 2022-05-22 23:26:29 +02:00
Aevann1 f67a91433c fds 2022-05-22 23:25:08 +02:00
Aevann1 ef2c09d9b6 sdf 2022-05-22 23:24:32 +02:00
Aevann1 027fac7509 sfd 2022-05-22 23:24:06 +02:00
Aevann1 ffad4f1c80 fds 2022-05-22 23:23:10 +02:00
Aevann1 3741b6caa2 fds 2022-05-22 22:14:51 +02:00
Aevann1 112a2679cc fsd 2022-05-22 22:05:44 +02:00
official-techsupport 36e0ce6e0a Handle invalid video formats better (#283) 2022-05-22 22:01:10 +02:00
Aevann1 3ae131f5d6 fds 2022-05-22 20:04:22 +02:00
Aevann1 d712b8cf94 fds 2022-05-22 20:04:11 +02:00
Aevann1 ae1ed0ded4 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-22 20:04:00 +02:00
Aevann1 c41f6977e7 sdf 2022-05-22 20:03:54 +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 9bc310a6a4 sfd 2022-05-22 19:23:52 +02:00
Aevann1 a4ca9fc1aa fds 2022-05-22 18:19:57 +02:00
Aevann1 10723940d1 sfd 2022-05-22 18:19:49 +02:00
Aevann1 ee9b5f2bcd g 2022-05-22 18:15:40 +02:00
Aevann1 236ce22c52 fsd 2022-05-22 18:14:32 +02:00
Aevann1 969d1898b5 vid refactor 2022-05-22 18:13:19 +02:00
Aevann1 0af46237f6 stripper 2022-05-22 12:26:59 +02:00
Aevann1 53dd9056b8 fsd 2022-05-22 12:23:02 +02:00
Aevann1 37a6ce39f5 fixing https://rdrama.net/post/69817/tfw-you-will-never-troll-harder/1961118?context=8#context 2022-05-22 12:20:11 +02:00
Aevann1 f0d3f35a29 fsd 2022-05-22 11:05:23 +02:00
Aevann1 8807ed0d13 fds 2022-05-22 10:58:42 +02:00
Snakes 23d93b2f19 Fix Snappy post pinning condition. 
Recently, caa81452f4 relaxed the condition for Snappy pinning a post
from `body.startswith(':#marseypin:')` to the same sans trailing colon.
I believe this was intended to allow :marseypin2: to also lead to post
pinning. However, the amusing, though incorrect, side effect is that
:marseypinkcat: and :marseypinochet: can now also lead to Snappy pins.
This has been remedied by explicitly defining the two conditions we
want rather than hoping all :marseypin [sic] are about pinning.
 2022-05-22 00:36:45 -04: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 3d9c302fae Blackjack: add five card charlie rule. 2022-05-20 23:08:20 -04: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
Snakes 9a23c195ed Fix overpermissive email regex. 2022-05-20 18:49:00 -04:00
Aevann1 2737a6ca47 sfd 2022-05-20 23:41:08 +02:00
Snakes 76fd1342f3 Fix @mention replacement. 
Comments of the style e.g. "@TLSM / @TLSM2" would mistakenly be
`sanitize`d to have identical links only on "@TLSM", the latter
instance having a dangling 2 on the end. It seems this is purely an
issue with text formatting; alerts.py @ NOTIF_USERS had no such
issues. The root cause appears to be partly an optimization and
partly the use of str.replace without a count limit.
 2022-05-20 17:04:36 -04:00
Aevann1 2cfd7c74a0 fds 2022-05-20 21:00:13 +02:00
Aevann1 aed84df4ad fsd 2022-05-20 20:45:12 +02:00
Aevann1 4f9df8c5bf sdf 2022-05-20 20:32:36 +02:00
Aevann1 301f134309 fds 2022-05-20 18:02:27 +02:00
Aevann1 a83a72ca95 fsd 2022-05-20 16:51:14 +02:00
Aevann1 f4ac063354 sfd 2022-05-20 16:48:13 +02:00
Aevann1 4a6545ef5d dfsfds 2022-05-20 16:39:46 +02:00
Aevann1 40dce26a65 Merge branch 'birthgay-staging' of https://github.com/Aevann1/Drama into birthgay-staging 2022-05-20 16:17:11 +02:00
Aevann1 eead5570e5 fsd 2022-05-20 16:17:09 +02:00
Snakes 16e3d3b3e9 Disable tilts on distinguished posts. 2022-05-19 22:27:51 -04:00
Snakes 97bfdc5d3e Improve readability on header birthgay bg. 2022-05-19 19:15:49 -04:00
Aevann1 8a54215464 Merge branch 'birthgay-staging' of https://github.com/Aevann1/Drama into birthgay-staging 2022-05-20 00:56:55 +02:00
Aevann1 5548160912 fsd 2022-05-20 00:56:53 +02:00
Snakes ee8c54a8d4 Replace journoid w b-day message, h/t @nekobbbbbbit 2022-05-19 18:48:55 -04:00
Aevann1 f4d5998e80 fsd 2022-05-20 00:38:03 +02:00
Snakes b7594e2cd2 Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 18:32:17 -04:00
Nekobit 568e32fff5 Birthday Navbar (#276) 
* q

* Update comments.html

* Update comments_v.js

* Baloons.webp

* Birthday bash
 2022-05-20 00:31:40 +02:00
Aevann1 0eb39b987c 2022-05-20 00:24:34 +02:00
Aevann1 85bf0ab866 sfd 2022-05-20 00:10:02 +02:00
Aevann1 b3740dca14 gf 2022-05-20 00:00:24 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Snakes 039991dd43 Add birthgay event banner assets, template change. 2022-05-19 17:26:22 -04:00
Snakes 5e85f34d3c Double XP enabled: actual launch timestamp. 2022-05-19 17:22:55 -04:00
Snakes b09cad1a84 Swap header icon to :marseyparty:. 2022-05-19 17:16:07 -04:00
Snakes 39c354c3fd Enable DXP at 2022-05-19 2200Z. 2022-05-19 17:15:39 -04:00
Aevann1 db3ed7961f idk 2022-05-19 20:36:26 +02:00
Aevann1 e511737702 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-19 19:58:22 +02:00
Aevann1 3e2af45a59 fds 2022-05-19 19:58:18 +02:00
Snakes ad328ff2d8 Award modal: flairlock note length limit in UI. 
The award modal note field had a maxLength of 200 characters.
This was retained when repurposing the field for the new flair to be
applied by a flairlock award. However, flairs have a maxLength of 100
characters. award_modal.js now makes this clearer in the UI by
changing the maxLength of note when a flairlock award is picked.
 2022-05-19 13:56:04 -04:00
Snakes 69dec16f55 Shop badge discount: fix Spender, add Roller disc. 
The shop discount from Big Spender badges was incorrectly implemented:
intended behavior was for 2pp per badge. However, the values in
const.py were set as if a user could only have one Spender badge at
once, while user.py @ discount was implemented as if they were
additive. Since users factually do have multiple big spender badges,
the values in const were adjusted to reflect this fact.

Also, lootbox Roller badges now each offer a 1pp discount.
users.py @ discount was improved to check against the `discounts`
keys for appropriate badges, rather than a hardcoded list.
 2022-05-19 13:41:04 -04:00
Snakes 0608e0ce9d Media folder: create, add birthgay, move crab. 2022-05-19 13:09:19 -04:00
Aevann1 44cd7f4a92 fds 2022-05-19 09:49:15 +02:00
Aevann1 f6cf02b210 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-19 09:44:46 +02:00
Aevann1 371c7375c8 fds 2022-05-19 09:44:43 +02:00
Snakes 5500bd4e03 Polls formatting help, minor revision. 2022-05-18 18:04:17 -04:00
Snakes 9ef2d95874 Expand formatting help on polls. 2022-05-18 17:41:01 -04:00
Snakes 289a00c302 Lootboxes: remove notification to Carp. 2022-05-18 17:33:40 -04:00
Aevann1 ef0046f091 fsd 2022-05-18 21:29:07 +02:00
Aevann1 3354363261 dfs 2022-05-18 21:04:06 +02:00
Aevann1 1874c3ffbc Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-18 20:45:05 +02:00
Aevann1 15f0b963c7 fc 2022-05-18 20:45:04 +02:00