clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,324 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

7806 Commits

Author SHA1 Message Date
Michael db8b0b9666 The next mail endpoint is done 2021-05-20 04:39:45 +00:00
Michael 8a3db0226b Coding standards 2021-05-20 03:53:48 +00:00
Michael 66ad777f4b Supporting all parameters 2021-05-19 22:33:40 +00:00
Michael 3d65ef3af2 Indentions 2021-05-19 22:20:56 +00:00
Michael d46150f1dc Whitespaces ... 2021-05-19 22:18:30 +00:00
Michael ae6dae3b23 Whitespace removed 2021-05-19 22:10:05 +00:00
Michael c1212dce03 Indentions 2021-05-19 22:09:25 +00:00
Michael 70259965df API: Support for private mails 2021-05-19 21:56:50 +00:00
Hypolite Petovan 09cf32926d
Merge pull request #10275 from very-ape/authenticate-hook 
Move the 'authenticate' hook deeper into the authentication flow so t…
 2021-05-19 16:51:15 -04:00
very-ape 9ddaabc22d Move the 'authenticate' hook deeper into the authentication flow so that password authentication addons are consulted whenever a user's password needs confirming. 2021-05-19 13:11:31 -07:00
Michael fcc18de9c5 Unneeded spaces removed 2021-05-19 16:09:09 +00:00
Michael ab96e694df Removed unused use 2021-05-19 16:07:37 +00:00
Michael 1c7d1c7c47 New endpoint "verify_credentials" added 2021-05-19 09:35:08 +00:00
Michael 3172b0bcf2 Log API errors 2021-05-19 09:03:41 +00:00
Michael b3b9c51dbe Reduced log level 2021-05-19 07:02:12 +00:00
Michael 50ca38a0f7 Harmonized API parameters for all timeline endpoints 2021-05-19 06:55:08 +00:00
Michael e3d227f3c9 API: Parameter cleanup 2021-05-19 06:18:42 +00:00
Michael e5c1b90668 API: Reworked request parameter handling 2021-05-18 19:26:46 +00:00
Michael f935c1cf73 Restructured variable handling 2021-05-18 08:38:04 +00:00
Michael 724a61390f Coding standards 2021-05-18 07:23:18 +00:00
Michael 2252949bca Style stuff ... 2021-05-18 07:18:31 +00:00
Michael f31fdf4391 Spaces 2021-05-18 07:13:32 +00:00
Michael 8ae29eabe8 Min is max 2021-05-18 07:02:50 +00:00
Michael 0a6127ea6e Set maximum value 2021-05-18 07:01:23 +00:00
Michael ce427b248e Central function to process request parameters 2021-05-18 06:31:22 +00:00
Michael 32e7ddf21b Improved parameter assignment 2021-05-18 04:54:37 +00:00
Michael 71a398277d Improved query 2021-05-17 22:44:42 +00:00
Michael 59cff3511b Standards 2021-05-17 22:31:35 +00:00
Michael c9110e03e1 API: Search endpoint 2021-05-17 22:22:51 +00:00
Michael 916c51c630 Fix fatal errors / added some API todo 2021-05-17 19:20:31 +00:00
Michael d46db31475 Reverted context 2021-05-17 06:04:48 +00:00
Michael 48d703d278 Fiy missing "in" 2021-05-17 06:03:14 +00:00
Michael 2e6cf056c1 Whitespace removed 2021-05-17 06:01:47 +00:00
Michael cb7206d92f Reverted yesterdays panic coding 2021-05-17 05:59:41 +00:00
Michael ce6b4c27ea Use locally stored original w3c documents 2021-05-17 05:51:14 +00:00
Michael 96ae7ce525 Merge branch 'apcontact-no-normalize' of github.com:annando/friendica into apcontact-no-normalize 2021-05-16 20:58:19 +00:00
Michael c21d991208 Use local copy of the w3id security context 2021-05-16 20:58:11 +00:00
Hypolite Petovan a44cf44708
Remove duplicated conditions, improve variables names in Model\APContact 2021-05-16 16:10:22 -04:00
Michael 4b4218f516 Compact using a predefined context to fix content from Pleroma 2021-05-16 19:31:10 +00:00
Michael 6f2fcd2859 Don't use compacted data when parsing accounts 2021-05-16 16:41:07 +00:00
Hypolite Petovan a4a2f4616c
Merge pull request #10256 from annando/fix-ap 
Quickfix for current Json-LD problems
 2021-05-16 11:06:47 -04:00
Michael 5ea44960e0 Additional change to the quickfix 2021-05-16 14:59:02 +00:00
Michael 4c72d2c34a Quickfix for current Json-LD problems 2021-05-16 14:32:06 +00:00
Michael dd16bccbc8 Fix for sending content via connectors 2021-05-16 14:30:15 +00:00
Michael 14c1f7167a API: We now can upload photos 2021-05-16 09:56:02 +00:00
Michael 49207a8624 Added scope check 2021-05-16 07:37:11 +00:00
Michael 1cc341033f API: We now can post statuses via API 2021-05-15 22:40:57 +00:00
Michael f001f52e39 API: Fix relationships 2021-05-15 15:02:15 +00:00
Michael 78dab01696 "UpdateCredentials" dummy added (currently not working) 2021-05-15 12:13:03 +00:00
Michael 9c427cc05d Unused use 2021-05-15 10:59:22 +00:00
Michael 6a5083d918 Fixed message, relationships endpoint added 2021-05-15 10:55:41 +00:00
Michael b34ee320b0 API: Many item related endpoints added 2021-05-15 10:08:47 +00:00
Michael 45c2cc3887 API: Account actions 2021-05-14 21:51:32 +00:00
Michael 0aaaf8d6ef API: Support OAuth client credentials 2021-05-14 06:05:01 +00:00
Michael 55919dbd06 API: The instance record had got a malformatted value 2021-05-14 05:09:11 +00:00
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
Michael f4649b9f0e Issue 4755: Use the system mail address as sender 2021-03-27 21:23:31 +00:00
Philipp 3327e6d979
Add EOL to help string 2021-03-27 13:59:32 +01:00
Philipp a831242095
Workaround for cURL troubles in container environments 
Addresses https://github.com/friendica/docker/issues/134
 2021-03-27 13:52:05 +01:00
