keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30593 commits 4 branches 0 tags 179 MiB
Commit graph

7351 commits

Author SHA1 Message Date
Michael
6eb3874646 Merge remote-tracking branch 'upstream/develop' into api-lists-missing 2021-05-13 22:01:19 +00:00
Michael
8b841dfa50 Fix connection issues with AndStatus 2021-05-13 22:00:40 +00:00
Michael
3aa883f1e3 API: List handling, dummy endpoints 2021-05-13 21:15:32 +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
5219080149 Fix url comparism 2021-05-13 15:01:35 +00:00
Michael
b18073d5a8 Repurposed OAuth frontend handling, store the scope 2021-05-13 14:58:55 +00:00
Michael
132e08edb8 Whitespaces ... 2021-05-13 11:33:07 +00:00
Michael
7975bc244d Refine OAuth flow 2021-05-13 11:26:56 +00:00
Michael
494e852c1a Removed old comment 2021-05-12 15:41:05 +00:00
Michael
9125d296a1 Improved error messages 2021-05-12 14:00:15 +00:00
Michael
8a5560ec8f Simplified null check 2021-05-12 12:40:45 +00:00
Michael
4a6d33e182 HTTP_AUTHORIZATION should be enough 2021-05-12 12:34:55 +00:00
Michael
8dccb66dec Display the application name 2021-05-12 12:19:15 +00:00
Michael
19a81d25d5 Added documentation headers 2021-05-12 12:08:30 +00:00
Michael
87f7e26638 Added documentation 2021-05-12 12:00:24 +00:00
Michael
daa832fcf9 Formatting 2021-05-12 11:54:43 +00:00
Michael
c3f28252ff Indention 2021-05-12 10:50:01 +00:00
Michael
a23d108fa7 Session variable needs to be removed afterwards 2021-05-12 06:51:59 +00:00
Michael
6ca42512e9 OAuth connections now have to be ackknowledged 2021-05-12 06:50:27 +00:00
Michael
c22846339a Improved error reporting 2021-05-12 05:30:21 +00:00
Michael
d1e109d9be Improved error handling 2021-05-12 03:05:22 +00:00
Michael Vogel
e99117ac22
Update src/Module/OAuth/Authorize.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-12 03:53:40 +02:00
Michael
4476634f6c Fix list of accounts 2021-05-11 23:39:08 +00:00
Michael
975c32116d Handling media in shared posts 2021-05-11 23:10:59 +00:00
Michael
e9fe92a5d7 Merge remote-tracking branch 'upstream/develop' into api-again 2021-05-11 21:21:32 +00:00
Michael
f5e98c8ecf Redirect at login does work 2021-05-11 21:04:45 +00:00
Hypolite Petovan
cac038639d Capitalize post action translation strings 2021-05-11 16:01:07 -04:00
Michael
8eacfbc570 Fix context order / notice fixed 2021-05-11 19:53:19 +00:00
Michael
bade0a2345 Improved cards handling, simplified Bearer handling 2021-05-11 19:15:05 +00:00
Michael
7d8c152aaf Check the start of the string 2021-05-11 13:17:48 +00: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
cfb9b73205 Store creation date 2021-05-11 08:16:40 +00:00
Michael
0f4920dca8 Unused use 2021-05-11 06:34:31 +00:00
Michael
a3d1423562 unused use 2021-05-11 06:33:18 +00:00
Michael
c9e6fea74b Code style 2021-05-11 06:31:48 +00:00
Michael
82003bbe47 Login prototype 2021-05-11 06:30:20 +00:00
Tobias Diekershoff
7789ea2507
Merge pull request #10228 from MrPetovan/bug/warnings 
[PHP 8] Fix undefined template variables
 2021-05-11 06:10:29 +02:00
Hypolite Petovan
10e5630988 Don't assume $a->contact is populated in Object\Post::getCommentBox 
- Address https://github.com/friendica/friendica/issues/10167#issuecomment-837238584
- This might reveal some side-effect
 2021-05-10 22:03:51 -04:00
Hypolite Petovan
48ac619599 Check unparseURL parameter type in APContact::getByURL 
- Address https://github.com/friendica/friendica/issues/10167#issuecomment-832421258
 2021-05-10 21:52:26 -04:00
