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

5301 Commits (9b2122823bc693a9b97589b93f469f88a5b3a1d6)

Author SHA1 Message Date
Snakes 9eab252e5b
Fix reply/mention notifications from muted users. 
Consider the case of the current /notifications filter condition:
    WHERE ... NOT ((comments.sentto = 2) AND (users.is_muted))

SELECT 1 WHERE NOT ((null = 2) AND (true)); ⇒ 0 rows
SELECT 1 WHERE NOT ((1 = 2) AND (true)); ⇒ 1 row
SELECT 1 WHERE NOT ((2 = 2) AND (true)); ⇒ 0 rows

We want the first expression, where comments.sentto = null, to evaluate
to false, not to null, so it negates to true. Behavior as written is:

SELECT 1 WHERE NOT ((null = 2) AND (true)); →
SELECT 1 WHERE NOT (null AND true); →
SELECT 1 WHERE NOT null; →
SELECT 1 WHERE null;

Which guarantees a null return set. If we check first for non-nullity:

SELECT 1 WHERE NOT ((null IS NOT null) AND (null = 2) AND (true)); ⇒ 1
SELECT 1 WHERE NOT ((1 IS NOT null) AND (1 = 2) AND (true)); ⇒ 1
SELECT 1 WHERE NOT ((2 IS NOT null) AND (2 = 2) AND (true)); ⇒ 0
 2022-11-21 23:08:31 -05:00