Michael c77f039f7a Fix Warning "key() expects parameter 1 to be array, string given" 2021-03-27 05:20:55 +00:00
Hypolite Petovan 8adb0825a6
Merge pull request #10083 from annando/post-user 
Use the "post-user" table instead of the "post" table for deletion checks
 2021-03-26 17:03:24 -04:00
Michael d80f1644f0 Use "post-user" for "uri-id" deletion 2021-03-26 20:36:22 +00:00
Michael 24099c3439 Comment deletions are always send via DFRN 2021-03-26 20:09:23 +00:00
Michael Vogel 0539c788ef
Update src/Model/Photo.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-03-26 15:51:26 +01:00
Michael e98d11a9ae Limit the size of contact avatars 2021-03-26 06:56:08 +00:00
Hypolite Petovan 7e283dcdf4
Merge pull request #10079 from annando/mobilizon 
Added support for Mobilizon on the federation page
 2021-03-25 15:13:56 -04:00
Michael 45c80ab52f Added support for Mobilizon on the federation page 2021-03-25 18:52:50 +00:00
Michael 8424c78a59 Improved checks when adding contacts 2021-03-25 05:45:16 +00:00
Michael 5bbcb8bdf4 ActivityPub: Delete Comments 2021-03-24 22:22:14 +00:00
Hypolite Petovan 2ef0cd91c5
Merge pull request #10075 from annando/fix-warning 
Fixes PHP Warning: " array_unshift() expects parameter 1 to be array, int given"
 2021-03-24 16:07:11 -04:00
Michael adb0b460ef Fixes PHP Warning: " array_unshift() expects parameter 1 to be array, int given" 2021-03-24 19:52:53 +00:00
Michael 2072fb1eed Avoid foreign key violations when deleting unused tables 2021-03-24 19:47:55 +00:00
Michael fb663f0668 Avoid several notices in ParseUrl 2021-03-23 20:03:08 +00:00
Michael e6f4ed47e2 Avoid error "Uncaught ImagickException: Unable to scale image" 2021-03-23 20:01:32 +00:00
Michael 4db6f11884 ParseUrl: Perform entitity decode afterwards 2021-03-22 06:47:04 +00:00
Michael 13ed585156 Display rhe provider and author of a shared post 2021-03-21 23:32:49 +00:00
Michael 76220537ab Avoid database error messages because of foreign key violations 2021-03-21 19:25:23 +00:00
Michael 2a68ad9b26 Check media links when fetching page data 2021-03-21 14:24:42 +00:00
Michael 531ef6e6e2 Issue 10050: Avoid creating new contacts for expired users 2021-03-20 09:56:35 +00:00
Michael 49919b5b1d Issue 10050: Improve photo deletions 2021-03-19 11:42:29 +00:00
Michael 437f96e573 Partly restored functionality 2021-03-18 15:56:50 +00:00
Michael b55ae5717b Issue 10050: Improved deletion order 2021-03-18 15:44:02 +00:00
Michael f772e11cfa Avoid empty type 2021-03-18 08:04:52 +00:00
Michael e3409c72e2 Add logos for person and organisation 2021-03-17 23:31:16 +00:00
Michael 558189e9d1 Reorganized functions 2021-03-17 22:29:12 +00:00
Michael f11712cdc0 Some more added types 2021-03-17 17:11:50 +00:00
Michael da6b54925a Added medias 2021-03-17 07:36:16 +00:00
Michael df566eea78 Added more types 2021-03-16 22:57:24 +00:00
Michael 003bf69d88 Changed assigning of author and publisher 2021-03-16 11:32:56 +00:00
Michael 08771d96c2 Remove unused parameter 2021-03-16 07:15:20 +00:00
Michael d498d15200 Avoid double fetches 2021-03-16 07:04:16 +00:00
Michael 0a3d50a270 Adjusted field names 2021-03-16 06:37:43 +00:00
Michael 70bf75c342 Support for page JSON-LD based page information 2021-03-15 22:02:21 +00:00
Hypolite Petovan 393de1a283 Use system.allowed_oembed config to allow iframe source 2021-03-14 14:19:35 -04:00
Hypolite Petovan 93823ecef5 Move HTML purification to own method in Content\Text\HTML 2021-03-14 14:19:33 -04:00
Michael Vogel 751bf7ae30
Merge pull request #10042 from MrPetovan/bug/10041-video-regex-backtrack 
Increase video tag regular expression specificity to decrease backtrack in BBCode::convert
 2021-03-13 17:54:15 +01:00
Hypolite Petovan e1f8e10fe7 Increase video tag regular expression specificity to decrease backtrack in BBCode::convert 2021-03-13 09:06:52 -05:00
Michael 7adbd73eca More general content type detection 2021-03-13 13:17:42 +00:00
Michael acffafe6b9 Merge remote-tracking branch 'upstream/2021.03-rc' into issue-10019 2021-03-13 12:30:41 +00:00
Hypolite Petovan e8929efbea
Merge pull request #10040 from annando/file-permissions 
Only set file permissions when configured
 2021-03-13 07:19:30 -05:00
Michael 0bc1ebe5bf Only set file permissions when configured 2021-03-13 11:37:11 +00:00
Michael ffb92e3355 Integrate fetching of the content type into "getSiteinfo" 2021-03-13 07:03:26 +00:00
Michael 262ee2b0b1 Issue 10019: Fix embedding of media objects 2021-03-12 23:04:51 +00:00
Hypolite Petovan f8e3c687d7
Merge pull request #10036 from fabrixxm/fix-installer-themes 
Installer: install themes as last action
 2021-03-12 14:43:58 -05:00
fabrixxm a861eb65af Storage: small fixes to 'storage move' 
- stop command if current storage backend is still "legacy"
- write destination backend name in log
 2021-03-12 18:24:45 +01:00
fabrixxm 225a37af9a Installer: install themes as last action 
this will register theme hooks
 2021-03-12 18:21:50 +01:00
utzer e20e62ffd6
Part of bugfix for storage move problem 
@fabrixxm is this already good to change?
 2021-03-12 09:55:55 +01:00