Hypolite Petovan
9ef9fc7c14 Skip URL-less mention terms in Object\Post::getDefaultText 
- Address https://github.com/friendica/friendica/issues/10167#issuecomment-830859710
- Added logging to troubleshoot deeper issue
 2021-05-10 21:50:42 -04:00
Hypolite Petovan
412a0b3e1c Ensure JsonD data passed to ParseURL::parseParts is an array 
- Address https://github.com/friendica/friendica/issues/10167#issuecomment-827894961
 2021-05-10 21:32:03 -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
Hypolite Petovan
abc0616d33 Fix undefined variables in profile/vcard.tpl 2021-05-10 18:59:49 -04:00
Hypolite Petovan
2c6bf754d5 Fix undefined variables in wall_thread.tpl 
- Remove unused "num_comments_text" template variable
- Remove unused "item.postops" template variable mention
 2021-05-10 18:59:09 -04:00
Michael
6644d117f6 Indentions 2021-05-09 22:29:04 +00:00
Michael
1ee1507f3b Whitespaces ... 2021-05-09 22:26:32 +00:00
Michael
585d283ff9 Preparation for Oauth client registration 2021-05-09 22:23:21 +00:00
Michael
a696b7f427 Renamed functions 2021-05-09 18:44:08 +00:00
Michael
591619e1d3 Unused use removed 2021-05-09 13:01:56 +00:00
Michael
1c6e915514 Media is now supported as well 2021-05-09 12:59:23 +00:00
Michael
6ac74f9cc9 Unused use removed 2021-05-09 12:05:22 +00:00
Michael
6cd7215d87 Formatting ... 2021-05-09 12:04:00 +00:00
Michael
6d3c82e54e Formatting 2021-05-09 12:01:44 +00:00
Michael
66be56e081 Some more formatting 2021-05-09 12:00:08 +00:00
Michael
6e9dd7641f Some more code styling 2021-05-09 11:58:27 +00:00
Michael
7a576111c7 Code styling 2021-05-09 11:56:34 +00:00
Michael
f5c7f9670f Remove blanks 2021-05-09 11:54:34 +00:00
Michael
cc5d4db6a3 Notifications are now supported as well 2021-05-09 11:50:05 +00:00
Michael
5bb5c44bd9 API: added account related endpoints 2021-05-09 09:35:51 +00:00
Michael
1e3182a896 And more formatting 2021-05-08 19:30:09 +00:00
Michael
a0e455a493 Again formatting 2021-05-08 19:28:20 +00:00
Michael
4b4298b0f8 Some more formatting 2021-05-08 19:26:57 +00:00
Michael
cce0d0c21b Formatting 2021-05-08 19:25:20 +00:00
Michael
3bbf543d25 API: Some more endpoints 2021-05-08 19:21:52 +00:00
Michael
7d1c43cf65 Formatting 2021-05-08 12:28:04 +00:00
Michael Vogel
31d70e02e0
Update src/Module/BaseApi.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-08 14:23:47 +02:00
Michael
054f6dedc1 /followes and /following is supported 2021-05-08 11:46:24 +00:00
Michael
d842a4ff87 Suggestions are now supported as well 2021-05-08 11:03:50 +00:00
Michael
c97cfd8a44 Removed unused use 2021-05-08 09:19:16 +00:00
Michael
6236870aa4 Add all required HTTP methods 2021-05-08 09:14:19 +00:00
Michael
4fdc1ae13a "/statuses/id" is now supported 2021-05-08 05:55:06 +00:00
Michael
9300395c6e "verify_credentials" is now partially supported 2021-05-08 02:52:44 +00:00
Michael
d39983c8b7 We now support lists as well 2021-05-08 02:21:01 +00:00
Michael
0ea2241eed Support the "only_media" parameter 2021-05-08 01:52:23 +00:00
Michael
0468b7b3f9 Formatting 2021-05-07 21:35:07 +00:00
Michael
0a25349fbf Formatting 2021-05-07 21:33:42 +00:00
Michael
dd38cc330f API: We now support two more timeline api endpoints 2021-05-07 21:28:48 +00:00
Michael
829a268faf Issue 10184: Fix directory search results 2021-05-07 18:38:04 +00:00
Michael
6be6803983 Improved code structure 2021-05-07 11:41:10 +00: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
Hypolite Petovan
53d4312903
Merge pull request #10202 from mexon/mat/contact-console-command 
Add console contact command
 2021-05-04 09:50:49 -04:00
