MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity
18,432 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

4392 Commits (fda1f1e5624514c2c5eadffabd8e8213d4060ce2)

Author SHA1 Message Date
Aevann1 e382334c53 add description to new badge messages 2022-09-08 19:48:56 +02:00
Aevann1 615d18c41b like last commit 2022-09-08 17:49:34 +02:00
Aevann1 4d3a76f686 vamp award adjust 2022-09-08 17:46:01 +02:00
Aevann1 f23912bc5b cosmetic shit 2022-09-08 17:45:10 +02:00
Aevann1 f4e4ff3839 comsetic shit 2022-09-08 17:38:27 +02:00
Aevann1 057dfc7d80 upgrade to ubuntu 22.04 2022-09-07 07:51:05 +02:00
Aevann1 9475aa27e4 award badges shit 2022-09-07 05:31:55 +02:00
Aevann1 043a235082 buff vamp house award again 2022-09-07 00:35:05 +02:00
Aevann1 71f3a2c24c buff vamp house award 2022-09-07 00:25:29 +02:00
Aevann1 d930141dc5 same as last commit 2022-09-06 06:54:59 +02:00
Aevann1 1d419640a3 make deflector unaffect me 2022-09-06 06:53:49 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 2005eb1bce leaderboard 2022-09-06 05:06:41 +02:00
Aevann1 0eb0e4ed5c experimenting w/ leaderboard 2022-09-06 04:58:04 +02:00
Aevann1 2717b93555 leaderboard cancer 2022-09-06 04:52:03 +02:00
Aevann1 d68ffeadb6 Revert "leaderboard cancer, don't read if u value ur sanity" 
This reverts commit b1933def96.
 2022-09-06 04:43:28 +02:00
Aevann1 a19d700c8d up ratelimit for adding mods 2022-09-06 04:40:46 +02:00
Aevann1 b1933def96 leaderboard cancer, don't read if u value ur sanity 2022-09-06 04:40:11 +02:00
Aevann1 5c854adc20 show urself in blocker users table 2022-09-06 04:13:43 +02:00
Aevann1 73dbb2dd7e change t2_ and t3_ to p_ and c_ 2022-09-06 00:52:22 +02:00
Aevann1 8085de14e4 make only house members able to vote on polls in their house hole 2022-09-06 00:30:44 +02:00
Aevann1 ae0dd18192 fix 500 error 2022-09-05 23:58:46 +02:00
Aevann1 c15e0f6fad show follow time 2022-09-05 23:52:56 +02:00
Outrun Colors 90507fc8e5 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-05 15:59:48 -05:00
Outrun Colors 3509d6a8b1 Implement a function to fix bad blackjack games 2022-09-05 15:59:42 -05:00
Aevann1 7404d94610 fix issues for new instances 2022-09-05 22:37:38 +02:00
Aevann1 e793a1ab3a show a list of blockers 2022-09-05 22:23:35 +02:00
Aevann1 0f232b264c refactor torture_ap 2022-09-05 22:05:04 +02:00
Outrun Colors b1674355c0
Restructure blackjack to only use a single endpoint and better handle "game end" logic 2022-09-05 13:27:00 -05:00
Aevann1 959e08bb83 make marsify not count towards /marseys 2022-09-05 10:49:34 +02:00
Aevann1 e2c7e2939f fix leaderboard 2022-09-05 10:42:04 +02:00
Aevann1 93d7c91ce7 add the ability to order hats by author username 2022-09-05 10:27:37 +02:00
Aevann1 b166fdcaf3 make hat designers gets their own hat for free 2022-09-05 09:59:24 +02:00
Aevann1 64f95f1fca sneed 2022-09-05 09:48:54 +02:00
Aevann1 e9f9756f16 leaderboard shit 2022-09-05 09:26:12 +02:00
Aevann1 6f9265a711 Revert "testing on prod" 
This reverts commit e1a71486f7.
 2022-09-05 09:01:04 +02:00