Hypolite Petovan 60a74fd5dc
Merge pull request #10034 from annando/better-tag-sorting 
Trending tags are now sort by different users
 2021-03-11 17:31:59 -05:00
Michael 5666866812 Trending tags are now sort by different users 2021-03-11 19:59:42 +00:00
Hypolite Petovan a1c15f43df
Update value interpolation syntax in Model\Event::getListById 2021-03-11 14:03:53 -05:00
Roland Häder 5de0008b48
Removed default values. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:45:59 +01:00
Roland Häder 15fd6822e4 Ops, missing ";" 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:41:33 +01:00
Roland Häder 736045c67d Code changes for #10020: 
Added ability to set chmod (default: 0640) for "proxified" files (downloaded to
/proxy/ directory). This allows customization, e.g. if people want 0600 instead
without changing the code.

Signed-off-by: Roland Häder <roland@mxchange.org>
 2021-03-11 12:41:33 +01:00
Michael 9e87dcb25b We now set the protocol in "gserver" on receiving as well 2021-03-10 22:31:33 +00:00
Michael Vogel 5e98a38ac9
Merge pull request #10027 from MrPetovan/task/9950-improve-maintenance-page 
Improve maintenance page
 2021-03-10 20:19:55 +01:00
Hypolite Petovan 4489d14b06
Remove admin condition to display the maintenance reason 2021-03-10 12:20:02 -05:00
Michael Vogel 2605cc1a8a
Merge pull request #10028 from MrPetovan/task/security.txt 
Add security.txt file
 2021-03-10 17:14:23 +01:00
Hypolite Petovan 2d91db9e76 Add /.well-known/security.txt route and module 2021-03-10 09:58:48 -05:00
Hypolite Petovan 2922be68bf Replace module output instead of redirecting to maintenance page 2021-03-10 09:50:20 -05:00
Hypolite Petovan 064ff693fd Add custom message to the maintenance module display 2021-03-10 09:50:20 -05:00
Michael 8211e6d887 Fixes notice: "Undefined index: type" 2021-03-10 14:40:57 +00:00
Michael d30ec1eb58 More indexes / performance for "pinned" improved 2021-03-10 13:25:37 +00:00
Hypolite Petovan df547ba73f
Merge pull request #10024 from annando/block-tags 
Block tags from the trending tags
 2021-03-09 18:14:41 -05:00
Michael 639a781125 Block tags from the trending tags 2021-03-09 22:34:41 +00:00
Michael 1e56cee2c5 Issue 9906: Hopefully finally fixes the speed issues 2021-03-09 21:21:33 +00:00
Michael 5863fd881d Issue 9906 (again): Provide index hints 2021-03-09 08:01:10 +00:00
Michael 972c9f7bc0 Issue 9743: Added translatable texts 2021-03-08 21:17:27 +00:00
Michael e826a4dafd We now use a constant 2021-03-08 18:57:19 +00:00
Michael 409a8322a8 Issue 9996: "bd" is a date field it cannot be empty 2021-03-08 18:50:50 +00:00
Michael e515ac11ed Don't check for table_open_cache when pdo_emulate_prepares is activated 2021-03-08 10:38:53 +00:00
Hypolite Petovan 9c9317010b
Merge pull request #10006 from annando/failed 
Use "failed" instead of "archive" for contact update check
 2021-03-07 16:54:26 -05:00
Michael a3e713d01b Use "failed" instead of "archive" for contact update check 2021-03-07 20:34:13 +00:00
Michael 7510e854de Issue 8547: Improve page load speed 2021-03-07 20:15:25 +00:00
Michael 6a4540e6f6 Issue 9799: Ensure that the first post date is after the registration date 2021-03-07 10:46:46 +00:00
Hypolite Petovan ab9090ede1
Merge pull request #10001 from annando/issue-9925 
issue 9925: Fixes database error with MySQL 8
 2021-03-07 04:35:10 -05:00
Michael 98ffcdd085 Issue 9925: Make query compatibly to MySQL 8 2021-03-07 07:54:02 +00:00
Michael 1940c17030 Issue 9992: post type hadn't been translated in the user's language 2021-03-07 07:39:13 +00:00
Michael 3695787968 Issue 9948: Remove "@" from full text search 2021-03-06 23:04:39 +00:00
Michael d2c734c025 Issue 9986: Improve contact search 2021-03-06 21:52:26 +00:00
Michael d78345e694 Issue 9968: Avoid blocking update calls 2021-03-06 16:52:36 +00:00
Hypolite Petovan aa6472061b
Merge pull request #9987 from annando/db-performance 
Small performance improvements, new view for future use
 2021-03-06 10:27:32 -05:00
Tobias Diekershoff 30ae5220b5
Merge pull request #9989 from annando/issue-9912 
Issue 9912: Process Markdown content from Peertube
 2021-03-06 14:04:28 +01:00
Michael Vogel 98599c4c4b Avoid notice "Undefined index: author-name" in Diaspora delivery 2021-03-06 13:47:10 +01:00
Michael 8c748f03f9 Issue 9912: Process Markdown content from Peertube 2021-03-06 08:43:25 +00:00
Michael 470a47647a Small performance improvements, new view for future use 2021-03-06 05:47:49 +00:00
Tobias Diekershoff f24deebc7f
Merge pull request #9981 from annando/issue-9977 
Issue 9977: Check for existance of the "item" table on postupdate
 2021-03-04 10:21:06 +01:00
Michael bd7e5b69c1 Issue 9975: Remove unused views 2021-03-04 00:02:34 +00:00
Michael b029e78212 Issue 9977: Check for the existance of the "item" table on postupdate 2021-03-04 00:00:24 +00:00
Michael 4a991f0189 Adding of missing entries is now kept behind a config 2021-03-03 11:01:16 +00:00
Michael 7f4722ce6f Less blocking clean up, adding of missing posts 2021-03-03 07:07:29 +00:00
Michael c740509a22 Changed worker order 2021-03-02 07:06:22 +00:00
Michael a228183abb Call post and item-uri expiry in squence 2021-03-02 06:50:12 +00:00
Michael 5f48d6497e Fix slow queries 2021-03-01 22:19:47 +00:00
Michael 73e36b64e6 Avoid "duplicate entry" error 2021-02-28 19:31:12 +00:00
Michael a1e2794c64 Avoid lock problems, fix foreign key problems with contact-relation 2021-02-28 17:56:56 +00:00
Michael 2bbfbd57b0 Only offer "ignore thread" when there is a need for this 2021-02-28 11:20:02 +00:00
Michael 530cfba71e Offer "follow thread" only when you don't already follow 2021-02-28 07:47:07 +00:00
Hypolite Petovan a5dde7a69b
Merge pull request #9964 from annando/fix-link-preview 
Fix link preview with videos
 2021-02-27 17:52:02 -05:00
