Aevann1
44aa666a4d
fix improper redirect URLs
2022-11-19 23:33:59 +02:00
Aevann1
d2ac8348dc
update app to v2.8
2022-11-19 23:18:25 +02:00
gooseman
8719c057ee
de-doooplicate post meta
...
luv u aevann
2022-11-19 11:54:07 -08:00
gooseman
7c880e1582
fix hats getting cut off on posts
2022-11-19 10:59:47 -08:00
Aevann1
4cb8508dea
make turnstile dark by default
2022-11-19 20:22:50 +02:00
Aevann1
2df059f7c5
fix overflow on pin symbol
2022-11-19 14:42:23 +02:00
Aevann1
7fe499ce41
remove unnecessary script attribute
2022-11-18 23:38:13 +02:00
Aevann1
599729f54a
use postToast in delete_post_modal
2022-11-18 23:35:38 +02:00
Aevann1
0e10dd6b32
use postToast in delete_comment_modal
2022-11-18 23:27:53 +02:00
Aevann1
4d2a2937e9
fix this https://rdrama.life/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3072105?context=8#context
2022-11-18 22:53:54 +02:00
Aevann1
da49ac14b0
I will
2022-11-18 22:39:36 +02:00
Aevann1
6c6ea21fd8
im genuinely gonna kill some people, this is not a threat, this is a promise
2022-11-18 22:37:33 +02:00
Aevann1
fe154554c6
make sure all /login and /signup link have redirect
2022-11-18 22:13:06 +02:00
Snakes
b808cf2917
html_head: fix SITE_NAME titles, improve settings2.
2022-11-18 14:44:05 -05:00
Aevann1
b4448ae926
remove unnecessary arrow functions
2022-11-18 21:34:38 +02:00
Aevann1
ce24c24e1d
put js files not made by us in a folder
2022-11-18 21:16:44 +02:00
Snakes
2075311901
html_head: fix page title on signup, login, others.
2022-11-18 14:10:48 -05:00
Snakes
ce84861a44
admin_home: add git HEAD to server status.
2022-11-18 14:05:47 -05:00
Aevann1
bd3b0047b8
remove unnecessary <span>
2022-11-18 08:56:33 -08:00
justcool393
2218cb55f1
mbux printer: unify with API requirement
2022-11-18 09:31:59 -06:00
justcool393
b60febf6e0
awards: award printing cleanup
2022-11-18 09:30:17 -06:00
Aevann1
4ec307a209
fix random ":"
2022-11-18 07:25:58 -08:00
justcool393
255d5b2453
security: fix mute bypass
...
modmail: constantify user ID
2022-11-17 16:50:06 -06:00
justcool393
49e2e73b9a
fix 500 with subs
2022-11-17 15:25:10 -06:00
justcool393
2bfb2c04a4
fix error in error handler
2022-11-17 15:20:36 -06:00
Snakes
0597347c76
html_head: fix syntax error.
2022-11-17 16:18:43 -05:00
geese-suck
47658f2897
clean up html head ( #461 )
...
* init (not done)
* asdf
* :marseymop:
* unnecesary
* remove
* Update html_head.html
2022-11-17 16:08:39 -05: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
Snakes
0c0cad0723
banners: use a class, only style correct elements.
...
Selecting on the alt attribute is unstable and creates a non-obvious
coupling to maintain. Also it inadvertently affected the shop banners
and some elements in settings.
2022-11-16 12:07:23 -05:00
Snakes
7feddc42f0
Unify template helpers and macros, fix header.
...
The need for sidebars to have access to macros.random_image means
all templates that include header.html (most templates) need to have
access to `macros`, because header.html includes sidebar_{SITE_NAME}.
Because of how sparse helpers was, we instead unify the two and
replace it since I know we had helpers in every top-level template.
2022-11-16 12:07:23 -05:00
gooseman
2b4634f857
fix link opening lol
2022-11-16 12:07:23 -05:00
gooseman
16e23e6f54
make banners not retarded + increase future scalability
2022-11-16 12:07:20 -05:00
justcool393
86459cdf24
chat: show mop tools to those with proper perms
2022-11-16 08:38:20 -06:00
justcool393
e1634d0940
modals: move all modals to a modals dir
2022-11-15 17:15:53 -05:00
justcool393
5dedde4691
admin: move admin pages to admin dir
2022-11-15 17:15:53 -05:00
justcool393
3d7737387c
use default config vlaue const everywhere
2022-11-15 10:55:00 -06:00
Snakes
e896aaa1f7
Fix comment rendering when pin.level > 1.
2022-11-15 05:29:47 -05:00
justcool393
26c725b2cd
fix comment bug
2022-11-15 03:31:37 -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
Snakes
2d6cb193c0
Audio post minor improvements.
...
- Make clear on post submission that users can upload audio.
- Fix a missing closing </div> that was breaking submission.html
on audio posts.
2022-11-14 17:26:39 -05:00
Aevann1
7db62212e0
change shirt color in megathread index
2022-11-14 21:06:04 +02:00
justcool393
c9ecb5d535
account linking improvements ( #448 )
...
currently account delinking is very messy and can sometimes just not work
we do codey stuff so it's not as bad
also we create a pretty page for mops to mop up borked account links
* alts: allow proper delinking
* fix prev commit
* url fix
* fix 500
* fixes
* :pepodrool:
* flag
* :pepodrool: redux
* sdsdsdsds
* correct endpoint
* fix html page
* alts: only adjust session history if flag is set
* fix 500
* allow relinking
* fsdsds
* :pepodrool: redux
* alts: don't fail if an alt isn't history
* use postToastSwitch + some API changes
* remove unnecessary variables
* d-none
* delink accounts mod action
* fa-link-slash
* alts: add form to create alt
* remove copied and pasted template
* rounded section
* UI improvement + fix
* \n
* fix status
* admin: remove duplicate route
admin: do a permissions check on 2 pages that need it
admin: set the manual flag for manually flagged alts
* variable change
* fix 500
* alts
* add shadowban icon to alt link tool
* shadowbanned tooltip
* add user info section
* fix 500, remove unnecessary form, and add alt votes button
* trans and also link to page
* margin
* sdsdsd
* stop the count
* fix prev commit
* with ctx
* plural
* alts
* don't show shadowbanned users to those who can't see them
this is... extremely rare and won't ever be seen in production however if perms were ever rearranged in the future, this keeps permissions correct
* shadowban check in alt list
* let shadow realm enthusiasts see shadowban alts
* sdsdsds
* test
* be graceful where needed
* sdsdsdsds
* alts: don't allow adding the same account
alts: clarify wording
* rename and reorder on admin panel
* EOL
* remove frankly unnecessary check
* try with a set
* test
* Revert "try with a set"
This reverts commit 72be353fba5ffa39b37590cc5d3bf584c94ee06e.
* Revert "Revert "try with a set""
This reverts commit 81e41890a192e8b46d0463477998e905fddf56ba.
* Revert "Revert "Revert "try with a set"""
This reverts commit be51592135a3c09848f993f0154bd2ac862ae505.
* clean up test
2022-11-14 12:32:13 -05:00
justcool393
cbe328e933
submit thing
2022-11-14 11:20:34 -06:00
Aevann1
2ab126ef33
adjust "mute" and "unmute" margins to accomodate switching
2022-11-14 19:06:59 +02:00
Aevann1
dc23016f17
fix capitlization
2022-11-14 07:49:23 +02:00
justcool393
39e7e61bcb
posts: make ghost threads cost DC again
...
who the hell disabled this
2022-11-13 19:52:32 -06:00
justcool393
994ca902ca
uploads: fix paste to upload on firefox
2022-11-13 08:16:42 -06:00
justcool393
24678ab7af
reorder buttons per pool
2022-11-13 06:18:09 -06:00
Aevann1
cf40574b7d
remove double spaces
2022-11-12 20:02:02 +02:00
Aevann1
983e8b21d1
update android app
2022-11-12 19:56:54 +02:00
Aevann1
82e32f8004
Revert "minor margin fix"
...
This reverts commit cbde66d8b9
.
2022-11-12 17:06:50 +02:00
Aevann1
eca45ecf16
update app url
2022-11-12 16:47:12 +02:00
justcool393
3c8559d741
contact: make mute button red like on userpage
2022-11-12 05:03:01 -06:00
Aevann1
b2cbb68652
extend the joan blurb (I like it)
2022-11-12 12:59:36 +02:00
Aevann1
cbde66d8b9
minor margin fix
2022-11-12 12:49:30 +02:00
Aevann1
d249553e39
remove unnecessary margin from popover-badges
2022-11-12 12:47:47 +02:00
Aevann1
1de4b2098f
remove ugly scrollbar from popover
2022-11-12 12:46:51 +02:00
Aevann1
42e40c1691
split off muting and unmuting
2022-11-12 11:11:34 +02:00
justcool393
9be721dcf4
send xhr header so errors don't give back HTML pages
2022-11-11 23:46:21 -06:00
Aevann1
0796a17422
switch from hcaptcha to turnstile
2022-11-11 20:34:06 +02:00
Aevann1
80d240a45b
show join date on popover
2022-11-11 17:22:10 +02:00
Aevann1
fc19b1a23e
make the block number accurate for holes with stealth mode
2022-11-11 17:00:56 +02:00
Aevann1
5b274c95c9
expand post-title field when editing
2022-11-11 16:47:51 +02:00
Aevann1
8a8c55ed09
Revert "remove badges from popovers"
...
This reverts commit 39297b7c22
.
2022-11-11 16:25:28 +02:00
Aevann1
bac4745164
remove repeated ":not" from the css
2022-11-11 16:06:28 +02:00
Aevann1
208a5829bd
make pcm circle appear to poorcels
2022-11-11 16:03:21 +02:00
Aevann1
05b7e79b76
remove the code i added for rdrama.com
2022-11-11 15:52:18 +02:00
Aevann1
e0b6b67645
Revert "testing CF polish"
...
This reverts commit 656131cd29
.
2022-11-11 13:11:50 +02:00
Aevann1
656131cd29
testing CF polish
2022-11-11 12:55:13 +02:00
Snakes
439b73d6ae
Make explicit submission flag behavior.
...
Main intention is to allow API users (bots) to benefit from the
defaults typically enforced clientside, and to generally be clearer
about what values do what.
2022-11-11 00:23:03 -05:00
geese-suck
3d6a12a750
Merge pull request #444 from geese-suck/patch-4
...
improve submission listing spacing
2022-11-09 22:08:04 -08:00
gooseman
49e4e652fd
improve submission listing spacing
2022-11-09 21:56:50 -08:00
Snakes
e2682491ea
Update text of 0c279ca101e: Joan changed his mind.
2022-11-09 23:45:35 -05:00
Snakes
0c279ca101
Add disclaimer to sidebar (by Joan request).
2022-11-09 23:42:55 -05:00
gooseman
739ea81ca2
Update header.html
2022-11-09 13:13:26 -08:00
gooseman
0c48d4c7e2
hide duplicate buttons in tablet mode
2022-11-09 12:29:04 -08:00
Aevann1
a4141e52be
fix sidebar margins
2022-11-09 21:53:37 +02:00
Aevann1
9e6324d7ca
remove ajax.cloudflare.com from CSP
2022-11-09 21:49:50 +02:00
Aevann1
a4bf57ae0d
fix FP and pusher being triggered inside holes
2022-11-09 21:49:21 +02:00
Aevann1
170959c071
untick "notify followers" checkbox when "ghost thread" checkbox is ticked
2022-11-09 21:26:38 +02:00
Aevann1
a95d378cf6
perserve status of ALL checkboxes in /submit
2022-11-09 21:25:52 +02:00
Aevann1
6694585434
make ghost threads free again
2022-11-09 21:19:29 +02:00
Aevann1
380e91e9c4
remove chat stuff not used anymore
2022-11-09 21:06:43 +02:00
Aevann1
5a10b849f8
show the hole name in sub modaction notifs
2022-11-09 20:23:59 +02:00
Snakes
e0f43c3668
Remove is_nofollow from backend.
2022-11-09 10:05:36 -05:00
Snakes
f1ceb5b079
Respect upper bound on award quantity.
2022-11-09 04:15:19 -05:00
Snakes
618c5dbde0
Deduplicate more code in awards.html.
2022-11-09 04:01:12 -05:00
Snakes
c1b371bf1e
Fix template import path from 462e3421b5
.
2022-11-09 02:34:18 -05:00
geese-suck
462e3421b5
organize templates ( #435 )
...
dude file management lmao
2022-11-09 01:11:46 -05:00
geese-suck
e672330614
simplify awards ( #434 )
2022-11-09 00:39:05 -05:00
justcool393
26549a6e66
remove logged out routes ( #433 )
...
* remove /logged_out/ routes
* update sitemap, remove users route, and update header
* cloudflare cookie
* only mess with the cookie whenever we desire auth
* sitemap: (small) improvements
sitemap: fix little bug i introduced
sitemap: fix login redirects for /id/ routes
* sitemap: remove duplicate entry
* contact is auth desired
* imports: don't import what we don't need and bind late to the db
* praying to god this works
* keep yourself safe
* oh i actually need to commit and push lol
* import Sub
* t
* refix cache purger
2022-11-09 00:35:24 -05:00
Aevann1
39297b7c22
remove badges from popovers
2022-11-08 15:58:34 +02:00
Aevann1
17ebb4363a
cosmetic fix
2022-11-08 15:52:09 +02:00
Aevann1
8b1f76f727
add hole actions notifs for hole mods
2022-11-08 15:49:43 +02:00
Aevann1
4465061162
fix margin
2022-11-08 15:29:02 +02:00
Aevann1
dda1c88f4f
fix margins
2022-11-08 12:05:07 +02:00
Aevann1
8ff5c02bf5
higher margin between embed and body
2022-11-08 06:27:43 +02:00
Aevann1
e773e40a0d
style change in settings_css
2022-11-08 06:09:55 +02:00
Snakes
6236fb1248
Fix profilecss setting form identifiers.
2022-11-07 23:00:31 -05:00
Aevann1
bd8192781a
fix some margins
2022-11-08 05:37:17 +02:00
justcool393
d9c1b31bd6
correct form action too loll
2022-11-07 20:58:56 -06:00
justcool393
ddbe3de33b
remove catalog feature no one uses
2022-11-07 18:59:28 -06:00
Snakes
1aa2d949bf
PCM: enable multiple banners.
2022-11-07 16:40:43 -05:00
Aevann1
cc4c2774f1
fix this https://rdrama.life/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3038729?context=8#context
2022-11-07 23:38:49 +02:00
Snakes
001bb6a3d0
Fix form data names for settings text fields.
2022-11-07 14:43:28 -05:00
Aevann1
016d009d3d
cosmetic fix in leaderboard
2022-11-07 14:08:59 +02:00
Aevann1
584bf34295
cosmetic fix
2022-11-07 13:30:44 +02:00
justcool393
a18c3cea20
fix "match the requested format"
2022-11-07 04:56:20 -06:00
Aevann1
ee77930fda
modify rdrama rules
2022-11-07 12:50:12 +02:00
Aevann1
939011a839
small margin fix
2022-11-07 09:25:18 +02:00
Aevann1
8652f5aadd
restore bottom margin for WPD/rDrama sidebars
2022-11-07 09:21:22 +02:00
justcool393
0fffa7efc0
rename truecoins to truescore
2022-11-06 23:04:34 -08:00
Aevann1
c915142089
make 1 more button instant
2022-11-07 08:32:30 +02:00
Aevann1
4b3b52013a
remove unnecessary parameter
2022-11-07 08:30:41 +02:00
Aevann1
3b49535c4a
make 3 more buttons instant
2022-11-07 08:26:41 +02:00
Aevann1
6c1c79ba44
remove insane indentation in a template
2022-11-07 08:26:37 +02:00
Aevann1
ce6998bd6e
make shadowbanned, banning, chudding from the userpage work without refreshing the page
2022-11-07 08:08:53 +02:00
justcool393
0178ea8249
fix fish bugs
2022-11-06 23:52:52 -06:00
justcool393
c6e3df3340
settings: fix NSFW toggle
2022-11-06 23:45:21 -06:00
justcool393
3c406248f3
remove "cel" per @Aevann1 request
2022-11-06 23:12:01 -06:00
justcool393
db8c94d385
fix 500 on settings/apps
2022-11-06 22:59:52 -06:00
justcool393
af696a2f9c
verified fixes again
2022-11-06 22:31:38 -06:00
justcool393
099639b4d8
fix checkmark color
2022-11-06 22:18:11 -06:00
justcool393
0c42a8d269
correct feature name
2022-11-06 20:06:37 -08:00
justcool393
7de3bb064c
make API message better
...
also make unchecking the box hide the permalink
2022-11-06 20:06:37 -08:00
justcool393
29f8b14362
fix i think
2022-11-06 20:06:37 -08:00
justcool393
ddd748b98b
fix js and html
2022-11-06 20:06:37 -08:00
justcool393
cac2ef3160
patronage text
2022-11-06 20:06:37 -08:00
justcool393
d0462a1cc1
fix links for WPD
2022-11-06 20:06:37 -08:00
justcool393
657c00244a
sanitize, fix bug with update_flag, and update copy for low tsfriends
2022-11-06 20:06:37 -08:00
justcool393
3049b69e33
truescore -> truecoins
2022-11-06 20:06:37 -08:00
justcool393
c2350d36bf
add patronage message and message for when it's enabled permanently
2022-11-06 20:06:37 -08:00
justcool393
edc969e2cd
use /settings/personal instead of /settings/profile
2022-11-06 20:06:37 -08:00
justcool393
83fe77c039
settings: implement backend logic for permanent filters
2022-11-06 20:06:37 -08:00
justcool393
528c27a841
fix previous commit... i think
2022-11-06 20:06:37 -08:00
justcool393
29cc09a8ab
fix slur and profanity replacers
2022-11-06 20:06:37 -08:00
justcool393
272e79b529
enable feature flag on testing environment
2022-11-06 20:06:37 -08:00
justcool393
2fdccc9304
fix jinja syntax
2022-11-06 20:06:37 -08:00
justcool393
3b44aa9f6c
namespace stuff
2022-11-06 20:06:37 -08:00
justcool393
77663e2cf6
fix prev commit
2022-11-06 20:06:37 -08:00
justcool393
72da55fd61
settings: implement front end for perma-filters
2022-11-06 20:06:37 -08:00
justcool393
3a989356dd
sorts and stuff
2022-11-06 20:06:37 -08:00
justcool393
32607ad058
settings: some changes and additions
...
settings: add theme
settings: move common controls to common
settings: add some consts
2022-11-06 20:06:37 -08:00
justcool393
867fdf1e58
settings: more fixes
...
settings: fix line section and text area section
2022-11-06 20:06:37 -08:00
justcool393
d8102f8677
settings: some fixes
...
settings: personal: fix banner and pfp not having a title
settings: advanced: fix custom filters not having a title
2022-11-06 20:06:37 -08:00
justcool393
d98b22df98
settings: advanced: fixes
...
settings: advacned: rename from Advanced Settings to Advanced
settings: advanced: fix spelling error
settings: advanced: fix hide voted on
settings: advanced: rename Default Sorting and Time Filter to Sorting and Filtering
settings: advanced: move frontpage size to sorting and filtering
2022-11-06 20:06:37 -08:00
justcool393
eef45e5ae6
settings: fix referral section
...
settings: fix bug with song
2022-11-06 20:06:37 -08:00
justcool393
85e1d271b7
settings: personal: wrap colors in required tags
...
settings: personal: put website backgrounds custom CSS
2022-11-06 20:06:37 -08:00
justcool393
5fbe680fe5
wrap color sections in a body so we have a well formed body
2022-11-06 20:06:37 -08:00
justcool393
52eb5e2b10
settings: personal: lg-8 -> lg-11
...
settings: personal: add body class where needful
settings: personal: make rounded where needful
2022-11-06 20:06:37 -08:00
justcool393
9c9ff873e6
fix 500 and logic error
2022-11-06 20:06:37 -08:00
justcool393
511ed26574
settings: add new settings pages to API
...
settings: remove old settings pages from API
settings: delete unused settings template
2022-11-06 20:06:37 -08:00
justcool393
6e0fd23ba3
settings: rework settings frontend
2022-11-06 20:06:37 -08:00
Aevann1
1de8e07280
margin change
2022-11-07 04:38:24 +02:00
Aevann1
a4440a6d82
small change to rules
2022-11-07 04:33:14 +02:00
Aevann1
ae607a8522
add 2 extra rdrama rules
2022-11-07 04:11:21 +02:00
Snakes
c86cd823bb
Remove tooltips from home sorting & filtering.
...
The design elements seem obvious enough that tooltips with e.g.
"Toggle" on a toggle button were somewhat redundant, and them
popping up during routine interaction felt distracting in practice.
2022-11-06 21:01:13 -05:00
Aevann1
2fe10e9644
replace cc toggle with holes toggle
2022-11-07 02:44:31 +02:00
Aevann1
8bd89b042d
make the tooltips i just added on the top and not bottom
2022-11-07 02:28:42 +02:00
Aevann1
14d0bd1173
add tooltips to sort and time filter
2022-11-07 02:27:15 +02:00
Aevann1
d5bb687288
small refactor to "pins" button
2022-11-07 02:26:41 +02:00
Aevann1
87cf4d13ff
add cc post search parameter
2022-11-07 02:22:06 +02:00
Snakes
920947d3c8
Fix post actions staggered vertically uneven.
2022-11-06 01:17:18 -05:00
Aevann1
bbfb18da9a
change clearing cache terminology
2022-11-06 07:28:47 +02:00
justcool393
0e7a7307e4
stats: add time
...
this is useful for knowing what anchor point stats is bound to
2022-11-05 19:15:13 -05:00
Aevann1
d3f67faa50
same as last commit
2022-11-05 23:51:09 +02:00
Aevann1
37c4062839
fix margin
2022-11-05 23:50:35 +02:00
Aevann1
158321483b
fix sorting vote tables being broken due to dff5bcefcf
2022-11-05 23:49:39 +02:00
Aevann1
2f5d3adda0
small margin fix
2022-11-05 23:41:18 +02:00
Aevann1
1a1b3bbba9
cosmetic fix
2022-11-05 23:08:41 +02:00
Aevann1
d76fe63c7f
constantify image extensions and fix imgur .gif bug
2022-11-05 23:01:23 +02:00
Aevann1
5efdc43be5
fix 500 errors JC caused with a completely unnecessary refactor
2022-11-05 16:14:52 +02:00
justcool393
260091eaee
assets: fix issue noted in 77e5da55ef
...
as it is, this is a backend issue. unforunately, there's no way in the UI that shows the name, image, or current tags, so that's why we insert it into the page
this change brings two ways to keep the current tag
as a sanity check: this also makes it so that you can't tag stuff as the string None
2022-11-05 03:37:03 -05:00
justcool393
9f8250cec1
fix prev commit
2022-11-05 01:05:01 -05:00
justcool393
c6675ff037
houses: make price a constant
...
houses: warn founders that switching houses will delete their founder status
2022-11-05 01:00:02 -05:00
Aevann1
6648e619ec
same as last commit
2022-11-05 05:38:32 +02:00
Aevann1
c870198188
cosmetic change to expanded images
2022-11-05 05:30:33 +02:00
Aevann1
f924f88821
make "unshadowban" button work instantly
2022-11-05 04:16:43 +02:00
Aevann1
87d5a0de46
improve ban modal and add chud modal
2022-11-05 04:12:22 +02:00
Aevann1
7b60190b0d
adjust margins
2022-11-05 04:12:22 +02:00
Aevann1
a733056124
remove a bunch of double spaces
2022-11-05 04:12:22 +02:00
Aevann1
c5c6db70e4
rename "submitFormAjax()" to "sendMessage()"
2022-11-05 04:12:22 +02:00
Aevann1
ab9c0288fb
make "unban user" button in userpage work instantly
2022-11-05 04:12:22 +02:00
Aevann1
10b40fbfd8
more margin fixes
2022-11-05 04:12:21 +02:00
Aevann1
47b89df619
change the chud theme terminology to a verb instead
2022-11-05 04:12:21 +02:00
Aevann1
76d29e4899
small margin fix
2022-11-05 03:05:46 +02:00
justcool393
7c385c222f
fix previous commit
2022-11-04 18:51:42 -05:00
justcool393
ebc6bf9958
mod log: fix bug where it links to 'admin' even on sub log pages
2022-11-04 18:48:16 -05:00
Aevann1
995d3cbc98
add postToastReload
2022-11-04 23:44:44 +02:00
Aevann1
40a6ed5155
add the subsidiary to the random blurbs
2022-11-04 20:30:56 +02:00
justcool393
3f457333b5
profanity: per fish request disable profanity filter everywhere but rdrama
...
feel free to revert this or whatever if discussed
2022-11-04 08:43:59 -05:00
justcool393
217e401979
css. -> CSS (fix spelling)
2022-11-03 20:05:04 -05:00
justcool393
5235f592f0
use correct checkbox
2022-11-03 18:20:06 -05:00
justcool393
339d5fe8f1
users: add profanity filter to censor our gosh darned potty mouthes
2022-11-03 17:59:18 -05:00
Aevann1
d4a99c05e9
rename postToast -> postToastSwitch and postToastCallback -> postToast for clarity
2022-11-03 21:08:22 +02:00
Aevann1
20fc3e29b2
use postToastCallback in postToast
2022-11-03 21:07:08 +02:00
Aevann1
c2c5e61e60
camelCase
2022-11-03 18:11:11 +02:00
Aevann1
721d223399
fix stray "\"
2022-11-03 17:44:26 +02:00
Aevann1
07a12380de
accomodate alt domain
2022-11-03 17:29:14 +02:00
Snakes
6f8d8b8ed9
Fix b79560247: chudrama sidebar art logic inverted.
2022-11-03 00:18:28 -04:00
justcool393
2ac1719131
hats: goldenify if owned all hats + unpurchasable ones
2022-11-02 22:56:35 -05:00
justcool393
4a252e9699
security: fix CSRF on internal cache dump route
...
move dumping internal cache to admin tools
2022-11-02 20:35:46 -05:00
justcool393
b795602475
subs: fix weird sidebar 500
2022-11-02 19:50:28 -05:00
Aevann1
eb76067253
small cosmetic fix
2022-11-02 17:11:31 +02:00
Aevann1
f73c6d46df
accomodate rdrama.com users
2022-11-02 08:31:04 +02:00
justcool393
86e2767ac4
admin: device -> deviceType
2022-11-02 01:06:43 -05:00
Aevann1
c0b44d8dd1
cosmetic change
2022-11-02 01:50:26 +02:00
Aevann1
c013463047
small cosmetic fix for expand-text button
2022-11-02 00:46:46 +02:00
Aevann1
405786f8dc
fix wrong positioning for gift boxes and message box in user profiles
2022-11-02 00:43:56 +02:00
justcool393
1bf3d3abc3
fix prev commit
2022-11-01 16:35:24 -05:00
justcool393
15460fb6e7
twentyone: set xhr header so we get errors back as JSON
2022-11-01 16:34:19 -05:00
justcool393
0dd956ae0e
twentyone: show ratelimit error when ratelimited
2022-11-01 16:23:51 -05:00
Aevann1
410575a02f
make the subsidary blurp occur 100% of the time instead of 50%
2022-11-01 22:18:16 +02:00
Aevann1
284002d7a4
dont allow admins to not select a badge
2022-11-01 22:12:05 +02:00
Aevann1
30144c46a4
cosmetic fix to !slots
2022-11-01 20:57:29 +02:00
Aevann1
eb98740f97
fix users being unclickable in user_listing.html
2022-11-01 20:24:18 +02:00
Aevann1
eed9ea6fb8
fix user search being broken
2022-11-01 20:21:46 +02:00
justcool393
f326b9d5d7
port self removal from spooky-22
2022-11-01 04:01:51 -05:00
justcool393
5c32713469
leaderboards: workaround jinja can't do this by setting a value for if v appears in ranking
2022-11-01 02:57:10 -05:00
justcool393
40a34ea26a
leaderboards: don't show users if they're in the ranking more than once
2022-11-01 02:49:20 -05:00
justcool393
444b3d36f1
leaderboard: fix bug in table
2022-11-01 02:43:08 -05:00
justcool393
d7c7026792
leaderboards: fix missing </div> that was never present
...
seriously someone copied and pasted the open div
2022-11-01 02:36:18 -05:00
justcool393
9048f5127d
leaderboards: fix usernames in tables i think
...
i'm not *happy* about this, something seems inelegant about this solution...
2022-11-01 02:17:33 -05:00
Snakes
be2664b284
Revert "set astolfo background to everyone in drama"
...
This reverts commit be1ff23d4d
.
2022-11-01 00:21:32 -04:00
Snakes
d7aaa33c7f
Formalize unpurchasable hats.
2022-10-31 23:38:10 -04:00
justcool393
bfb13e9fec
add a newline because posix users can't sneed
2022-10-31 19:14:24 -05:00
Aevann1
f4542db86f
fix first comment on a post being centered with huge padding
2022-11-01 01:12:31 +02:00
Aevann1
5d9ff04ad3
fix last commit
2022-11-01 01:07:42 +02:00
Aevann1
3bfe3be800
fix /create_hole
2022-11-01 01:07:24 +02:00
Aevann1
ce2d90a212
small refactor to buttons on userpages
2022-11-01 00:43:18 +02:00
Snakes
fa43317ee2
Revert "Merge pull request #396 from nekobbbbbbit/debooterstrap"
...
This reverts commit ae1e6b01a4
, reversing
changes made to 7e5c1b0ad8
.
2022-10-31 18:35:47 -04:00
Aevann1
cda0b3592c
make journoid blurb acquisition announcement temporarily
2022-10-31 22:54:56 +02:00
Aevann1
7f82a0c371
add "Official site of /r/SubredditDrama" to the journoid blurbs
2022-10-31 22:53:11 +02:00
Aevann1
a447fb83ae
remove carp's "everything legal is welcome' blurp in the sidebar
2022-10-31 22:46:52 +02:00
Aevann1
6ea05cdb18
add 4 extra meme rules to hopefully act as an extra barrier to retards
2022-10-31 22:35:23 +02:00
Aevann1
33d33a6468
fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2995576?context=8#context
2022-10-31 16:26:03 +02:00
Aevann1
024005cc17
small margin change
2022-10-30 21:44:02 +02:00
Aevann1
83b2511380
add a couple of margins to formatting.html
2022-10-30 21:43:35 +02:00
Aevann1
62d3738e46
rename ADMIGGER variable to ADMIGGER_THREADS for clarity
2022-10-30 20:45:53 +02:00
Aevann1
aec5f96a7b
changes to donation flow
2022-10-30 20:43:06 +02:00
Aevann1
915967ddd0
constantify BAN_EVASION_DOMAIN
2022-10-30 20:01:01 +02:00
Aevann1
8b95a02ae4
when u unpin a post that's temporarily pinned, both the unpin and pin buttons are hidden, this fixes that
2022-10-30 17:20:11 +02:00
Aevann1
2ba1a1e86e
remove postToast compatability function
2022-10-30 17:10:07 +02:00
Aevann1
13b184ee53
remove unnecssary space
2022-10-30 17:09:32 +02:00
Aevann1
b8f4d36f92
add confirmation dialog to "remove follow"
2022-10-30 17:07:10 +02:00
Aevann1
4e6633baa6
remove <blockquote> from formatting guide (cuz its padding is fucked up)
2022-10-30 16:56:20 +02:00
Aevann1
23883c530b
constantify TRUESCORE_DONATE_LIMIT
2022-10-30 16:18:42 +02:00
Nekobit
7b22f345f5
Remove temp code
2022-10-30 00:12:48 -04:00
Nekobit
302f35cca0
login: Fix scroll overlay page
...
Login and scroll page were overflowing. This workaround is a bit funky due to the overflow placement, but it'll do
2022-10-30 00:12:06 -04:00
justcool393
958e083904
don't include signup.js in the login page
2022-10-29 22:47:20 -05:00
justcool393
540cc99e25
add correct flag to sign up
2022-10-29 22:40:35 -05:00
justcool393
64bf0eda1f
add correct flag
2022-10-29 22:40:11 -05:00
justcool393
912dc80ae1
sign up page header
2022-10-29 22:19:30 -05:00
justcool393
417413dc29
fix prev commit
...
we need to exclude main.css if neko bootstrap mode is enabled
2022-10-29 22:15:54 -05:00
justcool393
85464fbb2e
update login page
2022-10-29 22:13:54 -05:00
justcool393
016e9b66a4
add neko debootstrap flag to html_head.html
...
this is awful but i made this a macro for some reason i have no idea why
2022-10-29 22:11:05 -05:00
justcool393
74d3c325d4
Merge branch 'frost' into debooterstrap
2022-10-29 20:07:18 -07:00
Aevann1
7e5c1b0ad8
don't redirect PCM and WPD to trans charity in 502.html
2022-10-30 03:04:08 +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
Snakes
bf25937b54
Make rDrama sidebar markup semantic.
2022-10-29 19:08:35 -04:00
Aevann1
77dc8a990c
remove some unnecessary <br>s
2022-10-30 00:42:40 +02:00
Aevann1
3bc248fe07
fix small bug in /live
2022-10-30 00:19:01 +02:00
Aevann1
227d074da7
remove redundant "noreferrer"
2022-10-29 23:46:35 +02:00
justcool393
ef4fc4dd99
remove redundant noreferrer tags
...
note: skipping on 502.html file as those are served by nginx
2022-10-29 16:46:22 -05:00
Aevann1
06314f92b1
remove referrer from html tags
2022-10-29 23:42:30 +02:00
Aevann1
6451572139
remove refererrs from profile images
2022-10-29 23:16:43 +02:00
Aevann1
be1ff23d4d
set astolfo background to everyone in drama
2022-10-29 22:23:16 +02:00
Nekobit
7e1681e34e
Bump, Responsive login page, use new stylesheet helpers
2022-10-29 14:30:20 -04:00
Aevann1
1b56fc22bb
hide reply buttons on deleted comments and posts for consistency
2022-10-29 19:24:22 +02:00
justcool393
26b469c361
fix minor typographical error
2022-10-29 01:11:05 -05:00
justcool393
e6ce4edbd8
templates: remove redundant badge_remove template
...
templates: fix badge admin template when removing a badge
2022-10-29 01:08:29 -05:00
Aevann1
f0c8af3ec7
remove all chained non-breaking spaces
2022-10-29 04:27:09 +02:00
Aevann1
eb1af8a69f
remove some chained non-breaking spaces
2022-10-29 04:21:06 +02:00
justcool393
6c6a578439
stickies: use permission constant on submission.html
2022-10-28 20:54:39 -05:00
Aevann1
6b0fe97a85
remove using invisible character as spacing
2022-10-29 03:31:25 +02:00
Aevann1
7915d9f0aa
fix bugs resulting from fdd608532b
2022-10-29 03:26:46 +02:00
Aevann1
d1f01d2dd7
remove some spacing insanity in login/signup pages
2022-10-29 03:01:59 +02:00
Aevann1
aec78a3b05
get rid of all header classes
2022-10-29 02:55:49 +02:00
Aevann1
efc390e0c0
get rid of some header classes
2022-10-29 02:52:11 +02:00
Aevann1
de8be8dd0e
get rid of <pre> being used as vertical spacing
2022-10-29 02:47:48 +02:00
Aevann1
edbbc5b672
convert the last remaining 2 <a> tags without href
2022-10-29 02:00:27 +02:00
Aevann1
5719688178
use tabs, not spaces
2022-10-29 01:39:31 +02:00
Aevann1
fdd608532b
add type="button" to all <button> tags
2022-10-29 01:35:14 +02:00
Aevann1
5eb2eb5035
remove role="button" from all <a> tags
2022-10-29 01:32:31 +02:00
Aevann1
2019f68217
same as last commit
2022-10-29 01:31:39 +02:00
Aevann1
11ad9a4a0a
remove role="button" from button tags
2022-10-29 01:28:17 +02:00
Aevann1
582a29232b
convert all <a> tags without a href, except 2 in award_modal.html
2022-10-29 01:27:38 +02:00
Aevann1
a33680dc22
convert more <a> tags to <button> tags
2022-10-29 01:09:06 +02:00
Aevann1
6c32916f1a
convert more <a> tags to <button> tags
2022-10-29 00:51:10 +02:00
Aevann1
b66f9fdb0a
convert 1 a tag to a button, and change native button css
2022-10-29 00:30:28 +02:00
Aevann1
86beaad37c
remove unused shit in profile template
2022-10-29 00:26:06 +02:00
Aevann1
649fc2414d
disable adding admins on WPD
2022-10-29 00:14:59 +02:00
Aevann1
067a83b1b1
remove 2 weird role="button"
2022-10-28 22:19:05 +02:00
Aevann1
f41b09cc07
small change to /admin/app
2022-10-28 22:13:58 +02:00
Aevann1
062e2523b5
change some <a> tags to <button>
2022-10-28 22:08:37 +02:00
justcool393
f5b40ebbbc
leaderboard: qol: link to relevant user pages for posts and comments
2022-10-28 12:36:18 -07:00
justcool393
b9b084ca1e
fix more templating errors
2022-10-28 12:36:18 -07:00
justcool393
efd63b8666
leaderboards: show user as last row if not in lb
2022-10-28 12:36:18 -07:00
justcool393
3aac8f1f24
leaderboard: fix some templating bugs i introduced
2022-10-28 12:36:18 -07:00
justcool393
8873171f5c
leaderboards: refactor leaderboards to their own class
...
right now, leaderboards are complex enough that they ought to be upgraded to at least a second class thing.
this commit provides an *okay* implementation of a per-request leaderboard
there are many things to be done, including caching, persistence, etc
i don't like this like 80 parameter __init__ but it's what i've got without overengineering it imo
this is potentially already overdoing it
2022-10-28 12:36:18 -07:00
justcool393
0258bfb356
i've done it... i've really done it 🥲
...
i've made the leaderboard code less crap all around
to those who wrote this old code
i forgive you
2022-10-28 12:36:18 -07:00
justcool393
09c3ac2b65
jinja2 doesn't has getattr but we can subscript apparently
...
weird but ok
2022-10-28 12:36:18 -07:00
justcool393
ad58490dd0
call the leaderboard, not LEADERBOARDS and also do it correctly
2022-10-28 12:36:18 -07:00
justcool393
db587a2501
i forgot a bloody comma ok
2022-10-28 12:36:18 -07:00
justcool393
0b61a83270
this leaderboard code is affecting my mental sanity
...
idk maybe this'll fix it it's 1 am who knows anything about coding anymore
2022-10-28 12:36:18 -07:00
justcool393
67768bf44d
fix prev commit
2022-10-28 12:36:18 -07:00
justcool393
b2cfabf244
i don't think the person who worked on either this template or the leaderboard python function has ever thought about the idea of code reuse
...
(make this template smaller by 3/4ths)
2022-10-28 12:36:18 -07:00
Aevann1
aadd054bc3
remove role="button" from button HTML tags
2022-10-28 21:30:08 +02:00
Aevann1
4a43bc239d
remove formatting buttons (useless bloat)
2022-10-28 21:09:56 +02:00
Aevann1
6271588056
small cosmetic change
2022-10-28 19:59:56 +02:00
Aevann1
5d9ddcc0f4
fix quoting on selection
2022-10-28 01:19:44 +02:00
Aevann1
1a35e2ec6a
refactor banned domains
2022-10-28 00:37:29 +02:00
Aevann1
2937872035
minor grammar change
2022-10-27 17:43:48 +02:00
Aevann1
98bae12134
show the time on which ppl blocked/followed the hole
2022-10-27 17:38:54 +02:00
Aevann1
8e84e3893e
same as last commit
2022-10-27 17:38:39 +02:00
Aevann1
28cf9b66f9
minor grammer change + delete unused template
2022-10-27 17:37:40 +02:00
Aevann1
35ea423f35
cosmetic change
2022-10-27 10:38:11 +02:00
Snakes
d626ae7f6b
Add login required signup blurb for rDrama.
2022-10-26 20:10:21 -04:00
Aevann1
b9d7b4e027
sneed
2022-10-26 16:33:50 +02:00
Snakes
f42d861cae
Add entry to journoid banner.
2022-10-26 01:33:58 -04:00
Snakes
9bfb121d2f
WPD: update sidebar rule #1 .
2022-10-26 00:35:20 -04:00
Aevann1
a25169cbea
remove makeQuote() from reply buttons
2022-10-25 23:16:34 +02:00
Aevann1
e4c7a588ca
add hat preview in /submit/hats
2022-10-25 23:12:52 +02:00
justcool393
f9343d3db1
full_name -> fullname
2022-10-25 15:05:37 -05:00
justcool393
56c1b64ec2
via @Aevann1 : add selection quoting feature to mobile
2022-10-25 14:57:43 -05:00
Aevann1
883ab31cc9
Describe what Poor Mode does
2022-10-25 20:20:43 +02:00
Aevann1
fbeac461ca
refactor poorcel mode
2022-10-25 18:07:44 +02:00
justcool393
ac43522570
Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost
2022-10-25 11:05:42 -05:00
justcool393
ff81af326e
fix issue where unable to self remove posts
2022-10-25 11:05:34 -05:00
Aevann1
8e257d2376
fix removing posts
2022-10-25 15:41:49 +02:00
Aevann1
a390f3d917
refactor my prev commit
2022-10-25 00:36:54 +02:00
Aevann1
b2317a4563
pause background music when a video or audio is played
2022-10-24 23:16:41 +02:00
Aevann1
03cd4246ff
switch the position of "reply" and "mute"
2022-10-24 22:39:48 +02:00
Aevann1
2d0879ec3e
allow admins to unmute users from modmail
2022-10-24 22:38:54 +02:00
Aevann1
b563b7af30
stop using "d-none d-md-block"
2022-10-23 19:57:38 +02:00
Aevann1
80eedbd58d
more approval/removal refactors
2022-10-23 18:24:23 +02:00
Aevann1
25e50be552
same as last commit
2022-10-23 18:24:22 +02:00
Aevann1
eafbebbdf1
same as last commit
2022-10-23 18:24:22 +02:00
Aevann1
e99aa6fd0e
same as last commit
2022-10-23 18:24:22 +02:00
Aevann1
a040b6779b
same as last commit
2022-10-23 18:24:21 +02:00
Aevann1
9b47ad166b
small refactor to approving psots and comments
2022-10-23 17:51:49 +02:00
Aevann1
096828dc1c
add some padding to admin tools
2022-10-23 17:24:41 +02:00
Aevann1
77e5da55ef
fix behavior that would replace marsey tags with "none" if we didn't specify them on update
2022-10-23 11:27:20 +02:00
justcool393
cc3fb59ccd
html head: fix default theme
2022-10-22 19:11:07 -05:00
Aevann1
fb6825ab58
add the redbubble megathread to the index
2022-10-22 23:12:23 +02:00
justcool393
db95ff7f43
head: temporarily use userpage's head tags instead of overwriting our own
2022-10-22 12:25:44 -05:00
Snakes
333c36f6b7
Update homoween badges, cachebust badges.
2022-10-21 19:57:59 -04:00
justcool393
a96bf4f81e
favicon: add back to all pages properly
2022-10-21 17:46:17 -05:00
justcool393
b6ad3555b2
chat: add favicon to HTML
2022-10-21 17:42:28 -05:00