Commit Graph

8967 Commits

Author SHA1 Message Date
Philipp 05ecd1e3d4
Replace IHTTPResult for CurlResult usages 2021-08-20 19:58:42 +02:00
Philipp 7009d90add
Introduce IHTTPResult Interface as abstraction for CurlResult 2021-08-20 19:58:42 +02:00
Hypolite Petovan 632d1024f7
Merge pull request #10309 from fabrixxm/feature/advanced-logsview
Display structured logs in admin
2021-08-20 05:24:07 -04:00
fabrixxm 3766204b05 Fix code standard 2021-08-20 11:09:35 +02:00
fabrixxm 7f695197aa Fix review points
- Fix headers hierarchy
- Improve accessibility:
 	- set mouse pointer
	- make rows focusable
	- open on key press
	- add tooltip with "title"
	- add role and aria attributes
- Rename `ParsedLog` to `ParsedLogLine`
- Add docs to `ReversedFileReader`'s implementation of `Iterator`'s methods
- Add docs to `ParsedLogIterator`'s implementation of `Iterator`'s methods
- Remove unnecessary comment
- Add more test for parsing log lines and fix some edge cases
- Fix function name in snake-case to camelCase
- Remove `DIRECTORY_SEPARATOR`
2021-08-20 11:02:18 +02:00
Hypolite Petovan 1de159a2ae Escape url tags before attempting to add missing mention links in Protocol\ActivityPub\Processor
- Mastodon uses @-sign in profile URLs which wrongly triggered the mention link add in existing mentions links
2021-08-20 03:45:15 -04:00
Hypolite Petovan 4b36f7e8c8
Merge pull request #10616 from annando/notification-message
Meaningful notification message
2021-08-19 19:20:46 -04:00
Michael c0d187f281 Added "causer" and "notification" for the "ping" mechanism 2021-08-19 14:57:35 +00:00
Michael 6899d3c618 Meaningful notification message 2021-08-19 13:58:55 +00:00
fabrixxm dd2abc7aff Fix code standard 2021-08-19 15:20:25 +02:00
fabrixxm ec4f53d56f Add DI to ParsedLogIterator, replace constructors with fluent api 2021-08-19 14:56:51 +02:00
fabrixxm a62124285d Add tests for ParsedLog and fix parsing 2021-08-19 14:55:33 +02:00
fabrixxm 84fa668845 Fix code formatting 2021-08-19 14:55:33 +02:00
fabrixxm 5b9aeeeca9 Add search and filter to log view 2021-08-19 14:55:33 +02:00
fabrixxm 9368f5445d Display structured logs in admin
Tries to parse log lines and to display info in a table.
Additional JSON data is parsed and displayed clicking on a row.

File reading and line parsing is handled in iterators, to avoid to keep
too much data in memory.
Search and filter should be trivial to add.
Log file is read backward to display log events newest first.
A "tail" functionality should be easy to implement.
2021-08-19 14:55:33 +02:00
Hypolite Petovan 9b64035231 ActivityPub: Add support for non-link mentions
- This enables implicit mention removal even if the remote server doesn't add links to mentions in the message body.
- This also enable interactive mentions in the message body when implicit mentions are disabled.
2021-08-18 14:36:21 -04:00
Hypolite Petovan f0bb83c225
Merge pull request #10613 from annando/improved-payload
The push api payload content is improved
2021-08-18 13:45:18 -04:00
Michael Vogel 9bc6b08618
Update src/Worker/PushSubscription.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-18 18:54:03 +02:00
Michael 6f6fe7fa25 Clarify the upcoming functionality 2021-08-18 10:27:45 +00:00
Michael Vogel 486328336f
Merge pull request #10611 from MrPetovan/task/feed-debug-contact
Allow contact creation in Module\Debug\Feed
2021-08-18 10:05:38 +02:00
Michael b521e45903 Merge remote-tracking branch 'upstream/develop' into improved-payload 2021-08-17 23:00:00 +00:00
Michael 5a9db1b3bc The push api payload content is improved 2021-08-17 22:53:52 +00:00
Hypolite Petovan 0a592fbf34 Abort early if owner isn't found in Module\RemoteFollow
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-899099987
2021-08-17 09:38:35 -04:00
Hypolite Petovan 6f13663c45 Return early if body is empty in Network\Probe::updateFromFeed
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-894815271
2021-08-17 09:35:44 -04:00
Hypolite Petovan a04944d443 Allow contact creation in Module\Debug\Feed
- This module only allowed existing contact feeeds to be debugged
2021-08-17 08:20:58 -04:00
Hypolite Petovan 64d6df659d
Merge pull request #10609 from tobiasd/20210816-10514
Issue 10514: add TLS check to the installer
2021-08-17 07:58:17 -04:00
Tobias Diekershoff e1c961cc64
Merge pull request #10607 from MrPetovan/task/advancecontentfilter-attachments
Add the attachments to the $item for the prepare_body_content_filter hook
2021-08-17 12:40:49 +02:00
Tobias Diekershoff ae6e13815d rewording the encouragement and regen of the messages.po 2021-08-17 08:38:06 +02:00
Tobias Diekershoff 6cd9f26771 add encuragement 2021-08-17 08:38:06 +02:00
Tobias Diekershoff e16e9bd929 typo 2021-08-17 08:38:06 +02:00
Tobias Diekershoff cafb91ec62 Issue 10514: add TLS check to the installer
This PR adds a check to the installer which tries to determine whether the
request to the installer was made over an HTTPS line or not.

I've only tested it with an Apache2 server, but there it works.