Michael ab3fed9643 Fix link preview with videos 2021-02-27 21:02:06 +00:00
Hypolite Petovan a6423031eb
Merge pull request #9963 from mexon/mat/support-cid-scheme 
Support cid URLs as used in mailstream plugin
 2021-02-27 12:11:15 -05:00
Matthew Exon 4a16d8e06f Support cid URLs as used in mailstream plugin 2021-02-27 16:54:52 +00:00
Michael 72863e8926 Avoid deletion of newly created contacts 2021-02-26 19:41:51 +00:00
Michael 3917c8ab5d Partly revert the contact-relation sruff 2021-02-25 05:21:47 +00:00
Michael 99a145f7cf Fixes several database errors, removes "relation" handling 2021-02-25 05:13:49 +00:00
Hypolite Petovan 77b24a0b66
Quit earlier in ProbeURL->getFeedLink if body is empty 2021-02-23 16:06:34 -05:00
Adam Clark 995d53ebfc Missed this file when adding. 2021-02-23 10:18:56 -08:00
Adam Clark 8248f6942f Quit when message is empty, similar to #9681 2021-02-23 10:16:59 -08:00
Tobias Diekershoff beccd12a2b Issue 9064: referring INSTALL.txt now points to doc/INSTALL.md 2021-02-23 09:57:33 +01:00
Michael 1792046a4f post/thread views are renamed, search bugs fixed 2021-02-22 19:47:08 +00:00
Michael Vogel 1935ec566a Avoid endless loop with the MagicLink 2021-02-21 20:51:00 +01:00
Michael 2bb8e7a56f Prohibit combined usage of "star" and "mention" 2021-02-21 12:18:50 +00:00
Michael dcc82bfcf7 Automatically set to "seen" 2021-02-21 11:59:59 +00:00
Michael 4dfd91dbbf Use the system user for uid=0 2021-02-21 11:47:03 +00:00
Michael ab34cbbfec Reset "star" and "mention" on new order 2021-02-21 11:14:35 +00:00
Michael 454fbc8ad7 Queries without indexes 2021-02-21 10:37:15 +00:00
Michael b444617a00 Non blocking item-uri cleanup 2021-02-21 08:55:09 +00:00
Michael e07b73f560 Update in chunks 2021-02-21 08:00:53 +00:00
Michael Vogel 5b9239b341 Spaces removed 2021-02-21 08:52:42 +01:00
Michael 10f7280bbc Fetch a given number of posts 2021-02-21 07:46:58 +00:00
Michael d37f3de3e6 Update in segments 2021-02-21 07:06:20 +00:00
Michael 92a8a399de Improved indexes, avoiding SQL errors, improving speed 2021-02-20 20:07:25 +00:00
Michael 1b1897db4a Contacts are now removed more ressource friendly 2021-02-19 17:56:13 +00:00
Michael abcbbd2ec1 Merge remote-tracking branch 'upstream/develop' into no-item 2021-02-19 06:59:45 +00:00
Michael c247d5fbeb The item table is now completely removed 2021-02-19 06:30:38 +00:00
Hypolite Petovan 3859b7ba10 Move /parse_url module to /parseurl 
- Update oexchange module to use BBCode::embedURL instead of a self-request
- Remove mod/parse_url.php file
- Restrict ParseUrl module to authenticated users
 2021-02-18 09:06:27 -05:00
Hypolite Petovan dc8ecbeb24 Add new Content\Text\BBCode::embedURL method 2021-02-18 09:06:13 -05:00
Hypolite Petovan 69802554fd Add native media types and expiration to getSiteInfo 2021-02-18 09:06:11 -05:00
Michael 312c01a517 Several speed improvements (magiclink, caching, indexes) 2021-02-17 18:59:19 +00:00
Hypolite Petovan 251465f67a
Merge pull request #9939 from jurassic-c/mimetype-dotname-fix 
File extension to Mimetype matching fix for filenames with extra periods in them
 2021-02-16 18:37:50 -05:00
Colby Sollars 5151a82d5e On wall_attach, file extension to mimetype matching now breaks the filename at the last . character instead of the first 2021-02-16 15:50:20 -07:00
Michael 60a6dfa23c Fix several database issues 2021-02-16 22:04:03 +00:00
Michael 890d1057d2 No implicit mention for top level Diaspora comments 2021-02-16 07:20:41 +00:00
Michael 1afc076831 Set the post update version 2021-02-15 22:22:34 +00:00
Michael 0beec80405 Fix updating the thread 2021-02-15 11:03:22 +00:00
Michael 2b17e36a67 Rever item reshare handling, fixed database 2021-02-15 10:29:58 +00:00
Michael 2b76ff61ad Avoiding notice 2021-02-15 07:44:51 +00:00
Michael a1a4471632 Fix SQL query 2021-02-15 07:25:45 +00:00
Michael 751232d679 Merge remote-tracking branch 'upstream/develop' into no-item 2021-02-14 22:44:38 +00:00
Michael Vogel 6321dcc6d7
Merge pull request #9916 from MrPetovan/task/babel-twitter-url 
Babel: Support tweet URL
 2021-02-14 23:42:35 +01:00
Michael 896e58347d Post update function to set the "external-id" 2021-02-14 21:57:02 +00:00
Michael e1c79a41d9 We now don't store in the "item" table anymore 2021-02-14 20:27:31 +00:00
Michael 36357e790e "id" is now post-user-id 2021-02-14 18:33:15 +00:00
Michael 6e1483545e Support for message delivering via uri-id 2021-02-14 14:24:48 +00:00
Michael 07c07ec499 More "item" traces removed 2021-02-14 09:43:27 +00:00
Michael ce6ad1aa73 Get rid of the "item" table, enhanced "post" tables 2021-02-13 19:56:03 +00:00
Tobias Diekershoff 97a6a742e7
Merge pull request #9922 from MrPetovan/bug/9666-video-bbcode-link 
Try OEmbed first for [audio] and [video] tags
 2021-02-10 11:33:42 +01:00
