TriHard
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity
18,363 Commits
2 Branches
0 Tags
2 GiB
Commit Graph

14659 Commits (5b2c1ab4727d5200ea20def7c0c701931c8bbc16)

Author SHA1 Message Date
Aevann1 da52d00ad3 fix 500 errors 2022-09-06 00:55:26 +02:00
Aevann1 ef5c3c89ee deduplicate polls 2022-09-06 00:55:01 +02:00
Aevann1 62d077576f change poll- and choice- and -bet to -option 2022-09-06 00:54:05 +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 185fc04101 followers table 2022-09-06 00:02:08 +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
Aevann1 de46a6e519 fix 2022-09-05 23:43:36 +02:00
Aevann1 28e9064e28 agony 2022-09-05 23:33:57 +02:00
Aevann1 3f54b065fa small modification 2022-09-05 23:28:05 +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 1f0e7f6f66 show followers in leaderboard too 2022-09-05 22:43:49 +02: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
Aevann1 26e28efbec Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-05 21:46:06 +02:00
Aevann1 4dc7e73499 strip emoji search input 2022-09-05 21:46:04 +02:00
Outrun Colors 4e2a220498 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-05 13:27:06 -05: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 b0016143e5 sneed 2022-09-05 18:00:02 +00:00
Aevann1 6ae4459063 sneed 2022-09-05 14:00:03 +00:00
Aevann1 8c1ceee1ac sneed 2022-09-05 13:00:02 +00:00
Aevann1 b364838ad5 wtf 2022-09-05 11:07:01 +02:00
Aevann1 514e67a454 THERE SHOULDN'T BE CONCURRENT BLACKJACK GAMES BY SAME USER 2022-09-05 10:59:30 +02:00
Aevann1 919f49ccb2 small css modification 2022-09-05 10:58:59 +02:00
Aevann1 6d37838f45 fix 500 error 2022-09-05 10:57:21 +02:00
Aevann1 9bf2d75bce fix chat hats 2022-09-05 10:57:11 +02: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 f6be11bc98 fix prev commit 2022-09-05 10:32:52 +02:00
Aevann1 93d7c91ce7 add the ability to order hats by author username 2022-09-05 10:27:37 +02:00
Aevann1 7785f049ec fix 500 error 2022-09-05 10:00:12 +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 9d6c6d88a0 remove unnecessary attribute 2022-09-05 09:40:49 +02:00
Aevann1 8fb22a397c dont use g.db.execute 2022-09-05 09:37:20 +02:00
Aevann1 22c65f74da reduce minimum gambling amount from 100 to 5 2022-09-05 09:28:53 +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 aae9389b23 comment "push" and "blackjack" 2022-09-05 08:50:18 +02:00
Aevann1 e554f0924b try fixing blackjack 2022-09-05 07:15:42 +02:00
Aevann1 225e64b91e add marsify toggle in settings 2022-09-05 06:50:27 +02:00
Aevann1 e6d5839e4d fix chat 2022-09-05 06:38:01 +02:00
Aevann1 3eddb8f391 more hat shit 2022-09-05 06:36:31 +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 b3b6f1cf34 add hats to all pp20 2022-09-05 06:00:19 +02:00
Aevann1 eb3dd36b59 add hats to a leaderboard table 2022-09-05 05:57:30 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 1816ce09f7 make it possible to equip multiple hats 2022-09-05 05:44:24 +02:00
Aevann1 82237ca585 fix prev commit 2022-09-05 05:17:40 +02:00
Aevann1 fef15b7da9 fix prev commit 2022-09-05 05:16:42 +02:00
Aevann1 f516f21ed3 fix prev commit 2022-09-05 05:15:00 +02:00
Aevann1 2636ae62c2 add hats to chat (Part II) 2022-09-05 05:14:03 +02:00
Aevann1 093ed82fb8 fix prev commit 2022-09-05 05:06:25 +02:00
Aevann1 49bcd0543d add hats to chat, part I 2022-09-05 05:04:48 +02:00
Aevann1 332a03219b add hats to most tables 2022-09-05 05:01:06 +02:00
Aevann1 fe7f0316f7 flush before game query 2022-09-05 04:41:08 +02:00
Aevann1 11b391c437 fix blackjack when hitting blackjack 2022-09-05 04:34:30 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 d51869e20a sneed 2022-09-05 01:57:26 +00:00
Aevann1 b0010a455d highlight mobile nav bar icons on click 2022-09-05 03:51:29 +02:00
Aevann1 6727d4005c better stripping syntax 2022-09-05 03:44:38 +02:00
Aevann1 0271d4488f do this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2658067?context=8#context 2022-09-05 03:43:07 +02:00
Aevann1 531525a254 Revert "set height and width for hats" 
This reverts commit c53418d50a.
 2022-09-05 02:57:24 +02:00
