405 commits

Author	SHA1	Message	Date
a	9471fa0078	more semantically correct webfinger (use rel=self, allow type=ld+json)	2022-12-23 08:21:03 -06:00
a	9bf651e442	remove unneeded duplicate accept type	2022-12-23 08:12:59 -06:00
Daniel Supernault	de56b0f078	Update MediaStorageService, clear MediaService and StatusService caches after localToCloud	2022-12-17 23:18:07 -07:00
Daniel Supernault	3328b367fd	Add optional home feed caching	2022-12-16 00:43:20 -07:00
Daniel Supernault	66226658db	Update MediaStorageService, improve support for pleroma .blob avatars	2022-12-12 23:46:51 -07:00
daniel	6157e7a501	Merge pull request #3932 from pixelfed/fix-content-type ... fix typo: http -> https	2022-12-12 19:15:29 -07:00
a	e380868b44	fix typo: http -> https	2022-12-12 17:30:48 -06:00
Daniel Supernault	81f7d17263	Update FollowerService, improve cache invalidation	2022-12-07 02:50:13 -07:00
Daniel Supernault	f46b01af51	Update FollowerService, use redis sorted sets for following relations	2022-12-06 23:41:05 -07:00
daniel	80acafc67a	Merge pull request #3905 from pixelfed/fix-content-type ... Fix: Use correct Content-Type over ActivityPub	2022-12-06 19:48:48 -07:00
a	6bf1bea325	Fix: Use correct Content-Type over ActivityPub ... This was causing federation issues	2022-12-05 14:05:15 -06:00
Daniel Supernault	356cc2774a	Update FollowerService, use redis sorted sets for follower relations	2022-12-05 05:27:27 -07:00
Daniel Supernault	da00287a8e	Update AP helpers	2022-12-05 00:46:55 -07:00
Daniel Supernault	a12712cc88	Update MediaService, add summary attribute for better alt text federation	2022-12-04 20:29:01 -07:00
Daniel Supernault	02edd19d4d	Update Avatar pipeline, fix cloud storage media_path	2022-12-02 02:45:35 -07:00
Daniel Supernault	d52ee26dd7	Update AvatarStorage pipeline	2022-12-02 01:36:23 -07:00
Daniel Supernault	319f0ba50f	Update MediaStorageService, fix size check bug	2022-12-01 23:13:44 -07:00
Daniel Supernault	5cac7fb44f	Revert nsfw posts hidden on local/network timelines by default	2022-11-28 05:13:12 -07:00
Daniel Supernault	3ebae614ce	Hide nsfw posts from public/network timelines by default	2022-11-25 22:57:31 -07:00
Daniel Supernault	989e42497a	Update Profile, fix avatarUrl paths. Fixes #3559 #3634	2022-11-18 02:26:18 -07:00
Daniel Supernault	e71972d8f1	Update ApiV1Controller, map AccountService	2022-11-17 20:13:26 -07:00
Daniel Supernault	8b7121f9fb	Update AccountService, fix delete status	2022-11-17 19:51:48 -07:00
Daniel Supernault	94697d536b	Add Server Directory integration	2022-11-13 20:11:07 -07:00
Daniel Supernault	b0422d4f26	Fix remote profile avatar urls when storing locally	2022-10-08 22:59:33 -06:00
Daniel Supernault	1de7a136f6	Update MediaStorageService	2022-10-07 06:16:54 -06:00
Daniel Supernault	b8ad594a05	Update CollectionController	2022-10-02 18:55:16 -06:00
Daniel Supernault	84e152896b	Update CollectionController	2022-10-01 05:36:07 -06:00
Daniel Supernault	eac3220ffd	Update CollectionService, revert timestamp change	2022-10-01 00:14:26 -06:00
Daniel Supernault	3bf792072a	Update CollectionService	2022-10-01 00:07:28 -06:00
Daniel Supernault	c40b2f091f	Update CollectionService	2022-09-30 23:48:11 -06:00
Daniel Supernault	5ec25204ca	Update LikeService, fix typo	2022-09-29 04:50:10 -06:00
Daniel Supernault	20d9f8b890	Update LikeService	2022-09-21 05:34:39 -06:00
Daniel Supernault	4514ab1dbe	Update SettingsController, fix double json encoding and cache settings for 7 days	2022-09-19 03:39:33 -06:00
Daniel Supernault	4d95d2cb7f	Add ProfileStatusService	2022-09-12 21:26:22 -06:00
Daniel Supernault	d72cd819d2	Update PronounService, fix jsonn_decode null parameter	2022-09-11 05:42:49 -06:00
Daniel Supernault	9d31f73bfa	Fix SearchApiV2Service, improve webfinger condition	2022-08-31 21:37:43 -06:00
Daniel Supernault	949b7bb6ea	Update NotificationService, fix account attribute	2022-08-29 20:06:59 -06:00
Daniel Supernault	533f7165a9	Update SearchApiService, improve account/webfinger results	2022-08-28 06:28:46 -06:00
Daniel Supernault	f6ed560e78	Limit NotificationService to 400 items	2022-08-17 23:08:40 -06:00
Daniel Supernault	0b7d0a9627	Add customizable Legal Notice page	2022-08-15 23:39:33 -06:00
Daniel Supernault	d1dbed8932	Fix AdminStatService cache key, fixes #3612	2022-08-15 20:35:52 -06:00
Daniel Supernault	eba84530aa	Fix mastoapi notification type casting to include comment and share (mention and reblog) notifications	2022-08-04 02:13:33 -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
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	f51ffa7eab	Update LiveStreamController, clear chat after stream ends	2022-06-26 19:37:05 -06:00
Daniel Supernault	44f4a9edd9	Improve CollectionService cache invalidation, fixes #3548	2022-06-18 23:47:16 -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	4ecbd7cbe4	Update FollowerService	2022-06-05 02:35:14 -06:00
Daniel Supernault	5206f21f59	Add Live Stories/Live streaming	2022-05-26 01:59:54 -06:00
noellabo	2093d1b33b	Change ISO-8601 to RFC 3339 EXTENDED	2022-05-21 05:14:22 +09:00
Shlee	e36be67c70	unwanted semicolons	2022-05-14 19:12:07 +09:30
Daniel Supernault	8f9d36bd3d	Cleanup, fixes #3440	2022-05-14 00:36:52 -06:00
Daniel Supernault	153eb6ba4c	Update HashtagService, use sorted set for followed tags	2022-05-09 02:01:33 -06:00
noellabo	74cc41d4fa	Add Content-Type and User-Agent for activity delivery	2022-05-03 01:58:20 +09:00
Daniel Supernault	cc6b78c436	Update StatusService	2022-04-18 01:59:27 -06:00
Daniel Supernault	488561c270	Update ConfigCacheService, fail to fallback earlier	2022-04-09 22:33:14 -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	93a9769e47	Update ApiV1Controller, add markers endpoint	2022-03-24 23:37:19 -06:00
Daniel Supernault	9dac861ebe	Update ApiV1Controller, fix search v2 entities	2022-03-23 05:58:14 -06:00
Daniel Supernault	afe903c36e	Update ApiV1Controller, fix notification entities	2022-03-23 00:28:39 -06:00
Daniel Supernault	74018e9c4e	Update search service, fix banned instance edge case	2022-03-16 22:38:42 -06:00
Daniel Supernault	72918a4b09	Update InstanceService, define cache keys	2022-03-12 23:32:31 -07:00
Daniel Supernault	281443d7fe	Update SearchApiV2Service, filter banned instances	2022-03-12 23:15:47 -07:00
Daniel Supernault	d48674154a	Update ReblogService	2022-03-11 00:00:47 -07:00
Daniel Supernault	4482482e2a	Update ReblogService	2022-03-10 23:58:47 -07:00
Daniel Supernault	ebe9c54dae	Update ReblogService	2022-03-10 23:55:32 -07:00
Daniel Supernault	3ef6c9fe81	Improve reblog api performance	2022-03-10 23:34:34 -07:00
daniel	018f7e10a3	Merge pull request #3294 from rm-yakovenko/issues/3288 ... Fix: Undefined index: replies_count	2022-03-08 21:05:48 -07:00
Daniel Supernault	aba0c97cee	Add CollectionService	2022-03-08 20:56:08 -07:00
Rm Yakovenko	72da667305	#3288 Fix: Undefined index: replies_count ... https://github.com/pixelfed/pixelfed/issues/3288	2022-03-07 09:21:05 +02:00
Daniel Supernault	ad48521a35	Update ConfigCacheService, fix discover features	2022-03-01 21:49:09 -07:00
Daniel Supernault	6af842eb3e	Update LikeService, improve caching logic and add profile id to likedBy method to fix #3271	2022-02-26 22:41:57 -07:00
Daniel Supernault	6cfd6be523	Add ReblogService, improve reblogged state for api entities	2022-01-28 22:06:43 -07:00
Daniel Supernault	a7d715517d	Update StatusService, use BookmarkService for bookmarked state	2022-01-28 20:57:25 -07:00
Daniel Supernault	a11772bcfe	Update BookmarkService, use sorted set	2022-01-28 18:27:53 -07:00
Daniel Supernault	0157566c25	Add BookmarkService	2022-01-27 05:17:55 -07:00
Daniel Supernault	16e725183e	Update ApiV1Controller, add custom_emoji endpoint	2022-01-25 02:08:50 -07:00
Daniel Supernault	792212b655	Cleanup	2022-01-22 19:42:37 -07:00
Daniel Supernault	aff7456639	Update WebfingerService. Fixes #3167	2022-01-22 19:37:50 -07:00
Daniel Supernault	dbb1638fd6	Invalidate status cache after importing custom emoji	2022-01-21 01:28:36 -07:00
Daniel Supernault	dc17c9fc27	Improve emoji import	2022-01-19 00:46:30 -07:00
Daniel Supernault	01798daf56	Update AP helpers, import Emoji tags	2022-01-18 23:26:44 -07:00
Daniel Supernault	ca79e26d3a	Add custom emoji	2022-01-18 23:03:21 -07:00
Daniel Supernault	1c20d6960a	Update MediaStorageService, fix reremote avatar bug	2022-01-17 17:11:16 -07:00
Daniel Supernault	c8a667f20e	Update SearchApiV2Service, resolve remote queries	2022-01-09 23:15:45 -07:00
Daniel Supernault	a578035bbc	Update AccountService	2022-01-08 04:03:45 -07:00
Daniel Supernault	eeaf0f9311	Update StatusService	2022-01-07 19:59:29 -07:00
Daniel Supernault	46485426ea	Update ApiV1Controller, add mastoapi strict mode	2022-01-05 21:36:02 -07:00
Daniel Supernault	454b4e21dd	Update Services, fix mastoapi compat	2022-01-03 02:31:03 -07:00
Daniel Supernault	85e4be8172	Update AccountService, add getMastodon method for mastoapi compatibility	2022-01-03 00:53:15 -07:00
Daniel Supernault	36a129fe89	Update StatusService, add getMastodon method for mastoapi compatibility	2022-01-02 23:47:08 -07:00
Daniel Supernault	b4bd0400c2	Store remote avatars locally if S3 not enabled	2022-01-02 21:30:02 -07:00
Daniel Supernault	e5f8f3441c	Update AccountService, fix json casting	2021-12-30 23:11:46 -07:00
Daniel Supernault	937cdfb7f9	Update StatusService	2021-12-21 21:40:10 -07:00
Daniel Supernault	aee9b994e3	Improve DiscoverService	2021-12-19 04:07:40 -07:00
Daniel Supernault	493c5ca0ce	Add DiscoverService	2021-12-19 00:43:09 -07:00
Daniel Supernault	83b48b5681	Update StatusService, improve cache invalidation	2021-12-12 22:30:55 -07:00
Daniel Supernault	c2910e5d42	Update MediaService, return empty array if cantt find status	2021-12-12 19:33:20 -07:00
Daniel Supernault	19d140b020	Update FollowerService	2021-12-04 17:37:44 -07:00
Daniel Supernault	f88b3a2fb9	Update StatusService, add getDirectMessage method	2021-12-04 17:33:32 -07:00
Daniel Supernault	fbaed93eda	Update SearchApiV2Service, improve performance and include hashtag post counts when applicable	2021-12-04 17:32:43 -07:00
Daniel Supernault	a37971dd28	Add HashtagService	2021-12-04 17:31:53 -07:00
Daniel Supernault	9d9e9ce7fa	Update MediaStorageService, improve header parsing	2021-12-04 17:30:05 -07:00
Daniel Supernault	2aa73c1ffa	Update AccountService, add dynamic user settings methods	2021-12-04 17:27:58 -07:00
Daniel Supernault	e5387d6742	Add StatusMentionService, fixes #3026	2021-12-03 20:47:00 -07:00
Daniel Supernault	639e9859ed	Add AutolinkService	2021-11-15 19:33:52 -07:00
Daniel Supernault	4cb956aea2	Update AdminStatsService, add storage() method	2021-11-10 21:54:50 -07:00
daniel	59d76bb9b3	Merge pull request #2956 from h3xx/fix-psql-grouping ... Fix grouping error in PostgreSQL	2021-11-10 21:53:30 -07:00
Daniel Supernault	2ae527c0f3	Update Status model, use AccountService to generate urls instead of loading profile relation	2021-11-03 23:29:12 -06:00
Daniel Supernault	192553ff77	Update public timeline api, add experimental cache	2021-10-21 19:02:15 -06:00
Dan Church	b167873632	Fix grouping error in PostgreSQL	2021-10-20 14:11:33 -05:00
Daniel Supernault	37abcf3898	Update public timeline api, use cached sorted set and client side block/mute filtering	2021-10-20 04:31:07 -06:00
Daniel Supernault	66f04bec25	Update InstanceService	2021-10-19 19:51:14 -06:00
Daniel Supernault	e5454620e6	Update HomeTimeline api	2021-10-07 04:49:33 -06:00
Daniel Supernault	80d9b9399a	Refactor following & relationship logic. Replace FollowerObserver with FollowerService and added RelationshipService to cache results. Removed NotificationTransformer includes and replaced with cached services to improve performance and reduce database queries.	2021-10-07 03:27:13 -06:00
Daniel Supernault	a900de2121	Update HttpSignatures, update instance actor headers. Fixes #2935	2021-09-20 00:21:16 -06:00
Daniel Supernault	4a609dc377	Update NotificationService, fix 500 bug	2021-09-19 23:05:56 -06:00
Daniel Supernault	0584f9ee95	Update ApiV1Controller, fix empty public timeline bug	2021-09-07 21:07:20 -06:00
Daniel Supernault	9e630851a3	Update AccountService, fix status bug	2021-09-04 21:12:44 -06:00
Daniel Supernault	6ae1ba0a64	Update StoryService, fix division by zero bug	2021-09-04 17:55:58 -06:00
Daniel Supernault	0d8d6bc71e	Update FollowerService	2021-09-03 20:51:56 -06:00
Daniel Supernault	6b0b2cfaa5	Update StoryService	2021-09-03 20:51:26 -06:00
Daniel Supernault	b32f4d91c4	Update Snowflake service	2021-09-03 20:51:05 -06:00
Daniel Supernault	da6943daed	Add InstancePipeline and NodeinfoService	2021-09-03 20:45:56 -06:00
Daniel Supernault	e5aea490b1	Refactor snowflake id generation to improve randomness	2021-09-01 22:46:57 -06:00
Daniel Supernault	0e13ab074c	Update SnowflakeService	2021-09-01 01:17:37 -06:00
Daniel Supernault	ef8e38298f	Update StatusService	2021-08-31 00:40:07 -06:00
Daniel Supernault	f9194df332	Update PollService	2021-08-31 00:39:32 -06:00
Daniel Supernault	2d93bc8b51	Update NotificationService	2021-08-31 00:39:03 -06:00
Daniel Supernault	07bc5d5c83	Update MediaStorageService	2021-08-31 00:38:43 -06:00
Daniel Supernault	450154e5af	Update MediaService	2021-08-31 00:38:27 -06:00
Daniel Supernault	427f9da33e	Update MediaPathService, change story paths	2021-08-31 00:38:07 -06:00
Daniel Supernault	168c19c5b6	Update LikeService	2021-08-31 00:37:40 -06:00
Daniel Supernault	2fb916c22b	Update InstanceService	2021-08-31 00:37:28 -06:00
Daniel Supernault	ad2db4aea7	Update FollowerService	2021-08-31 00:37:02 -06:00
Daniel Supernault	0573213093	Add StoryService	2021-08-31 00:29:17 -06:00
Daniel Supernault	7709220074	Add Polls	2021-08-04 20:29:21 -06:00
Daniel Supernault	acaf630dee	Update StatusService, invalidate profile embed cache on deletion	2021-07-27 00:13:03 -06:00
Daniel Supernault	3f8acb1266	Update AccountService, add syncPostCount method	2021-07-26 23:59:38 -06:00
Daniel Supernault	15c4fdd90c	Update StatusService, add non-public option and improve cache invalidation	2021-07-26 19:02:11 -06:00
Daniel Supernault	ee0028bc57	Update PublicApiController, use account service	2021-07-26 18:47:40 -06:00
Daniel Supernault	22257cc2a7	Update FollowerService, cache audience	2021-07-25 05:56:35 -06:00
Daniel Supernault	14a1367a8f	Federate Media Licenses	2021-07-25 03:17:49 -06:00
Daniel Supernault	09d5198c55	Update StatusTransformers, remove includes and use cached services	2021-07-24 23:10:44 -06:00
Daniel Supernault	728f10d778	Update Timeline.vue, improve followed hashtags	2021-07-16 01:20:21 -06:00
Daniel Supernault	135474ae11	Update DiscoverController, use UserFilterService on trendingApi	2021-07-15 20:48:39 -06:00
Daniel Supernault	c8824d1b51	Update FollowerService	2021-07-11 07:43:29 -06:00
Daniel Supernault	9650b668e9	Update PublicApiController, fix public timeline filtering	2021-07-08 17:33:51 -06:00
Daniel Supernault	08467d52d5	Update PublicTimelineService	2021-07-07 01:58:39 -06:00
Daniel Supernault	d43e6d8d07	Update NotificationService, use zrevrangebyscore for api	2021-07-06 20:10:42 -06:00
Daniel Supernault	918016a5ad	Update PublicTimelineService	2021-07-06 02:01:24 -06:00
Daniel Supernault	51a277e1ae	Update StatusHashtagService, fix null status bug	2021-07-05 23:40:54 -06:00
Daniel Supernault	447e44e5ac	Update LikeService	2021-07-02 01:31:45 -06:00
Daniel Supernault	117b8410eb	Update PublicTimelineService, skip adds for now	2021-07-02 01:21:21 -06:00
Daniel Supernault	3741c76da3	Update LikeService, skip self likes	2021-06-23 21:26:45 -06:00
Daniel Supernault	68aa25400b	Add Auto Following support for admins	2021-06-10 21:07:35 -06:00
Daniel Supernault	f767d99ad5	Update liked by, fix remote username urls	2021-05-31 22:43:53 -06:00
Daniel Supernault	af71913597	Update AdminStatsService, fix postgres bug	2021-05-25 01:36:13 -06:00
Daniel Supernault	eb7d5a4e36	New admin dashboard layout	2021-05-24 23:24:42 -06:00
Daniel Supernault	29947e157c	Update admin settings	2021-05-19 02:15:37 -06:00
Daniel Supernault	41792eea56	Update config() to config_cache()	2021-05-18 22:45:04 -06:00
Daniel Supernault	c9abd70e8a	Update LikeService, fix authentication bug	2021-05-14 17:15:08 -06:00
Daniel Supernault	4408e2ef8c	Update LikeService, show like count to status owner	2021-05-12 22:18:00 -06:00
Daniel Supernault	d2cb7d4770	Update ConfigCacheService, fix db issue	2021-05-11 23:33:08 -06:00
Daniel Supernault	fabb57a9d5	Add profile pronouns	2021-05-11 23:25:10 -06:00
Daniel Supernault	f2066b7401	Add admin config settings	2021-05-11 22:07:55 -06:00
Daniel Supernault	1d54204635	Update config() to config_cache()	2021-05-10 20:04:13 -06:00
Daniel Supernault	3136f8e137	Add ConfigCacheService	2021-05-07 21:34:58 -06:00
Daniel Supernault	a5e64da69b	Update LikeService, fix likedBy method	2021-05-03 17:55:06 -06:00
Daniel Supernault	477db75896	Add LikeService	2021-05-01 15:51:02 -06:00
Daniel Supernault	391b1287ac	Update ProfileService, use account transformer	2021-05-01 13:35:47 -06:00
Daniel Supernault	c20a9dfefe	Add InstanceService	2021-04-20 23:11:43 -06:00
Daniel Supernault	1769cdfd74	Update MediaStorageService, improve head checks to fix failed jobs	2021-02-17 01:09:39 -07:00
Daniel Supernault	37dbb3de29	Update MediaStorageService, dispatch deletes to MediaDeletePipeline	2021-02-05 21:00:29 -07:00
Daniel Supernault	b299da9311	Update AccountService, cache object and observe changes	2021-02-01 00:47:54 -07:00
Daniel Supernault	b16e9452bc	Update DiscoverController, deprecate unused endpoints	2021-01-30 23:13:54 -07:00
Daniel Supernault	aa4c718d79	Update StatusHashtagService, remove deprecated methods	2021-01-30 16:09:17 -07:00
Daniel Supernault	0355b567dd	Update StatusHashtagService, use StatusService for statuses	2021-01-30 16:07:12 -07:00
Daniel Supernault	6e44ae0b64	Update StatusService, add ttl of 7 days	2021-01-30 16:05:18 -07:00
Daniel Supernault	b7fcf8a504	Update StatusLabelService	2021-01-29 19:46:55 -07:00
Daniel Supernault	4abfe76a49	Update StatusLabelService, change config key	2021-01-28 18:42:15 -07:00
Daniel Supernault	ab888b2e70	Add StatusLabelService	2021-01-27 22:25:14 -07:00
Daniel Supernault	94a9f685b5	Update MediaStorageService, add avatar method	2021-01-25 21:54:30 -07:00
Daniel Supernault	654b08d382	Update ActivityPubFetchService, add url validation	2021-01-25 21:44:07 -07:00
Daniel Supernault	ce6ab80dba	Update MediaStorageService, clear transformer cache after storing media	2021-01-24 21:07:28 -07:00
Daniel Supernault	be6d12fcb6	Update MediaPipeline, handle cloud object storage	2021-01-24 13:30:31 -07:00
Daniel Supernault	234f72f3aa	Update ImageOptimizePipeline, add skip_optimize and MediaStorageService support	2021-01-17 21:59:34 -07:00
Daniel Supernault	aac4430970	Update MediaPathService, add story method	2021-01-17 21:46:40 -07:00
Daniel Supernault	b00e2b0868	Update EmailService	2021-01-17 15:33:56 -07:00
Daniel Supernault	3ee1215a4a	Add signed GET for secure mode compatibility	2021-01-17 12:51:07 -07:00
Daniel Supernault	c0076ab035	Add snowflake id service	2021-01-12 21:50:45 -07:00
Daniel Supernault	0fbde91e87	Update StatusService, cast response to array	2020-12-27 17:54:55 -07:00
Daniel Supernault	888ea7f07e	Update ap inbox	2020-12-18 02:58:00 -07:00
Daniel Supernault	941da5d589	Update admin dashboard	2020-12-18 00:52:49 -07:00
Daniel Supernault	1ea2db74b2	Update StatusService, fix json bug	2020-12-13 16:08:59 -07:00
Daniel Supernault	1b41d66446	Update EmailService, make case insensitive	2020-11-21 20:47:13 -07:00
Daniel Supernault	5d0a24a779	Add MediaBlocklistService	2020-07-26 22:14:57 -06:00