friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-25 14:26:07 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
36622 commits 3 branches 63 tags 248 MiB
Commit graph

979 commits

Author SHA1 Message Date
Roland Häder 44a9ec9b17
Rewrite: 
- avoid having array|string for $table to have a "string" type-hint for $table
- you now have to do it for yourself by giving 'schema.table' as parameter
 2022-06-21 13:47:38 +02:00
Roland Häder adb4aea6ad
Changes: 
- added some type-hints
- replaced most double-quotes (only Diaspora.php, later more) with single
- added some documentation
- normalized indenting in Diaspora.php (I hope I got all?)
 2022-06-18 05:03:10 +02:00
Roland Häder 33768ea1c6 Some fixes: 
- $gsid's default value cannot sadly be 0, it now must be null to allow some
  code work
- added some more type-hints
- documented a bit more
 2022-06-17 17:18:31 +02:00
Roland Häder 2c5595c358 Another incompatible method declaration fixed + type-hints added 2022-06-17 17:18:31 +02:00
Roland Häder 40d7f29a11 Continued: 
- more type-hints
- fixed incompatible method declarations
 2022-06-17 17:18:31 +02:00
Roland Häder 5106bb2881
Added parenthesis 2022-06-17 09:41:11 +02:00
Roland Häder a903dbd77e
Wrong braces causing 'undefined index causer-id'. See #11632 2022-06-16 23:00:16 +02:00
Roland Häder 962b06bf41
Added check as suggested by @MrPetovan for empty $message. 2022-06-16 16:54:51 +02:00
Roland Häder 143e4c4a18
Added more known type-hints 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2022-06-15 21:52:50 +02:00
Michael 2064a2ce87 Avoid notice when a contact couldn't be fetched 2022-06-08 05:35:34 +00:00
Michael d2772908e4 Fix: respected the account type on the community page update 2022-06-07 18:52:46 +00:00
Michael 557b1125e2 Hopefully make threads writable 2022-06-05 20:38:05 +00:00
Michael 50a0034744 Fix avatar for messages and feeds 2022-06-04 07:57:11 +00:00
Michael 0aee9a054a Fix: Like/Dislike/Reshare actions should now be visible 2022-06-03 17:40:06 +00:00
Michael 1dccc31508 Issue 11469: Repect desktop notification settings 2022-05-29 09:20:06 +00:00
Michael 881c4204b4 Issue 11431: Only show pinned posts on contacts and your own ones 2022-05-28 15:55:31 +00:00
Michael 087ad25c87 Escape the "share" as well 2022-05-21 11:55:38 +00:00
Michael 54d7a435a3 Don't parse tags in links 2022-05-21 11:46:38 +00:00
Michael 4daae255d8 Performance: Avoid queries where there is no media or category 2022-05-16 17:06:58 +00:00
Michael fae414fedd Fix local avatar, improve speed for fetching cached photos 2022-05-10 18:18:24 +00:00
Michael 630d25a24b Issue 11353: Suppress the forum sharer 2022-05-09 20:52:08 +00:00
Hypolite Petovan e1f32f7f15
Merge pull request #11477 from annando/avatar-file-cache 
Cache contact avatars locally as files
 2022-05-09 11:13:08 -04:00
Michael e3692c0105 Replaced check with hardwired path 2022-05-09 04:26:00 +00:00
Michael f220e26f00 Use new function to check for a local avatar cache file 2022-05-08 10:32:29 +00:00
Hypolite Petovan 510dacf4df Escape BBCode tag parsing avoidance tags when processing abstracts 
- Improve documentation for related methods
 2022-05-07 22:19:50 -04:00