Tobias Diekershoff
769834bf95
Merge pull request #10208 from MrPetovan/bug/10198-self-no-block-ignore 
Prevent self block/ignore
 2021-05-04 15:43:28 +02:00
Hypolite Petovan
0a1f4d81c8 Prevent self block/ignore in Module\Contact 2021-05-04 08:59:13 -04:00
Hypolite Petovan
98c2ca34f5 Remove block/ignore links from contact/item action menus for self 2021-05-04 08:45:27 -04: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
Matthew Exon
1ce7c337f5
Simplify test for empty network selection 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-05-04 13:16:00 +02:00
Michael
be29a42d74 Ignore identical provider and author 2021-05-04 06:08:40 +00:00
Michael
b3e511eb0c No link guessing for DFRN / Don't show redundant data 2021-05-04 05:18:03 +00:00
Matthew Exon
312de957f4
Fix assignment statement alignment 
Co-authored-by: Philipp <admin+Github@philipp.info>
 2021-05-03 20:56:49 +02:00
Matthew Exon
7a8f9f382e
Fix assignment statement alignment 
Co-authored-by: Philipp <admin+Github@philipp.info>
 2021-05-03 20:56:41 +02:00
Michael
6841608164 Fix fatal error because of parameter type mismatch 2021-05-03 18:43:38 +00:00
Matthew Exon
05481cab3d fix formatting issues 2021-05-03 20:30:44 +02:00
Matthew Exon
ba4492ea81 Add console contact command 2021-05-03 18:00:36 +02:00
Michael
10a6f0a98f API: New function to fetch current user id 2021-05-03 05:25:54 +00:00
Hypolite Petovan
4395f73d1e
Merge pull request #10196 from annando/link-detection 
Improved link detection
 2021-05-02 23:00:23 -04:00
Matthew Exon
023fb38a75 Check return values with empty() 2021-05-02 20:05:07 +02:00
Matthew Exon
ac4f62f556 Remove database dependency from user console command 2021-05-02 20:05:07 +02:00
Matthew Exon
19a86fd8f2 Fix console user config set command 2021-05-02 20:05:07 +02: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
Tobias Diekershoff
f57ddee31c the command was missing from the worker queue overview 2021-05-02 09:55:19 +02:00
Michael Vogel
35ad732e71
Merge pull request #10192 from MrPetovan/task/8262-rtl-user-content 
Add initial support for RTL in user-submitted content
 2021-05-01 22:53:27 +02:00
Matthew Exon
18762c8e6e When comparing config values, use strict string comparison 2021-05-01 21:46:30 +02:00
Hypolite Petovan
5bca6fe98c Add RTL support for display names in mentions 2021-05-01 15:32:17 -04:00
Matthew Exon
4858993024 Add error message when setting config to existing value 2021-05-01 21:10:10 +02:00
Michael
73c0bff665 Add missing provider url and name 2021-05-01 17:03:50 +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
6f7e063b34 Fixes "PHP Notice: Undefined variable: item in src/Model/Post/Media.php on line 561" 2021-05-01 07:10:27 +00:00
Michael
3217de30fa Merge branch 'avoid-duplicates' of github.com:annando/friendica into avoid-duplicates 2021-04-30 22:35:20 +00:00
Michael
c840ee82af Avoid empty posts on Diaspora 2021-04-30 22:35:16 +00:00
Michael Vogel
4889e82489
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-04-30 22:31:24 +02:00
Michael
3666742e7b Added comment 2021-04-30 06:11:13 +00:00
Michael
75a90f5e5d Avoid problems with an empty body 2021-04-30 04:45:31 +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
b88c9f9d67 Handling bottom anchor and top anchor 2021-04-29 19:29:29 +00:00
Michael
eb8e6c5b22 Improved link comparism on attached links 2021-04-29 19:02:43 +00:00
Michael
6ab35c20e0 Fix link comparism 2021-04-29 18:23:04 +00:00
Michael
5c9a5e736c Merge remote-tracking branch 'upstream/develop' into avoid-duplicates 2021-04-29 05:49:00 +00:00
Michael
94e36f7970 Avoid adding the same attachments in shared posts 2021-04-29 05:45:35 +00:00
Tobias Diekershoff
d28fbf9d8d
Merge pull request #10178 from nupplaphil/fix/10174 
Fixed new "user config" console feature
 2021-04-29 06:54:02 +02:00