justcool393 272e2ee936
sneed (rename procoins to marseybux) (#472) 
* sneed (rename procoins to marseybux)

* literally unusable

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 18:08:29 -05:00
Aevann1 f272989735 Revert "stop adding target="_blank" in the backend and move it to the frontend (to accomodate PWA users) - THANK YOU GEESE I LOVE YOU SO MUCH (#473)" 
This reverts commit 88f3cd519d.
 2022-11-21 19:37:38 +02:00
Aevann1 0d6b26d404 sneed 2022-11-21 19:09:04 +02:00
Aevann1 2f31fdfdd7 Revert "remove User.newtab and see if anyone complains" 
This reverts commit 787c89961f.
 2022-11-21 18:55:13 +02:00
justcool393 79b2b5cff8 cookies: set SameSite Lax to get rid of annoying console warning 2022-11-21 09:36:34 -06:00
justcool393 427d8f643d ratelimiting: use ratelimit_user everywhere 2022-11-21 09:30:27 -06:00
Aevann1 88f3cd519d
stop adding target="_blank" in the backend and move it to the frontend (to accomodate PWA users) - THANK YOU GEESE I LOVE YOU SO MUCH (#473) 
* test

* bleg

* remove User.newtab and see if anyone complains (#471)

* fddf
 2022-11-21 07:14:26 -08:00
justcool393 f52aec0477 fix betting on 0 2022-11-21 09:13:14 -06:00
justcool393 4d096a5bb6 make roulette cute and valid python syntax 2022-11-21 09:10:41 -06:00
justcool393 9f51259ee6
[DO NOT MERGE] roulette 0 and 00 bets redux (#470) 
* backend support for roulette betting on 0 and 00

* casino: roulette: add 0 and 00 frontend

* add spacer

* roulette: fix the thing

* don't payout where needful not to

* sanity check

* roulette: validate requests properly

* roulette actions from API make more sane
 2022-11-21 06:44:16 -08:00
Aevann1 787c89961f remove User.newtab and see if anyone complains 2022-11-21 16:36:17 +02:00
Aevann1 1de69518be stop forcing posts in /h/chudrama 2022-11-21 16:13:21 +02:00
justcool393 153fb4e2a2
[DO NOT MERGE] titlesssssssssss (#468) 
* titles

* testing

* self

* Revert "self"

This reverts commit d6c12d5a5ba125feb44673f55e1fdac75f151cb5.

* Revert "testing"

This reverts commit 86d800f9fd552196b31f0e0b3891d4fc072a9bc0.

* testing on devrama

* rewrite the html head

* reference error or smth idk

* tempalte debug

* template debug redux

* default2

* rename default2 -> root, page title

* fix settings2

* include the set_variables block

* root scope variables 2

* test 3

* remove unnecessary set

* add pagetitles to all settings2 pages

* add pagetitle to casino

* remove bloat

* remove duplicate site name thingy

* page titles 2

* page titles 3

* remove duplicate imports and add page titles everywhere iirc

* ok but actually this time

* remove unnecessary newlines

* fix title lol

* >

* fsdfsfsfsfsfs

* fsfs

* template configurations

* fix 500

* reduce login template bloat

* move files and add status codes where needful

* move authfroms to login

* remove 2fa bloat

* verification code

* sign up fixes

* readability

* fssfsfsfs

* move forgot password to login/

* readability

* don't emit comments

* add page titles where needful

* gsgsgs

* modals: move to respective pages

* testing on devrama

* get home garbage out of title

* remove insane amount of icon duplication

* sign up text

* add votes pagetitle

* fix blank lines

* Revert "fix blank lines"

This reverts commit b2c54339970725d00b6fc82bb458c1757909952c.

* Fix blank lines on sign_up.html.

* title: votes.html more meaningful identifier.

* titles: Lottery, Directory, Notifications

* head final in submission.html

* fix missing comma

* >

* test

* title: /comments

* fsfsfsfsf

* titles: user_cards

* head: only load video and audio meta attributes if they actually exist

* titlessssss: /admin/lottery/participants

* titlessssssss: extra quote in search.html

* titlessssss: userpage voters.

* titties: /h/<sub>/{followers,blockers,exilees[sic]}

* test banner

* Revert "test banner"

This reverts commit c3d875d03f3e60d72a60dab7d28bf108554a5826.

* make submit.html inherit from default.html

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 02:52:22 -06:00
Aevann1 cb2fd8e43f increase approve hat ratelimit per minute from 30 to 120 2022-11-21 03:18:02 +02:00
Aevann1 e82d92d844 default response code is 200, dont need to specify it 2022-11-21 03:13:31 +02:00
Aevann1 0c9ed95c55 allow me and sneks to award carp and pizzashill 2022-11-21 03:12:01 +02:00
Snakes 220409c8fb
Fix 62ffe2d628: returning document, must send 200. 2022-11-20 20:11:17 -05:00
Aevann1 62ffe2d628 use postToast in betting so the js deducting coins only execute if responde code is < 300 2022-11-21 03:00:16 +02:00
Snakes 1f234ef67d
Actually call total_bet_voted in betting poll. 
Currently always truthy because it's a non-None first-class function.
 2022-11-20 19:56:28 -05:00
Snakes 44ef4bc551
search: fix tsquery when quoted unstripped space. 2022-11-20 19:31:27 -05:00
Aevann1 0c9d19c7eb add safari and firefox screenshots to /app 2022-11-21 01:31:26 +02:00
Aevann1 ccfc71290d fix 500 error 2022-11-21 01:20:57 +02:00
Aevann1 caabaf0c6f expand IS_LOCALHOST 2022-11-21 00:16:49 +02:00
Aevann1 da34a099a3 fix 500 errors 2022-11-20 21:05:32 +02:00
Aevann1 6b7b2ff59a show only permachudded users in /chuds 2022-11-20 19:37:45 +02:00
Aevann1 36a0d48fe6 sneed 2022-11-20 19:21:19 +02:00
Aevann1 d354a86cbb fix 500 errors 2022-11-20 19:00:05 +02:00
Aevann1 f62a9769fd fix annoying 500 errors 2022-11-20 18:46:15 +02:00
justcool393 a2c4bca2da polls: don't allow bets on closed polls 2022-11-20 10:11:47 -06:00
Snakes 23ff5450d6
Rename ranking constant by Capy request. 2022-11-20 06:31:16 -05:00
Snakes db329f487f
User.pay_account everywhere, fix lottery payout. 2022-11-20 05:50:02 -05:00
Snakes f5563900ae
Un-nerf schizohole in rankings. 2022-11-19 21:19:06 -05:00
Aevann1 5288d7a7dc remove android app and replace with instructions on how to install PWA 2022-11-20 00:04:08 +02:00
Aevann1 4eccfeb705 sneed 2022-11-19 18:23:53 +02:00
Aevann1 caff8815ee restore pinning to how it was before JC raped it 2022-11-19 17:36:37 +02:00
justcool393 750a87713f pins: fix removal behavior 2022-11-19 08:24:32 -06:00
justcool393 33878fcd02 remove unnecessary check 2022-11-19 07:46:23 -06:00
Aevann1 0be653e632 remove unecessary request when making a post linking to a yt video 2022-11-19 06:44:07 -06:00
Snakes 38ac92b4aa
search: escape apostrophes. 2022-11-18 16:55:15 -05:00
Aevann1 2fd63d7474 I hate you and I hope you die a violent death 2022-11-18 23:11:03 +02:00
justcool393 aaa6d6696e lowercase it too 2022-11-18 14:39:52 -06:00
justcool393 fc5d78a4a1 don't do it for the POST either 2022-11-18 14:34:23 -06:00
Snakes 2c81db79ef
Fix API for /comment/<cid>, /search/comments. 2022-11-18 15:33:07 -05:00
justcool393 6f1b9014b4 fix 400: improve 4e57369e68 
a couple of other places shouldn't redirect either
 2022-11-18 14:32:00 -06:00
Aevann1 4e57369e68 dont actually redirect to /reset_2fa 2022-11-18 22:16:28 +02:00
Aevann1 785fb28bb2 fix bug when 2fa toggle looked like it didnt apply 2022-11-18 22:07:07 +02:00
Aevann1 bcfe98c295 remove hole pins when post moved 2022-11-18 21:58:12 +02:00
Aevann1 446ef58c2c sneed 2022-11-18 21:20:17 +02:00
Snakes ce84861a44
admin_home: add git HEAD to server status. 2022-11-18 14:05:47 -05:00