Aevann1 e1a71486f7 testing on prod 2022-09-05 08:57:56 +02:00
Aevann1 225e64b91e add marsify toggle in settings 2022-09-05 06:50:27 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 1816ce09f7 make it possible to equip multiple hats 2022-09-05 05:44:24 +02:00
Aevann1 49bcd0543d add hats to chat, part I 2022-09-05 05:04:48 +02:00
Aevann1 11b391c437 fix blackjack when hitting blackjack 2022-09-05 04:34:30 +02:00
Aevann1 6727d4005c better stripping syntax 2022-09-05 03:44:38 +02:00
Aevann1 fb4f43d2fb increase gambling ratelimit 2022-09-05 02:01:16 +02:00
Aevann1 842300ac6e remove code irrelevant now (not broken this time I hope) 2022-09-05 01:21:48 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Aevann1 eec0a6a436 casino shit 2022-09-04 23:35:18 +02:00
Outrun Colors cfa4231f7d
Fix issue with slots not reducing value / center casino games / update user currency without refresh 2022-09-04 16:17:44 -05: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 88e96988a9 more marsify/owoify shit 2022-09-04 21:43:02 +02:00
Aevann1 38036cf9ec fix incorrect calculated cut in hat notifs 2022-09-04 00:33:25 +02:00
Aevann1 038452f9a6 display total hat sales in /hats 2022-09-04 00:32:46 +02:00
Aevann1 90d32b1381 fix marseybux gift reasons not appearing in /transfers 2022-09-03 23:45:32 +02:00
Aevann1 91d8c709cb increase hat artist cut by 10% 2022-09-03 21:53:38 +02:00
Aevann1 865723470b show owners of hats 2022-09-03 21:36:50 +02:00
Aevann1 5d704a2cb2 make /hats more intuitive 2022-09-03 21:11:02 +02:00
Aevann1 256b384e69 add 2 leaderboard tables for hats 2022-09-03 20:50:20 +02:00
Aevann1 82282cc8a4 check if user owns the hat alrdy or not 2022-09-03 05:58:43 +02:00
Aevann1 91d7e4fcd3 fix hats being lowecase in admiggers thread 2022-09-03 04:15:03 +02:00
Aevann1 01dc4db96b %5 -> 5% 2022-09-03 03:44:04 +02:00
Aevann1 8975f0e4f2 fix bug 2022-09-03 03:27:46 +02:00
Aevann1 6022129f99 fix whoopsie lol 2022-09-03 03:19:47 +02:00
Aevann1 29f09634fd more hat shit 2022-09-03 03:13:23 +02:00
Aevann1 db9a995032 more hats 2022-09-03 03:11:10 +02:00
Aevann1 697a722c6e fix stupidity 2022-09-03 02:54:17 +02:00
Aevann1 bfdb7a87d7 fix missing import 2022-09-03 02:52:59 +02:00
Aevann1 09d1e4d887 more hats 2022-09-03 02:48:01 +02:00
Aevann1 f92a33fb04 sort hats by price then alphabetically 2022-09-03 02:29:54 +02:00
Aevann1 de9f9ab11c display owned hats at the top 2022-09-03 02:27:19 +02:00
Aevann1 28bbdccdeb add hat badges 2022-09-03 02:18:10 +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 2201745c93 add owoify and marsify to offsites 2022-09-02 20:10:35 +02:00
Aevann1 9a32337a22 add flush=true to a print statement 2022-09-02 19:43:59 +02:00
Aevann1 62fd93ee7d fix wrongly-named route 2022-09-02 19:36:49 +02:00
Aevann1 8ed450e980 fix edge case with pinning child comments 2022-09-02 06:13:40 +02:00
Aevann1 5032a9aec2 fix pinned child comments 2022-09-02 02:46:17 +02:00
Aevann1 d9d017844a keep chat count when purging cache 2022-09-02 01:59:56 +02:00
Aevann1 dcf8892465 make it so u cant add hole mods in WPD 2022-09-02 01:54:05 +02:00
Snakes 7e5378405f Remove redundant `if not user: abort()` checks. 2022-09-01 18:41:47 -04:00
Aevann1 57d7e2c125 fix owoify and marsify getting wasted when awarded on a post 2022-09-02 00:11:30 +02:00
Snakes c506ff0c40 Add admin mute for user reports and modmail. 2022-09-01 17:30:15 -04:00
Snakes ba05430a80 Prevent permabanned users from replying to DMs. 
Permabanning already prevents users from initiating new DMs, and we
complete this by preventing replying to existing DM chains.
New modmails may still be initiated, and existing modmails may still
be replied to.
 2022-09-01 17:30:15 -04:00
Aevann1 083371f20f keep_blank_values 2022-09-01 22:46:57 +02:00
Aevann1 17fd089870 refactor pinning child comments 2022-09-01 22:31:08 +02:00
Aevann1 e4c0f1b4b3 restore pizza autoupvotes on posts 2022-09-01 22:07:08 +02:00
Aevann1 8e74171d9d exclude authorized bots from hole restrictions 2022-09-01 22:01:03 +02:00
Aevann1 c2e4b99d39 replace '/logged_out' from redir value 2022-09-01 21:24:06 +02:00
Aevann1 e5b2675f0d try to fix db 500 errors on wpd 2022-09-01 21:05:37 +02:00
Aevann1 4ef9a7b58c fix occasional 500 errors on WPD 2022-09-01 21:00:08 +02:00
Aevann1 04e47017c1 fix chudrama for paypigs 2022-08-31 18:49:31 +02:00
Aevann1 60709a7253 add error handling for incorrect time format in search 2022-08-31 03:48:20 +02:00
Snakes 09d95e3e63
Revert unblockable users being unable to block. 
Related commits:
26b2f55e68
356d1ca8a0
 2022-08-30 21:31:48 -04:00
Snakes 0e70879598
Fix /h/<sub>/submit header icon. 
sub.marsey_url was returning false because the submit.html template,
which then includes header.html, was passed an SQLAlchemy Row instance,
not a files.classes.sub.Sub instance. This worked alright because both
the header and the submit page only accessed the name field; however,
accessing the marsey_url property (rather than the marseyurl column
field) failed because of it.
 2022-08-30 19:20:27 -04:00
Aevann1 11afc5cff1 fix redirection on signup 2022-08-30 21:03:49 +02:00
Aevann1 1706b15ce6 fix deflector not working for house awards 2022-08-30 20:35:03 +02:00
Aevann1 bcec360f30 sort posts with "megathread" in title by new cuz ppl forget to tick the "new" checkbox 2022-08-30 20:22:15 +02:00
Snakes 8c50047f20
Remove new sort on 'thread' in Submission.title. 
Requested by multiple jannies. Rough timeline, as I understand it:
  - Circa 7mo ago, this logic was originally added for threads with
    'megathread' in the title.
  - Some time later, a checkbox on submission which sets the flag
    Submission.new does the same thing.
  - In af680d8a94, change the check from 'megathread' to 'thread'.

There must've been some reason for the change of substring checked.
However, it routinely causes issues for the admins and confuses
users. Solution has been to retroactively update posts that currently
rely on the 'megathread' in title behavior to use the `new` flag and
to remove the logic going forward.
 2022-08-30 12:14:19 -04:00
Aevann1 7fbcec3b82 turns out we didnt need a dedicated ajax variable 2022-08-30 07:26:13 +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