Hypolite Petovan b2680bffb0 Babel: Support tweet URL 2021-02-09 23:26:02 -05:00
Hypolite Petovan 4a57ed1a31 Move HTTPS exception for YouTube and Vimeo to OEmbed::fetchUrl 
- Both Youtube and Vimeo output OEmbed endpoint URL with HTTP but their OEmbed endpoint is only accessible by HTTPS ¯\_(ツ)_/¯
 2021-02-09 23:25:18 -05:00
Hypolite Petovan 0927bb5f2c Harden OEmbed link discovery 
- Check OEmbed call return code before storing response
- Stop at first successful OEmbed response
 2021-02-09 23:25:18 -05:00
Hypolite Petovan 7653bc00df Try OEmbed first for [audio] and [video] tags 2021-02-09 23:20:28 -05:00
Michael badb73d0cb Added update for post-thread-user 2021-02-09 17:04:41 +00:00
Michael f1377ce7fb Issue 9906: Improved view speed 2021-02-09 16:35:01 +00:00
Michael ab5a447bc2 The "thread" table isn't used anymore 2021-02-08 07:48:36 +00:00
Michael 8f27715d8b "item" is replaced whenever possible at the moment 2021-02-06 13:42:21 +00:00
Michael 265f46692f Avoid foreign key problems when deleting contacts 2021-02-05 07:44:39 +00:00
Michael 2282bb4a19 Fix test data 2021-02-04 09:46:29 +00:00
Michael 5e846dd7c2 The thread table is replaced by post-thread and post-thread-user 2021-02-04 05:51:25 +00:00
Michael e561cad844 "participation" is removed since it is unused 2021-02-02 06:28:51 +00:00
Michael 5a2c5da81d Added "user-item" table to the list of removable tables 2021-02-02 06:10:10 +00:00
Michael 48ba88b11c remove test logging 2021-02-02 05:53:55 +00:00
Michael df24c0daeb User-Item table is replaced 2021-02-02 05:45:57 +00:00
Michael be3dfb4ffe Merge remote-tracking branch 'upstream/develop' into post-thread-user 2021-02-01 19:31:39 +00:00
Michael 32e6b28aab Fixed class name 2021-02-01 13:36:20 +00:00
Michael d5c33216b7 Don't remove data from the item array 2021-02-01 11:00:35 +00:00
Michael c62d93cfe8 Avoid "Undefined index: verb" 2021-02-01 10:57:25 +00:00
Michael 8c9346fc12 New table "post-user-notification" 2021-02-01 10:31:38 +00:00
Michael 08317036e7 List of deprecated fields is checked 2021-02-01 07:06:01 +00:00
Michael c1d99d6c4c Most user-item traces removed 2021-01-31 23:37:34 +00:00
Hypolite Petovan 15e9f219e7 Add new item/{id}/follow module and POST route 
- It is meant to replace mod/subthread
 2021-01-31 17:36:18 -05:00
Hypolite Petovan b31fc3bfa9 Move GET starred/{id} to POST item/{id}/star 2021-01-31 14:21:57 -05:00
Michael ac03399a90 Merge remote-tracking branch 'upstream/develop' into post-thread-user 2021-01-31 18:33:02 +00:00
Michael 15162b4027 New table "post-thread-user" 2021-01-31 18:32:22 +00:00
Hypolite Petovan 6d31c11e57 Move GET item/ignore/{id} to POST item/{id}/ignore 2021-01-31 12:56:44 -05:00
Michael Vogel 71b85ef393
Merge pull request #9893 from MrPetovan/bug/9879-empty-plurals 
Skip empty message strings in Console\PoToPhp
 2021-01-31 18:32:44 +01:00
Hypolite Petovan 151db1104a Move GET /like/{id} to POST /item/{id}/activity/{verb} 2021-01-31 08:41:04 -05:00
Hypolite Petovan 3c4d3dc2d0 Skip empty message strings in Console\PoToPhp 
- Fix issue with empty plurals not displaying the defaut translation string
 2021-01-31 08:36:57 -05:00
Hypolite Petovan 185adc61f0 Set correct integer return type for Temporal::getAgeByTimezone 2021-01-31 08:36:56 -05:00
Michael 998f127cb8 Prevent "No post-content stored" 2021-01-31 12:26:25 +00:00
Michael Vogel 56a77f5275
Merge pull request #9882 from MrPetovan/bug/po2php-plural-conversion 
Remove ternary operators from converted .po plural condition
 2021-01-31 11:43:25 +01:00
Hypolite Petovan 188f7b0eb0 Move GET pinned/{id} to POST item/{id}/pin 2021-01-30 18:42:23 -05:00
Hypolite Petovan 9885c1f128
Merge pull request #9890 from annando/post-content 
New table "post-content"
 2021-01-30 18:01:13 -05:00
Michael 41061a7ec1 Avoid "Duplicate entry" 2021-01-30 22:39:06 +00:00
Michael c3398511b4 New table "post-content" 2021-01-30 22:03:53 +00:00
Hypolite Petovan acaf2f768e
Merge pull request #9884 from annando/update-in-maintenance 
Setting "maintenance" for pre and post updates
 2021-01-30 11:22:37 -05:00
Michael 8eb3bddc2a Reduce the parameter chaos by splitting the update function 2021-01-30 13:31:59 +00:00
Michael 90f1175cf5 Setting "maintenance" for pre and post updates 2021-01-30 07:50:20 +00:00
Hypolite Petovan 3bb10b82a1 Remove ternary operators from converted .po plural condition 
- Thanks @sunchaserinfo for most of the work
 2021-01-29 20:01:14 -05:00
Michael 722083f9ed Avoid non numeric parameter 2021-01-29 23:41:42 +00:00
Hypolite Petovan 43f0f6bbdc
Merge pull request #9877 from annando/application-json 
Accept "application/json" as application type for ActivityPub
 2021-01-29 10:14:16 -05:00