Michael Vogel 1e7a55180a
Update src/Content/Conversation.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-05-05 22:40:20 +02:00
Michael 4d359b7de1 Move the plink functionality to the right function 2022-05-05 07:57:52 +00:00
Michael f6218427a4 Use the uri-id to fetch the contact 2022-05-03 21:51:56 +00:00
Michael 4ba28e0199 Merge remote-tracking branch 'upstream/2022.05-rc' into performance 2022-05-03 08:23:09 +00:00
Michael 1f43332a1d Only fetch category when it exists 2022-04-30 06:57:22 +00:00
Michael fb3353d4bd Separate loop to fetch thread parents 2022-04-30 06:19:18 +00:00
Michael 8dc0ab9bb3 Test: Disable magiclink in posts 2022-04-29 09:49:16 +00:00
Michael d3de2497bc Use gsid for the network name 2022-04-29 07:47:24 +00:00
Michael d44641e58c Fetch avatar by id 2022-04-29 07:30:13 +00:00
Michael 1326239576 Reduce the amount of queries 2022-04-29 05:32:12 +00:00
atjn 31ed9b450d Update default icon 2022-04-28 12:41:26 +02:00
Michael 171354181d Use central function to fetch the global directory 2022-04-26 18:33:58 +00:00
Michael 2236e5cfb0 Issue 11425: Additional sorting by creation date 2022-04-20 21:03:33 +00:00
Michael 0d8cf06e4a Experimental feature to enter a custom creation date 2022-04-13 05:31:32 +00:00
Hypolite Petovan 4eecf733e1
Merge pull request #11389 from nupplaphil/feat/http_client_arg 
Introduce explicit HttpClient "Accept" parameter
 2022-04-08 15:05:40 -04:00
Michael 75bc4eccb7 Display featured posts for contacts 2022-04-07 21:52:25 +00:00
Philipp Holzer 04866195b4
Remove accept parameter for head/post again 2022-04-03 19:33:09 +02:00
Philipp Holzer e299fc67c8
Introduce "accept_header" as specific argument to the http client 2022-04-02 21:16:53 +02:00
Philipp Holzer 73c3b21665
Move ACCEPT constants to own "enum" class 2022-04-02 20:26:11 +02:00
Michael 28e3eee91b Add "Accept" to "head" 2022-03-29 13:34:54 +00:00
Michael 1fae0123ec Some more "accept" parameters are added 2022-03-29 06:24:20 +00:00
Michael 8c34c3b8ae Don't display Peertube groups as forums 2022-03-24 11:30:32 +00:00
Michael 13addaf901 Always provide the title variable 2022-03-22 07:07:33 +00:00
Michael be016b0c45 Prioritize the title over the content warning 2022-03-22 07:00:44 +00:00
Michael a2a5f05a19 Issue 11310: Show pinned posts when not logged in 2022-03-21 22:58:23 +00:00
Michael e0295abdab Replace abstract content with a space to prevent missing spaces 2022-03-08 19:58:55 +00:00
Michael 903bc9b679 Improved support for Mastodon style content warnings 2022-03-06 11:49:55 +00:00
Michael 5539e42743 API: Support for the "direct" visibility 2022-03-05 06:14:30 +00:00
Michael f853d58198 API: Forum mentions are now working 2022-03-02 06:59:07 +00:00
Michael ec0b05d826 Display announces identital for starting posts and comments 2022-02-21 05:17:54 +00:00
Hypolite Petovan 30dcf3380c Show only the user's categories on their profile 2022-02-18 23:58:23 -05:00
Michael 9a764516d0 Use the "contact-type" instead of "forum" or "prv" 2022-02-09 06:52:16 +00:00
Hypolite Petovan 237492979c Add rel="tag" to the HTML Purifier allow list in BBCode::convert 
- This enables Mastodon to recognize hashtag links and prevent unwarranted link previews
 2022-02-01 08:20:45 -05:00
Michael 54d474d0e4 function documentation clarified 2022-01-31 05:47:18 +00:00
Michael 8034a48ffe "inform" functionality moved / unified functionality 2022-01-30 10:56:13 +00:00
Tobias Diekershoff d5665331fe
missing "as" in string 
A translator from the SV team discovered a missing "as" in a string.
 2022-01-21 14:23:30 +01:00
Hypolite Petovan aeb112ab5f Fix bidi support in shared posts 
- Display was wrong when language direction was different between nickname and content
 2022-01-17 07:39:05 -05:00
Michael 95f085b7ac API: The legacy API finally moved 2022-01-15 21:38:19 +00:00
Balázs Úr 733f3de9ed Add missing copyright text 2022-01-02 10:49:50 +01:00
Philipp 322b7c856c
Merge pull request #11129 from urbalazs/copyright-2022 
Update copyright
 2022-01-02 09:45:35 +01:00
