Commit Graph

8071 Commits

Author SHA1 Message Date
Michael 3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
Michael d4fd151227 Partly reverting formatting to cause a code style checker error 2021-09-25 08:06:38 +00:00
Michael 5cfb0cb58a Last style stuff ... 2021-09-24 04:52:34 +00:00
Michael 943f1961ea Style again 2021-09-24 04:50:47 +00:00
Michael 8fd8241797 Style again 2021-09-24 04:46:30 +00:00
Michael 64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael f696fce824 Reformatting 2021-09-23 21:53:52 +00:00
Michael 26fa5e8b3f Moved functions 2021-09-23 21:29:36 +00:00
Michael 0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Hypolite Petovan 7f7f0eb10c Improve compacting error logging in Util\JsonLD
- Exceptions thrown by friendica/json-ld are nested and their string representation shows all the exception chain
2021-09-22 23:09:46 -04:00
Michael 840d9823d4 Log unexpected value 2021-09-22 03:25:01 +00:00
Michael 7ac76639c5 AVoid warning when fetching page data 2021-09-22 02:41:24 +00:00
Hypolite Petovan be3fb5f205
Merge pull request #10730 from annando/public-contact-list
Display the public contacts for profile visitors
2021-09-19 17:32:51 -04:00
Michael 325342a886 Renamed variable 2021-09-19 17:56:44 +00:00
Michael 9c73e49db7 Make posts on the profile page writable 2021-09-19 10:53:19 +00:00
Michael f032f66b38 Display the public contacts for profile visitors 2021-09-19 10:06:42 +00:00
Michael 3dddea96fa Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-18 20:27:24 +00:00
Hypolite Petovan 24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar
Issue 10720: Use different path scheme for user avatars
2021-09-18 09:30:08 -04:00
Philipp c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
Philipp fd22906d70
Add feedback 2021-09-18 12:51:10 +02:00
Philipp 6893e2c3f7
Add feedback / revert fix for $item['post-type'] 2021-09-18 12:51:09 +02:00
Philipp 462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp 89a085a12c
Check DBA::count() result 2021-09-18 12:51:08 +02:00
Philipp 644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
Michael a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
Hypolite Petovan 9a0c3cc834 Simplify max_data parameter for Temporal::getDateTimeField 2021-09-15 15:56:44 -04:00
Michael Vogel 695df7507a
Merge pull request #10713 from MrPetovan/task/10672-contact-module-security-token
Use CSRF token as name and value for contact deletion confirm form
2021-09-15 07:55:34 +02:00
Hypolite Petovan 44ec4de14c Use CSRF token as name and value for contact deletion confirm form 2021-09-14 17:28:42 -04:00
Michael Vogel a689db7b64
Update src/Protocol/ActivityPub.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-09-14 23:22:57 +02:00
Michael b18f92ea72 Fixed indendation 2021-09-14 20:46:59 +00:00
Michael f99c4ca704 Removing unused variable 2021-09-14 08:08:50 +00:00
Michael 72fa4e9970 Better handling of displaying peertube videos 2021-09-14 07:52:53 +00:00
Michael d33fea1993 Fix: Use the $uid 2021-09-14 02:00:40 +00:00
Michael e3413cf959 Issue 10706: Publish public custom fields in AP 2021-09-14 01:28:58 +00:00
Michael 2926282f8d More fields added to "user-contact" 2021-09-13 14:20:20 +00:00
Michael 5abc1543fd Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-13 12:31:30 +00:00
Hypolite Petovan d78661817e
Merge pull request #10693 from nupplaphil/feat/config_dir
Add the possibility to use a different configuration directory
2021-09-13 07:02:52 -04:00
Philipp a65fbcebe7
Fixing #10699 (prohibits blocking and ignoreing from the photo menu) 2021-09-12 21:20:12 +02:00
Michael 3eea4b1130 Use "rel" for "self" instead of using a separate field 2021-09-12 19:04:27 +00:00
Michael 19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
Philipp 27e4586597
Move path determination logic into the ConfigFactory 2021-09-12 13:44:29 +02:00
Michael Vogel 5246b9c4b0
Merge pull request #10697 from MrPetovan/bug/10692-api-expand-entities
Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
2021-09-12 06:47:51 +02:00
Hypolite Petovan e3a2f17f9f
Merge pull request #10696 from annando/photo-type
Use post type "photo" for multiple photos as well
2021-09-12 00:19:47 -04:00
Hypolite Petovan 8e99b7f775 Refine BBCode::expandTags regular expression
- Now requires the tag to be preceded by either a non-word character or a start of a line
- Added corresponding tests
2021-09-12 00:06:14 -04:00
Hypolite Petovan 5a93bb6eff Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses
- We never need to expand tags inside of an already existing BBCode url tag
2021-09-12 00:05:22 -04:00
Michael 6579a3a106 Use post type "photo" for multiple photos as well 2021-09-12 01:58:29 +00:00
Michael 9191daf12f Fix commenting on public posts 2021-09-12 01:52:10 +00:00
Michael eeec6aaeb9 Removed unused "use" 2021-09-11 13:02:36 +00:00
Michael 1e123ace12 Only fetch, not probe 2021-09-11 13:00:12 +00:00
Michael 10cb52bc00 Only add user contacts, alternate way to fetch public contact id 2021-09-11 12:43:46 +00:00
Philipp 5702944116
Add the possibility to use a different configuration directory 2021-09-11 14:33:26 +02:00
Michael 5113987031 Added update function to add user-contact entry 2021-09-11 07:59:46 +00:00
Michael f33a98578d Capitalization 2021-09-10 23:59:33 +00:00
Michael b170dd765d Insert and update some more fields 2021-09-10 20:53:10 +00:00
Michael 2486c8031b update for user-contact is added 2021-09-10 20:22:24 +00:00
Michael 9c14eb0c6b Use centralized function to update contact entries 2021-09-10 18:21:19 +00:00
Hypolite Petovan 8b450be09b Move unsecured GET endpoint handlers before security token check in Module\Contact 2021-09-10 12:05:43 -04:00
Hypolite Petovan 75d3f5094b
Merge pull request #10683 from annando/proxify
Make the proxy functionality optional
2021-09-10 10:24:17 -04:00
Michael a4b0ab90b1 Insert a user-contact for every contact 2021-09-10 13:05:16 +00:00
Michael 634db1ec85 Changed text 2021-09-10 00:30:11 +00:00
Michael bdb5aa6bd9 Make the proxy functionality optional 2021-09-09 12:40:19 +00:00
Hypolite Petovan e9aa27b19f Add form security token to contact actions
- Add token to batch POST actions
- Add token to individual GET actions
2021-09-06 12:30:38 -04:00
Hypolite Petovan d20b53607d Distinguish between public and private contact in contact actions
- Block and ignore is done relating to a public contact (uid = 0)
- Update and drop is done relating to a private contact (uid !=0)
- Method documentation has been improved to precise the contact type it needs
- Public and private contact ids are retrieved before acting on contacts
2021-09-06 11:50:46 -04:00
Hypolite Petovan 5262843e63 Add redirect URL parameter to contact batch
- This allows redirection to the correct contact tab after a batch action
2021-09-05 14:54:51 -04:00
Hypolite Petovan 6e358bfacf Remove user-controlled contact archival feature
- Archival is managed at the system level for failed probing and doesn't make sense for a user to decide on it
2021-09-05 14:54:50 -04:00
Hypolite Petovan 7ee88c3457 Improve documentation of $old_fields possible values in DBA::update and Database->update 2021-09-05 14:54:50 -04:00
Hypolite Petovan bd09f5f665
Merge pull request #10669 from annando/no-rino
Remove all traces of "rino"
2021-09-05 14:53:46 -04:00
Michael 52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
Philipp fc46744183
Fix Photo::delete() 2021-09-05 19:20:43 +02:00
Michael d89f004a2a Issue 10651: Improved logging 2021-09-04 04:51:20 +00:00
Michael ce6f6978bd Use the correct function is adviced ... 2021-09-03 04:20:32 +00:00
Michael 307cfef12b Select all fields 2021-09-03 04:09:02 +00:00
Michael 6bb8b63da0 Adding gravity to avoid notices 2021-09-03 04:05:29 +00:00
Hypolite Petovan 1852ea98cf
Merge pull request #10657 from annando/self-unfollow
Don't offer to unfollow yourself
2021-09-02 20:04:16 -04:00
Hypolite Petovan 4140a59332
Merge pull request #10658 from nupplaphil/feat/storage_naming
Rename Storage Backend labels
2021-09-02 19:55:15 -04:00
Philipp 687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00
Michael 547a13661a Don't offer to unfollow yourself 2021-09-02 19:38:10 +00:00
Michael 64fd94fc74 Issue 10651: remote comments appeared as own posts 2021-09-02 05:57:50 +00:00
Michael 58abaf5c53 Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c 2021-09-01 18:34:24 +00:00
Michael c8d2c87af0 Issue 10640 - Inverse user display settings 2021-09-01 18:29:45 +00:00
Philipp 728e82d8b0
Improve translation for Storage module 2021-09-01 14:00:23 +02:00
Hypolite Petovan 1665b54c6f
Fix variable assignment alignment in Module\Admin\Site 2021-08-31 16:01:20 -04:00
Michael 13ae96e9e1 Some more "enable" 2021-08-31 19:54:05 +00:00
Michael 85e2328b23 Issue 10640: Some more inversed settings 2021-08-31 19:26:17 +00:00
Michael 80b13ec232 Fix translations for singular/plural strings 2021-08-31 05:51:08 +00:00
Michael 3944e5d38e Disable mail setting when imap support is disabled 2021-08-30 21:17:03 +00:00
Michael e3c7cd25e1 Issue 10640: Use consistent settings to enable protocol support 2021-08-30 19:46:10 +00:00
Michael 2bae4dde1f Avoid notices 2021-08-30 12:29:09 +00:00
Hypolite Petovan 4f7142198e
Merge pull request #10642 from annando/url-change
Set contact to failed when url changed
2021-08-30 08:12:10 -04:00
Michael 9135ff5124 Set contact to failed when url changed 2021-08-29 20:25:21 +00:00
Philipp 0d6884a8a9
Fix http_code usage in case of failures 2021-08-29 14:05:38 +02:00
Philipp 58001c729f
Fix https://github.com/friendica/friendica/issues/10473#issuecomment-907749093 2021-08-29 13:56:56 +02:00
Philipp b76634ea0c
Catch TransferExceptions for HTTPClient::finalUrl() in case the headers are empty 2021-08-29 13:37:08 +02:00
Philipp 1c089e8d89
[WIP] WebDav Storage backend 2021-08-25 23:47:18 +02:00
Philipp 13a91e63aa
Rename DI::httpRequest() into DI::httpClient() 2021-08-25 21:54:54 +02:00
Philipp 505100bdd7
Rename HTTPRequestOptions to HTTPClientOptions 2021-08-25 21:45:15 +02:00
Philipp 478f69c403
Realy fix setCookieJar 2021-08-25 21:32:44 +02:00
Philipp 2054a787da
Fix HTTPRequestOptions at HTTPClient::post() 2021-08-25 21:31:30 +02:00
Philipp 0cafa871f1
Use HTTPRequestOptions constants for HTTPClient::get() 2021-08-25 21:31:30 +02:00
Philipp aad7bac686
Use HTTPRequestOptions constants for HTTPClient::post() 2021-08-25 21:31:30 +02:00
Philipp e9902401a5
Fixing HTTPClient::post() and introduce HTTPRequestOptions 2021-08-25 21:31:30 +02:00
Philipp 660a3cd247
Expose IHTTPClient::request() 2021-08-25 21:31:30 +02:00
Philipp 749f3e158b
Use temporary files for the URLResolver CookieJar 2021-08-25 20:39:33 +02:00
Philipp 81ad618480
Merge branch 'task/httprequest_optimiziations' of https://github.com/nupplaphil/friendica into task/httprequest_optimiziations 2021-08-25 18:01:34 +02:00
Philipp 4ddaf49f53
Revert setCookieJar() and add overwrite parameter fpr rare cases 2021-08-25 18:01:07 +02:00
Philipp f10de08166
Update src/Network/IHTTPClient.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-25 17:02:42 +02:00
Philipp f00da9eccf
Update src/Network/IHTTPClient.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-25 17:02:34 +02:00
Philipp a6258cfbfa
Adapt description for "accept_content" 2021-08-25 14:28:59 +02:00
Philipp 12367648fa
Add suggestions 2021-08-25 14:22:43 +02:00
Philipp 7d251f092e
Add logpoint 2021-08-25 14:22:43 +02:00
Philipp befd5c860d
Fix headers (string to array) and make sure the signature doesn't change 2021-08-25 14:22:43 +02:00
Philipp f01d882e6c
Fix HTTPClient 2021-08-25 14:22:43 +02:00
Philipp d4a233a149
Extend test capability for HTTP Requests 2021-08-25 14:22:43 +02:00
Philipp a3d0404290
Fix curResult::getHeader() in GServer.php 2021-08-25 14:22:43 +02:00
Philipp 2356221aba
Fixup HTTP headers for httpClient requests 2021-08-25 14:22:43 +02:00
Philipp 10e6089405
Fixing https://github.com/friendica/friendica/issues/10473#issuecomment-903993836 2021-08-25 14:22:42 +02:00
Philipp 3eb2abdb2a
Adapt tests 2021-08-25 14:22:42 +02:00
Philipp 8385ee7a61
Use mattwright/urlresolver for HTTPClient::finalUrl() 2021-08-25 14:22:42 +02:00
Philipp e576af218b
Use Guzzle for HTTPClient::post() 2021-08-25 14:22:42 +02:00
Philipp 736277dcf0
Refactor HTTPClient::get() / ::head() 2021-08-25 14:22:42 +02:00
Philipp 52c7948526
Create HTTPClientFactory and introduce ImageTest 2021-08-25 14:22:42 +02:00
Hypolite Petovan 7a8d800024 Add probe support to @user@domain.tld search string format 2021-08-24 12:46:01 -04:00
Hypolite Petovan 17944c01ea Allow a GuzzleResponse body to be queried more than once
- Using `StreamInterface->getContents` left the stream index at the end of the stream, which made every subsequent call to `getBody()` return empty string
- Using `StreamInterface->__toString()` magic method correctly seek the stream to the start before reading
2021-08-24 11:30:11 -04:00
Hypolite Petovan e7fdf3c0c3
Merge pull request #10630 from annando/cleared-enotify
Unused parts of the old notification system are removed
2021-08-24 10:25:06 -04:00
Michael Vogel 9aca4b515f
Merge pull request #10628 from MrPetovan/bug/fatal-errors
Set profile fields for system user in Model\User::getOwnerDataById
2021-08-24 14:13:32 +02:00
Hypolite Petovan ceeb246128 Remove Profile::load from Module\HCard
- Renamed and re-scoped Profile::sidebar to getVcardHtml
2021-08-24 06:24:06 -04:00
Hypolite Petovan 8f0e36d617 Raise an Exception when Profile::load is profided the system user nickname 2021-08-24 05:54:15 -04:00
Hypolite Petovan e155821d7a Set profile fields for system user in Model\User::getOwnerDataById
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-903676606
- This is required when Model\Profile::load is called for the system user for example
2021-08-24 05:53:46 -04:00
Michael 429a724bc1 Unused parts of the old notification system are removed 2021-08-24 08:53:15 +00:00
Hypolite Petovan 0651ace4e4
Merge pull request #10627 from annando/like-announce
Reliably display "like" and "share" notifications
2021-08-23 14:12:57 -04:00
Michael c78b7f45c5 Reliably diasplay "like" and "share" notifications 2021-08-23 15:07:14 +00:00
Hypolite Petovan 2108be7e07
Merge pull request #10619 from nupplaphil/task/guzzlehttp
PSR-7 Part 1: Use Guzzle PSR-7 library for HTTPRequest->get()
2021-08-22 18:11:30 -04:00
Philipp ff2d85b703
Initialize $curlOptions[CURLOPT_HTTPHEADER] outside of the checks 2021-08-22 22:49:55 +02:00
Philipp c3eca0cfae
Remove legacy header-parsing for guzzle 2021-08-22 22:43:28 +02:00
Michael e9c63ff075 Added "follow" subscription message 2021-08-22 08:27:56 +00:00
Michael 59045b2e23 Added handling another situation 2021-08-22 03:58:50 +00:00
Michael 4f1e61457d Fetch the user's post if present 2021-08-21 21:40:47 +00:00
Michael 42de5c77d0 The desktop notifications have been reworked 2021-08-21 20:35:04 +00:00
Philipp 8f13319c73
remove unused $redirect parameter 2021-08-20 22:30:54 +02:00
Philipp 9eba32226c
make CS happy :) 2021-08-20 22:11:36 +02:00
Philipp 653d49cb92
Fix getHeader() 2021-08-20 22:00:28 +02:00
Philipp 65ca164487
A lot of Fixings 2021-08-20 21:35:14 +02:00
Philipp 06371d29a6
Cleanup 2021-08-20 20:03:42 +02:00
Philipp a338e4cbff
Update src/Network/GuzzleResponse.php 2021-08-20 19:58:42 +02:00
Philipp 756f57f198
Revert "Use last entry for Content-Type 2021-08-20 19:58:42 +02:00
Philipp 50e2478189
Remove unnecessary exception message (avoid log flooding) 2021-08-20 19:58:42 +02:00
Philipp 1995feff61
Fix redirect logging 2021-08-20 19:58:42 +02:00
Philipp 26401e88b8
IHTTPResult::getContentType is now a string again 2021-08-20 19:58:42 +02:00
Philipp 82f767f2ee
Fix Content-Type for CurlResult class 2021-08-20 19:58:42 +02:00
Philipp 803c1d71de
Fix IHTTPResult::getHeader()
- Now returns a string array, like expected
- Fix usages
- Fix dataset
2021-08-20 19:58:42 +02:00