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

15477 Commits (c789f6923eafc8595d9672fa224f3b5552db7c95)

Author SHA1 Message Date
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 a2a3765393 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-19 20:36:29 +02:00
Aevann1 db3ed7961f idk 2022-05-19 20:36:26 +02:00
Aevann1 6987601bdb sneed 2022-05-19 18:00:01 +00: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 db2e8a58db sneed 2022-05-19 14:00:02 +00: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
William 5ae53637af Also check KeyboardEvent.metaKey for the post shortcut. (#275) 2022-05-19 00:20:05 -04: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 2e9d6e13fd sneed 2022-05-18 20:00:01 +00:00
Aevann1 e9e4a219f9 fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-18 19:29:15 +00:00
Aevann1 ef0046f091 fsd 2022-05-18 21:29:07 +02:00
Aevann1 3354363261 dfs 2022-05-18 21:04:06 +02:00
Aevann1 cb09ab4b12 sneed 2022-05-18 19:00:01 +00: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
Aevann1 29d8acc09f sneed 2022-05-18 06:00:01 +00:00
Snakes 38680fd38c Fix user popovers failing from early bs_trigger. 
Very strange bug, and I hope this fixes it. User popovers, e.g. on
comments pages when names are clicked, spontaneously stopped working
on my local instance. This parallels occasional reports from others
that their popovers stop working for seemingly no reason.

The primary symptom appeared to be in comments+submission_listing.js
@ popclick(...), which became unable to find any `.popover` elements
in the document, resulting in a console error. Running `bs_trigger(
document)` manually in console after page load always fixed this.
As such, I am assuming this is (hopefully) a timing bug from the
bs_trigger call in header.js running before document ready. The call
now runs on a standard document ready callback boilerplate.
May God have mercy on our souls if this doesn't fix it.
I discovered that running `bs_trigger(document)`
 2022-05-18 01:46:14 -04: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
Snakes 8d6e542eaf Fix shop MBux button wrapping to two lines. 2022-05-17 22:07:07 -04:00
Nekobit 63fbc64da5 Read <em> and <strong> as well in reply text (#273) 
* q

* Update comments.html

* Update comments_v.js
 2022-05-17 21:58:22 -04:00
Snakes f9bfb6ddc6 Update birthgay award descs, ricardo price. 2022-05-17 20:04:16 -04:00
Snakes 67bd2abfd3 Fix ricardo error spam when 0 < n_ricardo < 3. 
When ricardo.js was included on a page with ≥1 ricardo but <3
ricardos, the ricardo2 and ricardo3 handlers attempted to modify
non-existent DOM objects. There is now a non-null check before doing
so. Non-null check on ricardo1 isn't strictly necessary; however,
it has been added in case the inclusion of ricardo.js ever is not
conditional on a serverside ricardo quantity check.
 2022-05-17 19:30:15 -04:00
Snakes 28e99956c3 Re-enable mobile multi-Ricardo. 
By direct request of Carp. Additional testing with a variety of
simulated mobile screen sizes suggests it may not be too overly
crowded.
 2022-05-17 19:21:16 -04:00
Nekobit 86e90efb90 bump (#272) 
* q

* Update comments.html
 2022-05-17 18:23:44 -04:00
Nekobit d2604b6f16 q (#271) 2022-05-17 18:04:56 -04:00
Aevann1 3c8c091b03 fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-17 21:34:27 +00:00
Snakes 1434270975 Cache busting comments_v.js (again). 2022-05-17 17:20:37 -04:00
DrTransmisia d27cefb87e le execution bit (#269) 2022-05-17 23:19:53 +02:00
Nekobit e43da20741 Image and emoji quote fixes (#268) 2022-05-17 23:15:40 +02: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 0cf5181e9c sneed 2022-05-17 21:00:01 +00:00
Nekobit a9a78b0a98 Proper selection quoting (#267) 2022-05-17 22:47:03 +02:00
DrTransmisia d3c404a5f5 CTRL + ENTER TO POST LE NEW COMMENT (#266) 
* le shortcut handlers

* le white line as arrived

* Update default.html

Co-authored-by: Aevann1 <59999695+Aevann1@users.noreply.github.com>
 2022-05-17 22:44:17 +02:00
Aevann1 d1e6e6a5a0 fsd 2022-05-17 22:01:27 +02:00