Michael
8541e248bb Less greedy when replacing attachment elements 2021-04-29 04:14:44 +00:00
Philipp
020d893260
Fix PHP-Code-Style 2021-04-28 22:13:00 +02:00
Philipp
d1d5cb2857
Fixed new "user config" console feature 
- Replaced "DI::" call with constructor injection
- Added return value for IPConfig::load() and PreloadPConfig::load()
 2021-04-28 22:13:00 +02:00
Michael
3d64c3031b Preview for Videos and images / Video resolution selection 2021-04-28 19:05:46 +00:00
Hypolite Petovan
909e029168
Merge pull request #10174 from mexon/mat/user-config-console-command 
Add "user config" console command
 2021-04-27 15:06:21 -04:00
Matthew Exon
5421f53a76 Add "user config" console command to administer user-specific configuration 2021-04-27 19:46:16 +02:00
Michael
44c801905a Improve page load performance with attached links 2021-04-27 12:29:54 +00:00
Hypolite Petovan
53e38b0313
Merge pull request #10166 from mexon/mat/refactor-user-arguments 
Refactor user console command to re-use common code
 2021-04-26 13:00:07 -04:00
Michael
5527353d87 Removed trailing whitespace 2021-04-26 15:09:32 +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
f25c3f4619 Merge remote-tracking branch 'upstream/develop' into media-handling 2021-04-26 09:01:26 +00:00
Tobias Diekershoff
2a431b580f Merge branch 'develop' of https://github.com/friendica/friendica into develop 2021-04-26 09:49:48 +02:00
Michael
8685e5ca32 Reworked media handling 2021-04-26 06:50:12 +00:00
Matthew Exon
471bb53746 Refactor user console command to re-use common code 2021-04-25 19:27:10 +02:00
Philipp
6acedcb25e
Fix empty needle after trimming at PageInfo 2021-04-23 21:12:00 +02:00
Michael
c9a00fcb1c Issue 10156: Fix endless scroll with filed posts 
Fixes #10156
 2021-04-20 20:51:09 +00:00
Michael
e80cb60e40 Bugfix: Store to category 2021-04-20 19:17:07 +00:00
Michael
4f5d2e7d36 Avoid empty basepath when loading database structure 2021-04-19 19:42:57 +00: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
a12992f063 Allow to remove the "extid" content as well. 2021-04-18 09:57:08 +00:00
Michael
be16bdcc24 Merge remote-tracking branch 'upstream/2021.03-rc' into extid-update 2021-04-18 07:40:35 +00:00
Michael
15caf4b3f7 Fix: The "extid" field wasn't updated 2021-04-18 07:08:16 +00:00
Hypolite Petovan
52d6add84a
Merge pull request #10143 from nupplaphil/bug/fix_l10n 
Fix L10n in case of empty strings array
 2021-04-18 00:16:24 -04:00
Michael
79ec2cbc6d Prevent multiple videos from Peertube 2021-04-17 13:57:25 +00:00
Philipp
f10c24c83a
remove warning 2021-04-17 13:24:37 +02:00
Philipp
6a414b0543
Fix L10n in case of empty strings array 2021-04-17 13:24:37 +02:00
Michael
f3b27dc789 Quickfix to avoid bad looking incoming tweets 
Fixes https://github.com/friendica/friendica/pull/10148#issuecomment-821512658
 2021-04-17 07:26:03 +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
2ed98bd040 Prevent false "photo" page detection 2021-04-15 21:13:20 +00:00
Michael
b65f73e348 Improved mimeType detection and setting of the "type" field 2021-04-14 19:12:01 +00:00
Michael
238adabefb Catch Imagick errors 
See https://github.com/friendica/friendica/issues/9747#issuecomment-809675750
 2021-04-12 12:37:11 +00:00
