Commit Graph

470 Commits (83248970b54f0d4b4b2f492ef2073bc0e4b7a0d2)

Author SHA1 Message Date
Aevann1 bcbf524fbe make sure stickied child comments are always at the top place they can be 2022-11-26 06:01:20 +02:00
justcool393 83963470e8
user can_view functions (#460)
* user: move can_see_to user class

* stub out can_see in comments and posts

* make can_see a classmethod so it's usable for loggedoutfriends

* test

* kill me now

* threelargeclassesmating

* dfdfdfdfdfdfd

* sdsdsdsd

* classmethod should be above i think

* Revert "classmethod should be above i think"

This reverts commit df1772eb9e7e71bf7b89123f6277b648de2b1af3.

* Revert "Revert "classmethod should be above i think""

This reverts commit 32883406c2e2916fc6c436611376a1817c16cb84.

* test rewritnig thing

* go home python

* what the fuck python

* fix AttributeError

* sdsdsdsdsdsd

* lazy and user and stuff

* test

* Revert "test"

This reverts commit 45af5bb3d45f3ec17126ab117d494ec978062a38.

* merge

* newline

* test

* test 2

* Revert "test"

This reverts commit 196dae677e2ee8cd29261c93dcb747087cb399b6.

* revert test

* fix merge error

* fix import error ciruclation i think

* sdsd

* add type annotations back

* deleted_utc

* isinstance

* user_can_see in jinja and remove unnecessary things

* a bunch of stuff
remove can_see from comment and post
expand can_see to messages

* antiannoyingamountsofwhitespace

* fix for chudrama

* improve prev
2022-11-17 16:02:08 -05:00
justcool393 4b9c702877 fix listing bugs 2022-11-15 03:28:39 -06:00
justcool393 8f2f48d6d1
[DO NOT MERGE] import detanglation (#442)
* move Base definition to files.classes.__init__.py

* fix ImportError

* move userpage listing to users.py

* don't import the app from classes

* consts: set default values to avoid crashes
consts: warn if the secret key is the default config value

* card view: sneed (user db schema)

* cloudflare: use DEFAULT_CONFIG_VALUE

* const: set default values

* decouple media.py from __main__

* pass database to avoid imports

* import cleanup and import request not in const, but in the requests mega import

* move asset_submissions site check to __init__

* asset submissions feature flag

* flag

* g.is_tor

* don't import request where it's not needed

* i think this is fine

* mail: move to own routes and helper

* wrappers

* required wrappers move

* unfuck wrappers a bit

* move snappy quotes and marseys to stateful consts

* marsify

* :pepodrool:

* fix missing import

* import cache

* ...and settings.py

* and static.py

* static needs cache

* route

* lmao all of the jinja shit was in feeds.py amazing

* classes should only import what they need from flask

* import Response

* hdjbjdhbhjf

* ...

* dfdfdfdf

* make get a non-required import

* isort imports (mostly)

* but actually

* configs

* reload config on import

* fgfgfgfg

* config

* config

* initialize snappy and test

* cookie of doom debug

* edfjnkf

* xikscdfd

* debug config

* set session cookie domain, i think this fixes the can't login bug

* sdfbgnhvfdsghbnjfbdvvfghnn

* hrsfxgf

* dump the entire config on a request

* kyskyskyskyskyskyskyskyskys

* duifhdskfjdfd

* dfdfdfdfdfdfdfdfdfdfdfdf

* dfdfdfdf

* imoprt all of the consts beacuse fuck it

* 😭

* dfdfdfdfdfdfsdasdf

* print the entire session

* rffdfdfjkfksj

* fgbhffh

* not the secret keys

* minor bug fixes

* be helpful in the warning

* gfgfgfg

* move warning lower

* isort main imports (i hope this doesn't fuck something up)

* test

* session cookie domain redux

* dfdfdfd

* try only importing Flask

* formkeys fix

* y

* :pepodrool:

* route helper

* remove before flight

* dfdfdfdfdf

* isort classes

* isort helpers

* move check_for_alts to routehelpers and also sort imports and get rid of unused ones

* that previous commit but actkally

* readd the cache in a dozen places they were implicitly imported

* use g.is_tor instead of request.headers. bla bla bla

* upgrade streamers to their own route file

* get rid of unused imports in __main__

* fgfgf

* don't pull in the entire ORM where we don't need it

* features

* explicit imports for the get helper

* explicit imports for the get helper redux

* testing allroutes

* remove unused import

* decouple flask from classes

* syntax fix also remember these have side fx for some reason (why?)

* move side effects out of the class

* posts

* testing on devrama

* settings

* reloading

* settingssdsdsds

* streamer features

* site settings

* testing settings on devrama

* import

* fix modlog

* remove debug stuff

* revert commit 67275b21ab6e2f2520819e84d10bfc1c746a15b6

* archiveorg to _archiveorg

* skhudkfkjfd

* fix cron for PCM

* fix bugs that snekky wants me to

* Fix call to realbody passing db, standardize kwarg

* test

* import check_for_alts from the right place

* cloudflare

* testing on devrama

* fix cron i think

* shadow properly

* tasks

* Remove print which will surely be annoying in prod.

* v and create new session

* use files.classes

* make errors import little and fix rare 500 in /allow_nsfw

* Revert "use files.classes"

This reverts commit 98c10b876cf86ce058b7fb955cf1ec0bfb9996c6.

* pass v to media functions rather than using g

* fix

* dfdfdfdfd

* cleanup, py type checking is dumb so don't use it where it causes issues

* Fix some merge bugs, add DEFAULT_RATELIMIT to main.

* Fix imports on sqlalchemy expressions.

* `from random import random` is an error.

* Fix replies db param.

* errors: fix missing import

* fix rare 500: only send to GIFT_NOTIF_ID if it exists, and send them the right text

* Fix signup formkey.

* fix 2 500s

* propagate db to submissions

* fix replies

* dfdfdfdf

* Fix verifiedcolor.

* is_manual

* can't use getters outside of an app context

* don't attempt to do gumroad on sites where it's not enabled

* don't attempt to do gumraod on sites's where it's unnecessary

* Revert "don't attempt to do gumroad on sites where it's not enabled"

This reverts commit 6f8a6331878655492dfaf1907b27f8be513c14d3.

* fix 500

* validate media type

Co-authored-by: TLSM <duolsm@outlook.com>
2022-11-15 03:19:08 -06:00
justcool393 1ae4613d6d remove bug 2022-11-13 22:03:51 -06:00
justcool393 79e6d237c1 fix shadow API leak 2022-11-13 20:52:46 -06:00
Snakes 6169c02c89
Fix f6dea300b for logged-out users. 2022-11-13 21:12:08 -05:00
Snakes f6dea300b0
Adjust shadowed comment visibility.
- Don't show shadowed comments to non-jannies in notifications.
- Auto-collapse for jannies in notifs/threads.
2022-11-13 17:13:14 -05:00
Aevann1 f81205a427 hide poll scores until the user votes 2022-11-11 21:02:57 +02:00
Aevann1 05b7e79b76 remove the code i added for rdrama.com 2022-11-11 15:52:18 +02:00
Aevann1 87d5a0de46 improve ban modal and add chud modal 2022-11-05 04:12:22 +02:00
Aevann1 07a12380de accomodate alt domain 2022-11-03 17:29:14 +02:00
Aevann1 f73c6d46df accomodate rdrama.com users 2022-11-02 08:31:04 +02:00
Aevann1 d52216beda restore historical blackjack games 2022-10-30 02:40:35 +02:00
Aevann1 f09ec0ca17 restore slot gambling in comments 2022-10-30 02:36:23 +02:00
Aevann1 ad358650e1 remove retarded bullshit I wasn't consulted about 2022-10-27 19:53:08 +02:00
gooseman 8b98eabbb9 simultaneous hosts 2022-10-24 15:28:43 -07:00
justcool393 60284daa8e replace all of the duplicated age strings with make_age_string 2022-10-15 11:11:43 -07:00
Aevann1 a5eaeb809d fix 500 error 2022-10-13 16:26:35 +02:00
Aevann1 86d5da7de6 fix this https://rdrama.net/post/112582/chudded-award-now-destroys-hours-of 2022-10-13 13:55:29 +02:00
Snakes e5af46c4ae
Fix shadow visibility logic. 2022-10-13 00:10:34 -04:00
Aevann1 31a3b987d6 fix 500 error 2022-10-12 17:23:15 +02:00
Snakes 166e33dc38
Clarify architecture of sort_objects. 2022-10-12 04:05:26 -04:00
Aevann1 2aa281e8c8 refactor sorting again (untested) 2022-10-12 09:03:28 +02:00
Aevann1 0ba14cb771 same as last commit 2022-10-11 16:44:43 +02:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
justcool393 dd7e0abd6a fix some conflicts 2022-10-06 19:04:27 -07:00
Aevann1 4d15d76dfa show the earlylife parantheses in more places 2022-10-07 01:31:09 +02:00
Aevann1 3ffac6f0f6 fix tranny slur replacement in plainbody and plaintitle 2022-10-07 00:34:25 +02:00
Aevann1 8b1cf50965 fix misplaced ")" resulting in 500 error 2022-10-06 23:17:35 +02:00
justcool393 04f24cd8fd content moderation permission level
holy crap there's a lot
2022-10-05 17:57:08 -07:00
justcool393 635e35204e i'm an idiot 2022-10-04 17:08:15 -07:00
justcool393 93fb4f40d6
security: don't leak comment contents for removed/deleted comments 2022-10-04 16:51:42 -07:00
Aevann1 947e362c00 fix 3e58cf64ce 2022-10-05 00:28:48 +02:00
Aevann1 3e58cf64ce let ppl see the replies if they participated in the thread before it got CC'd 2022-10-04 22:36:16 +02:00
Snakes d28281bf8f
Fix ORM trying to INSERT/UPDATE into body_ts. 2022-10-02 05:12:04 -04:00
Snakes 701f64c91b
Change comment search to use tsvector. 2022-10-02 04:55:39 -04:00
Aevann1 b9d3336a9e nitter shit 2022-09-29 07:53:37 +02:00
Snakes 4a54c6219a
Add trailing final newlines to source files.
Touched a ton of files to finally standardize on having trailing
final newlines, as best practice recommends and so our devs stop
accidentally fighting each other over it.

This was performed automatically with the following:
git ls-files -z '*.py' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
git ls-files -z '*.css' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
2022-09-29 01:43:29 -04:00
Aevann1 b980c63d1b Revert "created_utc refactor"
This reverts commit 791aececbb.
2022-09-19 22:40:33 +02:00
Aevann1 791aececbb created_utc refactor 2022-09-19 21:24:16 +02:00
Aevann1 f7727f1029 refactor sigs 2022-09-19 19:51:40 +02:00
Aevann1 dc6f4f8e10 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2723089?context=8#context 2022-09-17 23:45:17 +02:00
Aevann1 ae90eb1cf2 simplify house checking logic 2022-09-11 03:53:16 +02:00
Aevann1 f8cd1bea03 make the poll code much worse 2022-09-06 01:33:58 +02:00
Aevann1 ed60cafb24 make the poll code make a little more sense 2022-09-06 00:56:21 +02:00
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 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02: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 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 04e47017c1 fix chudrama for paypigs 2022-08-31 18:49:31 +02:00
Aevann1 66aa4c5c35 make the parantheses stack work for comments too 2022-08-30 14:18:35 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 be251e7756 give paypigs access to chudrama 2022-08-22 22:52:00 +02:00
Aevann1 797cf61d3f let chuds into /h/chudrama 2022-08-21 15:57:56 +02:00
Aevann1 3140adfbdb small change to can_see logic 2022-08-20 15:05:02 +02:00
Aevann1 725179dc6c add exception in can_see for offsites 2022-08-20 02:10:13 +02:00
Aevann1 da4070b62a reduce chudrama requirement from 20k to 5k 2022-08-20 00:45:21 +02:00
Aevann1 e1e7258e7a add def can_see(v) 2022-08-20 00:36:28 +02:00
Aevann1 1883d60f4e fix nitter and imginn 2022-08-18 23:58:02 +02:00
Aevann1 7edd569090 refactor nitter 2022-08-16 18:53:24 +02:00
Aevann1 8e48728614 add imginn toggle 2022-08-15 19:45:43 +02:00
Aevann1 484cac64f0 fix 500 errors 2022-08-13 10:35:44 +02:00
Aevann1 2d9b42237e fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2497656?context=8#context 2022-08-13 10:26:33 +02:00
Aevann1 ce9c4a1a41 fix https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2480694?context=8#context 2022-08-11 10:29:56 +02:00
Aevann1 adc77681df switch to another nitter instance 2022-07-28 18:47:44 +02:00
Aevann1 f6bf7400c3 do this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2298056?context=8#context 2022-07-13 17:20:10 +02:00
Aevann1 f2e2e05958 don't collapse comment chains 2022-07-11 23:21:25 +02:00
Aevann1 ee11a28636 fix flag filtering 2022-07-11 20:13:00 +02:00
Aevann1 ae45b45bfb refactor json again 2022-07-11 19:33:26 +02:00
Aevann1 bc4074f9aa fix api 500 errors 2022-07-11 19:19:48 +02:00
Aevann1 27b1ed83cc refactor json a little bit and fix https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2278188?context=8#context 2022-07-11 15:14:34 +02:00
Aevann1 79824227de Revert "Revert "Revert "try to fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2278188?context=8#context"""
This reverts commit 95194359fa.
2022-07-09 14:21:28 +00:00
Aevann1 95194359fa Revert "Revert "try to fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2278188?context=8#context""
This reverts commit 5dcd678193.
2022-07-09 15:29:00 +02:00
Aevann1 5dcd678193 Revert "try to fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2278188?context=8#context"
This reverts commit f166522b26.
2022-07-09 14:02:21 +02:00
Aevann1 f166522b26 try to fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2278188?context=8#context 2022-07-09 13:19:15 +02:00
Aevann1 ec3b4357cf refactor sorting and time filter 2022-07-09 12:32:49 +02:00
Aevann1 b617321529 move all env-getting to .const 2022-07-08 18:21:13 +02:00
Aevann1 3356504b78 sneed 2022-07-04 05:50:01 +02:00
Aevann1 978c3eb880 fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2242521?context=8#context 2022-07-04 03:04:33 +02:00
Aevann1 a8c4c7bcc5 order child comments by upvotes 2022-07-03 04:10:02 +02:00
Aevann1 386bfa1f3b fix 500 error 2022-07-02 13:02:03 +02:00
Aevann1 bce4c13043 kitchen sink commit, all over the place 2022-07-02 12:44:05 +02:00
Aevann1 7db7abc3ab fix 500 error 2022-07-02 08:52:11 +02:00
Aevann1 1a0b2b6813 fix 500 errors 2022-07-02 08:51:19 +02:00
Aevann1 d0d15c319a Poll rework (#312)
* poll rework

* forgot to do joinedload on comments

* Fix logic errors with voting, SQL syntax.

Kitchen sink commit from review of poll-rework changes:
  1. Fix seed-db.sql syntax error.
  2. Fix SQL patch file duplication of *submissions* tables rather
     than one set of submissions and one for comments.
  3. Start makeshift SQL patch folder, since this is a large change
     that contributors may wish to apply to their local instances.
  4. Fix checkbox (non-`exclusive`) polls being unable to be
     unchecked. For consistency with `exclusive` polls, they should.
  5. Fix changing the option of an `exclusive` poll when both
     exclusive and non-exclusive options are present in one comment/
     post causing the non-exclusive options to become unchecked.
     (which, by my reading of SQLAlchemy `Query.one_or_none()`
     really could break quite badly in some cases).

* link relationships with their counterparts

* small modification to poll unchecking

Co-authored-by: TLSM <duolsm@outlook.com>
2022-07-02 08:48:04 +02:00
Aevann1 070945d98a cut down on the number of queries 2022-06-29 09:22:18 +02:00
Aevann1 52a8a219ae make poorcel-mode device-specific 2022-06-27 05:46:32 +02:00
Aevann1 b1ef8e4c62 add poorcel mode 2022-06-27 04:14:53 +02:00
Aevann1 e7ce39bd80 fix poll-voting 2022-06-26 22:53:12 +02:00
Aevann1 b450d5bb8c fix sorting by bottom for comments 2022-06-26 08:16:05 +02:00
Aevann1 5e745e38d3 revert the saving and subscription shit 2022-06-26 08:11:38 +02:00
Aevann1 4d7e7b629b fix 0ef33b396a 2022-06-26 07:51:02 +02:00
Aevann1 ecc22cfc06 fix 2b1e7f6570 2022-06-26 06:57:31 +02:00
Aevann1 2b1e7f6570 make checking if a post/comment is saved less retarded 2022-06-26 06:54:41 +02:00