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

3645 Commits (3fbc4233360e034d6f7c58438c92b2cbe14be846)

Author SHA1 Message Date
Aevann1 195148da1e sfd 2022-05-25 21:45:34 +02:00
Aevann1 94151bf2d6 fsd 2022-05-25 21:45:03 +02:00
Aevann1 c213451722 fdsfdsxc 2022-05-25 20:44:43 +02:00
Aevann1 386db76c10 crgd is a king 2022-05-25 20:29:22 +02:00
Aevann1 162bf9dad7 no more g.timestamp y'all couldn't behave 2022-05-25 17:42:04 +02: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
Aevann1 b2de1dca52 upload mp3 2022-05-25 01:26:50 +02:00
Aevann1 9af50ae9b3 jannies can now block ppl 2022-05-24 22:43:49 +02:00
Aevann1 2b9dcb0c6a users here now 2022-05-24 22:19:18 +02:00
Aevann1 bbd851210e fds 2022-05-24 17:32:49 +02:00
Aevann1 0bd15d3914 burgers? 2022-05-23 21:00:14 +02:00
Snakes 62c85cd314 Fix admiggers assets CF purge requests. 2022-05-23 01:04:59 -04:00
Aevann1 649f8d5323 vdffsd 2022-05-23 00:45:04 +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
Aevann1 112a2679cc fsd 2022-05-22 22:05:44 +02:00
Aevann1 9bc310a6a4 sfd 2022-05-22 19:23:52 +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 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 2cfd7c74a0 fds 2022-05-20 21:00:13 +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 5548160912 fsd 2022-05-20 00:56:53 +02:00
Snakes b7594e2cd2 Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 18:32:17 -04: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
Aevann1 db3ed7961f idk 2022-05-19 20:36:26 +02:00
Aevann1 3e2af45a59 fds 2022-05-19 19:58:18 +02: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
Snakes f0c9a354e9 Implement better double XP infrastructure. 
Double XP now has a constant for unixtime to start. Logic around
DXP is designed to only apply to votes made after DOUBLE_XP_ENABLED.
This prevents an exploit in the old implementation where spam voting/
unvoting a post made prior to the DXP start could farm 300 DC/hr/alt.
Also it's more maintainable and comports with the coin_delta changes
to prevent self-vote coin changes.
 2022-05-18 00:54:05 -04:00
Snakes b51ab09b27 Lootboxes: re-enable for birthgay, improve. 
Re-enable lootboxes in const.py, and update their contents in
awards.py. Additionally, improve appearance in shop.

Upon purchasing a lootbox, users now receive a message informing
them of the contents thereof.

Lootbox backend now properly uses CARP_ID (and checks for the
existence thereof correctly).

Also, minor changes to how const.py whitelists awards.
 2022-05-17 22:10:04 -04:00
Aevann1 c80dcaf706 sfd 2022-05-17 18:16:56 +02:00
Aevann1 0e8a2ad1c8 sdf 2022-05-17 18:03:59 +02:00
Aevann1 ed7e4c61c1 fds 2022-05-16 21:42:34 +02:00
Aevann1 19863e8c1a sfd 2022-05-16 21:41:19 +02:00
Snakes 32416e71fa Fix /stats distinct user count fields. 
The COUNT(*) performance optimization in b71ae6cc74 was a bit
overzealous and wound up breaking four fields in /stats intended to
count distinct users who performed certain activities. These fields
were returned to their original implementation.
 2022-05-14 17:24:55 -04:00
Aevann1 9df5e30d66 sdf 2022-05-14 19:13:20 +02:00
Aevann1 7278e65362 fds 2022-05-14 16:12:51 +02:00
Aevann1 709e6b75e6 fsd 2022-05-14 16:04:14 +02:00
Aevann1 ed0d225554 sfd 2022-05-14 15:11:11 +02:00
Aevann1 caa81452f4 sf 2022-05-13 14:38:14 +02:00
float-trip 9be2264a65 Fix profile CSS on localhost (#260) 2022-05-12 16:21:55 +02:00