Hypolite Petovan 315f39de2f
Merge pull request #9876 from annando/thr-parent 
Set thr-parent when importing mails
 2021-01-29 10:12:49 -05:00
Michael b22d7452a3 Accept "application/json" as application type for ActivityPub 2021-01-29 11:15:47 +00:00
Michael ae684b4938 Set thr-parent when importing mails 2021-01-29 10:39:55 +00:00
Michael 56db5a29c4 Prevent permissionset foreign key constraint 2021-01-29 06:26:51 +00:00
Hypolite Petovan 9a4128a5c8
Merge pull request #9873 from annando/post-user 
New "post-user" structure, new update  functionality
 2021-01-28 19:32:17 -05:00
Michael 9a9674d5fb New "post-user" structure, new update functionality 2021-01-28 22:45:54 +00:00
Michael Vogel 199f72ee3c
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device 
Add "Remember this device" feature to two factor authentication
 2021-01-27 22:32:08 +01:00
Hypolite Petovan a7791bebc2
Merge pull request #9870 from annando/uri-id 
"uri-id" instead of "uri" or "id"
 2021-01-27 11:45:19 -05:00
Michael ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Extarys d5a066400d style: tab to space 2021-01-25 12:02:49 -05:00
Extarys 68a2c4c885 pwa: add fields 2021-01-25 11:46:27 -05:00
Hypolite Petovan 82e094179c Rename notify classes according the feature name, not the table name 2021-01-24 09:33:23 -05:00
Hypolite Petovan a2556e7c67 Remove leading space in displayed public tags in profile page 2021-01-23 15:55:21 -05:00
Hypolite Petovan 5a949911ba Add trusted browsers user setting module 
- Add trusted browsers help section
 2021-01-23 05:42:59 -05:00
Hypolite Petovan 50f97e977a Added support for trusted browser during authentication 2021-01-23 05:42:59 -05:00
Hypolite Petovan 72bb3bce34 Add trusted browser classes 
- Added some tests
 2021-01-23 05:42:59 -05:00
Hypolite Petovan 0fc5f26ff7 Replace BaseEntity with BaseDataTransferObject class for API representation classes 2021-01-23 05:42:58 -05:00
Hypolite Petovan 3e257d4266 Move all two-factor authentication classes in Security\TwoFactor 2021-01-23 05:42:58 -05:00
Hypolite Petovan c644d76d28 Allow setting arbitrary keys in the cookie array 2021-01-23 05:42:58 -05:00
Hypolite Petovan 6b0df74ed7 Add blocking author from an item context feature 2021-01-23 05:30:03 -05:00
Hypolite Petovan e2c38f1347 Prevent hashtag parsing and replacement in image alternative text 2021-01-22 17:45:28 -05:00
Hypolite Petovan 2343d7bb73 Replace obsolete call to Item::selectFirstThreadForUser in Module\Item\Ignore 2021-01-22 16:03:36 -05:00
Michael 4002bd9b97 Don't create a user-item entry on default 2021-01-22 08:16:41 +00:00
Hypolite Petovan 215c6ecc14
Merge pull request #9843 from annando/no-filetag 
Legacy file/category storage is removed
 2021-01-21 18:50:57 -05:00
Michael 0c14f41873 Use an exception 2021-01-21 21:53:19 +00:00
Michael fbcc59cc1d Some more removed functionality from FileTag class 2021-01-21 20:25:06 +00:00
Tobias Diekershoff cf51237e70
Merge pull request #9828 from MrPetovan/bug/9733-tag-numbers 
Remove strictly numeric tags exception
 2021-01-21 17:09:51 +01:00
Hypolite Petovan 9a9b43bd6c Fix wrong uses of DI::l10n() in Core\Update 
- Fix typos in version number in translated messages
 2021-01-21 10:36:52 -05:00
Michael d2ea3eabfb Replace legacy file/category handling 2021-01-21 07:16:41 +00:00
Hypolite Petovan 35213630e8 Remove strictly numeric tags exception 
- It prevented to use year number hashtags for no clear benefit
 2021-01-20 08:10:20 -05:00
Michael a773a72eaa The "icid" field is deprecated 2021-01-19 23:26:24 +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 9ccfa37d3c Fixes 9814 - again 2021-01-18 20:19:13 +00:00
Michael f9430175c6 Avoid multiple lines in post-view, added thread view 2021-01-18 07:10:04 +00:00
Michael ff8b578cde Fix the test data / unused function removed 2021-01-17 22:20:46 +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 2c65b81182 Fix notice "Undefined index: internal-verb" 2021-01-17 08:15:18 +00:00
Michael e775be38c8 Fix failed query 2021-01-16 23:24:48 +00:00
Michael 2b1d0b9db8 "selectForUser" and "" selectFirstForUser" is now moved to Post 2021-01-16 22:37:27 +00:00
Hypolite Petovan c1226bff07
Merge pull request #9803 from annando/post 
New post class in the rest of the classes
 2021-01-16 08:26:05 -05:00
Hypolite Petovan e68f7444ed
Improve class alias naming in Object\Post 2021-01-16 08:12:41 -05:00
Hypolite Petovan edf9bdfa14
Merge pull request #9801 from annando/protocol-worker 
New post class in protocol and worker classes
 2021-01-16 07:58:00 -05:00
Michael 2fa692bcce New post class in the rest of the classes 2021-01-16 04:16:09 +00:00
Michael 68502daed0 New post class in protocol and worker classes 2021-01-16 04:14:58 +00:00
Michael b0d1a295fe New post class in model classes 2021-01-16 04:13:22 +00:00
Michael f4addd337d New database version, fixes to empty field list 2021-01-14 22:51:44 +00:00
Michael 55204d26b1 Added function to count posts 2021-01-14 14:51:04 +00:00
Michael 8e12dd1658 Post view works now, "file" handling improved 2021-01-14 14:45:40 +00:00
Michael ca16a4892b The item view is completed, unneeded fields removed 2021-01-13 07:23:57 +00:00
Michael 0951b551c5 Issue 9777: Fix to deliver public posts to Diaspora again 2021-01-11 20:31:52 +00:00
Hypolite Petovan 884419a6bb
Merge pull request #9780 from annando/alternate-9775 
Create plink if missing
 2021-01-11 15:25:25 -05:00