Balázs Úr e56a53647b Update copyright 2022-01-02 08:27:47 +01:00
Michael 33f080d118 Remove obsolete network guessing function 2021-12-07 07:28:55 +00:00
Hypolite Petovan e7d87d3524 Suppress notice messages related to the VCard::getHTML call in mod/display 
- Address https://soc.schuerz.at/display/4edd2508-6661-a8d1-f168-b2a245440386
 2021-12-02 09:45:32 -05:00
Philipp Holzer 4cc36c9b2c
Fix BBCode::expandTags() & Remove AppMockTrait 2021-11-28 13:07:38 +01:00
Philipp Holzer b5d2d32b44
Split and delete ModuleController 
- $moduleName is part of the argument string => App\Arguments
- $isBackend boolean already part of App\Mode::isBackend()
- $module is now the direct return of App\Router::getModule()
- ModuleController::run() moved to BaseModule::run()
 2021-11-27 12:39:45 +01:00
Hypolite Petovan 23e1130264 Move title attribute to <time> tag 
- Use correct machine-readable value in datetime attribute
 2021-11-21 22:51:21 -05:00
Michael eb1b2256a0 Removed and replaced deprecated functionalities 2021-11-07 14:00:47 +00:00
Michael 63da4a75e9 The boot.php had been cleared of most functions 2021-11-04 20:29:59 +00:00
Philipp Holzer 409d909d0f
Restructure HTTPClient for new paradigm 2021-10-28 20:01:03 +02:00
Hypolite Petovan 24f8ee8e67
Merge pull request #10918 from nupplaphil/feat/core_new_paradigm 
Paradigm Restructuring Part 1 - Core classes
 2021-10-27 13:45:40 -04:00
Tobias Diekershoff 2a0d3da070 fix link to media tab in navigation 
In #10904 the wrong link was set, this PR should fix it and really point towards the media tab of the profiles.
 2021-10-27 15:09:37 +02:00
Philipp Holzer b216317477
Refactoring Core class structures ... 2021-10-26 22:11:09 +02:00
Philipp Holzer 68046573a4
Restructure Cache to follow new paradigm 2021-10-26 22:11:06 +02:00
Tobias Diekershoff bc65f10190 replace the video entry in the Nav.php with media as well 2021-10-20 15:11:30 +02:00
Michael Vogel df99ca8d82
Merge pull request #10888 from MrPetovan/task/10887-bbcode-style-block 
Add conditional block output for BBCode tag [style]
 2021-10-18 20:19:53 +02:00
Michael Vogel 1dc613a0a1
Merge pull request #10889 from MrPetovan/task/10886-bbcode-remove-class 
Deprecate limited-use and potentially confusing [class] BBCode tag
 2021-10-18 19:28:07 +02:00
Hypolite Petovan 6f290607de
Merge pull request #10890 from xundeenergie/improve-links 
Improve links
 2021-10-18 09:08:48 -04:00
Hypolite Petovan 39aff642aa Deprecate limited-use and potentially confusing [class] BBCode tag 
- Replace its usage in Mastodon emoji with an internal tag [emoji]
 2021-10-18 02:45:42 -04:00
Jakobus Schürz (admin) 4aaa5a6a46 open provider-url in new tab 2021-10-18 08:41:45 +02:00
Jakobus Schürz (admin) c450a7a757 open link from picture in new tab 2021-10-18 08:39:01 +02:00
Hypolite Petovan 4bee4818cf Add conditional block output for BBCode tag [style] 
- Move new line conversion to <br> tags
- Update BBCode help page
 2021-10-17 21:27:05 -04:00
Hypolite Petovan f9165fbaf0 Decode HTML entities in code blocks in HTML::toBBCode 
- Replace PHP_EOL uses with the more common \n
 2021-10-15 11:36:40 -04:00