Aevann1 c53418d50a set height and width for hats 2022-09-05 02:55:03 +02:00
Aevann1 cade131aa6 cachebust hats 2022-09-05 02:52:52 +02:00
Aevann1 cf5012aa35 blackjack fix (I hope) 2022-09-05 02:38:35 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 fb4f43d2fb increase gambling ratelimit 2022-09-05 02:01:16 +02:00
Aevann1 71b5367874 cachebust all css and js 2022-09-05 01:50:43 +02:00
Aevann1 97e3614072 fix 500 error 2022-09-05 01:39:56 +02:00
Aevann1 a0e3d75f3e same as last commit 2022-09-05 01:37:39 +02:00
Aevann1 92a134c28f fix PWA prompt not working for logged-in users 2022-09-05 01:37:01 +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 554c53633c fix again 2022-09-05 00:32:17 +02:00
Aevann1 1a5647d44b fix again 2022-09-05 00:30:32 +02:00
Aevann1 881dc51a44 fix again 2022-09-05 00:29:26 +02:00
Aevann1 b29f456242 fix again 2022-09-05 00:27:23 +02:00
Aevann1 9d57ce9b6b fix pfps not working in /leaderboard 2022-09-05 00:25:22 +02:00
Aevann1 57dcd0ddef remove snappy gambling 2022-09-05 00:13:23 +02:00
Aevann1 1470b2c8cc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-05 00:07:22 +02:00
Aevann1 63b48e0687 cachebust 2022-09-05 00:07:20 +02:00
Outrun Colors 1a8c811faa
Re-enable wager after finishing up 2022-09-04 17:04:46 -05:00
Outrun Colors e2ad3e6ca3 Merge branch 'frost' of github.com:Aevann1/rDrama into frost 2022-09-04 16:58:26 -05:00
Outrun Colors 8e7c4563c0
Temporarily disable blackjack 2022-09-04 16:58:19 -05:00
Aevann1 75a362bf63 reduce lottery top margin 2022-09-04 23:58:19 +02:00
Aevann1 27ef2d14cc Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 23:58:03 +02:00
Aevann1 4995a69ace convert to tabs 2022-09-04 23:58:01 +02:00
Aevann1 41f9a128ac Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 21:53:07 +00:00
Aevann1 38031b627e cachebust 2022-09-04 23:38:13 +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
Aevann1 19e9db0865 sneed 2022-09-04 21:00:04 +00: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 bfaedc99fc restore bottom border 2022-09-04 22:31:50 +02:00
Aevann1 10efc700d1 make chadmins have access to /h/chudrama 2022-09-04 22:27:37 +02:00
Aevann1 9d101e7841 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 20:02:51 +00:00
Aevann1 f5b157707c sneed 2022-09-04 20:00:04 +00:00
Aevann1 88e96988a9 more marsify/owoify shit 2022-09-04 21:43:02 +02:00
Aevann1 d88d5ad453 add logic for permarsify 2022-09-04 21:06:26 +02:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02:00
Aevann1 c41d6bc646 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 18:51:50 +00:00
Aevann1 1acfb0a2cd fix 500 error 2022-09-04 20:50:59 +02:00
Aevann1 7a536f87a6 sneed 2022-09-04 16:00:02 +00:00
Aevann1 8bd0ef9251 sneed 2022-09-04 15:00:02 +00:00
Aevann1 39e76a4cf3 sneed 2022-09-04 06:00:02 +00:00
Aevann1 9692a716c6 sneed 2022-09-04 05:00:02 +00:00
Aevann1 a827f41592 sneed 2022-09-04 04:00:02 +00:00
Aevann1 3ba56fcb62 sneed 2022-09-04 03:00:02 +00:00
Aevann1 d45d2b3e07 sneed 2022-09-04 02:00:01 +00:00
gooseman 862b9ebad9 popover hats? 2022-09-03 17:25:00 -07:00
gooseman e0262930ef pp20 hats 2022-09-03 16:53:45 -07:00
Aevann1 0bb45b4367 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 01:43:01 +02:00
Aevann1 027bad8aeb dudup popover 2022-09-04 01:42:59 +02:00
Aevann1 b6758de7e5 sneed 2022-09-03 23:00:04 +00:00
Aevann1 38036cf9ec fix incorrect calculated cut in hat notifs 2022-09-04 00:33:25 +02:00
Aevann1 e2744d9330 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-04 00:32:48 +02:00
Aevann1 038452f9a6 display total hat sales in /hats 2022-09-04 00:32:46 +02:00
gooseman f727ab4a2e Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-09-03 15:08:04 -07:00
gooseman 1afba98cec hopeless attempt at "fixing" hats page 2022-09-03 15:07:59 -07:00
Aevann1 90d32b1381 fix marseybux gift reasons not appearing in /transfers 2022-09-03 23:45:32 +02:00
Aevann1 57b999385b remove hats not made on the template 2022-09-03 23:33:00 +02:00
Aevann1 d9a9d6bd0e /hats never reloads now, don't read code if u value ur sanity 2022-09-03 22:45:06 +02:00
Aevann1 91d8c709cb increase hat artist cut by 10% 2022-09-03 21:53:38 +02:00
Aevann1 393fbf075d decrease padding-top by 0.1px 2022-09-03 21:52:46 +02:00
Aevann1 3e4216c78e fix my whoopsie 2022-09-03 21:37:20 +02:00
Aevann1 865723470b show owners of hats 2022-09-03 21:36:50 +02:00
Aevann1 b295af02f4 mute SQLalchemy warnings 2022-09-03 21:28:49 +02:00
Aevann1 9381763753 fix 500 errors 2022-09-03 21:27:17 +02:00
Aevann1 8f4236a294 fix samsung browser 2022-09-03 21:19:18 +02:00
Aevann1 5d704a2cb2 make /hats more intuitive 2022-09-03 21:11:02 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00
Aevann1 256b384e69 add 2 leaderboard tables for hats 2022-09-03 20:50:20 +02:00
Aevann1 3e75309821 rewrite sort_table.js, credit to htbz 2022-09-03 20:24:26 +02:00
Aevann1 5aaeb93b35 fix colors on most blocked table 2022-09-03 20:17:51 +02:00
Aevann1 5fa854afd6 dont archive site urls 2022-09-03 20:05:00 +02:00
Aevann1 9b7b3fe805 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 20:03:16 +02:00
Aevann1 a763646ea4 display /h/sub as tab name 2022-09-03 20:03:14 +02:00
Aevann1 54aba93d6a sneed 2022-09-03 18:00:02 +00:00
Aevann1 f0e375a0ac sneed 2022-09-03 17:00:02 +00:00
Aevann1 4307b776af sneed 2022-09-03 16:00:02 +00:00
Aevann1 714a1e61c0 sneed 2022-09-03 15:00:04 +00:00
Aevann1 284dfbc30e ignore archiveorg errors 2022-09-03 16:24:16 +02:00
Aevann1 5d63badabd sneed 2022-09-03 14:00:02 +00:00
Aevann1 594b030dc8 sneed 2022-09-03 08:00:02 +00:00
Aevann1 fdd85383f8 sneed 2022-09-03 07:00:02 +00:00
Aevann1 2986ad6fe3 sneed 2022-09-03 06:00:02 +00:00
Aevann1 4456ee6e3f sneed 2022-09-03 05:00:02 +00:00
Aevann1 b1a49d36f6 sneed 2022-09-03 04:00:03 +00:00
Aevann1 82282cc8a4 check if user owns the hat alrdy or not 2022-09-03 05:58:43 +02:00
Aevann1 18c0cfe94f sneed 2022-09-03 05:56:25 +02:00
Aevann1 982984acd2 sneed 2022-09-03 05:50:21 +02:00
Aevann1 e4d6c596ed sneed 2022-09-03 05:48:52 +02:00
Aevann1 a0579b40e0 restore metadata for audio 2022-09-03 05:39:35 +02:00
Aevann1 28dbe0d6ab fix WPD slowness 2022-09-03 05:34:06 +02:00
Aevann1 d3179e69b4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 05:11:20 +02:00
Aevann1 3a83e8f4c8 enable hats on all sites 2022-09-03 05:11:17 +02:00
Aevann1 f5d9926a35 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 03:10:27 +00:00
Aevann1 2398cf45f7 refactor archive.org 2022-09-03 05:10:14 +02:00
Aevann1 48affb53e6 more hat shit 2022-09-03 05:04:51 +02:00
Aevann1 3ff356b984 sneed 2022-09-03 03:00:04 +00:00
Aevann1 0839077838 fix pup mask 2022-09-03 04:48:27 +02:00
Aevann1 38a2cc0e82 fix zombiewolf helmet 2022-09-03 04:45:42 +02:00
Aevann1 91d7e4fcd3 fix hats being lowecase in admiggers thread 2022-09-03 04:15:03 +02:00
Aevann1 515526f9cb fix hat name regex 2022-09-03 03:57:03 +02:00
Aevann1 8f5e4c3ec6 add .hat class for easier blocking 2022-09-03 03:52:54 +02:00
Aevann1 f221af76f2 allow capital letters in hat names 2022-09-03 03:51:24 +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 399518fed9 reduce the margin under the text 2022-09-03 03:18:48 +02:00
Aevann1 2d972eee41 same as last commit 2022-09-03 03:18:06 +02:00
Aevann1 39c5fa39c1 make the hats link look better 2022-09-03 03:17:41 +02:00
Aevann1 e479663f1a Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 03:15:31 +02:00
Aevann1 3b5aed864d add a link to /hats in /shop 2022-09-03 03:15:29 +02:00
Aevann1 c0b88437b5 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 01:13:30 +00: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 f0ec3e3cd1 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 02:18:11 +02:00
Aevann1 28bbdccdeb add hat badges 2022-09-03 02:18:10 +02:00
Aevann1 79b4e2c7dc
Hats (#349) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats

* replace weird iOS apostrophe ’

* print archiveorg response codes
 2022-09-03 02:10:15 +02:00
Aevann1 46351f72ee sneed 2022-09-03 00:00:02 +00:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 7bb902c814 remove comma bothering me 2022-09-02 20:14:13 +02:00
Aevann1 2201745c93 add owoify and marsify to offsites 2022-09-02 20:10:35 +02:00
Aevann1 80cd9f9bbb Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-02 20:02:58 +02:00
Aevann1 1024c48cb4 prepare for site-wide marsify 2022-09-02 20:02:56 +02:00
Aevann1 44183cc767 sneed 2022-09-02 18:00:03 +00:00
Aevann1 a52fe22dc9 fix css rule 2022-09-02 19:56:02 +02:00
Aevann1 567c772b11 add sidebar button for tabletcels 2022-09-02 19:54:01 +02:00