Commit graph

2707 commits

Author SHA1 Message Date
Daniel Supernault
b700790bb4
Update update_credentials endpoint, enforce validator limits 2022-08-01 19:47:11 -06:00
Daniel Supernault
44de1ad748
Update unfollow api endpoint to only decrement when appropriate, fixes #3539 2022-08-01 19:05:22 -06:00
Daniel Supernault
9d52b9c2d6
Improve admin dashboard by moving expensive stats to its page and loading stats and recent data async on the dashboard home page 2022-07-28 01:06:39 -06:00
a
23e2f111b7 fix null values on capabilities 2022-07-27 04:43:35 -05:00
Daniel Supernault
b4bc9fe31c
Update AdminReportController 2022-07-26 03:11:28 -06:00
Daniel Supernault
abb4f7e1ec
Hydrate favourited and reblogged state on v1 context endpoint 2022-07-25 23:35:44 -06:00
Daniel Supernault
734b30e59a
Fix NotificationService bug returning html response on /api/v1/notifications endpoint when a notification id belonging to a deleted account is rendered by checking AccountService before NotificationTransformer. 2022-07-21 20:12:07 -06:00
Daniel Supernault
54a5c3be34
Fix v1 api block/mute endpoints, refresh RelationshipService cache after relationship changes 2022-07-19 23:22:31 -06:00
Daniel Supernault
8803c6de3d
Update ResetPasswordController redirectToo path to /i/web as /home is deprecated 2022-07-19 22:48:50 -06:00
Daniel Supernault
89abbe200d
Add report api endpoint 2022-07-19 20:05:00 -06:00
Daniel Supernault
672f7c8ce0
Fix remote avatar urls when not using cloud storage 2022-07-16 02:47:05 -06:00
Shlee
5e73c2d539
Update Installer.php 2022-07-05 22:44:40 +09:30
Daniel Supernault
feb969b908
Update LiveStreamController, remove auth middleware from config endpoint 2022-06-29 00:28:58 -06:00
Daniel Supernault
4bd9e12f00
Update livestream events 2022-06-27 21:52:07 -06:00
Daniel Supernault
19908f6ffb
Update LiveStreamController 2022-06-26 20:54:35 -06:00
Daniel Supernault
433eace75e
Update LiveStreamController 2022-06-26 20:52:42 -06:00
Daniel Supernault
473cdba855
Update LiveStreamController 2022-06-26 20:42:05 -06:00
Daniel Supernault
4630c5d67a
Update LiveStream events 2022-06-26 20:24:32 -06:00
Daniel Supernault
b55e91d1e3
Update LiveStreamController, add stream end event to deleteStream 2022-06-26 20:15:52 -06:00
Daniel Supernault
a45deb93ed
Add stream start + end events 2022-06-26 20:10:10 -06:00
Daniel Supernault
6bf68c147e
Update LiveStreamController, fix visibility condition 2022-06-26 19:53:36 -06:00
Daniel Supernault
f8e585c49a
Update LiveStreamController, clear chat cache when deleting stream 2022-06-26 19:50:40 -06:00
Daniel Supernault
f51ffa7eab
Update LiveStreamController, clear chat after stream ends 2022-06-26 19:37:05 -06:00
Daniel Supernault
020f810a7e
Add TelescopeServiceProvider 2022-06-26 19:22:06 -06:00
Daniel Supernault
aa498af073
Add live stream events 2022-06-26 16:06:08 -06:00
Shlee
00c6e7c664
Update Installer.php 2022-06-26 15:52:19 +09:30
daniel
c25347603b
Merge pull request #3535 from shleeable/patch-10
artisan user:create - password must be 6 characters or more
2022-06-25 14:47:33 -06:00
daniel
6704e43af8
Merge pull request #3511 from shleeable/patch-5
Update StatusTransformer.php/StatusStatelessTransformer.php
2022-06-25 14:26:06 -06:00
daniel
fc46c350a4
Merge pull request #3546 from shleeable/patch-14
Installer Updated
2022-06-25 14:24:28 -06:00
Shlee
563b7af500
Update Installer.php 2022-06-25 12:10:41 +09:30
Shlee
ed2d4a9b34
Update Installer.php 2022-06-25 12:06:15 +09:30
Shlee
e0307babf8
PHP check lists all PHP modules + linted 2022-06-25 12:03:00 +09:30
Shlee
13a86ab2b5
bug fix 2022-06-25 11:52:52 +09:30
Daniel Supernault
5254f3921b
Update ApiV1Controller, fix source note 2022-06-23 01:09:25 -06:00
Daniel Supernault
c32bb55b8a
Update AP helpers, fix last_fetched_at condition 2022-06-20 21:48:37 -06:00
Daniel Supernault
03a85460af
Fix timeline infinite scroll 2022-06-19 07:05:07 -06:00
Daniel Supernault
bb1cccbe03
Update MediaDeletePipeline, fix async media deletion 2022-06-19 06:52:06 -06:00
Shlee
b8526bfeb0
Update Installer.php 2022-06-19 15:56:55 +09:30
Daniel Supernault
1eba7f810a
Update Inbox, improve status deletion cache invalidation 2022-06-19 00:14:05 -06:00
Shlee
097a04edc3
Update Installer.php 2022-06-19 15:35:06 +09:30
Shlee
d2e0b9ace1
Update Installer.php 2022-06-19 15:32:44 +09:30
Shlee
dcd7a35384
Update Installer.php 2022-06-19 15:31:55 +09:30
Daniel Supernault
44f4a9edd9
Improve CollectionService cache invalidation, fixes #3548 2022-06-18 23:47:16 -06:00
Shlee
211b497240
Update Installer.php 2022-06-19 15:15:13 +09:30
Shlee
2e0587cef8
Update Installer.php 2022-06-19 15:00:08 +09:30
Shlee
e77400b621
Update Installer.php 2022-06-19 14:58:33 +09:30
Shlee
4da076c756
Update Installer.php 2022-06-16 11:05:05 +09:30
Shlee
83bb370ec9
Update Installer.php 2022-06-16 11:02:47 +09:30
Shlee
56ebd8c06c
Update Installer.php 2022-06-16 10:06:47 +09:30
Shlee
a0bca2668a
Update Installer.php 2022-06-15 19:38:40 +09:30
Shlee
a2090f5445
Update Installer.php 2022-06-15 19:32:51 +09:30
Shlee
fc811416f3
Update Installer.php 2022-06-15 19:16:11 +09:30
Shlee
6d76d02732
Update Installer.php 2022-06-15 19:15:33 +09:30
Shlee
df51e838bd
Update Installer.php 2022-06-15 19:15:12 +09:30
Shlee
825365a6b6
Update Installer.php 2022-06-15 19:09:19 +09:30
Daniel Supernault
a7613baee6
Update ApiV1Controller, fix public timeline min/max id pagination 2022-06-15 03:32:04 -06:00
Shlee
4ffa4a3609
Update Installer.php 2022-06-15 18:59:37 +09:30
Shlee
8d583403cb
Update Installer.php 2022-06-15 18:53:50 +09:30
Shlee
d5436fbd5f
Update Installer.php 2022-06-15 18:48:49 +09:30
Daniel Supernault
11e99d782f
Update ApiV1Controller, fix network timeline 2022-06-15 01:10:39 -06:00
Daniel Supernault
494f11202f
Update LiveStream model 2022-06-15 00:46:20 -06:00
Daniel Supernault
4ff179ad4d
Update ApiV1Controller, improve local/remote logic in public timeline endpoint 2022-06-13 03:08:43 -06:00
Daniel Supernault
e97900a060
Update follower counts on follow_request approval 2022-06-11 05:16:38 -06:00
Daniel Supernault
b4dda5776b
Implement follow request api endpoints 2022-06-11 03:31:24 -06:00
Daniel Supernault
4470981af7
Improve follow request flow, federate rejections and delete rejections from database to properly handle future follow requests from same actor 2022-06-11 03:27:52 -06:00
Daniel Supernault
aded149fae
Update AccountController, include account entities in follow_requests.json endpoint 2022-06-11 00:37:36 -06:00
Daniel Supernault
f54fd6e9cc
Update ApiV1Controller, add network timeline support via NetworkTimelineService 2022-06-09 05:11:39 -06:00
Daniel Supernault
37f97ccc2d
Update AP helpers 2022-06-09 04:19:57 -06:00
Daniel Supernault
1310d95cdb
Add NetworkTimelineService cache 2022-06-09 04:15:23 -06:00
Daniel Supernault
9c17def4a0
Update UserFilterService, improve cache strategy by using in-memory state via UserFilterObserver for empty lists with a ttl of 90 days. 2022-06-09 04:09:05 -06:00
Daniel Supernault
97f3bc571e
Update TrustProxies middleware 2022-06-09 02:28:59 -06:00
Daniel Supernault
7c8f76438b
Update LiveStream model 2022-06-09 00:14:40 -06:00
Daniel Supernault
feecc06c2a
Update installer command 2022-06-09 00:09:01 -06:00
Daniel Supernault
2b7c8dd1e5
Update GenerateInstanceActor command 2022-06-06 22:29:33 -06:00
Daniel Supernault
98c2397bf0
Update ApiV1Controller, fix non-public visibility inclusion on home timeline 2022-06-05 03:24:44 -06:00
Daniel Supernault
5bcc02ecac
Update PublicApiController, fix non-public visibility inclusion on home timeline 2022-06-05 03:23:41 -06:00
Daniel Supernault
a73b2f0002
Update Profile model 2022-06-05 02:49:29 -06:00
Daniel Supernault
4ecbd7cbe4
Update FollowerService 2022-06-05 02:35:14 -06:00
Shlee
8c31bd4c68
Update UserCreate.php 2022-06-05 15:20:57 +09:30
Shlee
95a22b7b55
Update UserCreate.php 2022-06-05 15:20:43 +09:30
Shlee
330ed8ef82
Update UserCreate.php 2022-06-05 15:19:54 +09:30
Daniel Supernault
68300c426c
Update AccountController 2022-06-03 04:28:58 -06:00
Daniel Supernault
4dc9365acb
Update AccountController, dispatch Accept Follow activity if applicable 2022-06-03 04:18:06 -06:00
Daniel Supernault
85fb46668c
Update FollowRequest model 2022-06-03 01:29:50 -06:00
Daniel Supernault
c82f208517
Update Inbox, store follow request activity 2022-06-02 23:47:43 -06:00
Daniel Supernault
00770c6002
Update livestream config 2022-06-01 00:13:44 -06:00
Shlee
4a1eb82f63
Update StatusTransformer.php 2022-05-31 14:38:24 +09:30
Shlee
e2a5a25416
Update StatusStatelessTransformer.php 2022-05-31 14:38:04 +09:30
Daniel Supernault
5206f21f59
Add Live Stories/Live streaming 2022-05-26 01:59:54 -06:00
Daniel Supernault
13a6630351
Update network timeline api, limit falloff to 2 days 2022-05-21 01:49:39 -06:00
Shlee
347f1a6d53
Update StatusStatelessTransformer.php 2022-05-21 16:09:19 +09:30
Shlee
af3d313047
Update StatusTransformer.php 2022-05-21 16:06:56 +09:30
Shlee
0fcdf1ebe4
Update AdminSettingsController.php 2022-05-21 16:02:55 +09:30
Shlee
6c69b30870
Update UserCreate.php 2022-05-21 15:53:47 +09:30
daniel
ecffbd294e
Merge pull request #3490 from shleeable/patch-25
Update LabsSettings.php - CookieJar::make() expects string, true given.
2022-05-20 23:38:40 -06:00
daniel
8d49ca18fd
Merge pull request #3486 from shleeable/patch-21
Update InstallController.php - function version_compare expects string, float given.
2022-05-20 23:35:20 -06:00
daniel
ccc219bf55
Merge pull request #3485 from shleeable/patch-20
Update MediaDraftTransformer.php
2022-05-20 23:33:22 -06:00
daniel
c516174376
Merge pull request #3484 from shleeable/patch-19
Update ResultsTransformer.php
2022-05-20 23:32:02 -06:00
daniel
9784e261ea
Merge pull request #3483 from shleeable/patch-18
Update SpaController.php
2022-05-20 23:29:21 -06:00
Daniel Supernault
20e0371c19
Update AP helpers, remove unused variable 2022-05-20 23:19:45 -06:00
Daniel Supernault
505261dab1
Refactor AP profileFetch logic to fix race conditions and improve updating fields and avatars 2022-05-20 23:09:25 -06:00
noellabo
2093d1b33b Change ISO-8601 to RFC 3339 EXTENDED 2022-05-21 05:14:22 +09:00
noellabo
1bdfa7a4a2 Fix instance API 2022-05-21 05:13:03 +09:00
Daniel Supernault
d48642132b
Add custom content warnings/spoiler text 2022-05-18 02:58:49 -06:00
daniel
7d26f4ef2e
Merge pull request #3453 from shleeable/staging-unwanted-semicolons
unwanted semicolons
2022-05-17 23:43:23 -06:00
Daniel Supernault
657c66c1f1
Update AP Helpers, fix getSensitive and getScope missing parameters 2022-05-17 23:25:15 -06:00
Shlee
7447209236
Update SettingsController.php 2022-05-18 11:51:21 +09:30
Shlee
9b792e8e98
Update LabsSettings.php 2022-05-18 11:48:16 +09:30
Shlee
a54d9c4f71
Update InstallController.php 2022-05-17 20:37:38 +09:30
Shlee
eacbc06c3f
Update MediaDraftTransformer.php 2022-05-17 20:18:17 +09:30
Shlee
2e50811f2f
Update ResultsTransformer.php 2022-05-17 20:11:01 +09:30
Shlee
f47ed7bdd1
Update SpaController.php 2022-05-17 18:04:21 +09:30
Daniel Supernault
f58dec3d73
Fix typos in ap transformers 2022-05-16 02:26:46 -06:00
Daniel Supernault
3f322e29d7
Update adminReportController, fix mail verification request 500 bug by changing filter precedence to catch deleted users that may still be cached in AccountService 2022-05-16 02:16:23 -06:00
Daniel Supernault
0a7a061a83
Update StatusTransformer 2022-05-15 23:50:55 -06:00
Daniel Supernault
5ff4730ff1
Update home timeline, redirect to /i/web unless force_old_ui is present 2022-05-15 23:09:45 -06:00
daniel
73b82855ed
Merge branch 'staging' into ld 2022-05-15 21:52:59 -06:00
daniel
8b594acfb2
Merge pull request #3460 from shleeable/staging-6
Update Inbox.php - add missing break on case
2022-05-15 21:41:33 -06:00
daniel
732521e954
Merge pull request #3455 from shleeable/staging-2
Update AdminController.php
2022-05-15 21:37:48 -06:00
daniel
a7f8c297b1
Merge pull request #3449 from shleeable/patch-6
safefixes - Remove unwanted else from loop
2022-05-15 21:36:46 -06:00
daniel
c9037a1243
Merge pull request #3448 from shleeable/patch-5
Update StatusTransformer.php - #3440
2022-05-15 21:26:41 -06:00
a
9e22b48a42 add back missing security context to direct messages 2022-05-14 10:35:36 -05:00
a
be6dc8ac47 clean up json-ld schema 2022-05-14 10:31:47 -05:00
Shlee
0053775bd4 Update Inbox.php 2022-05-14 19:43:28 +09:30
Shlee
d0c44757e7 Update AdminController.php 2022-05-14 19:27:04 +09:30
Shlee
e36be67c70 unwanted semicolons 2022-05-14 19:12:07 +09:30
Daniel Supernault
95f902b12b
Fix json-ld attributes, fixes #3423 2022-05-14 03:24:40 -06:00
Shlee
d36e472646
Update Installer.php 2022-05-14 18:35:26 +09:30
Shlee
549b8f40dc
Update StatusTransformer.php 2022-05-14 18:30:01 +09:30
Daniel Supernault
8f9d36bd3d
Cleanup, fixes #3440 2022-05-14 00:36:52 -06:00
Daniel Supernault
84209c2433
Remove arbitrary metro url redirect timeout 2022-05-13 23:59:00 -06:00
Daniel Supernault
18931a1ffc
Update AP helpers, enforce UTC 2022-05-13 23:13:30 -06:00
Daniel Supernault
f6d1b0a24b
cs fix 2022-05-13 21:33:48 -06:00
daniel
c8014674c3
Merge pull request #3438 from shleeable/patch-1
Update MediaDeletePipeline.php for Jortage S3 support
2022-05-13 21:32:59 -06:00
Shlee
485c586ef2
Update MediaDeletePipeline.php 2022-05-13 15:40:03 +09:30
Daniel Supernault
0afea2ba1c
Cleanup outdated discover routes and unused HomeController 2022-05-11 18:28:44 -06:00
Daniel Supernault
153eb6ba4c
Update HashtagService, use sorted set for followed tags 2022-05-09 02:01:33 -06:00
Daniel Supernault
71ba5fedc2
Update Like model, bump max likes per day from 100 to 200 2022-05-09 00:33:01 -06:00
Daniel Supernault
a4659fd2ab
Update DirectMessageController to support new Metro 2.0 UI DMs 2022-05-09 00:15:03 -06:00
Daniel Supernault
d43908780f
Update StoryFanout, remove unused variable 2022-05-02 17:11:29 -06:00
noellabo
74cc41d4fa Add Content-Type and User-Agent for activity delivery 2022-05-03 01:58:20 +09:00
Daniel Supernault
f07cc14c4f
Add /api/v2/media endpoint, fixes #3405 2022-04-30 12:29:39 -06:00
Daniel Supernault
cb2392f351
Update FederationController 2022-04-26 20:36:08 -06:00
Daniel Supernault
3172cb59cd
Add Conversations to Inbox 2022-04-20 05:08:49 -06:00
Daniel Supernault
f34a1e9d8e
Add Conversations model 2022-04-20 05:07:20 -06:00
Daniel Supernault
cc6b78c436
Update StatusService 2022-04-18 01:59:27 -06:00
Daniel Supernault
563817a94a
Update AdminReportController, add account delete button 2022-04-18 00:30:06 -06:00
Daniel Supernault
6cf671cb23
Add web installer 2022-04-10 05:50:44 -06:00
Daniel Supernault
488561c270
Update ConfigCacheService, fail to fallback earlier 2022-04-09 22:33:14 -06:00
Daniel Supernault
a3d76ee522
Update AdminSettingsController 2022-04-07 23:52:55 -06:00
Daniel Supernault
197499da8b
Update AP helpers 2022-04-06 01:51:40 -06:00
Daniel Supernault
58d3c700b2
Update AP helpers 2022-04-06 01:42:45 -06:00
Daniel Supernault
4287f14bc5
Update InboxPipeline, fixes #3332 2022-04-06 01:03:05 -06:00
Daniel Supernault
f8931dc7cd
Update AP Inbox, fixes #3332 2022-04-06 01:01:10 -06:00
Daniel Supernault
3ef850fe59
Update nodeinfo 2022-04-05 22:12:13 -06:00
Daniel Supernault
b424691110
Update DeleteWorker, fixes #3338 2022-04-05 21:25:01 -06:00
Daniel Supernault
f6f2c27874
Update horizon config, add default timeout limit 2022-04-05 21:22:32 -06:00
Daniel Supernault
a0061eb56c
Update CollectionController, limit unpublished collections to owner 2022-04-03 03:25:08 -06:00
Daniel Supernault
dab9bcaf36
Update SpaController, fix typo 2022-04-03 01:47:20 -06:00
Daniel Supernault
9a7289198a
Update PublicApiController, fix edge case in timeline pagination 2022-04-03 00:50:25 -06:00
Daniel Supernault
5649873ab8
Update ApiV1Controller, add miissing pagination header 2022-04-02 16:34:12 -06:00
Daniel Supernault
a5cdc28b6c
Update ApiV1Controller, fix timelline pagination 2022-04-02 16:18:13 -06:00
daniel
a5114bf35a
Merge pull request #3348 from shadowfacts/emoji-schema
Change static_path on custom emojis to static_url
2022-04-01 17:21:22 -06:00
Shadowfacts
0a7f8fd142
Change static_path on custom emojis to static_url 2022-04-01 18:40:13 -04:00
Daniel Supernault
d8ff40ebf9
Update DiscoverController, improve tag feed perf 2022-03-31 01:31:03 -06:00
Daniel Supernault
0541aed510
Update DiscoverController, cache public tag feed and only include local posts for unauthenticated users 2022-03-31 01:04:15 -06:00
Daniel Supernault
d9e4cc3df6
Update PublicApiController, return empty 403 response 2022-03-31 00:14:48 -06:00
Daniel Supernault
6ba7d43391
Updaet PublicApiController, disable legacy public access to local timeline 2022-03-31 00:04:04 -06:00
Daniel Supernault
e7783af686
Update PlaceController, require authentication 2022-03-30 23:56:46 -06:00
Daniel Supernault
4701b0e8f0
Update media model, use original photo url for non-existent thumbnails 2022-03-30 23:50:32 -06:00
Daniel Supernault
9b04b9d897
Update media model, use original photo url for non-existent thumbnails 2022-03-30 23:43:43 -06:00
Daniel Supernault
2533bd51a9
Update DeleteAccountPipeline, fix typo 2022-03-30 22:41:48 -06:00
Daniel Supernault
4870cc3b5d
Update DeleteAccountPipeline, improve coverage 2022-03-30 22:35:17 -06:00
Daniel Supernault
a9edd93fb5
Update DeleteAccountPipeline, fix perf issues 2022-03-30 21:44:44 -06:00
Daniel Supernault
37dfb1014f
Update ApiV1Controller, remove no-preview image from media urls 2022-03-30 20:51:35 -06:00
Daniel Supernault
72e3d89118
Update controller signatures, fix mysql 8 support 2022-03-30 20:33:34 -06:00
Daniel Supernault
6057de305e
Update ApiV1Controller, remove pinned attribute to match MastoAPI Status entity 2022-03-25 02:46:12 -06:00
Daniel Supernault
a84ab6ea92
Update ApiV1Controller, update statusCreate entity 2022-03-25 02:10:57 -06:00
Daniel Supernault
db7b1af343
Update ApiV1Controller, fix accountStatusesById endpoint 2022-03-25 00:33:30 -06:00
Daniel Supernault
15eccd443c
Update ApiV1Controller, increase limits from 80 to 100 2022-03-24 23:56:08 -06:00
Daniel Supernault
235d9184c6
Update ApiV1Controller, update markers endpoint 2022-03-24 23:51:44 -06:00
Daniel Supernault
93a9769e47
Update ApiV1Controller, add markers endpoint 2022-03-24 23:37:19 -06:00
Daniel Supernault
fbe07c5161
Update ApiV1Controller, add announcements endpoint 2022-03-24 23:00:55 -06:00
Daniel Supernault
d40a84533a
Update ApiV1Controller, add trends endpoint 2022-03-24 22:57:04 -06:00
Daniel Supernault
8c65d60b77
Update ApiV1Controller, fix tag timeline limits and remove has(media) constraint 2022-03-24 22:41:19 -06:00
Daniel Supernault
c3e56b8722
Update ApiV1Controller, add preferences endpoint 2022-03-24 22:32:16 -06:00
Daniel Supernault
df22f2e4b0
Update ApiV1Controller, increase max limit on timelines 2022-03-24 22:12:07 -06:00
Daniel Supernault
1c02afb1a1
Update oauth flow 2022-03-24 21:42:58 -06:00
Daniel Supernault
c4d38c201f
Update ApiV1Controller, add apps/verify_credentials endpoint 2022-03-23 18:11:06 -06:00
Daniel Supernault
50baae5269
Update ApiV1Controller, fix apps endpoint 2022-03-23 16:59:18 -06:00
Daniel Supernault
9dac861ebe
Update ApiV1Controller, fix search v2 entities 2022-03-23 05:58:14 -06:00
Daniel Supernault
a87f8301b1
Update ApiV1Controller, fix timeline default limit 2022-03-23 02:54:15 -06:00
Daniel Supernault
b1ab41e0c4
Update ApiV1Controller, fix context entities 2022-03-23 02:41:59 -06:00
Daniel Supernault
a0e15d89e2
Update FederationController, fix webfinger endpoint 2022-03-23 00:58:21 -06:00
Daniel Supernault
afe903c36e
Update ApiV1Controller, fix notification entities 2022-03-23 00:28:39 -06:00
Daniel Supernault
244869b7c2
Update ApiV1Controller, fix statusCreate validator 2022-03-22 23:35:16 -06:00
Daniel Supernault
b6b15b0cce
Update ApiV1Controller, fix statusCreate validator 2022-03-22 23:32:12 -06:00
Daniel Supernault
89303fa478
Update ApiV1Controller, marshal json without escaped slashes 2022-03-22 23:13:04 -06:00
Daniel Supernault
3a3997fa91
Update ApiV1Controller, fix instance endpoint 2022-03-22 22:04:11 -06:00
Daniel Supernault
c383f1008d
Update ApiV1Controller, fix instance endpoint 2022-03-22 21:56:22 -06:00