Michael 86947b0997 Replace "p" with "select" 2021-10-11 06:25:04 +00:00
Michael 41dc6cea2b Replace the legacy function 2021-10-11 04:33:10 +00:00
Michael 2c134c5229 q is now completely removed 2021-10-09 21:16:15 +00:00
Hypolite Petovan b214470b1a Replace remaining explicit network value checks by Protocol::supportsFollow calls 2021-10-09 02:10:16 -04:00
Michael ab17fbf6b2 Unneeded "ProxyUtils" renamed to "Proxy" 2021-10-05 20:18:19 +00:00
Hypolite Petovan 9935e8e711 Remove event.adjust field 
- It was confusing and introduced complexity that wasn't worth the unclear gain
 2021-10-03 13:42:32 -04:00
Michael 9961943b73 Code Style: Replace "AS" with "as" 2021-10-03 10:34:41 +00:00
Michael 5a7bd4884a Issue 10772: Avoid duplicated links in AP posts 2021-09-27 20:26:08 +00:00
Michael 1bb25de287 Applied change from PR #10763 2021-09-26 12:17:30 +00:00
Michael e08c5ca2e0 Another try ... 2021-09-26 04:16:21 +00:00
Michael 1e583b4f35 Space removed 2021-09-26 04:07:02 +00:00
Michael 171cbf0512 Removed spaces 2021-09-26 04:05:46 +00:00
Michael d4fd151227 Partly reverting formatting to cause a code style checker error 2021-09-25 08:06:38 +00:00
Michael 5cfb0cb58a Last style stuff ... 2021-09-24 04:52:34 +00:00
Michael 943f1961ea Style again 2021-09-24 04:50:47 +00:00
Michael 8fd8241797 Style again 2021-09-24 04:46:30 +00:00
Michael 64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael f696fce824 Reformatting 2021-09-23 21:53:52 +00:00
Michael 26fa5e8b3f Moved functions 2021-09-23 21:29:36 +00:00
Michael 0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Michael 325342a886 Renamed variable 2021-09-19 17:56:44 +00:00
Michael f032f66b38 Display the public contacts for profile visitors 2021-09-19 10:06:42 +00:00
Michael Vogel 5246b9c4b0
Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities 
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
 2021-09-12 06:47:51 +02:00
Hypolite Petovan 8e99b7f775 Refine BBCode::expandTags regular expression 
- Now requires the tag to be preceded by either a non-word character or a start of a line
- Added corresponding tests
 2021-09-12 00:06:14 -04:00
Michael 6579a3a106 Use post type "photo" for multiple photos as well 2021-09-12 01:58:29 +00:00
Michael 547a13661a Don't offer to unfollow yourself 2021-09-02 19:38:10 +00:00
Philipp Holzer 13a91e63aa
Rename DI::httpRequest() into DI::httpClient() 2021-08-25 21:54:54 +02:00
Philipp Holzer 505100bdd7
Rename HTTPRequestOptions to HTTPClientOptions 2021-08-25 21:45:15 +02:00
Philipp Holzer aad7bac686
Use HTTPRequestOptions constants for HTTPClient::post() 2021-08-25 21:31:30 +02:00
Philipp Holzer 65ca164487
A lot of Fixings 2021-08-20 21:35:14 +02:00
Philipp Holzer 06371d29a6
Cleanup 2021-08-20 20:03:42 +02:00
Philipp Holzer 803c1d71de
Fix IHTTPResult::getHeader() 
- Now returns a string array, like expected
- Fix usages
- Fix dataset
 2021-08-20 19:58:42 +02:00
