Commit Graph

1651 Commits

Author SHA1 Message Date
Michael 58cec97358 Merge remote-tracking branch 'upstream/develop' into loop-prevention 2021-07-19 07:51:29 +00:00
Michael 424a85bb94 Fetch local data without HTTP requests 2021-07-18 18:54:25 +00:00
Michael d8bf9c4601 Prevent loop also when fetching the outbox 2021-07-18 16:42:55 +00:00
Michael 2030691f9f Improved event storing / improved performance when fetching events 2021-07-18 15:05:46 +00:00
Michael f62f82df75 Move ActivityPub endpoints to an AP class 2021-07-17 20:28:46 +00:00
Michael 3a5523820c Legacy DFRN transport layer is removed 2021-07-15 13:28:32 +00:00
Michael d267ba999c We now use the new account-user-view (and fixed the function name) 2021-07-11 09:39:34 +00:00
Michael 07d2dfcd60 Some more "convertForUriId" replacements 2021-07-10 12:58:48 +00:00
Michael de39091a79 Revert some test changes 2021-07-09 19:32:06 +00:00
Michael 90897f36ca Fix notices because of unknown Hubzilla activity type 2021-07-09 19:30:41 +00:00
Michael d6c1e1fd1c Fix "Undefined index: reply-to-id" 2021-07-09 18:10:48 +00:00
Michael d8974c9a2a Function renamed to better reflect the functionality 2021-07-09 06:29:24 +00:00
Michael e72e74f7db Fixed function name 2021-07-08 15:44:55 +00:00
Michael f29bd23ea8 New function to convert BBCode for a given ID 2021-07-08 13:47:46 +00:00
Michael 37a76e70ef Providing the uri-id to "convert" when possible 2021-07-06 12:34:48 +00:00
Michael 3deb384c54 Replace the proxify function 2021-07-05 21:35:57 +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 f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Michael 5ee0f6e5e1 Transmit preview link 2021-07-04 06:30:54 +00:00
Hypolite Petovan c63dfa38c1
Merge pull request #10451 from annando/contact-path
Some more places changed to the new contact avatar path format
2021-06-30 21:24:27 -04:00
Michael 16de3454bc Change logo path 2021-06-30 20:00:57 +00:00
Michael b46ad72651 Fix media size 2021-06-30 19:55:28 +00:00
Michael 98dd4e889a Some more contact paths 2021-06-30 18:44:41 +00:00
Michael e2dc36a691 AP: Support "discoverable" 2021-06-30 05:40:11 +00:00
Michael 19aef93560 Unified avatar paths 2021-06-29 20:26:58 +00:00
Michael df05d6b52a Transmit mediaType for headers as well / use blank image for empty header 2021-06-22 13:58:29 +00:00
Michael dd39b3203b Transmit mediaType, preparation for header image 2021-06-22 03:17:41 +00:00
Michael a2b1819721 Fix notice "Undefined index: url in .../src/Protocol/ActivityPub/Transmitter.php on line 611" 2021-06-17 18:48:23 +00:00
Michael fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael bf8cb39102 Diaspora relay functionality is removed 2021-06-13 11:15:04 +00:00
Michael 265137ef44 Avoid PHP Warning: Illegal string offset 'type' in /src/Protocol/ActivityPub/Receiver.php on line 668 2021-06-07 10:21:48 +00:00
Michael 038e505ca3 Improve forum delivery, avoid false distribution 2021-06-06 19:28:47 +00:00
Michael 3fd5c79025 Add the forum followers to forum posts 2021-06-06 13:25:42 +00:00
Michael 56f07d412b Addec comments on forum delivery 2021-06-06 10:07:21 +00:00
Michael e2b8d5379b Public forums are now posting unlisted 2021-06-05 18:38:21 +00:00
Michael 58531a2748 Fix tests 2021-05-31 20:02:53 +00:00
Michael be7a01f086 Fix commenting on mobile to Diaspora 2021-05-31 19:39:50 +00:00
Michael da20b48651 Fix PHP Notice: Undefined index: isForum in /src/Protocol/ActivityPub/Processor.php on line 605 2021-05-29 19:09:41 +00:00
Michael 403cce25c4 Follower is sharer instead 2021-05-27 04:00:38 +00:00
Michael a3c323b366 Issue 10262: Don't accept BCC posts from non followers 2021-05-26 20:52:39 +00:00
Michael 785f8124ed Issue 10306: Improve local delivery 2021-05-26 09:24:37 +00:00
Michael 77092157fe Don't create automated summaries 2021-05-22 16:11:10 +00:00
Michael 6fe916a390 API: improved mail handling 2021-05-22 13:37:04 +00:00
Michael db8b0b9666 The next mail endpoint is done 2021-05-20 04:39:45 +00:00
Michael 916c51c630 Fix fatal errors / added some API todo 2021-05-17 19:20:31 +00:00
Tobias Diekershoff af1896f4d2
Merge pull request #10231 from MrPetovan/bug/warnings
Make birthday time comparison 32-bit safe in Protocol\DFRN
2021-05-13 17:58:59 +02:00
Michael 74f3c885bf use "random_bytes" instead of "openssl_random_pseudo_bytes" 2021-05-11 13:12:12 +00:00
Hypolite Petovan aeef4960a1 Make birthday time comparison 32-bit safe in Protocol\DFRN
- Address https://github.com/friendica/friendica/issues/10168#issuecomment-838221234
2021-05-11 08:10:25 -04:00
Michael 95f741c427 Improve data of shared posts 2021-05-07 06:26:41 +00: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 4b12c54345 API: photos are now directly stored as attached data and not in the body anymore 2021-05-01 15:48:19 +00:00
Michael d8901452fc Improved logging for invalid HTTP signatures 2021-05-01 12:32:33 +00:00
Michael c840ee82af Avoid empty posts on Diaspora 2021-04-30 22:35:16 +00:00
Michael 795761ee89 Attachments are added to OStatus as well 2021-04-29 21:16:04 +00:00
Michael 639d5373e0 Add atachments to body for Diaspora and DFRN 2021-04-29 21:05:22 +00:00
Michael 7c80f513d5 Transmit shared attachments via ActivityPub 2021-04-29 20:22:38 +00:00
Michael 3d64c3031b Preview for Videos and images / Video resolution selection 2021-04-28 19:05:46 +00:00
Michael c4705a33c0 Removed unneeded stuff 2021-04-26 14:10:16 +00:00
Michael 9afa3610cf Adding media attachments to Diaspora posts if they are only attached and not embedded in the body 2021-04-26 10:49:57 +00:00
Michael 8685e5ca32 Reworked media handling 2021-04-26 06:50:12 +00:00
Michael b65f73e348 Improved mimeType detection and setting of the "type" field 2021-04-14 19:12:01 +00:00
Michael 304b52ec0f Improve the code 2021-04-10 21:33:18 +00:00
Michael 4d40bac8ee Fix mentions for the summary 2021-04-10 21:13:37 +00:00
Michael 5a00902e11 Avoid HTML parsing of an empty body 2021-04-10 05:46:19 +00:00
Michael 37d15b47e8 Issue 10126: Transmit "adjust" 2021-04-08 19:38:16 +00:00
Michael 688e056ad1 "post-reason" ends double usage of "post-type" 2021-04-07 06:02:06 +00:00
Michael 274130f2eb Improved handling of leading and trailing attachments 2021-04-04 06:49:47 +00:00
Balázs Úr befc2af504
Merge branch '2021.03-rc' into copyright-2021 2021-03-29 08:45:21 +02:00
Balázs Úr 054c301ef0 Update copyright 2021-03-29 08:40:20 +02:00
Michael cefc2c9a93 Fix mentions on Pleroma 2021-03-27 22:49:55 +00:00
Michael 5bbcb8bdf4 ActivityPub: Delete Comments 2021-03-24 22:22:14 +00:00
Michael 08771d96c2 Remove unused parameter 2021-03-16 07:15:20 +00:00
Michael 9e87dcb25b We now set the protocol in "gserver" on receiving as well 2021-03-10 22:31:33 +00:00
Michael 8211e6d887 Fixes notice: "Undefined index: type" 2021-03-10 14:40:57 +00:00
Michael 8c748f03f9 Issue 9912: Process Markdown content from Peertube 2021-03-06 08:43:25 +00:00
Michael 4dfd91dbbf Use the system user for uid=0 2021-02-21 11:47:03 +00:00
Michael 454fbc8ad7 Queries without indexes 2021-02-21 10:37:15 +00:00
Michael c247d5fbeb The item table is now completely removed 2021-02-19 06:30:38 +00:00
Michael 890d1057d2 No implicit mention for top level Diaspora comments 2021-02-16 07:20:41 +00:00
Michael ce6ad1aa73 Get rid of the "item" table, enhanced "post" tables 2021-02-13 19:56:03 +00:00
Michael b22d7452a3 Accept "application/json" as application type for ActivityPub 2021-01-29 11:15:47 +00:00
Michael ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Hypolite Petovan 82e094179c Rename notify classes according the feature name, not the table name 2021-01-24 09:33:23 -05:00
Michael d2ea3eabfb Replace legacy file/category handling 2021-01-21 07:16:41 +00:00
Michael 487c2df9ca The "tag" field is not used anymore 2021-01-19 10:30:45 +00:00
Michael b892db0cf3 All item selects are now done by the post class 2021-01-19 07:23:01 +00:00
Michael f57ad05736 Added missing parameter 2021-01-17 21:10:16 +00:00
Michael 4157db5473 "item" is replaced by "post-view" / postupdate check added 2021-01-17 20:32:13 +00:00
Michael 2b1d0b9db8 "selectForUser" and "" selectFirstForUser" is now moved to Post 2021-01-16 22:37:27 +00:00
Michael 68502daed0 New post class in protocol and worker classes 2021-01-16 04:14:58 +00:00
Michael ca16a4892b The item view is completed, unneeded fields removed 2021-01-13 07:23:57 +00:00
Michael 83266b87af Create plink if missing 2021-01-11 20:14:17 +00:00
Michael f40ab2b65d Always deliver via AP if the server supports it 2021-01-10 19:41:01 -05:00
Hypolite Petovan ca8e4066fc
Merge pull request #9766 from annando/conversation-direction
Improved direction and protocol detection
2021-01-10 18:54:29 -05:00
Michael fd562677fd Use "===" 2021-01-10 21:30:30 +00:00
Michael 4cfcaa82c0 Fix relay handling 2021-01-09 19:19:20 +00:00
Michael 8894f14b4e Set post type if relay post was received via DFRN 2021-01-09 18:17:49 +00:00
Michael 6401bd7503 Mark if post was received via relay 2021-01-09 16:56:42 +00:00
Michael 2987070d93 Improved direction and protocol detection 2021-01-09 12:59:30 +00:00
Michael 66c1592171 Fix notices 2020-12-17 18:08:07 +00:00
Hypolite Petovan 1414d43597
Merge pull request #9664 from annando/delete-contacts
Delete removed contacts
2020-12-16 11:28:56 -05:00
Michael 974f7bffc8 Indentation 2020-12-16 15:43:12 +00:00
Michael a331a8cf0a Delete removed contacts 2020-12-15 22:56:46 +00:00
Michael Vogel e4228c6218
Merge pull request #9655 from MrPetovan/bug/fatal-errors
Fix several occasional fatal errors
2020-12-14 22:11:45 +01:00
Michael c210e0b97f Issue 9657: Check the age of an item 2020-12-14 00:00:10 +00:00
Hypolite Petovan 0441b912ac Return early if an URI id cannot be obtained in ActivityPub\Processor::createItem
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743769813
2020-12-13 13:42:08 -05:00
Hypolite Petovan 8f10cf8e53 Simplify Contact::addRelationship call in ActivityPub\Processor::followUser
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743382769
2020-12-13 12:16:04 -05:00
Michael 0eb4a600b0 Delay unprepared posts 2020-12-13 12:47:49 +00:00
Michael 297118f902 Archive/Unarchive at ActivityPub delivery 2020-12-12 16:45:23 +00:00
Michael 61b3003f64 Standards 2020-12-11 20:20:27 +00:00
Michael a43059df27 Relay posts with the original protocol 2020-12-11 06:35:38 +00:00
Michael 965374596f Avoid dropping of incoming DFRN messages 2020-12-10 07:22:49 +00:00
Hypolite Petovan 9c0342b907
Merge pull request #9638 from annando/bad-priority
Check for bad worker priorities
2020-12-09 01:12:34 -05:00
Michael dd94fb1242 Check for bad worker priorities 2020-12-08 21:58:32 +00:00
Hypolite Petovan c7a2988454 Check for the existence of array key before using it in Protocol\ActivityPub\Transmitter
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-739534960
2020-12-08 10:08:49 -05:00
Michael 1f1697222b Don't create the parent during a deletion 2020-12-06 09:54:34 +00:00
Michael c1d1b189f7 Cleaned code 2020-12-02 08:36:23 +00:00
Michael 6c3b1ac4bd Moved direct storage 2020-12-02 05:41:33 +00:00
Michael b54465ba9c Directly post non mirrored feed items 2020-12-02 05:08:39 +00:00
Michael e9fecf1541 Only delay mirrored feeds 2020-12-02 04:53:54 +00:00
Michael b2dadf0f92 Use a combined unique index 2020-12-02 00:34:10 +00:00
Michael 425440ec24 The network doesn't matter 2020-12-02 00:29:57 +00:00
Michael c302b7c347 Check for existing post 2020-12-02 00:20:07 +00:00
Michael 4fbd0a46b5 Reducing parameter list 2020-12-02 00:05:03 +00:00
Michael b047d31a4f Added logging and default config value 2020-12-01 23:46:50 +00:00
Michael 2aa302c570 New class for handling delayed posts 2020-12-01 22:11:29 +00:00
Michael b30d2c9c6b Renamed function 2020-11-30 20:59:18 +00:00
Michael 8bc799ff38 Issue 8943: Only check for too old postings for feeds 2020-11-30 20:32:56 +00:00
Michael 5b19469a4c Fix Notice: Undefined variable: publish_at 2020-11-30 18:27:02 +00:00
Michael Vogel d0f45c4ecb Fixed function name and variable 2020-11-30 09:59:29 +01:00
Michael 6e06e0cf20 New class for delayed postings 2020-11-30 06:59:00 +00:00
Michael cbd1ba8da2 Post delay is in seconds 2020-11-30 06:23:27 +00:00
Michael a7e0a1f7de The maximum delay should be a day 2020-11-30 06:19:10 +00:00
Michael Vogel 4c39c88b52 Adjusted log levels, removed spaces 2020-11-30 07:06:43 +01:00
Michael 3f3f56db57 Poll interval function moved to feed class, first steps for delayed posts 2020-11-30 05:39:12 +00:00
Michael a68810301a Fix structure error 2020-11-29 11:43:07 +00:00
Michael 7ab63d2106 Store the protocol of the received message 2020-11-29 09:01:51 +00:00
Michael 1d4be7b01f Fixes notice "Undefined index: parent-uri" 2020-11-28 10:17:55 +00:00
Michael 818c064c0a The notifications parameters are now simplified 2020-11-25 19:56:39 +00:00
Hypolite Petovan 486b43f09d Avoid unmarking for archival an empty contact in Protocol\ActivityPub\Receiver
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-733198306
2020-11-24 17:32:52 -05:00
Michael e4e9a20ac8 Don't transmit to archived inboxes 2020-11-23 19:25:22 +00:00
Michael 8a29d20083 Comments on PeerTube videos not working
Fixes #9407
2020-11-21 08:28:33 +00:00
Michael Vogel f69c043bec
Update src/Protocol/OStatus.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2020-11-18 18:07:20 +01:00
Michael a1dcbedc6f Fix Notice: Undefined variable: valid in /src/Protocol/OStatus.php on line 526 2020-11-18 13:47:29 +00:00
Hypolite Petovan ccad67c68f Use correct contact key in Protocol\ActivityPub\Transmitter
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-719866843
2020-11-17 17:59:39 -05:00
Hypolite Petovan 283b70928d Remove top-level parent check from Protocol\OStatus
- It's done in Item::insert instead
- Address part of https://github.com/friendica/friendica/issues/9252#issuecomment-729171051
2020-11-17 17:54:07 -05:00
Hypolite Petovan 54aef550c5 Remove superfluous mentions of parent-uri in Protocol\Diaspora
- Address part of https://github.com/friendica/friendica/issues/9252#issuecomment-729171051
2020-11-17 17:54:07 -05:00
Hypolite Petovan a69c98e32f
Merge pull request #9535 from annando/ap-relay
Relay code reworked to support AP delivery
2020-11-15 20:27:08 -05:00
Michael 0384bf3e76 Relay code reworked to support AP delivery 2020-11-15 23:28:05 +00:00
Hypolite Petovan 2e7c505ac0 Revert wrong item.thr-parent field usage in Protocol\OStatus 2020-11-14 10:08:52 -05:00
Hypolite Petovan 042f6b98ac Remove unnecessary data array assignment in Protocol\Feed 2020-11-14 10:08:51 -05:00
Hypolite Petovan 5ce8cc24de Clarify parameter type in DFRN::mail 2020-11-14 10:08:51 -05:00
Hypolite Petovan 0f2a5daf09 Replace confusing uses of item.parent-uri with expected item.thr-parent 2020-11-14 10:08:50 -05:00
Hypolite Petovan 6dee10f340
Merge pull request #9530 from annando/fatal
Fix fatal errors
2020-11-12 07:57:53 -05:00
Michael 36c65643fb Fix fatal errors 2020-11-12 05:17:48 +00:00
Hypolite Petovan a8f16788f4 Prevent multiple replacements for the same emoji in Protocol\ActivityPub\Processor::replaceEmojis 2020-11-11 18:28:26 -05:00
Hypolite Petovan fa003eaa84 Fix expected implementation of JsonLD::fetchElementArray
- Added expected field value matching
2020-11-11 11:19:08 -05:00
Hypolite Petovan 0de8319c15 Filter blocked contacts out from Protocol\ActivityPub\Transmitter::getContacts 2020-11-11 09:18:51 -05:00
Hypolite Petovan 6b8c8b03c6 Prevent ActivityPub message transmission to blocked followers 2020-11-11 02:52:23 -05:00
Hypolite Petovan b1bc8ebbfa
Merge pull request #9517 from annando/no-duplicated
Improve duplicate check
2020-11-09 16:00:52 -05:00
Michael c4f1719e8d Improve duplicate check 2020-11-09 20:29:42 +00:00
Hypolite Petovan 7debe1e999 [AP] Use contact.alias if it exists instead of contact.url for mention links
- Make mentions links handled by Mastodon for logged in users
2020-11-08 23:32:02 -05:00
Hypolite Petovan ecb0c46323 Normalize mention formatting for AP 2020-11-08 14:21:20 -05:00
Hypolite Petovan 4b090c2c08 Never mention yourself in AP messages 2020-11-08 14:21:08 -05:00
Michael 43749c3069 The "attach" field is now deprecated 2020-11-07 08:22:59 +00:00
Michael d383f49f1e The "[attach]" field is replaced by the "post-media" table 2020-11-06 04:14:29 +00:00
Hypolite Petovan c9c3d022bd
Merge pull request #9492 from annando/fix-fatal
Handle fatal error when attachment url is null
2020-11-04 09:56:53 -05:00
Hypolite Petovan 4e65b54b60
Merge pull request #9490 from annando/forum-fix
Fix: Posts sent to forums had been rejected
2020-11-04 09:56:20 -05:00
Michael 49fee4096a Handle fatal error when attachment url is null 2020-11-04 13:14:33 +00:00
Michael 29ec0bb98d Replaced debug log 2020-11-04 13:05:07 +00:00
Michael e5704eb05a Fix: Posts sent to forums had been rejected 2020-11-04 08:57:21 +00:00
Michael Vogel bf50f80399 Fix fatal error "Argument 2 passed to Friendica\Model\Post\Media::getAttachElement() must be of the type int, string given" 2020-11-04 07:58:04 +01:00
Hypolite Petovan 1e1d7a4411 Ensure we provide a mediaType string to Post\Media::getAttachElement
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-720101289
2020-11-02 00:23:08 -05:00
Michael 8485c8c357 The post-media table now works with the "attach" field as well 2020-10-31 13:26:08 +00:00
Michael 56fe1400a7 Next renamed function 2020-10-29 09:03:06 +00:00
Michael 5ac73a847d Functions renamed 2020-10-29 08:48:08 +00:00
Michael e548d647aa New table for attached media files 2020-10-29 05:20:26 +00:00
Philipp a6fc9cd32e
Remove $binary flag for HTTPRequest::get(), HTTPRequest::fetch(), HTTPRequest::fetchAll() (deprecated since PHP 5.1.3) 2020-10-18 20:56:31 +02:00
Philipp 069753416d
Revert "Fix IHTTPResult::getHeader/s() - Split functionality "getHeader()" and "getHeaders()" analog to IMessageInterface::getHeader/s() - Fix functionality at various places - Adapt CurlResultTest"
This reverts commit 933ea7c9
2020-10-11 23:26:03 +02:00
Philipp 0449077126
Revert "Fix IHTTPResult::getHeader() - Now returns a string array, like expected - Fix usages - Fix dataset"
This reverts commit 80bd0a4d
2020-10-11 23:25:40 +02:00
Philipp 80bd0a4d5a
Fix IHTTPResult::getHeader()
- Now returns a string array, like expected
- Fix usages
- Fix dataset
2020-10-10 23:11:30 +02:00
Philipp 933ea7c9ce
Fix IHTTPResult::getHeader/s()
- Split functionality "getHeader()" and "getHeaders()" analog to IMessageInterface::getHeader/s()
- Fix functionality at various places
- Adapt CurlResultTest
2020-10-10 23:11:30 +02:00
Hypolite Petovan 2bfd9851d3
Merge pull request #9314 from annando/suggestions
New function for contact suggestions
2020-10-03 13:32:21 -04:00
Michael 9b1918c650 Don't accept ignored author via relay 2020-10-02 03:35:22 +00:00
Michael 427881c437 Default values for settings / use lowercase 2020-10-01 21:14:26 +00:00
Michael 648e8a00a4 Use the right table ... 2020-09-30 19:05:19 +00:00
Michael e26d73393e New "relay" class / check of incoming popsts from DFRN and Diaspora 2020-09-30 17:37:46 +00:00
Tobias Diekershoff c06197377f
Merge pull request #9322 from annando/issue-9305
Issue 9305: Relay deny tags are added
2020-09-30 07:21:59 +02:00
Michael 15e61e78ac Issue 9305: Relay deny tags are added 2020-09-29 19:48:26 +00:00
Michael eff4d18209 Force removal from relay list 2020-09-29 05:06:37 +00:00
Michael Vogel 777ece84cf
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2020-09-29 05:56:57 +02:00
Michael fb50a43ac0 New function for contact suggestions 2020-09-28 21:33:40 +00:00
Michael 9ea34370a6 We now inherit the causer for completing a thread 2020-09-25 12:16:08 +00:00
Michael 9552473db5 Issue 9264: post types should now work 2020-09-25 06:47:07 +00:00
Michael d9d1268194 Issue 9264: Ensure that "pt_follower" is only set when its a real follower 2020-09-24 10:26:28 +00:00
Hypolite Petovan fa94c82299
Merge pull request #9260 from annando/ap-relay-settings
Relay settings are now valid for the ActivityRelay as well
2020-09-23 12:46:32 -04:00
Michael ea698b6702 Delimiter added 2020-09-23 15:57:10 +00:00
Hypolite Petovan befc8c86ab
Merge pull request #9261 from annando/relay-distribution
Delayed relay distribution
2020-09-23 11:43:52 -04:00