Michael
5b2c4d70be Avoid notices whwn creating events 2021-04-11 06:53: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
5d61599964 Fix notices 
See https://github.com/friendica/friendica/issues/9749#issuecomment-774666356
and https://github.com/friendica/friendica/issues/9747#issuecomment-785262156
 2021-04-10 16:19:22 +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
17b569c5d4 Remove empty lines arounf the horizontal ruler, no maximum height 2021-04-07 12:16:24 +00:00
Michael
f70650f824 Further unused tables to be dropped 2021-04-07 12:10:54 +00:00
Michael
688e056ad1 "post-reason" ends double usage of "post-type" 2021-04-07 06:02:06 +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
Michael
e8a539b68d Move template to content/ 2021-04-05 11:44:43 +00:00
Michael
7e0d21b5bb Audio attachments are now displayed as audio elements 2021-04-05 09:15:36 +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
Michael
274130f2eb Improved handling of leading and trailing attachments 2021-04-04 06:49:47 +00:00
Hypolite Petovan
d666b6cb42
Merge pull request #10116 from mexon/mat/addon-console-command 
Add "addon" console command to enable and disable addons
 2021-04-02 14:34:23 -04:00
Matthew Exon
492ac0c387 Remove unneeded parameters to console addon command 2021-04-02 20:17:12 +02:00
Matthew Exon
3545e9cfa8 Add "addon" console command to enable and disable addons 2021-04-02 18:56:24 +02:00
Hypolite Petovan
acbcc56754 Prevent settings/userexport to be used by anonymous users 
- Add forbidden exceptions in module methods
- Add runtime exceptions in individual export methods
 2021-04-01 19:29:21 -04:00
Philipp
b983559980
Fix Object parsing for Logging 2021-04-01 20:55:25 +02:00
Tobias Diekershoff
8285a3a280
Merge pull request #10109 from annando/post-type 
Use post-type for the item container
 2021-04-01 07:49:00 +02:00
Michael
9072107b83 Use post-type for the item container 2021-04-01 04:58:53 +00:00
Michael
087a17b43d Issue 10105: Use legacy photo data field if used 2021-04-01 04:51:55 +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
Hypolite Petovan
1e71398c72
Merge pull request #10104 from nupplaphil/fix/jit_caching 
Fix JIT Config Adapter caching
 2021-03-28 20:11:16 -04:00
Philipp
b2a7c5ff6c
Fix JIT Config Adapter caching 2021-03-28 23:28:47 +02:00
Philipp
b61b3cb182
Fix object handling inside log arrays 2021-03-28 21:50:32 +02:00
Michael
70d5802793 Avoid HTML in ParseUrl desriptions 2021-03-28 11:32:26 +00:00
Hypolite Petovan
f1b60414b3
Merge pull request #10096 from annando/parseurl-photos 
ParseUrl: Remove image when it doesn't fit the requirements
 2021-03-28 03:37:56 -04:00
Michael
bb0f3552e2 ParseUrl: Remove image when it doesn't fit the requirements 2021-03-28 06:47:58 +00:00
Hypolite Petovan
5b13de8e7f
Merge pull request #10095 from annando/parseurl-photos 
Fix: ParseUrl now fetches images again
 2021-03-28 02:29:02 -04:00
Hypolite Petovan
3af12004fe
Merge pull request #10090 from nupplaphil/feat/install_testrewrite 
FollowUp #10086
 2021-03-28 02:24:49 -04:00
Hypolite Petovan
992ffcc720
Merge pull request #10092 from annando/fix-pleroma-mention 
Fix the display of mentions on Pleroma
 2021-03-28 02:21:02 -04:00
Michael
4a19348900 Fix: ParseUrl now fetches images again 2021-03-28 06:20:11 +00:00
Hypolite Petovan
ed639045fb
Merge pull request #10089 from annando/issue-4755 
Issue 4755: Use the system mail address as sender
 2021-03-27 19:28:08 -04:00
Michael
cefc2c9a93 Fix mentions on Pleroma 2021-03-27 22:49:55 +00:00
Philipp
26bd1bb26d
FollowUp #10086 2021-03-27 22:42:11 +01:00