Michael 6899d3c618 Meaningful notification message 2021-08-19 13:58:55 +00:00
Michael Vogel fa65c436f4
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-08-12 18:04:01 +02:00
Michael 473adaf463 Mark, file and starring does now work for all items 2021-08-12 05:28:47 +00:00
Michael c81e81dc8d "getUserId" is now "getLoggedInUserId" 2021-08-09 20:33:46 +00:00
Michael 15b93b4459 "getUserNickname" is now "getLoggedInUserNickname" 2021-08-09 19:48:39 +00:00
Michael 4495e83eca Merge remote-tracking branch 'upstream/develop' into app-user2 2021-08-09 15:32:32 +00:00
Michael b8fa75b2dd Changed function name 2021-08-09 15:29:07 +00:00
Michael bee04f86ee Matrix addresses can be entered in the profile 2021-08-09 01:39:09 +00:00
Michael 9f01052dd2 Removed some more unused "use" 2021-08-08 20:03:28 +00:00
Michael 28090bd793 Get rid of App->user completely 2021-08-08 19:30:21 +00:00
Michael fc283ab928 Remove direct calls to App->user 2021-08-08 10:14:56 +00:00
Michael 6f40904ea1 Increased version 2021-07-28 10:18:34 +00:00
Michael d58eaa13d1 Issue 10545: Convert complex zmg BBCode elements 2021-07-27 21:44:02 +00:00
Michael c89533a70b Support for stacked profiler analysis 2021-07-27 04:57:29 +00:00
Michael 1539d76fda Forgotten variable 2021-07-25 20:39:03 +00:00
Michael 5a87ccf026 Getter/Setter for theme info 2021-07-25 19:39:10 +00:00
Michael c52b8595e8 theme infos are now bundled in a single array 2021-07-25 19:07:03 +00:00
Michael 8f46064430 Using getter/setter functions 2021-07-24 20:34:07 +00:00
Michael b3b5599d27 Show the network icon for the contact 2021-07-24 12:21:33 +00:00
Michael 30aad250df App->contact is now removed 2021-07-24 11:49:11 +00:00
Michael 2502a9192d Many more app-variables removed 2021-07-24 10:09:39 +00:00
Michael 2fae93d8fd More standards 2021-07-23 13:09:12 +00:00
Michael 90d7360252 Standards 2021-07-23 13:08:41 +00:00
Michael afe3c8954c Simplified functionality to load the profile in the sidebar 2021-07-23 12:39:37 +00:00
Michael bb222209bc Some small performance tweaks 2021-07-22 15:35:30 +00:00
Michael 71f53c946f New function to replace mentions with nicknames 2021-07-22 09:13:39 +00:00
Michael bb5f738619 Fix for Mastodon falsely adding previews to mentions 2021-07-22 04:50:01 +00:00
Michael 69c6a5f567 Avoid "DB Error" messages 2021-07-21 03:43:30 +00:00
Hypolite Petovan 2b5f1f8bca
Merge pull request #10493 from annando/api 
Improve how shared posting look on mobile apps
 2021-07-13 22:48:31 -04:00
Michael 5526421607 Issue 10491: Possibility for simple shortening added 2021-07-13 22:37:22 -04:00
Michael ff8f350a42 Change the BBCode version 2021-07-13 20:37:06 +00:00
Michael 875a6b81ef Improve links for API 2021-07-13 14:40:10 +00:00
Michael 267b652857 Improve how shared posting look on mobile apps 2021-07-13 08:30:05 +00:00
Michael 219534e88c Accepting "null" as parameter value 2021-07-11 14:37:17 +00:00
Michael 7390791d21 Avoid problems with "null" values 2021-07-11 11:11:03 +00:00
Michael d8974c9a2a Function renamed to better reflect the functionality 2021-07-09 06:29:24 +00:00
Michael 17ae9b71af Avoid error on empty content 2021-07-09 04:42:01 +00:00
Michael c972cce740 Avoid notice 2021-07-08 16:38:02 +00:00
Michael f29bd23ea8 New function to convert BBCode for a given ID 2021-07-08 13:47:46 +00:00
Michael f3452d86c4 Improved logging, improved link check 2021-07-06 17:40:40 +00:00
Michael d0136222e7 Further simplification 2021-07-06 09:24:25 +00:00
Michael 12173df4d3 Replace proxy function 2021-07-06 09:22:41 +00:00
Michael 8bfa15cf23 Simplify the attachment handling 2021-07-06 08:57:49 +00:00
Michael b7a4ef0ec1 Modfy links for attachments 2021-07-06 08:40:59 +00:00
Michael cdc18387fd Use the uri-id directly in the bbcode converter 2021-07-06 05:25:30 +00:00
Michael db90e3bf25 Remove attachment on plaintext conversion 2021-07-05 20:20:39 +00:00
Michael 90588ddb8e Avoid proxyfying images that are removed or replaced later 2021-07-05 07:00:35 +00:00
Michael e519b782fd Simplified proxy handling 2021-07-04 21:24:49 +00:00
Michael 9cf39dbf00 Quickfix for hashtags in usernames in shared posts 2021-07-02 04:34:49 +00:00
Michael b46b7b08ba Reduce the usage of the "proxifyUrl" function 2021-06-27 11:50:10 +00:00
Hypolite Petovan 303c9d4a54 Check Content\Item::replaceTag return for false return value before using it 
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-835547443
- Remove unused code in Content\Item::replaceTag
 2021-05-31 08:29:50 -04:00