Michael 83266b87af Create plink if missing 2021-01-11 20:14:17 +00:00
Michael b160aa07b6 Issue 9705: Perform an age check when the post isn't fetched 2021-01-11 20:00:51 +00:00
Michael f40ab2b65d Always deliver via AP if the server supports it 2021-01-10 19:41:01 -05:00
Michael f29ed78155 Prevent error when gsid is null 2021-01-10 19:08:23 -05:00
Michael 050f31eeb3 Don't try legacy if the server supports more 2021-01-10 19:08:23 -05:00
Michael bf563a1a39 Store the server transport protocol 2021-01-10 19:08:23 -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 81ffe38f2e The highest post update version number is 1385 2021-01-07 22:12:53 +00:00
Hypolite Petovan c8604895c4 [frio] Add share dropdown to mobile post view 
- This should prevent accidental taps from resharing content unwittingly
 2021-01-07 10:13:40 -05:00
Michael df135c31fe Merge remote-tracking branch 'upstream/develop' into no-frontend-worker 2021-01-07 10:44:12 +00:00
Michael 0fd01015e1 Increase wait time to 5 minutes 2021-01-06 23:24:00 +00:00
Michael d5280c3dc3 Removed to-do comment 2021-01-06 23:08:09 +00:00
Michael ced417da6c Added functionality to kill processes 2021-01-06 23:05:55 +00:00
Michael 594b1a75b5 Use the correct pid 2021-01-05 21:48:29 +00:00
Michael 6ef0f9646f Set the new pid 2021-01-05 21:39:53 +00:00
Michael 2f8e873cc7 Wait for parent 2021-01-05 16:47:55 +00:00
Michael 17fbe5c299 Delete IPC entries 2021-01-05 16:01:05 +00:00
Michael 7e89bf5af8 Wait for child being ready 2021-01-05 10:18:25 +00:00
Michael 69c7e9af20 Let the worker run for an hour in daemon mode 2021-01-04 09:20:44 +00:00
Michael 74d7d7e164 Check for childf status 2021-01-03 22:57:25 +00:00
Michael d70d180e4b Merge remote-tracking branch 'upstream/2020.12-rc' into fork 2021-01-03 10:06:17 +00:00
Hypolite Petovan 7e8f13d703
Merge pull request #9741 from annando/worker-cooldown 
Additional worker cooldown
 2021-01-02 15:04:29 -05:00
Michael 10b035b51a Additional worker cooldown 2021-01-02 19:33:50 +00:00
Michael c0ac120578 Issue 9736: Fix for undroppable registrations 2021-01-02 09:11:38 +00:00
Michael 7a03b72060 Improved daemon test 2021-01-02 08:43:55 +00:00
Michael 78f67c1e0e Check for reaching the memory limit 2021-01-01 23:10:38 +00:00
Michael a81ac835a1 The frontend worker is removed 2021-01-01 23:05:26 +00:00
Michael 9a6141dcbe Use "pcntl_fork" to fork processes 2021-01-01 19:35:29 +00:00
Michael 5dcc02594c Some more log levels 2020-12-31 20:44:33 +00:00
Michael d1ea529cfb Issue 9704: Improved log levels 2020-12-31 20:14:13 +00:00
Michael Vogel 54db693e16
Merge pull request #9724 from MrPetovan/bug/notices 
Various improvements
 2020-12-31 17:30:50 +01:00
Hypolite Petovan c69d8ee455
Merge pull request #9732 from annando/public-permissionset 
Accept public and user contact id for permissionsets
 2020-12-31 11:14:22 -05:00
Michael a2c9aa8e11 Accept public and user contact id for permissionsets 2020-12-31 15:22:38 +00:00
Hypolite Petovan 422de110e6
Merge pull request #9727 from annando/notice 
Fix a notice when the path is empty
 2020-12-31 07:15:12 -05:00
Michael fec5f2c217 Fix a notice when the path is empty 2020-12-31 07:54:56 +00:00
Hypolite Petovan fff565a80b Prevent alt text of emoji image tags to be converted to smilies in BBCode::convert 2020-12-30 22:23:58 -05:00
Hypolite Petovan beaef12296 Add missing first file/line in exception template 2020-12-30 21:15:01 -05:00
Hypolite Petovan e342f69e21 Simplify item sanitization in Util\ACLFormatter 2020-12-30 21:11:24 -05:00
Hypolite Petovan a12380a247
Fix typo in Model\Event 2020-12-30 09:20:46 -05:00
Michael c5c9fda93c Improved logging, avoid fatal error 2020-12-30 07:13:47 +00:00
Michael 96e140a027 Merge remote-tracking branch 'upstream/2020.12-rc' into notices 2020-12-30 07:12:59 +00:00
Michael d666501ee0 Fix fatal error 2020-12-29 22:14:54 +00:00
Michael a294c19d6e Fix several notices 2020-12-29 21:38:23 +00:00
Tobias Diekershoff cf65725373
Merge pull request #9713 from annando/annando/issue9712 
Comment to Twitter post is posted to AP instead
 2020-12-28 08:08:02 +01:00
Michael 152daaabfb Comment to Twitter post is posted to AP instead 
Fixes friendica/friendica#9712
 2020-12-28 06:49:23 +00:00
Hypolite Petovan 8c1e2b9800 Throw exception when item doesn't exist in Factory\Api\Mastodon\Status->createFromUriId 
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-750464977
 2020-12-27 21:15:21 -05:00
Michael 447bac077e Simplify the resizing 2020-12-26 21:24:36 +00:00
Michael 997319a41f Use the raw data instead of an object 2020-12-26 19:31:39 +00:00
Michael 7f56e2e7a9 Improve photo loading speed 2020-12-26 18:51:36 +00:00
Hypolite Petovan f0eeb4900f Add support for Unicode in Model\Tag::store 2020-12-24 05:09:38 -05:00
Michael Vogel 71bd6c674b
Merge pull request #9701 from MrPetovan/bug/9636-frio-mobile-intros-buttons 
[frio] Improve display of introduction action buttons on mobile
 2020-12-23 19:50:16 +01:00