Addresses #10514
2021-08-17 08:38:06 +02:00
Philipp db6fded5d2
Update src/Core/StorageManager.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-16 23:32:32 +02:00
Philipp 99239e3d99
Fix usage 2021-08-16 23:27:43 +02:00
Philipp 1901716479
Lower complexity for valid backends (replace hashmap with a "simple" name array) 2021-08-16 23:27:43 +02:00
Philipp 02a4d30f7d
Add todo for later 2021-08-16 23:27:43 +02:00
Philipp 1df6225868
Update src/Model/Storage/Filesystem.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-16 23:27:42 +02:00
Philipp f4941b5b49
Update src/Model/Storage/IWritableStorage.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-16 23:27:42 +02:00
Philipp c17bc55158
Introduce InvalidClassStorageException and adapt the code for it 2021-08-16 23:27:42 +02:00
Philipp d0536ebea7
Rename ISelectableStorage to IWritableStorage 2021-08-16 23:27:42 +02:00
Philipp eb035771f1
Revert Photo::getImageDataForPhoto return-type change 2021-08-16 23:27:42 +02:00
Philipp 51ebb1541a
- Revert HTTPSignature change 2021-08-16 23:27:42 +02:00
Philipp 57438afbb3
- Moved the description for the specific storage exception first
- Introduced exceptions for try to get invalid storage
- ReferenceStorageException now extends StorageException
2021-08-16 23:27:42 +02:00
Philipp 470ba8b61b
Fixup Database behaviour 2021-08-16 23:27:42 +02:00
Philipp 90c99520bb
Fix Storage Exceptions 2021-08-16 23:27:42 +02:00
Philipp 29c7552df5
Refactor IStorage 2021-08-16 23:27:42 +02:00
Philipp 5dcdf2322e
Split IStorage and ISelectableStorage and make their behaviour homogenous 2021-08-16 23:27:41 +02:00
Hypolite Petovan e205bd450e
Merge pull request #10602 from annando/push
Transmit push subscriptions
2021-08-16 14:33:36 -04:00
Michael 7158b35f58 Added logging, removed superfluous comments 2021-08-16 15:23:34 +00:00
Hypolite Petovan 7082582655 Add the attachments to the $item for the prepare_body_content_filter hook
- Allows filtering on attachments that are added later to the post content
2021-08-16 05:28:08 -04:00
Michael ce9da778b9 Clarify XMPP profile field description 2021-08-16 06:15:18 +00:00
Michael c85ce2f6b0 Add a payload 2021-08-16 06:11:26 +00:00
Michael 69c816eb17 Trim whitespace 2021-08-15 22:09:32 +00:00
Michael e3f8f371a7 Use the existing VAPID key generation 2021-08-15 21:54:24 +00:00
Michael 2c1b33af87 Standards 2021-08-15 21:30:27 +00:00
Michael 69f11c4a84 Adding the VAPID keys 2021-08-15 21:24:23 +00:00
Michael d5e9253adb Standards again 2021-08-15 21:03:43 +00:00
Michael 5cf0da4140 Coding standards 2021-08-15 21:01:58 +00:00
Michael 977d28353c Transmit push subscriptions 2021-08-15 20:52:46 +00:00
Hypolite Petovan 414f20c529
Merge pull request #10600 from nupplaphil/bug/update_autoinstall_doc
AutomaticInstallation - Fix last example
2021-08-15 16:50:58 -04:00
Philipp b52c9215f6
AutomaticInstallation - Fix last example 2021-08-15 21:36:05 +02:00
Michael c78d490c2e Some more standards 2021-08-15 16:24:12 +00:00
Michael f29cef175e Remove spaces 2021-08-15 16:22:23 +00:00
Michael 19f3cad56c Preparation for creating push notification 2021-08-15 16:18:25 +00:00
Michael 5056376902 We need to create a vapid public and private key 2021-08-15 12:57:29 +00:00
Michael 74f3cbc383 Improved error check, added "put" 2021-08-15 07:28:26 +00:00
Michael 8b6ace6629 Don't continue when key couldn't be created 2021-08-15 06:45:48 +00:00
Michael 167a12ef54 Styling 2021-08-15 00:43:07 +00:00
Michael e28a4265c5 API: First steps to support subscriptions 2021-08-15 00:30:41 +00:00
Hypolite Petovan 1e305e748d
Merge pull request #10596 from annando/mark-file-star-for-all
Follow, file and star does now work for all items
2021-08-12 12:20:55 -04:00
Michael Vogel fa65c436f4
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-08-12 18:04:01 +02:00
Hypolite Petovan a364436623
Merge pull request #10597 from annando/warning
Fixes "PHP Warning:  key() expects parameter 1 to be array, string given"
2021-08-12 11:48:35 -04:00
Michael Vogel f7f79a240a Are the tests happy? 2021-08-12 15:12:41 +02:00
Michael Vogel e6ab4d9be9 Fixes "PHP Warning: key() expects parameter 1 to be array, string given" 2021-08-12 14:00:54 +02:00
Michael 81d9fc677f Updated messages.po 2021-08-12 06:33:08 +00:00
Michael 473adaf463 Mark, file and starring does now work for all items 2021-08-12 05:28:47 +00:00
Michael Vogel b855646097
Merge pull request #10580 from MrPetovan/bug/10019-peertube-embed
Simplify attachment processing in Protocol\ActivityPub\Receiver
2021-08-11 13:56:33 +02:00
Michael ce46ab2573 The Matrix and XMPP address is now transported via AP as well 2021-08-10 23:49:09 +00:00
Hypolite Petovan 56ee1a211f
Merge pull request #10592 from annando/event
Simplify event storing
2021-08-10 09:00:41 -04:00
Michael 8e074a5fe4 Simplify event storing 2021-08-10 10:24:14 +00:00
Michael 56c00ea42d Handles PHP Notice: Undefined index: addr in src/Protocol/Diaspora.php on line 3091 2021-08-10 03:50:43 +00:00
Hypolite Petovan d7e5814b12 Simplify attachment processing in Protocol\ActivityPub\Receiver
- Remove indexing attachments by mediatype for later sorting
2021-08-09 19:29:12 -04:00
Michael 28cfdec7c4 Some more renamed functions 2021-08-09 20:56:15 +00:00
Michael c81e81dc8d "getUserId" is now "getLoggedInUserId" 2021-08-09 20:33:46 +00:00
Michael 15b93b4459 "getUserNickname" is now "getLoggedInUserNickname" 2021-08-09 19:48:39 +00:00
Michael f5e84c1ff0 Use owner not profile 2021-08-09 15:38:22 +00:00
Michael 4495e83eca Merge remote-tracking branch 'upstream/develop' into app-user2 2021-08-09 15:32:32 +00:00
Michael b8fa75b2dd Changed function name 2021-08-09 15:29:07 +00:00
Hypolite Petovan 3e1e3c8b3e
Merge pull request #10588 from annando/matrix
Matrix addresses can be entered in the profile
2021-08-09 10:56:12 -04:00
Michael 51d549639d Fix profile probing via Pleroma 2021-08-09 06:56:41 +00:00
Michael bee04f86ee Matrix addresses can be entered in the profile 2021-08-09 01:39:09 +00:00
Michael 9f01052dd2 Removed some more unused "use" 2021-08-08 20:03:28 +00:00
Michael a9d7e5b29e Removed unused use 2021-08-08 19:43:15 +00:00
Michael 28090bd793 Get rid of App->user completely 2021-08-08 19:30:21 +00:00
Michael fc283ab928 Remove direct calls to App->user 2021-08-08 10:14:56 +00:00
Michael 9664efd66b Added some description 2021-08-07 20:09:25 +00:00
Michael 6a23b17c95 Respect the postopts values for scheduled posts 2021-08-06 18:49:17 +00:00
Tobias Diekershoff 266ee26240
Merge pull request #10579 from annando/http-errors
Avoid some HTTP errors
2021-08-06 08:11:35 +02:00
Michael a8442e41ab Improved error message for external resources 2021-08-06 04:02:42 +00:00
Michael 4bc3e8c141 Don't send "accept" when we accept anything 2021-08-06 04:02:22 +00:00
Tobias Diekershoff 0e54d35f65
Merge pull request #10575 from MrPetovan/bug/10019-peertube-embed
Extract MP4 video URL from PeerTube ActivityPub metadata to enable video embed
2021-08-05 18:11:07 +02:00
Hypolite Petovan f194d167b0 Extract MP4 video URL from PeerTube ActivityPub metadata to enable video embed
- This MP4 video URL is located in the tags of the streaming URL link element that we don't support yet
2021-08-05 10:51:42 -04:00
Michael d6c25dc63c Handle profile page detection without a type 2021-08-05 11:37:04 +00:00
Michael eec6cdf01b Avoid a database query when possible 2021-08-05 08:51:39 +00:00
Michael 835152d418 Simplified signature creation 2021-08-05 08:42:46 +00:00
Michael a26a2a0228 Make the system owner ready for Diaspora 2021-08-05 08:30:44 +00:00
Michael Vogel c73130aa6b Create the Diaspora signature for the correct user 2021-08-05 08:58:50 +02:00
Michael 1c5baddcd2 Don't use the system user for participation messages 2021-08-04 12:35:03 +00:00
Michael Vogel 25f0f0c439 Display the publish time in the local timezone 2021-08-04 07:58:07 +02:00
Michael ec3eead034 Don't set the pconfig values on manual mode 2021-08-03 05:39:04 +00:00
Hypolite Petovan 37d5bc1a51
Merge pull request #10566 from annando/manage-avatar
Use the general function ro create an avatar path
2021-08-02 18:50:15 -04:00
Michael 9f19adf8bb Use the general function ro create an avatar path 2021-08-02 22:28:42 +00:00
Michael 6c8a4a2552 Use a centralized function to delete delayed entries 2021-08-02 20:56:34 +00:00
Michael 88e276843e Using "post" when deleting, fixing deleting 2021-08-02 19:18:44 +00:00
Michael f87e41e206 Scheduled posts are now listed and can be deleted 2021-08-02 17:03:06 +00:00
Michael ec5ed0cf46 Placeholder page for scheduled posts 2021-08-02 12:10:03 +00:00
Michael 8214401b57 Merge remote-tracking branch 'upstream/develop' into scheduled-frontend 2021-08-01 13:12:25 +00:00
Michael 2e2d1bf81d Added option to define a schedule date when posting items 2021-08-01 13:01:31 +00:00
Hypolite Petovan 98803064eb
Merge pull request #10562 from nupplaphil/bug/storage_admin
Fix legacy storage config
2021-08-01 05:59:35 -04:00
Philipp 839b5b5859
Fix legacy storage config 2021-07-31 20:56:32 +02:00
Michael e89d0f2599 Style 2021-07-31 06:22:08 +00:00
Michael 13529fa97d Support the "media_attachments" field 2021-07-30 22:39:13 +00:00
Michael 9b609ba19d Space added 2021-07-30 14:06:18 +00:00
Michael 48f2790593 Spaces removed 2021-07-30 14:05:57 +00:00
Michael 929de9081e All needed fields are now filled 2021-07-30 13:22:06 +00:00
Michael 93263a820d Function renamed, documentation added 2021-07-30 10:24:08 +00:00
Michael bb37c41bd7 Scheduled posts can now be created 2021-07-30 06:22:32 +00:00
Michael 4137a6250b Delayed now return their id on insert 2021-07-30 06:20:10 +00:00
Michael 5e75ba3083 guid function is now public 2021-07-30 06:19:25 +00:00
Michael 432206bc5b Use router constants 2021-07-30 06:19:02 +00:00
Michael c9eca1edeb Fix array index 2021-07-29 15:01:09 +00:00
Michael a1828430e5 Fixing variables 2021-07-29 14:58:04 +00:00
Michael 20e69c1e71 Return as array 2021-07-29 10:46:40 +00:00
Michael 6ea3d4aa61 Added API calls, removed fields 2021-07-29 10:34:31 +00:00
Michael fbbe9a3c1f "wid" is not an item field 2021-07-29 03:57:37 +00:00
Michael 2951243b07 Preparation for delayed posts 2021-07-28 22:22:00 +00:00
Hypolite Petovan f89cc6bd45
Merge pull request #10553 from annando/issue-10545
Issue 10545: Convert complex zmg BBCode elements
2021-07-28 06:37:52 -04:00
Michael 6f40904ea1 Increased version 2021-07-28 10:18:34 +00:00
Michael d58eaa13d1 Issue 10545: Convert complex zmg BBCode elements 2021-07-27 21:44:02 +00:00
Hypolite Petovan dfb043ce60 Add Exception for empty User::getOwnerDataById(0 return case in Protocol\ActivityPub\Transmitter::getProfile()
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-882781552
- Add try-catch blocks to all references of Protocol\ActivityPub\Transmitter::getProfile()
2021-07-27 16:46:08 -04:00
Michael ab24f58bad Parser is now session 2021-07-27 13:56:28 +00:00
Michael Vogel c03fb998f4
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-07-27 15:16:31 +02:00
Michael 8dd21d82f5 Fix possible fatal error when body is null 2021-07-27 12:25:38 +00:00
Michael 9226b98724 Performance: Moved filter call after content generation 2021-07-27 12:24:22 +00:00
Michael 72bc1238ba Tests 2021-07-27 06:17:24 +00:00
Michael c89533a70b Support for stacked profiler analysis 2021-07-27 04:57:29 +00:00
Hypolite Petovan 3cef3ab107
Merge pull request #10548 from annando/args
Replaced argv/argc with replacement functions
2021-07-26 18:43:47 -04:00
Hypolite Petovan e34795762d
Merge pull request #10544 from annando/router-lock
Lock before recreate / fix cache key misspelling
2021-07-26 03:57:30 -04:00
Michael 1539d76fda Forgotten variable 2021-07-25 20:39:03 +00:00
Michael 5a87ccf026 Getter/Setter for theme info 2021-07-25 19:39:10 +00:00
Michael c52b8595e8 theme infos are now bundled in a single array 2021-07-25 19:07:03 +00:00
Michael 0551648399 App->data is not needed anymore 2021-07-25 17:29:50 +00:00
Michael df558d4056 Completely removed argc/argv 2021-07-25 15:23:37 +00:00
Michael 540ddb9265 Hopefully making the tests to work 2021-07-25 14:27:13 +00:00
Hypolite Petovan 69c75daf4f
Merge pull request #10543 from annando/app-variables
App variables reduced and removed
2021-07-25 08:56:05 -04:00
Michael 9cc4682e0a Merge branch 'app-variables' of github.com:annando/friendica into app-variables 2021-07-25 05:08:33 +00:00
Michael fbac31edc5 Simplyfying code 2021-07-25 05:08:29 +00:00
Michael Vogel 1793513f46
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-07-25 07:04:48 +02:00
Michael 2aa2c61479 Lock before recreate / fix cache key misspelling 2021-07-25 04:31:48 +00:00
Michael 0bbe954316 Getter/Setter for queue 2021-07-24 22:08:33 +00:00
Michael 866dbf9f89 Use getter/setter for timezone value 2021-07-24 21:16:53 +00:00
Michael 40a42ccdb1 Defining default value 2021-07-24 20:51:55 +00:00
Michael eda2f95a66 Added documentation 2021-07-24 20:42:09 +00:00
Michael 8f46064430 Using getter/setter functions 2021-07-24 20:34:07 +00:00
Philipp 4be4498b13
Update UX for Storage administration 2021-07-24 19:01:01 +02:00
Philipp 1e4f9f62fe
Rename buttons 2021-07-24 19:01:00 +02:00
Philipp e19b9824cd
Allow setting & saving storages per type 2021-07-24 19:00:58 +02:00
Philipp 2fe28af74f
PHP-CS fixing 2021-07-24 19:00:58 +02:00
Philipp cbe522ee82
Fixings 2021-07-24 19:00:58 +02:00
Philipp 3647f6f031
Refactor storage admin setting 2021-07-24 19:00:58 +02:00
Philipp 97bafb3a59
Extract Storage admin section to own page 2021-07-24 19:00:58 +02:00
Michael 2420bf84db Simplified code 2021-07-24 13:29:58 +00:00
Michael d56793dd09 Fix field name 2021-07-24 13:24:26 +00:00
Michael b3b5599d27 Show the network icon for the contact 2021-07-24 12:21:33 +00:00
Michael 30aad250df App->contact is now removed 2021-07-24 11:49:11 +00:00
Michael 0fe5759d8a Fixed avatar fetching for mail and feed 2021-07-24 10:32:55 +00:00
Michael 2502a9192d Many more app-variables removed 2021-07-24 10:09:39 +00:00
Michael fae0f839bc Merge remote-tracking branch 'origin/develop' into profile 2021-07-23 13:29:36 +00:00
Michael 2fae93d8fd More standards 2021-07-23 13:09:12 +00:00
Michael 90d7360252 Standards 2021-07-23 13:08:41 +00:00
Michael c17e1d7e0b Removed unused code from the profile sidebar 2021-07-23 13:05:53 +00:00
Michael afe3c8954c Simplified functionality to load the profile in the sidebar 2021-07-23 12:39:37 +00:00
Michael 9a3a4def3d "hovercard" is "hcard" 2021-07-23 12:38:29 +00:00
Michael bb222209bc Some small performance tweaks 2021-07-22 15:35:30 +00:00
Hypolite Petovan 81e6e65bc8
Merge pull request #10535 from annando/mentions
Fix for Mastodon falsely adding previews to mentions
2021-07-22 07:46:14 -04:00
Michael 71f53c946f New function to replace mentions with nicknames 2021-07-22 09:13:39 +00:00
Michael c1f849c389 Unneeded legacy DFRN table removed 2021-07-22 07:11:26 +00:00
Michael bb5f738619 Fix for Mastodon falsely adding previews to mentions 2021-07-22 04:50:01 +00:00
Michael 08cd651a03 Improved performance for UpdateContacts 2021-07-21 15:12:30 +00:00
Hypolite Petovan e7880cd37d
Merge pull request #10528 from annando/db-error
Avoid "DB Error" messages
2021-07-21 10:30:06 -04:00
Hypolite Petovan 72ab57f067
Merge pull request #10530 from annando/api-mail
API: Support for fetching mails with more "statuses" calls
2021-07-21 09:52:26 -04:00
Michael 01fd128502 API: Support for fetching mails with more "statuses" calls 2021-07-21 05:58:22 +00:00
Michael ec08784aa3 API: Added dummy endpoint for featured tags 2021-07-21 05:22:56 +00:00
Michael 69c6a5f567 Avoid "DB Error" messages 2021-07-21 03:43:30 +00:00
Michael c01ca1583c Added permission check 2021-07-20 21:45:42 +00:00
Michael e199abc837 Removed unused use 2021-07-20 21:19:16 +00:00
Michael b5f59d5be0 API: Support for deprecated API endpoints and OAuth removal 2021-07-20 20:48:37 +00:00
Michael a8fb90f42f Merge remote-tracking branch 'upstream/develop' into legacy-oauth-removed 2021-07-20 17:44:05 +00:00
Michael 6668066099 The legacy OAuth server is removed 2021-07-20 17:41:04 +00:00
RealKinetix cf32a4b7cc Sanitize negative status count on APContact
Similar to PR #10499, Mastodon apparently has some counting flaws and
can present a negative status count for a user, causing Friendica to
fail (at least under PHP 8) with:

[20-Jul-2021 16:35:18 UTC] PHP Fatal error:  Uncaught PDOException: SQLSTATE[22003]: Numeric value out of range: 1264 Out of range value for column 'statuses_count' at row 1 in /home/friendicadev/friendica/src/Database/Database.php:560
Stack trace:
  thrown in /home/friendicadev/friendica/src/Database/Database.php on line 560

This change prevents values lower than 0 from being assigned to
statuses_count.
2021-07-20 10:11:04 -07:00
Hypolite Petovan f3131c6277 Manually add Persian to post body language detection 2021-07-19 14:00:31 -04:00
Michael 289a4dcba7 Added missing app class (avoid fatal error) 2021-07-19 16:15:06 +00:00
Michael d2408c1f1b Merge remote-tracking branch 'upstream/develop' into loop-prevention 2021-07-19 12:07:34 +00:00
Michael 64026ed979 Simplify code 2021-07-19 12:07:02 +00:00
Hypolite Petovan 0dd94e8fd5
Merge pull request #10515 from annando/event-handling
Improved event storing / improved performance when fetching events
2021-07-19 04:00:53 -04:00
Michael 58cec97358 Merge remote-tracking branch 'upstream/develop' into loop-prevention 2021-07-19 07:51:29 +00:00
Hypolite Petovan eb43a579ec
Merge pull request #10512 from annando/ap-endpoints
Move ActivityPub endpoints to an AP class
2021-07-19 03:30:23 -04:00
Michael f5a7b0141b Added todo 2021-07-19 06:55:23 +00:00
Michael fa00a4ee32 Simplyfied picture fetching 2021-07-19 06:19:13 +00:00
Michael 2647514603 Detection of local requests 2021-07-19 06:14:14 +00:00
Michael 01abea7c25 Don't probe non existing local contacts 2021-07-19 04:49:58 +00:00
Michael aa6313dee6 Improved detection for a local contact 2021-07-19 04:15:57 +00:00
Michael 424a85bb94 Fetch local data without HTTP requests 2021-07-18 18:54:25 +00:00
Michael d8bf9c4601 Prevent loop also when fetching the outbox 2021-07-18 16:42:55 +00:00
Michael 2030691f9f Improved event storing / improved performance when fetching events 2021-07-18 15:05:46 +00:00
Michael f62f82df75 Move ActivityPub endpoints to an AP class 2021-07-17 20:28:46 +00:00
Michael ea056b93fa Fix notice in events 2021-07-17 20:27:18 +00:00
Michael dd2abf254d Issue 10506 - again. Improved check for pictured in body 2021-07-17 07:55:19 +00:00
Michael 596bb9fa7c Fixed wrong parameter 2021-07-17 05:25:04 +00:00
Michael 89f7ee2cc5 Prevent endless loop when updating contact by probe 2021-07-17 04:57:21 +00:00
Michael feab53b58b Issue 10506: Fix for multiple picture posts 2021-07-17 04:32:46 +00:00
Michael 209d4d0d6a DFRN endpoints moved, changelog entry added 2021-07-16 14:45:29 +00:00
Hypolite Petovan 4dc6b29046
Merge pull request #10503 from annando/no-legacy-dfrn
Legacy DFRN transport layer is removed
2021-07-15 16:24:07 -04:00
Michael c1e681e007 Improved comment 2021-07-15 17:42:03 +00:00
Michael 3a5523820c Legacy DFRN transport layer is removed 2021-07-15 13:28:32 +00:00
RealKinetix a0107be2af Negative numbers in following is a thing too
Check & sanitize 'following' as well, as per:
https://mastodon.social/@BLUW
2021-07-14 13:51:30 -07:00
RealKinetix f16b1df83f Adjust where the code is to avoid empty warning
Shifted the code to avoid:
PHP Warning:  Undefined array key "totalItems" in /home/friendicadev/friendica/src/Model/APContact.php on line 277
2021-07-14 13:46:38 -07:00
RealKinetix c1db1c980e Fix indent to standards 2021-07-14 12:17:03 -07:00
RealKinetix 2ebebe9abc Sanitize negative followers count on APContact
Please see
https://github.com/friendica/friendica/issues/9498#issuecomment-818894106
and related discussion regarding this - it appears it's possible for AP
users, maybe just Mastodon users, to have a negative followers count.
This causes fatal errors in Friendica, so I think we should sanitize
this input.
2021-07-14 10:15:19 -07:00
Hypolite Petovan fd37a57678
Merge pull request #10496 from annando/subscribe
Subscribe to contacts from a remote AP account
2021-07-14 06:45:25 -04:00
Hypolite Petovan be18a59bd7 Make last status parameter actually optional in Object\Api\Mastodon\Conversation 2021-07-13 23:02:11 -04:00
Michael 0277589fbd Removed experimental code 2021-07-14 02:59:29 +00:00
Michael 6fceab0cc8 Merge remote-tracking branch 'upstream/develop' into subscribe 2021-07-14 02:54:12 +00:00
Hypolite Petovan 2b5f1f8bca
Merge pull request #10493 from annando/api
Improve how shared posting look on mobile apps
2021-07-13 22:48:31 -04:00
Michael 5526421607 Issue 10491: Possibility for simple shortening added 2021-07-13 22:37:22 -04:00
Michael b4e4378568 Merge remote-tracking branch 'upstream/develop' into api 2021-07-14 02:28:37 +00:00
Hypolite Petovan 999a394b4d
Merge pull request #10490 from annando/fatal
Fix Uncaught TypeError: Argument 1 passed to Friendica\Model\Item::storeForUserByUriId()
2021-07-13 21:01:53 -04:00
Michael ff8f350a42 Change the BBCode version 2021-07-13 20:37:06 +00:00
Michael 875a6b81ef Improve links for API 2021-07-13 14:40:10 +00:00
Michael 267b652857 Improve how shared posting look on mobile apps 2021-07-13 08:30:05 +00:00
Michael 1466afe3b2 Automatically subscribe to the followings of a given AP account 2021-07-13 06:06:08 +00:00
Michael 299cff8c50 Defining return value 2021-07-12 20:06:35 +00:00
Michael aee652117c Definiing parameter type 2021-07-12 14:28:13 +00:00
Michael e5c312a066 Issue 10491: Possibility for simple shortening added 2021-07-12 14:11:51 +00:00
Michael 002df6e8d1 Fix Uncaught TypeError: Argument 1 passed to Friendica\Model\Item::storeForUserByUriId() 2021-07-12 07:02:01 +00:00
Michael e151a2dc41 Fixes "Undefined index: nick" 2021-07-12 06:25:48 +00:00
Michael 219534e88c Accepting "null" as parameter value 2021-07-11 14:37:17 +00:00
Michael 7390791d21 Avoid problems with "null" values 2021-07-11 11:11:03 +00:00
Michael d267ba999c We now use the new account-user-view (and fixed the function name) 2021-07-11 09:39:34 +00:00
Michael b46b88cc10 Fix fatal error 2021-07-10 21:08:55 +00:00
Michael 07d2dfcd60 Some more "convertForUriId" replacements 2021-07-10 12:58:48 +00:00
Michael 161fa4a795 Post update: Set "uri-id" in the contact tables 2021-07-10 01:41:26 +00:00
Michael de39091a79 Revert some test changes 2021-07-09 19:32:06 +00:00
Michael 90897f36ca Fix notices because of unknown Hubzilla activity type 2021-07-09 19:30:41 +00:00
Michael d6c1e1fd1c Fix "Undefined index: reply-to-id" 2021-07-09 18:10:48 +00:00
Michael e0fdde3287 Fix the tests, hopefully 2021-07-09 17:13:54 +00:00
Michael 04580ad4fb Don't update automatically to make tests happy 2021-07-09 16:20:22 +00:00
Michael 0735a22cdd Fix notice "undefined index: uri" 2021-07-09 14:52:22 +00:00
Michael 9ac284ec3a Update on empty uri-id 2021-07-09 08:46:42 +00:00
Michael b50a92cf7a Contact tables added to expire function 2021-07-09 08:08:48 +00:00
Michael 6e79da0b0c The uri-id is now in all contact tables 2021-07-09 07:09:33 +00:00
Michael c63d3f4604 Fix tests 2021-07-09 06:37:45 +00:00
Michael d8974c9a2a Function renamed to better reflect the functionality 2021-07-09 06:29:24 +00:00
Michael 17ae9b71af Avoid error on empty content 2021-07-09 04:42:01 +00:00
Michael 88f147c6a7 Always update on missing uri-id, check for uri-id in contact before removal 2021-07-09 04:38:36 +00:00
Michael 377bb78cc2 Set "convertForItem" at more places 2021-07-08 20:01:52 +00:00
Michael 901c3f4855 we now have got an uri-id field for the contact table 2021-07-08 18:59:58 +00:00
Michael 178bc543e3 New founction to count threads 2021-07-08 17:32:41 +00:00
Michael c972cce740 Avoid notice 2021-07-08 16:38:02 +00:00
Michael e72e74f7db Fixed function name 2021-07-08 15:44:55 +00:00
Michael 165c6ddc63 "convert" changed to "convertForItem" 2021-07-08 15:41:46 +00:00
Michael f29bd23ea8 New function to convert BBCode for a given ID 2021-07-08 13:47:46 +00:00
Michael f3452d86c4 Improved logging, improved link check 2021-07-06 17:40:40 +00:00
Michael ecf0b67d9d Just look at HTTP links 2021-07-06 16:10:10 +00:00
Michael 234bdff7ab Improved link check 2021-07-06 15:06:15 +00:00
Michael 37a76e70ef Providing the uri-id to "convert" when possible 2021-07-06 12:34:48 +00:00
Michael 098cd543ea Cleaned code for contact avatars 2021-07-06 10:36:00 +00:00
Michael d0136222e7 Further simplification 2021-07-06 09:24:25 +00:00
Michael 12173df4d3 Replace proxy function 2021-07-06 09:22:41 +00:00
Michael 8bfa15cf23 Simplify the attachment handling 2021-07-06 08:57:49 +00:00
Michael b7a4ef0ec1 Modfy links for attachments 2021-07-06 08:40:59 +00:00
Michael 93309a3728 Quit on empty uri-id 2021-07-06 06:45:53 +00:00
Michael dac27ead7a Proxy settings removed 2021-07-06 06:44:18 +00:00
Michael cdc18387fd Use the uri-id directly in the bbcode converter 2021-07-06 05:25:30 +00:00
Michael f8ce59b411 Use the post uri-id for false reshares 2021-07-06 04:36:45 +00:00
Michael 3deb384c54 Replace the proxify function 2021-07-05 21:35:57 +00:00
Michael db90e3bf25 Remove attachment on plaintext conversion 2021-07-05 20:20:39 +00:00
Michael 903c646a62 Style 2021-07-05 19:42:17 +00:00
Michael aed5e4cc96 New struture for post related links 2021-07-05 18:45:49 +00:00
Michael 90588ddb8e Avoid proxyfying images that are removed or replaced later 2021-07-05 07:00:35 +00:00
Michael a5176cb841 Unused constant removed 2021-07-05 05:41:05 +00:00
Michael fccb725651 Unneeded workaround removed 2021-07-05 05:11:35 +00:00
Michael a06d699480 Item cache related functionality removed 2021-07-05 04:57:50 +00:00
Michael 844727dc19 Simplyfying code 2021-07-05 04:16:02 +00:00
Michael 7188ed745c Merge remote-tracking branch 'upstream/develop' into proxy 2021-07-05 03:44:15 +00:00
Michael b09f555f4f Merge remote-tracking branch 'upstream/develop' into notice 2021-07-05 03:03:41 +00:00
Michael 1b6d0f8b1f Fix notice "Undefined index: account-type" 2021-07-04 21:26:08 +00:00
Michael e519b782fd Simplified proxy handling 2021-07-04 21:24:49 +00:00
Michael dfc1b1e7a5 Allow search for only locally published contacts 2021-07-04 19:58:02 +00:00
Tobias Diekershoff 2b95a7e7cd Merge branch 'stable' into develop 2021-07-04 20:52:22 +02:00
Michael f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Hypolite Petovan 638723ea1c
Merge pull request #10466 from annando/local-follow
Ensure that the network is set for "self" contacts
2021-07-04 12:21:21 -04:00
Michael 582fd613e0 Ensure that the network is set for "self" contac ts 2021-07-04 14:17:10 +00:00
Hypolite Petovan b84c68f024
Merge pull request #10465 from annando/local-follow
Fix local follow (and local contact data update)
2021-07-04 10:15:10 -04:00
Hypolite Petovan bedc8e1427
Merge pull request #10463 from annando/proxy-security
Proxy: Avoid access for not logged in users
2021-07-04 10:12:36 -04:00
Hypolite Petovan c0579bcad9
Merge pull request #10462 from annando/duplicate-avatars
Removal of duplicated photo entries for a contact
2021-07-04 09:56:47 -04:00
Michael 74a0bfc6da Ensure to not update the "self" contact 2021-07-04 12:38:35 +00:00
Michael 87cc17337b Fix local follow (and local contact data update) 2021-07-04 12:35:48 +00:00
Michael 24f013a654 Redirecting not logged in user instead of failing 2021-07-04 11:53:49 +00:00
Michael 4f6be0bd03 Function only needs to be private 2021-07-04 10:59:24 +00:00
Michael da484a48e3 Proxy: Avoid access for not logged in users 2021-07-04 10:55:32 +00:00
Michael 47904f99c2 Removal of duplicated photo entries for a contact 2021-07-04 10:40:03 +00:00
Michael 5ee0f6e5e1 Transmit preview link 2021-07-04 06:30:54 +00:00
Michael 1da6fa0043 Issue 10352: Fixing photo entries for contact avatars 2021-07-03 20:43:00 +00:00
Michael f37e808e02 Fix test 2021-07-03 15:47:11 +00:00
Michael c72abe48a8 Fixed fetching private local images 2021-07-03 15:29:27 +00:00
Michael 9cf39dbf00 Quickfix for hashtags in usernames in shared posts 2021-07-02 04:34:49 +00:00
Michael 8e9433f2e9 Fix: Fetching of non public photos 2021-07-01 18:05:54 +00:00
Hypolite Petovan c63dfa38c1
Merge pull request #10451 from annando/contact-path
Some more places changed to the new contact avatar path format
2021-06-30 21:24:27 -04:00
Hypolite Petovan 7a2038fc93
Merge pull request #10452 from annando/notice
Avoid Notice: Undefined index: field1 in /src/Module/Register.php on line 253
2021-06-30 21:23:12 -04:00
Hypolite Petovan dfd711d111
Merge pull request #10450 from annando/discoverable
AP: Support "discoverable"
2021-06-30 21:16:11 -04:00
Michael 16de3454bc Change logo path 2021-06-30 20:00:57 +00:00
Michael b46ad72651 Fix media size 2021-06-30 19:55:28 +00:00
Michael df9a69db01 Avoid Notice: Undefined index: field1 in /src/Module/Register.php on line 253 2021-06-30 19:13:27 +00:00
Michael 98dd4e889a Some more contact paths 2021-06-30 18:44:41 +00:00
Michael 09aa496387 Some more places changed to the new contact avatar path format 2021-06-30 16:58:46 +00:00
Michael e2dc36a691 AP: Support "discoverable" 2021-06-30 05:40:11 +00:00
Michael ec49afa116 Guess the mimetype in advance 2021-06-30 04:28:03 +00:00
Michael 39fe60744b Grammar 2021-06-30 03:49:43 +00:00
Michael d2b32a151e Detect the mimetype for external resources 2021-06-30 03:47:53 +00:00
Michael 19aef93560 Unified avatar paths 2021-06-29 20:26:58 +00:00
Michael 9edc75e29d Improved avatar handling (timestamps for caching) 2021-06-29 06:15:45 +00:00
Michael ebb9e0c2f5 Fix resizing 2021-06-28 19:38:03 +00:00
Michael ffdbac7e41 Issue 10443: Fix requesting media content 2021-06-28 18:53:10 +00:00
Michael 2f06d271bb Use a default value for "uid" 2021-06-28 13:58:06 +00:00
Michael a1a584f444 External resources are cacheable 2021-06-28 13:09:00 +00:00
Michael 4f95622d73 Only user the user with attached media. 2021-06-28 12:40:58 +00:00
Michael 8ac9b37176 Merge remote-tracking branch 'upstream/2021.06-rc' into proxy2 2021-06-28 10:11:41 +00:00
Michael 6f350c1e59 Use signed requests for fetching private images 2021-06-28 10:08:51 +00:00
Michael 7e200174d6 Replace attachment links in the body 2021-06-28 04:53:20 +00:00
Hypolite Petovan 681c7c0187 Add ExternalStorage dependency to StorageManager
- Since ExternalStorage isn't instantiated automatically by Dice, we have to provide the dependency manually in StorageManager->getByName
- This requires StorageManager to take one one additional dependency
- Tests are updated with this additional dependency
2021-06-27 23:15:46 -04:00
Hypolite Petovan faac5b71ce
Merge pull request #10437 from annando/reduce-proxy
Reduce the usage of the "proxifyUrl" function
2021-06-27 22:41:14 -04:00
Michael dbf9132ea6 Fixed indendation 2021-06-28 01:34:29 +00:00
Hypolite Petovan 005ba8c388
Merge pull request #10435 from nupplaphil/feat/di_cleanup
Add constructor injection for ExternalResource Storage
2021-06-27 21:02:03 -04:00
Michael c89547aead Only proxify images 2021-06-27 19:06:05 +00:00
Michael b46b7b08ba Reduce the usage of the "proxifyUrl" function 2021-06-27 11:50:10 +00:00
Philipp b5acc07eaf
Add todo for develop phase 2021-06-26 21:17:10 +02:00
Michael de2898988b Inverted condition 2021-06-26 11:31:37 +00:00
Michael 258d5fa695 Issue 10433: Only notify when there had been changes 2021-06-26 11:29:58 +00:00
Philipp f1f3fa7216
Add constructor injection for ExternalResource 2021-06-25 20:13:50 +02:00
Michael Vogel d9d30d9555
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-25 20:00:59 +02:00
Michael ed4a18f079 Function to return the avatar and header path for a given contact id 2021-06-25 17:03:35 +00:00
Michael e6e90abc77 AOI: Send "history" section for trends 2021-06-24 22:15:25 +00:00
Michael 89608d5844 Set CORS header fields to support Halcyon 2021-06-24 18:02:29 +00:00
Michael ee25246e41 Standards 2021-06-24 17:37:50 +00:00
Michael 9276f6823b New class for external resources 2021-06-24 17:30:22 +00:00
Michael 96809b3fdd API: Improved avatar handling 2021-06-24 07:08:38 +00:00
Tobias Diekershoff cfc08cbc11 console autoinstall used parameter U twice
The parameter "-U" was used twice for the database user and for the URL.
As all other database parameters are using the lowercase letter for the
parameter, this was adopted for the dbuser as well.
2021-06-23 18:05:39 +02:00
Michael df05d6b52a Transmit mediaType for headers as well / use blank image for empty header 2021-06-22 13:58:29 +00:00
Michael dd39b3203b Transmit mediaType, preparation for header image 2021-06-22 03:17:41 +00:00
Hypolite Petovan 47cb89967f
Merge pull request #10420 from annando/usercount
Don't count the system user as user
2021-06-21 08:46:56 -04:00
Michael 6b46fdb54e Don't count the system user as user 2021-06-21 04:03:20 +00:00
Michael d5e5a6ea23 Fix fatal error: Uncaught TypeError: Argument 1 passed to Friendica\Model\Post\Media::existsByURIId() must be of the type int, null given 2021-06-21 03:53:53 +00:00
Philipp 5a6c5e9a17
Fix wrong attachement index 2021-06-20 22:33:05 +02:00
Philipp d4387d45ee
Cleanup Code 2021-06-20 13:25:45 +02:00
Philipp 263774eb46
Satisfy PHP-CS 2021-06-20 13:25:45 +02:00
Philipp 322f0b3ecf
Cleanup Mastodon Factories 2021-06-20 13:25:45 +02:00
Michael 97891fe05b Context: use the correct "select functionality 2021-06-19 18:27:35 +00:00
Michael 7dd5ea42e9 An empty user id does not have children 2021-06-19 06:27:25 +00:00
Michael 09609c40a4 Classname fixed 2021-06-18 05:50:52 +00:00
Michael 7d835ad790 Unused "use" removed 2021-06-18 03:32:20 +00:00
Michael 0a5904a001 API: "created_at" is timestamp 2021-06-18 03:21:38 +00:00
Michael a2b1819721 Fix notice "Undefined index: url in .../src/Protocol/ActivityPub/Transmitter.php on line 611" 2021-06-17 18:48:23 +00:00
Michael Vogel b184df1108
Update src/Object/Api/Mastodon/Account.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-17 19:14:35 +02:00
Michael bd016dc680 Photos should point to the local system 2021-06-17 16:55:54 +00:00
Michael fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael ebd4f59d02 Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 21:01:20 +00:00
Hypolite Petovan 7b91bd1d80
Merge pull request #10410 from annando/oauth
API: Added OAuth revoke, adding documentation to parameters
2021-06-16 16:32:45 -04:00
Michael Vogel a256f18159
Update src/Module/OAuth/Token.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-06-16 22:19:26 +02:00
Hypolite Petovan 59204d641d
Merge pull request #10409 from annando/api-link-header
Set the "Link" header
2021-06-16 16:16:35 -04:00
Michael 6b3476409a Check for REDIRECT_REMOTE_USER as well 2021-06-16 19:39:51 +00:00
Michael 5e22704f7e API: Added OAuth revoke, adding documentation to parameters 2021-06-16 19:24:44 +00:00
Michael 6e789ec19a No need for +1 and -1 2021-06-16 17:57:01 +00:00
Hypolite Petovan ead0cf370a
Merge pull request #10408 from annando/issue-10392
Issue 10392: Avoid "Friendica can't display this page at the moment"
2021-06-16 13:32:17 -04:00
Michael 78d4aff878 Set the "Link" header 2021-06-16 15:02:33 +00:00
Michael ae5f57233e Issue 10392: Avoid "Friendica can't display this page at the moment" 2021-06-16 13:23:07 +00:00
Michael 11d2440425 New functions for the post-view view 2021-06-16 10:16:01 +00:00
Michael 5211c12b0c Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 05:58:11 +00:00
Michael 3796e13142 Force a directory update if previously published 2021-06-16 05:23:43 +00:00
Michael 1ced04e54c Merge remote-tracking branch 'upstream/2021.06-rc' into profile-publish 2021-06-16 05:01:16 +00:00
Michael c17f23423f Chec for missing profile first 2021-06-15 22:01:30 +00:00
Michael e994d02791 Add a profile entry if missing 2021-06-15 21:39:28 +00:00
Michael 0ab24510ef Centzralized functionality to update and publish profile changes 2021-06-15 11:12:44 +00:00
Michael d348e4afca Possibly fixes notice "Undefined index: private in .../src/Model/Item.php on line 3115" 2021-06-14 18:34:11 +00:00
Hypolite Petovan c9ec2e21b3
Merge pull request #10403 from annando/doc-structure
Updated database structure documentation
2021-06-14 09:01:58 -04:00
Michael 7106106f11 Formatted index list 2021-06-14 12:15:10 +00:00
Michael 96f07c7288 Indexes and foreign keys added 2021-06-14 08:53:37 +00:00
Michael fd30df7300 Pad the header 2021-06-14 05:58:51 +00:00
Michael 4095e6c9be Pad the lengths of the columns 2021-06-14 05:33:47 +00:00
Michael a827f948c8 Reversed "null" 2021-06-14 05:14:09 +00:00
Michael 31db9dbef7 Added default value "NULL" 2021-06-14 05:08:01 +00:00
Michael bb5e6d248b Added sort order 2021-06-13 20:56:14 +00:00
Michael 84ab5d6159 Updates database structure documentation 2021-06-13 20:33:50 +00:00
Michael bf8cb39102 Diaspora relay functionality is removed 2021-06-13 11:15:04 +00:00
Simon Rupf 8b841ccc51 Reduce batch size for photo processing to reduce memory usage 2021-06-12 20:40:17 +02:00
Michael 24cc82f396 API: (hopefully) improves speed of the public timeline 2021-06-12 15:19:56 +00:00
Michael b7f12051a8 Small fixes 2021-06-12 11:19:23 +00:00
Michael c21cbd936e Changed sorting 2021-06-12 10:12:02 +00:00
Michael b8da971fac Server statistics: New section for relais and nomads 2021-06-12 08:08:35 +00:00
Michael 84028d7342 Proxify the media url 2021-06-11 03:51:11 +00:00
Michael 4ea30af752 Videos are now working as well 2021-06-10 19:55:43 +00:00
Michael 945f482ba3 API: Some more apps are now supported 2021-06-10 19:10:33 +00:00
Michael 6dc2988c0f Return the application fields 2021-06-10 08:05:21 +00:00
Michael 0b9c934cad Simplify the code 2021-06-10 07:02:06 +00:00
Michael d917ed58a8 API: Tests with various clients, small fixes 2021-06-10 06:26:34 +00:00
Michael 5e36d10730 Merge remote-tracking branch 'upstream/2021.06-rc' into http-options 2021-06-09 11:11:11 +00:00
Michael 4706d60b04 Added documentation 2021-06-09 07:44:19 +00:00
Michael c9b66d6e28 Deactivate CORS related headers 2021-06-09 07:42:23 +00:00
Michael 58a513cb30 Support HTTP OPTIONS requests 2021-06-09 07:27:42 +00:00
Michael 385c03364f The function is now protected again 2021-06-08 20:45:58 +00:00
Michael e4be1e0cd5 Get rid of "api_user()" function 2021-06-08 20:41:46 +00:00
Michael 8bf5dd187b Added "source" detection 2021-06-08 17:48:41 +00:00
Michael 0f0a301280 Move basic auth functionality to the new class 2021-06-08 17:32:41 +00:00
Michael 2a440c0bae Use "checkAllowedScope" instead of "login" 2021-06-08 12:00:22 +00:00
Michael 5853fe562d Login hasn't got a return value 2021-06-08 09:51:17 +00:00
Michael 9720ee2c20 Rearranged scope check 2021-06-08 09:11:56 +00:00
Michael 95cac04540 Rearranged function order 2021-06-08 08:56:01 +00:00
Michael 11c8dfe73a Unified request for uid 2021-06-08 08:28:14 +00:00
Michael 85217941e3 Simplified code 2021-06-08 08:04:12 +00:00
Michael 8cde7fe51f Standards 2021-06-08 07:37:28 +00:00
Michael 4b280a7279 Standards 2021-06-08 07:35:36 +00:00
Michael ca5e0eaaea Fix coding standards 2021-06-08 07:33:53 +00:00
Michael 126e281165 Improved documentation 2021-06-08 06:39:23 +00:00
Michael acbe9ebf9e API: New classes for OAuth and basic auth 2021-06-08 06:32:24 +00:00
Michael 265137ef44 Avoid PHP Warning: Illegal string offset 'type' in /src/Protocol/ActivityPub/Receiver.php on line 668 2021-06-07 10:21:48 +00:00
Michael 8e12c1d39b Added note about missing parameters 2021-06-07 07:45:20 +00:00
Michael dc9b5df072 API: The endpoints "followers" and "following" are swapped 2021-06-07 04:44:12 +00:00
Michael 038e505ca3 Improve forum delivery, avoid false distribution 2021-06-06 19:28:47 +00:00
Michael 3fd5c79025 Add the forum followers to forum posts 2021-06-06 13:25:42 +00:00
Michael 56f07d412b Addec comments on forum delivery 2021-06-06 10:07:21 +00:00
Michael 73b0af52fb Use "self" 2021-06-06 09:24:12 +00:00
Michael b269a2da87 Respect the "unlisted" setting for forum posts 2021-06-06 09:19:29 +00:00
Michael ace89197ff Display the forum posts in the new format. 2021-06-05 20:29:19 +00:00
Michael e2b8d5379b Public forums are now posting unlisted 2021-06-05 18:38:21 +00:00
Michael 8a9f633ce2 Merge remote-tracking branch 'upstream/2021.06-rc' into forum-handling 2021-06-05 06:14:06 +00:00
Michael 98c314599c Don't lose ownership on forum posting 2021-06-05 06:13:10 +00:00
Hypolite Petovan 11bc968294
Merge pull request #10368 from annando/more-api
API: some more endpoints added
2021-06-04 15:30:52 -04:00
Michael 5ddd2f3ab5 Coding standards 2021-06-03 05:18:22 +00:00
Michael 4206c5d363 API: some more endpoints added 2021-06-03 04:47:02 +00:00
Tobias Diekershoff ed3d32f0e2
Merge pull request #10367 from annando/old-api-oauth
Support OAuth for the legacy API
2021-06-03 06:36:03 +02:00
Michael 9c59bcb6a5 Support OAuth for the legacy API 2021-06-02 22:11:21 +00:00
Michael 5df1b59bb3 Fix "Undefined index: post-type in .../src/Model/Item.php on line 2888" 2021-06-02 17:43:30 +00:00
Hypolite Petovan 86d56c7f57
Merge pull request #10361 from annando/limit-context
Simplify the code
2021-06-02 09:11:11 -04:00
Hypolite Petovan b47ae829f7
Merge pull request #10360 from annando/limit-context
API: Limit the elements for the context
2021-06-02 07:13:39 -04:00
Michael 4d19a6f0e3 Simplify the code 2021-06-02 07:15:42 +00:00
Michael a2be7e386f API: Lim it the elements for the context 2021-06-02 07:11:18 +00:00
Michael e7bc908655 Renaming the date format to "JSON" 2021-06-02 03:32:42 +00:00
Michael 4e164690d5 Use the proper way to display milliseconds 2021-06-02 03:19:55 +00:00
Michael 5bd51b156a API: Fix date format 2021-06-01 22:32:05 +00:00
Michael d3833f63e0 Fix account id of notifications 2021-06-01 22:00:12 +00:00
Michael 842cbbaf09 Added notifications for follow requests 2021-06-01 21:13:16 +00:00
Michael 49459821be Renamed function 2021-06-01 14:23:12 +00:00
Michael 3f0937dd42 API: Show activity notifications 2021-06-01 05:51:03 +00:00
Hypolite Petovan d99286640d
Merge pull request #10348 from annando/fix-diaspora-comment
Fix commenting on mobile to Diaspora
2021-05-31 19:27:53 -04:00
Michael 58531a2748 Fix tests 2021-05-31 20:02:53 +00:00
Michael be7a01f086 Fix commenting on mobile to Diaspora 2021-05-31 19:39:50 +00:00
Hypolite Petovan 52cf924558 Check for post-type key existence in Model\Item::addVisualAttachments
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-844324800
2021-05-31 08:29:50 -04:00
Hypolite Petovan 303c9d4a54 Check Content\Item::replaceTag return for false return value before using it
- Address https://github.com/friendica/friendica/issues/10169#issuecomment-835547443
- Remove unused code in Content\Item::replaceTag
2021-05-31 08:29:50 -04:00
Hypolite Petovan 302070875c Ensure nodeinfo-provided protocols are strings in Model\GServer::parseNodeinfo2
- https://github.com/friendica/friendica/issues/10168#issuecomment-828281803
2021-05-31 00:47:03 -04:00
Philipp bdc2cd000b
Update avatar after user creation 2021-05-30 20:47:21 +02:00
Michael 2df14fab3b Ensure that the public contact exists when a user is created 2021-05-30 12:04:26 +00:00
Hypolite Petovan 9b9449c03c
Merge pull request #10340 from annando/relevant-url
Add relevant link after media links had been removed
2021-05-30 07:50:43 -04:00
Hypolite Petovan 15581ba91f
Merge pull request #10338 from annando/issue-9923
Issue 9923: Fix DB Error 1055
2021-05-30 07:48:49 -04:00
Michael 6f730bd671 Add relevant link after media links had been removed 2021-05-30 06:13:20 +00:00
Michael c05c447d0f Avoid warning "array_merge(): Expected parameter 2 to be an array, null given" 2021-05-29 22:48:06 +00:00
Michael 4cdfcb5cfb Avoid DB Errors with "group by" 2021-05-29 21:51:33 +00:00
Michael 6c90005363 Issue 9923: Fix DB Error 1055 2021-05-29 21:28:40 +00:00
Michael da20b48651 Fix PHP Notice: Undefined index: isForum in /src/Protocol/ActivityPub/Processor.php on line 605 2021-05-29 19:09:41 +00:00
Hypolite Petovan 452ed8aa8c
Merge pull request #10332 from annando/calender-download
simplify the calendar download
2021-05-29 13:46:41 -04:00
Michael 0249048534 More logging for the contact discovery 2021-05-29 17:24:50 +00:00
Michael a9302c30c3 simplify the calendar download 2021-05-29 17:09:45 +00:00
Hypolite Petovan b621d2c714
Merge pull request #10329 from annando/unified-request
API: Unified request parameter handling
2021-05-29 10:53:16 -04:00
Michael Vogel 1ca58968f2
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-05-29 14:32:31 +02:00
Michael b28acc7dad Improved logging for local probing, avoid worker fork 2021-05-29 11:11:26 +00:00
Michael c3c6f3c8d3 Code style conventions 2021-05-29 10:40:47 +00:00
Michael 97356ed617 API: Unified request parameter handling 2021-05-28 06:10:32 +00:00
Michael ce8e5012e9 Fix reshare of Diaspora posts only with pictures 2021-05-27 19:58:18 +00:00
Hypolite Petovan 7af91bafec
Merge pull request #10324 from annando/issue-10262
Issue 10262: Don't accept BCC posts from non followers
2021-05-27 11:40:14 -04:00
Michael c076545e3b API: Only show "bookmarked" on top level post 2021-05-27 10:49:15 +00:00
Michael 8b3884b2de API: Bookmarked posts are starred, not pinned 2021-05-27 07:51:30 +00:00
Michael 403cce25c4 Follower is sharer instead 2021-05-27 04:00:38 +00:00
Michael a3c323b366 Issue 10262: Don't accept BCC posts from non followers 2021-05-26 20:52:39 +00:00
Hypolite Petovan 8c99d3acc1
Merge pull request #10323 from annando/issue-10306
Issue 10306: Improve local delivery
2021-05-26 14:24:24 -04:00
Michael c6a56985a8 Changed comments 2021-05-26 18:15:07 +00:00
Michael 76e6a71822 Setting the post reason 2021-05-26 14:29:50 +00:00
Michael 016911a20c Setting the post reason and causer 2021-05-26 14:21:28 +00:00
Michael 785f8124ed Issue 10306: Improve local delivery 2021-05-26 09:24:37 +00:00
Philipp 681f55315b
Downgrading PHP 7.4 incompatible fread/fwrite checks 2021-05-25 20:21:51 +02:00
Michael ee5209a847 Improved logging 2021-05-25 13:18:48 +00:00
Michael 09f29cd577 Avoid notices because of empty fields 2021-05-25 13:11:23 +00:00
Michael 4d4544ada3 Separate the char from the binary handling 2021-05-24 20:07:39 +00:00
Michael da8d5f5015 Issue 9926: Limit the length of data to store in the apcontact table 2021-05-24 19:44:24 +00:00
Hypolite Petovan 6ef9ccbb97
Merge pull request #10311 from fabrixxm/fix/consoleautoinstall
console autoinstall: handle `-f/--file` as single config file
2021-05-24 10:30:45 -04:00
fabrixxm c45a1d1e4d autoinstall: compact output 2021-05-24 15:27:23 +02:00
fabrixxm 613cdf7ee1 autoinstall: handle -f/--file as single config file
as help string says.
2021-05-24 15:21:24 +02:00
Michael 32d0d45adf Issue 10287: Don't show ignored and blocked posts 2021-05-24 10:51:21 +00:00
Hypolite Petovan de2c43ce4b
Merge pull request #10294 from annando/http-input-data
New class to process HTTP input data
2021-05-24 06:11:23 -04:00
Michael 6e1402f7bd Calling it static 2021-05-24 08:08:01 +00:00
Michael 3e303fb366 Test file uploads 2021-05-24 07:43:42 +00:00
Michael ca5fd01f75 Transmit encoding, deactivated file test 2021-05-24 05:33:34 +00:00
Michael 7b49117801 Return data should be array 2021-05-24 05:22:25 +00:00
Hypolite Petovan a24febb8b6
Merge pull request #10283 from very-ape/fix-message-button
Fix message button using a more targeted approach.
2021-05-23 18:49:21 -04:00
Philipp 15216266d9
Add ContentType Injection for HTTPInputData tests 2021-05-23 22:40:41 +02:00
very-ape 7776c5f690 Implement code changes from review. 2021-05-23 13:25:25 -07:00
Michael a69e128fe4 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-23 20:17:50 +00:00
Philipp c064a39341
Adapt tests using a content file 2021-05-23 20:30:27 +02:00
Philipp a0da84b6b0
Enable testability for HTTPInputData and create a failing test for it :-) 2021-05-23 19:58:09 +02:00
Michael 4ac68394c3 Fix warning "reset() expects parameter 1 to be array, null given" 2021-05-23 16:37:34 +00:00
Hypolite Petovan 48a783c91a
Merge pull request #10300 from annando/issue-10264
Issue 10264: Remote comments for visitors
2021-05-23 12:00:53 -04:00
Tobias Diekershoff 0ca929dccd
Merge pull request #10304 from annando/fix-emptymissing-photos
Fix missing media on posts to Mastodon
2021-05-23 15:34:34 +02:00
Michael 36c5e360f6 Fix missing media on posts to Mastodon 2021-05-23 13:29:25 +00:00
Michael b7a7ae58e9 Issue 10232: Improved search for embedded media links 2021-05-23 12:35:05 +00:00
Hypolite Petovan 4d214bd9cb
Merge pull request #10292 from annando/fix-mail
Fix inserting mails
2021-05-23 07:39:00 -04:00
Hypolite Petovan 0238a15809
Merge pull request #10295 from nupplaphil/bug/php7_cs
Fix PHP 7.0 Coding Standards
2021-05-23 07:38:38 -04:00
Michael 050bc673aa Issue 10264: Remote comments for visitors 2021-05-23 10:39:11 +00:00
Michael 8f9033633c Issue 10287: Make block and ignore work for the API as well 2021-05-23 08:56:24 +00:00
Tobias Diekershoff 55dda47f39 Issue 10293: mention the required function in the error message 2021-05-23 07:50:32 +02:00
Michael Vogel d00a4eacdc
Update src/Model/Mail.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-05-23 07:37:17 +02:00
very-ape b2bc911eb2 Merge branch 'fix-message-button' of https://github.com/very-ape/friendica into fix-message-button 2021-05-22 15:32:08 -07:00
very-ape ceb409dae8 Replace $contact with $profile_contact in sidebar function. 2021-05-22 15:30:46 -07:00
Philipp 965cd8b096
Fix PHP 7.0 Coding Standards 2021-05-22 23:47:35 +02:00
Michael fd3706b72e Coding standards again 2021-05-22 20:33:26 +00:00
Michael 684f9cdb96 Coding standards 2021-05-22 20:31:50 +00:00
Michael 2c6db3ccac Coding standards 2021-05-22 20:29:15 +00:00
Michael 6f44476c56 Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data 2021-05-22 20:26:32 +00:00
Michael c18cbe95a6 Fix inserting mails 2021-05-22 18:20:11 +00:00
Tobias Diekershoff 83cb4edc36
Merge pull request #10291 from annando/no-summary
Don't create automated summaries
2021-05-22 18:17:43 +02:00
Michael 77092157fe Don't create automated summaries 2021-05-22 16:11:10 +00:00
Michael ede808f449 Fixes "Undefined index: upubkey" by replacing the profile load mechanism 2021-05-22 15:50:05 +00:00
Michael a5c8c4d8b7 Fixes notice 2021-05-22 15:41:25 +00:00
Michael 6fe916a390 API: improved mail handling 2021-05-22 13:37:04 +00:00
Michael 0c21588ab9 Don't delete local tombstone contacts 2021-05-22 08:25:30 +00:00
very-ape bd9a469392
Merge branch '2021.06-rc' into fix-message-button 2021-05-21 23:40:49 -07:00
very-ape 34eb81a187 Don't retrieve a contact record we've already been given. 2021-05-21 22:49:35 -07:00
Michael 9d4b29d9c0 Fix for empty profile pages 2021-05-22 05:34:10 +00:00
very-ape c22ef3e79e Fix message button using a more targeted approach. 2021-05-21 14:28:01 -07:00
Hypolite Petovan 26d3f5433b
Merge pull request #10280 from very-ape/fix-message-button
Fix Message button.
2021-05-21 14:57:28 -04:00
very-ape 97a9ec4e40 Bug fix: last commit results in logged-in user's contacts being displayed on contact profile sidebar. 2021-05-21 11:38:50 -07:00
Michael 081652e09a Wrong class path 2021-05-21 18:00:03 +00:00
Michael bcb2073c9a New class to process HTTP input data 2021-05-21 17:36:51 +00:00
very-ape 93926e99b8 Use getByNickname as suggested in code review. 2021-05-21 10:15:32 -07:00
very-ape fe52719d37 Fix Message button. 2021-05-20 23:30:42 -07:00
Hypolite Petovan 315dddbcb9
Merge pull request #10277 from very-ape/authenticate-hook
Bug fix: allow authentication addons to create users again.
2021-05-20 15:05:55 -04:00
very-ape e2d93b57da
Update src/Model/User.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-05-20 11:54:30 -07:00
very-ape d66f1e30ae Apply suggestions from code review
Also clean up some code, make it less needlessly verbose.

Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-05-20 11:35:33 -07:00
Hypolite Petovan 0e368c4ba4 Fix display of RTL tags 2021-05-20 08:39:36 -04:00
Hypolite Petovan 93f3c511dc Fix wrong display of mentions in RTL context 2021-05-20 08:39:36 -04:00
very-ape c89241dbd8 Bug fix: add missing changes. 2021-05-20 00:19:09 -07:00
very-ape 9ab57de356 Bug fix: allow authentication addons to create users again. 2021-05-20 00:16:08 -07:00
Tobias Diekershoff 57ff3e3a07
Merge pull request #10276 from annando/api-conversations
API: Support for private mails
2021-05-20 09:13:50 +02:00
Michael f5f919aead Coding standards 2021-05-20 06:58:15 +00:00
Michael e10f3f26b9 Removed unused parameter 2021-05-20 04:44:45 +00:00
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
Michael a331a8cf0a Delete removed contacts 2020-12-15 22:56:46 +00:00
Michael Vogel 569ad89f10
Merge pull request #9661 from MrPetovan/bug/9651-apdelivery-inboxes
Clarify usage of ActivityPub\Transmitter::fetchTargetInboxes in Worker\APDelivery queuing
2020-12-15 22:05:59 +01:00
Hypolite Petovan a2f14efd94
Remove reference to receivers when adding relay delivery tasks in Worker\Notifier
- Address https://github.com/friendica/friendica/pull/9661#issuecomment-745553051
2020-12-15 15:42:16 -05:00
Hypolite Petovan 6d3864a16b
Remove owner.deleted check in user deletion check in Model/Item 2020-12-15 14:24:42 -05:00
Hypolite Petovan 0951a50bcd Add item user owner data check in Model\Item::isValid
- Prevents deleted users from posting any item, manually or automatically through mirroring
2020-12-15 09:41:58 -05:00
Hypolite Petovan 8c17a6b4d9 Rename Model\User::getOwnerDataById parameter to better reflect intent 2020-12-15 09:41:10 -05:00
Hypolite Petovan 5f148dcb42 Add temporary console command to fix workerqueue row with corrupted parameter data
- It should be reverted just before the 2020.12 release
2020-12-15 00:20:49 -05:00
Hypolite Petovan d59fcd5093 Clarify usage of ActivityPub\Transmitter::fetchTargetInboxes in Worker\APDelivery queuing
- $inbox is now always a string
- $receivers should be correctly populated now
- $target_id is renamed to $item_id and correctly initialized to 0 for non-item deliveries
2020-12-14 23:33:14 -05:00
Michael Vogel e4228c6218
Merge pull request #9655 from MrPetovan/bug/fatal-errors
Fix several occasional fatal errors
2020-12-14 22:11:45 +01:00
Hypolite Petovan 481c5c9e81 Account for inbox array in Worker/APDelivery
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-744339671
2020-12-14 09:12:29 -05:00
Michael c210e0b97f Issue 9657: Check the age of an item 2020-12-14 00:00:10 +00:00
Hypolite Petovan 0441b912ac Return early if an URI id cannot be obtained in ActivityPub\Processor::createItem
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743769813
2020-12-13 13:42:08 -05:00
Michael cd96955fcf Fix: posted unprepared posts hadn't been deleted 2020-12-13 18:17:50 +00:00
Michael d938e37767 Set the return value 2020-12-13 17:22:50 +00:00
Hypolite Petovan 61aa4efa89 Account for missing contact in dfrn_request_post
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743407998
2020-12-13 12:18:10 -05:00
Hypolite Petovan 8f10cf8e53 Simplify Contact::addRelationship call in ActivityPub\Processor::followUser
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743382769
2020-12-13 12:16:04 -05:00
Michael 4626f98dbe Added logging 2020-12-13 16:38:12 +00:00
Michael 0eb4a600b0 Delay unprepared posts 2020-12-13 12:47:49 +00:00
Hypolite Petovan c787281eff
Merge pull request #9652 from annando/issue-9584
Issue 9584: Only search posts from federated networks
2020-12-12 15:13:31 -05:00
Michael c3d0ab56a5 Issue 9584: Only search posts from federated networks 2020-12-12 19:55:47 +00:00
Michael 297118f902 Archive/Unarchive at ActivityPub delivery 2020-12-12 16:45:23 +00:00
Hypolite Petovan 67573cf996
Merge pull request #9647 from annando/original-relay
Relay posts with the original protocol
2020-12-11 16:17:05 -05:00
Michael 61b3003f64 Standards 2020-12-11 20:20:27 +00:00
Michael a43059df27 Relay posts with the original protocol 2020-12-11 06:35:38 +00:00
Hypolite Petovan 99b200868b Normalize return value in Database->fetch
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-741857058
2020-12-10 06:12:10 -05:00
Michael 965374596f Avoid dropping of incoming DFRN messages 2020-12-10 07:22:49 +00:00
Michael 20ded2b35a Parameters should be float ... 2020-12-10 00:02:23 +00:00
Michael 5fb83d0632 Improved performance profiler 2020-12-09 22:10:27 +00:00
Hypolite Petovan 9c0342b907
Merge pull request #9638 from annando/bad-priority
Check for bad worker priorities
2020-12-09 01:12:34 -05:00
Michael Vogel 33930b0bd9
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2020-12-09 06:58:19 +01:00
Michael Vogel 809035b872
Merge pull request #9635 from MrPetovan/bug/notices
Batch of notice fixes
2020-12-09 06:51:54 +01:00
Michael dd94fb1242 Check for bad worker priorities 2020-12-08 21:58:32 +00:00
Michael 2cb71341b2 Fixes "Unknown column '729' in 'field list'" 2020-12-08 21:23:10 +00:00
Hypolite Petovan c7a2988454 Check for the existence of array key before using it in Protocol\ActivityPub\Transmitter
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-739534960
2020-12-08 10:08:49 -05:00
Hypolite Petovan 99828c0fea Suppress notice message when guid isn't supplied in Module\Admin\Item\Source
- https://github.com/friendica/friendica/issues/9252#issuecomment-740052103
2020-12-08 10:00:09 -05:00
Michael e17ca9cc35 Check for remote default avatars as well 2020-12-07 07:14:09 +00:00
Michael a49a35f459 Centralized fetching of the default avatar 2020-12-07 06:43:43 +00:00
Michael 9acecfd9e6 Issue 9630: Prevent negative values for registered users 2020-12-06 18:14:05 +00:00
Michael Vogel ce52d31afa
Merge pull request #9626 from MrPetovan/bug/9611-bbcode-convert-html-purify
Prevents share block new lines from being converted to HTML <br> tags
2020-12-06 15:53:18 +01:00