Michael a9302c30c3 simplify the calendar download 2021-05-29 17:09:45 +00:00
Philipp Holzer 965cd8b096
Fix PHP 7.0 Coding Standards 2021-05-22 23:47:35 +02:00
Michael 6fe916a390 API: improved mail handling 2021-05-22 13:37:04 +00:00
Hypolite Petovan 93f3c511dc Fix wrong display of mentions in RTL context 2021-05-20 08:39:36 -04:00
Michael 1cc341033f API: We now can post statuses via API 2021-05-15 22:40:57 +00:00
Hypolite Petovan cac038639d Capitalize post action translation strings 2021-05-11 16:01:07 -04:00
Hypolite Petovan 43638fa29b Fix undefined variables in nav.tpl 
- Reworked the nav_info hook to include the rest of the array keys defined in Nav::getInfo
- Replaced the theme-specific template variable nav.userinfo with the regular userinfo in frio nav.tpl
- Initialized all the nav array keys
 2021-05-10 19:03:33 -04:00
Michael f683f791ee Avoid duplicated attachments / unwanted attachments 2021-05-05 16:46:55 +00:00
Michael 8f318e492e Don't transmit smiley links to external systems 2021-05-04 21:07:41 +00:00
Michael 4ffb67e73c Another "curl" call is replaced with a standard call 2021-05-04 11:39:56 +00:00
Michael 60bec48f61 Replace "curl" calls with centralized "head" function 2021-05-04 11:35:23 +00:00
Michael 0616f5230c Only detect http links 2021-05-02 17:53:11 +00:00
Michael 77e1ec6df2 Improved link detection 2021-05-02 17:33:32 +00:00
Hypolite Petovan 5bca6fe98c Add RTL support for display names in mentions 2021-05-01 15:32:17 -04:00
Michael b88c9f9d67 Handling bottom anchor and top anchor 2021-04-29 19:29:29 +00:00
Michael 8541e248bb Less greedy when replacing attachment elements 2021-04-29 04:14:44 +00:00
Michael 44c801905a Improve page load performance with attached links 2021-04-27 12:29:54 +00:00
Michael f25c3f4619 Merge remote-tracking branch 'upstream/develop' into media-handling 2021-04-26 09:01:26 +00:00
Michael 8685e5ca32 Reworked media handling 2021-04-26 06:50:12 +00:00
Philipp Holzer 6acedcb25e
Fix empty needle after trimming at PageInfo 2021-04-23 21:12:00 +02:00
Michael f21d04e01e Simplified code 2021-04-19 04:18:43 +00:00
Michael 02700194c1 Fix photo post detection / url check in publisher url 2021-04-18 14:38:12 +00:00
Michael 346714eb88 Unneded class removed 2021-04-16 14:30:08 +00:00
Michael 676f62c012 Returning the correct data in oembed with photos 2021-04-16 05:33:52 +00:00
Michael 5a00902e11 Avoid HTML parsing of an empty body 2021-04-10 05:46:19 +00:00
Michael 99e93d2ba8 Remove empty lines arounf the horizontal ruler, no maximum height 2021-04-07 12:17:35 +00:00
Hypolite Petovan 1849bf0a12
Merge pull request #10124 from annando/media-attachments 
Attached audio is now displayed with the audio element
 2021-04-05 13:26:09 -04:00
Michael 770b9359a4 Harmonize the video display 2021-04-05 11:45:03 +00:00
Hypolite Petovan 3027b7d3aa Prevent HTMLPurify from removing ForkAwesome icon tags 2021-04-04 20:21:31 -04:00
Hypolite Petovan 62e7d0f40a Update HTML::purify debug comment formatting 2021-04-04 20:21:10 -04:00