Hypolite Petovan 241cd32b14 Replace obsolete calls to $APP->is_mobile in templates 2020-12-23 03:25:55 -05:00
Hypolite Petovan cab40636bd Add expected contact field in Module\Contact\Poke 
- Address PHP Notice: Undefined index: photo in src/Module/Contact/Poke.php on line 94
 2020-12-23 02:48:38 -05:00
Hypolite Petovan 586fb10176
Merge pull request #9697 from annando/improved-server 
Server detection: Handle redirects, better Peertube detection
 2020-12-22 11:14:07 -05:00
Michael Vogel ae386a78a4
Merge pull request #9696 from MrPetovan/bug/9306-poke-privacy 
Use correct request parameter type for poke privacy
 2020-12-22 17:11:37 +01:00
Michael ae8a376eab Fix wrong variable 2020-12-22 08:24:56 +00:00
Michael a5096ea549 Server detection: Handle redirects, better Peertube detection 2020-12-22 08:12:36 +00:00
Hypolite Petovan 2ef5bf1e21 Use correct request parameter type for poke privacy 2020-12-22 01:02:42 -05:00
Hypolite Petovan 043e2224b0 Add mentions to poke posts 2020-12-22 01:02:06 -05:00
Hypolite Petovan 2ef4972782 Fix capitalization of Contact::magicLinkById calls 2020-12-22 01:01:43 -05:00
Hypolite Petovan 4b1180ec8b Restore autolink in share block content in BBCode::convertShare 2020-12-21 22:46:29 -05:00
Hypolite Petovan b0234f4ef9 Remove autocomplete from 2FA code input fields 2020-12-21 00:25:21 -05:00
Hypolite Petovan c8476f6838
Merge pull request #9687 from annando/drop-unused 
Drop unused friendica tables
 2020-12-20 19:11:45 -05:00
Hypolite Petovan ec33957a4f
Merge pull request #9686 from annando/removed-unneeded 
Remove unneeded configutation
 2020-12-20 19:10:45 -05:00
Michael 1e27396851 Improved help texts 2020-12-20 16:22:25 +00:00
Michael Vogel 4ee029c9c7
Merge pull request #9684 from MrPetovan/bug/9678-required-translation 
Add translation to untranslated strings in templates
 2020-12-20 16:27:31 +01:00
Michael 246a90b0e6 Replaced tabs with spaces 2020-12-20 14:04:00 +00:00
Michael 6ebd023c4e Drop unused friendica tables 2020-12-20 14:01:46 +00:00
Michael d755bbae8f Remove unneeded configutation 2020-12-20 08:56:32 +00:00
Hypolite Petovan fbd0cefdf7 Add translation to Yourself option in view as select in profile 
- Address https://github.com/friendica/friendica/issues/9682
 2020-12-20 02:08:17 -05:00
Hypolite Petovan a991f3dfcf Add translation to required labels for install checks 
- Remove unused checks loop in install_base template
 2020-12-20 02:08:13 -05:00
Hypolite Petovan d5a90f384d
Merge pull request #9685 from annando/clean-avatar 
Remove unused cached avatar photo entries
 2020-12-20 02:04:16 -05:00
Michael 460b6d1c75 Remove unused cached avatar photo entries 2020-12-20 06:22:31 +00:00
Hypolite Petovan 65f74da45b Add translation to required labels on input fields 
- Normalize display of required label
- Remove unused field_richtext template
 2020-12-19 22:52:45 -05:00
Hypolite Petovan 5649861fde
Merge pull request #9681 from annando/fatal-php8 
Quit when message is empty
 2020-12-19 21:13:38 -05:00
Michael 92679de225 Remove orphaned avatar photo entries 2020-12-19 22:07:08 +00:00
Michael 3ec1270fde Quit when message is empty 2020-12-19 18:17:32 +00:00
Hypolite Petovan fc19d98392
Merge pull request #9680 from annando/issue-9402 
Issue 9402: Avoid message "invalid storage backend settings" on empty value
 2020-12-19 13:07:02 -05:00
Michael Vogel e66fba9757 Issue 9402: Avoid message "invalid storage backend settings" on empty value 2020-12-19 18:17:12 +01:00
Michael 944b0eadb7 Issue 9457: Fix remembering "personal" and "starred" 2020-12-19 16:48:12 +00:00
Hypolite Petovan bcd61c8372
Merge branch '2020.12-rc' into bug/9656-purify-video-embed 2020-12-18 14:47:24 -05:00
Hypolite Petovan 95f099d26c Restore Mastodon emoji span classes 
- Fix typo in replacement of [class] tag
 2020-12-18 11:08:03 -05:00
Hypolite Petovan 20d9dcf7ac Bump BBCode version to 2020-12-18 2020-12-18 10:32:36 -05:00
Hypolite Petovan 0781f28ca6 Allow support for allowlisted iframe sources in Content\text\BBCode::convert 
- Support Youtube, Vimeo and unused local embeds
 2020-12-18 10:32:36 -05:00
Hypolite Petovan ec0c9dcdb1 Remove support for [iframe] BBCode 
- It was a huge gaping security hole, and now HTML Purify will remove the src attribute of all non-allowed sources anyway.
 2020-12-18 10:32:36 -05:00
Hypolite Petovan 0dac6e9d34 Add general information header translation to admin site template 2020-12-17 22:52:30 -05:00
Michael c1e8dbdbae Avoid "Duplicate entry" 2020-12-17 18:56:10 +00:00
Michael 66c1592171 Fix notices 2020-12-17 18:08:07 +00:00
Hypolite Petovan 38b17e1aae
Merge pull request #9668 from annando/keywarning 
Fix warning "supplied key param cannot be coerced into a public key"
 2020-12-17 08:25:25 -05:00
Michael e713db4ac7 Delete tombstone contacts 2020-12-17 08:00:56 +00:00
Michael a548e7c4be Fix warning "supplied key param cannot be coerced into a public key" 2020-12-17 07:07:54 +00:00
Michael e22bb32247 Store the network profiler data 2020-12-17 06:23:03 +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