Commit graph

2986 commits

Author SHA1 Message Date
Michael
b0bf4b4359 Some more "q" calls and deprecated logging replaced 2021-10-03 19:43:49 +00:00
Hypolite Petovan
9935e8e711 Remove event.adjust field
- It was confusing and introduced complexity that wasn't worth the unclear gain
2021-10-03 13:42:32 -04:00
Michael
6668591afe Merge remote-tracking branch 'upstream/develop' into more-q 2021-10-03 15:06:31 +00:00
Michael
763e264196 More "q" calls have been replaced 2021-10-03 15:02:20 +00:00
Michael Vogel
3d97149007
Merge pull request #10722 from MrPetovan/task/refactor-notifications
Move notify, notifications and introduction notifications to new paradigm
2021-10-03 14:13:28 +02:00
Michael
42790fbc1f Don't store emoji images as media but links 2021-10-03 09:42:14 +00:00
Hypolite Petovan
8cb0bb5deb Switch uid with nickname in user picture URLs
- Keep previous URL scheme fallback as remote contact avatar URLs pointing to local user avatar URLs need to update
2021-10-02 19:06:59 -04:00
Hypolite Petovan
7cdd2d1336 Refactor User::getAvatarUrlForId into getAvatarUrl
- Use user/owner array as parameter instead of uid
- Rename $profile variables to $owner when it's the result of User::getOwnerDataByNick
- Replace Module\Photo::stripExtension with native pathinfo() calls
2021-10-02 19:06:25 -04:00
Hypolite Petovan
7a2d5f6a8e Move notification to the new paradigm 2021-10-02 18:15:45 -04:00
Hypolite Petovan
3e6fea30f2 Create constants for Mastodon notification types 2021-10-02 18:15:44 -04:00
Hypolite Petovan
ea6f7aba40 Fix method name typos in Model\Post\UserNotification
- Reformat file, improve type-hinting
2021-10-02 18:15:43 -04:00
Hypolite Petovan
bf81f21001 Rename Model\Post\UserNotifications type constants 2021-10-02 18:15:43 -04:00
Hypolite Petovan
47acb6a278 Move notify to the new paradigm
- Remove unused frion notify template
- Update API test
2021-10-02 18:15:42 -04:00
Hypolite Petovan
66fec8944f Add block and unblock hooks 2021-10-02 17:30:40 -04:00
Hypolite Petovan
b0d8136b00 Remove contact record instead of setting rel = 0 in Contact::revokeFollow 2021-10-02 17:30:03 -04:00
Hypolite Petovan
c4a4473cd0 Remove the obsolete parameter $two_way from terminateFriendship methods
- Follow revokation is now done independently
2021-10-02 16:14:22 -04:00
Hypolite Petovan
222333f64f Remove contact drop feature
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
2021-10-02 16:04:28 -04:00
Michael
da3fbced38 Merge branch 'contact-media' of github.com:annando/friendica into contact-media 2021-10-02 18:35:47 +00:00
Michael
2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
Michael Vogel
a2f5190bdb
Update src/Model/Contact.php
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-10-02 20:31:30 +02:00
Hypolite Petovan
72fae04e97 Add revoke follow feature
- Add new follow revoke module
- Add new hooks: revoke_follow, support_follow, support_revoke_follow
- Add link in contact page action menu
2021-10-02 14:01:46 -04:00
Michael
c822cdaebd Removing "blubb" 2021-10-02 17:47:11 +00:00
Michael
a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
Michael
c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
Hypolite Petovan
797391e1d8 Rework contact termination to separate protocol-level and contact-level
- Mail and Feed contacts are now removed automatically on relationship termination
- Added logging and notice messages for different results
2021-10-02 08:31:59 -04:00
Michael
865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
Michael
f1e2ceb32c Issue 10747: Improved check for blocked domains 2021-10-02 10:25:50 +00:00
Hypolite Petovan
2a88262732
Merge pull request #10760 from annando/conversation-moved
The conversation functionality moved to a class
2021-09-26 10:03:26 -04:00
Hypolite Petovan
0bb169b4ed Check for reply existence before using its values in Model\Mail
- Address https://github.com/friendica/friendica/issues/10474#issuecomment-925263894
2021-09-26 08:15:07 -04:00
Michael
96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
Michael
a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
Hypolite Petovan
d8febbe45e Add new hook to support unfollow contacts on non-native networks 2021-09-25 16:15:06 -04:00
Michael
3fddf3807a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-25 18:34:55 +00:00
Michael
0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Michael
f032f66b38 Display the public contacts for profile visitors 2021-09-19 10:06:42 +00:00
Michael
3dddea96fa Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-18 20:27:24 +00:00
Hypolite Petovan
24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar
Issue 10720: Use different path scheme for user avatars
2021-09-18 09:30:08 -04:00
Philipp
fd22906d70
Add feedback 2021-09-18 12:51:10 +02:00
Philipp
6893e2c3f7
Add feedback / revert fix for $item['post-type'] 2021-09-18 12:51:09 +02:00
Philipp
462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp
644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
Michael
a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
Michael
f99c4ca704 Removing unused variable 2021-09-14 08:08:50 +00:00
Michael
72fa4e9970 Better handling of displaying peertube videos 2021-09-14 07:52:53 +00:00
Michael
2926282f8d More fields added to "user-contact" 2021-09-13 14:20:20 +00:00
Michael
3eea4b1130 Use "rel" for "self" instead of using a separate field 2021-09-12 19:04:27 +00:00
Michael
19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
Michael
9191daf12f Fix commenting on public posts 2021-09-12 01:52:10 +00:00
Michael
eeec6aaeb9 Removed unused "use" 2021-09-11 13:02:36 +00:00
Michael
1e123ace12 Only fetch, not probe 2021-09-11 13:00:12 +00:00
Michael
10cb52bc00 Only add user contacts, alternate way to fetch public contact id 2021-09-11 12:43:46 +00:00
Michael
5113987031 Added update function to add user-contact entry 2021-09-11 07:59:46 +00:00
Michael
f33a98578d Capitalization 2021-09-10 23:59:33 +00:00
Michael
b170dd765d Insert and update some more fields 2021-09-10 20:53:10 +00:00
Michael
2486c8031b update for user-contact is added 2021-09-10 20:22:24 +00:00
Michael
9c14eb0c6b Use centralized function to update contact entries 2021-09-10 18:21:19 +00:00
Michael
a4b0ab90b1 Insert a user-contact for every contact 2021-09-10 13:05:16 +00:00
Philipp
fc46744183
Fix Photo::delete() 2021-09-05 19:20:43 +02:00
Michael
2bae4dde1f Avoid notices 2021-08-30 12:29:09 +00:00
Michael
9135ff5124 Set contact to failed when url changed 2021-08-29 20:25:21 +00:00
Philipp
13a91e63aa
Rename DI::httpRequest() into DI::httpClient() 2021-08-25 21:54:54 +02:00
Philipp
505100bdd7
Rename HTTPRequestOptions to HTTPClientOptions 2021-08-25 21:45:15 +02:00
Philipp
0cafa871f1
Use HTTPRequestOptions constants for HTTPClient::get() 2021-08-25 21:31:30 +02:00
Philipp
aad7bac686
Use HTTPRequestOptions constants for HTTPClient::post() 2021-08-25 21:31:30 +02:00
Philipp
a3d0404290
Fix curResult::getHeader() in GServer.php 2021-08-25 14:22:43 +02:00
Philipp
2356221aba
Fixup HTTP headers for httpClient requests 2021-08-25 14:22:43 +02:00
Hypolite Petovan
e7fdf3c0c3
Merge pull request #10630 from annando/cleared-enotify
Unused parts of the old notification system are removed
2021-08-24 10:25:06 -04:00
Michael Vogel
9aca4b515f
Merge pull request #10628 from MrPetovan/bug/fatal-errors
Set profile fields for system user in Model\User::getOwnerDataById
2021-08-24 14:13:32 +02:00
Hypolite Petovan
ceeb246128 Remove Profile::load from Module\HCard
- Renamed and re-scoped Profile::sidebar to getVcardHtml
2021-08-24 06:24:06 -04:00
Hypolite Petovan
8f0e36d617 Raise an Exception when Profile::load is profided the system user nickname 2021-08-24 05:54:15 -04:00
Hypolite Petovan
e155821d7a Set profile fields for system user in Model\User::getOwnerDataById
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-903676606
- This is required when Model\Profile::load is called for the system user for example
2021-08-24 05:53:46 -04:00
Michael
429a724bc1 Unused parts of the old notification system are removed 2021-08-24 08:53:15 +00:00
Hypolite Petovan
0651ace4e4
Merge pull request #10627 from annando/like-announce
Reliably display "like" and "share" notifications
2021-08-23 14:12:57 -04:00
Michael
c78b7f45c5 Reliably diasplay "like" and "share" notifications 2021-08-23 15:07:14 +00:00
Hypolite Petovan
2108be7e07
Merge pull request #10619 from nupplaphil/task/guzzlehttp
PSR-7 Part 1: Use Guzzle PSR-7 library for HTTPRequest->get()
2021-08-22 18:11:30 -04:00
Michael
e9c63ff075 Added "follow" subscription message 2021-08-22 08:27:56 +00:00
Michael
59045b2e23 Added handling another situation 2021-08-22 03:58:50 +00:00
Michael
4f1e61457d Fetch the user's post if present 2021-08-21 21:40:47 +00:00
Michael
42de5c77d0 The desktop notifications have been reworked 2021-08-21 20:35:04 +00:00
Philipp
653d49cb92
Fix getHeader() 2021-08-20 22:00:28 +02:00
Philipp
65ca164487
A lot of Fixings 2021-08-20 21:35:14 +02:00
Philipp
06371d29a6
Cleanup 2021-08-20 20:03:42 +02:00
Philipp
26401e88b8
IHTTPResult::getContentType is now a string again 2021-08-20 19:58:42 +02:00
Philipp
803c1d71de
Fix IHTTPResult::getHeader()
- Now returns a string array, like expected
- Fix usages
- Fix dataset
2021-08-20 19:58:42 +02:00
Philipp
05ecd1e3d4
Replace IHTTPResult for CurlResult usages 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
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
ec4f53d56f Add DI to ParsedLogIterator, replace constructors with fluent api 2021-08-19 14:56:51 +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
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
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
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
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
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
69f11c4a84 Adding the VAPID keys 2021-08-15 21:24:23 +00:00
Michael
977d28353c Transmit push subscriptions 2021-08-15 20:52:46 +00: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
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
Michael
ce46ab2573 The Matrix and XMPP address is now transported via AP as well 2021-08-10 23:49:09 +00:00
Michael
8e074a5fe4 Simplify event storing 2021-08-10 10:24:14 +00:00
Michael
15b93b4459 "getUserNickname" is now "getLoggedInUserNickname" 2021-08-09 19:48:39 +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
Michael
bee04f86ee Matrix addresses can be entered in the profile 2021-08-09 01:39:09 +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
Michael
4bc3e8c141 Don't send "accept" when we accept anything 2021-08-06 04:02:22 +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
ec3eead034 Don't set the pconfig values on manual mode 2021-08-03 05:39:04 +00:00
Michael
6c8a4a2552 Use a centralized function to delete delayed entries 2021-08-02 20:56:34 +00:00
Michael
2e2d1bf81d Added option to define a schedule date when posting items 2021-08-01 13:01:31 +00:00
Michael
929de9081e All needed fields are now filled 2021-07-30 13:22:06 +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
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
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
9226b98724 Performance: Moved filter call after content generation 2021-07-27 12:24:22 +00:00
Michael
c89533a70b Support for stacked profiler analysis 2021-07-27 04:57:29 +00:00
Michael
5a87ccf026 Getter/Setter for theme info 2021-07-25 19:39:10 +00:00
Michael
866dbf9f89 Use getter/setter for timezone value 2021-07-24 21:16:53 +00:00
Michael
8f46064430 Using getter/setter functions 2021-07-24 20:34:07 +00:00
Michael
d56793dd09 Fix field name 2021-07-24 13:24:26 +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
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
bb222209bc Some small performance tweaks 2021-07-22 15:35:30 +00:00
Michael
69c6a5f567 Avoid "DB Error" messages 2021-07-21 03:43:30 +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
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
Michael
58cec97358 Merge remote-tracking branch 'upstream/develop' into loop-prevention 2021-07-19 07:51:29 +00:00
Michael
2647514603 Detection of local requests 2021-07-19 06:14:14 +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
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
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
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
Michael
1466afe3b2 Automatically subscribe to the followings of a given AP account 2021-07-13 06:06:08 +00:00
Michael
e5c312a066 Issue 10491: Possibility for simple shortening added 2021-07-12 14:11:51 +00:00
Michael
e151a2dc41 Fixes "Undefined index: nick" 2021-07-12 06:25:48 +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
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
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
88f147c6a7 Always update on missing uri-id, check for uri-id in contact before removal 2021-07-09 04:38:36 +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
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
098cd543ea Cleaned code for contact avatars 2021-07-06 10:36:00 +00:00
Michael
8bfa15cf23 Simplify the attachment handling 2021-07-06 08:57:49 +00:00
Michael
93309a3728 Quit on empty uri-id 2021-07-06 06:45:53 +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
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
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
Michael
f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Michael
582fd613e0 Ensure that the network is set for "self" contac ts 2021-07-04 14:17:10 +00: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
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
Hypolite Petovan
dfd711d111
Merge pull request #10450 from annando/discoverable
AP: Support "discoverable"
2021-06-30 21:16:11 -04: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
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
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
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
faac5b71ce
Merge pull request #10437 from annando/reduce-proxy
Reduce the usage of the "proxifyUrl" function
2021-06-27 22:41:14 -04: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
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
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
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
Michael
7dd5ea42e9 An empty user id does not have children 2021-06-19 06:27:25 +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
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
Michael
24cc82f396 API: (hopefully) improves speed of the public timeline 2021-06-12 15:19:56 +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
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
Michael
5df1b59bb3 Fix "Undefined index: post-type in .../src/Model/Item.php on line 2888" 2021-06-02 17:43:30 +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
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
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
Michael
6f730bd671 Add relevant link after media links had been removed 2021-05-30 06:13:20 +00:00
Michael
0249048534 More logging for the contact discovery 2021-05-29 17:24:50 +00:00
Michael
b28acc7dad Improved logging for local probing, avoid worker fork 2021-05-29 11:11:26 +00:00
Michael
c6a56985a8 Changed comments 2021-05-26 18:15:07 +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
Michael
09f29cd577 Avoid notices because of empty fields 2021-05-25 13:11:23 +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
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
very-ape
7776c5f690 Implement code changes from review. 2021-05-23 13:25:25 -07: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
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
Michael
c18cbe95a6 Fix inserting mails 2021-05-22 18:20:11 +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
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
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
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
916c51c630 Fix fatal errors / added some API todo 2021-05-17 19:20:31 +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
Hypolite Petovan
a44cf44708
Remove duplicated conditions, improve variables names in Model\APContact 2021-05-16 16:10:22 -04:00
Michael
6f2fcd2859 Don't use compacted data when parsing accounts 2021-05-16 16:41:07 +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
45c2cc3887 API: Account actions 2021-05-14 21:51:32 +00:00
Michael
5219080149 Fix url comparism 2021-05-13 15:01:35 +00:00
Michael
7975bc244d Refine OAuth flow 2021-05-13 11:26:56 +00:00
Michael
4476634f6c Fix list of accounts 2021-05-11 23:39:08 +00:00
Michael
e9fe92a5d7 Merge remote-tracking branch 'upstream/develop' into api-again 2021-05-11 21:21:32 +00:00
Hypolite Petovan
cac038639d Capitalize post action translation strings 2021-05-11 16:01:07 -04:00
Michael
bade0a2345 Improved cards handling, simplified Bearer handling 2021-05-11 19:15:05 +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
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
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
f5c7f9670f Remove blanks 2021-05-09 11:54:34 +00:00
Michael
5bb5c44bd9 API: added account related endpoints 2021-05-09 09:35:51 +00:00
Michael
3bbf543d25 API: Some more endpoints 2021-05-08 19:21:52 +00:00
Michael
d842a4ff87 Suggestions are now supported as well 2021-05-08 11:03:50 +00:00
Michael
dd38cc330f API: We now support two more timeline api endpoints 2021-05-07 21:28:48 +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
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
Michael
77e1ec6df2 Improved link detection 2021-05-02 17:33:32 +00: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
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
639d5373e0 Add atachments to body for Diaspora and DFRN 2021-04-29 21:05:22 +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
94e36f7970 Avoid adding the same attachments in shared posts 2021-04-29 05:45:35 +00:00
Michael
8541e248bb Less greedy when replacing attachment elements 2021-04-29 04:14:44 +00:00
Michael
3d64c3031b Preview for Videos and images / Video resolution selection 2021-04-28 19:05:46 +00:00
Michael
44c801905a Improve page load performance with attached links 2021-04-27 12:29:54 +00: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
8685e5ca32 Reworked media handling 2021-04-26 06:50:12 +00:00
Michael
e80cb60e40 Bugfix: Store to category 2021-04-20 19:17:07 +00:00
Michael
a12992f063 Allow to remove the "extid" content as well. 2021-04-18 09:57:08 +00:00
Michael
15caf4b3f7 Fix: The "extid" field wasn't updated 2021-04-18 07:08:16 +00:00
Michael
79ec2cbc6d Prevent multiple videos from Peertube 2021-04-17 13:57:25 +00:00
Michael
b65f73e348 Improved mimeType detection and setting of the "type" field 2021-04-14 19:12:01 +00:00
Michael
5b2c4d70be Avoid notices whwn creating events 2021-04-11 06:53:01 +00:00
Michael
5a00902e11 Avoid HTML parsing of an empty body 2021-04-10 05:46:19 +00:00
Michael
688e056ad1 "post-reason" ends double usage of "post-type" 2021-04-07 06:02:06 +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
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
054c301ef0 Update copyright 2021-03-29 08:40:20 +02: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
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
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
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
Michael
9e87dcb25b We now set the protocol in "gserver" on receiving as well 2021-03-10 22:31:33 +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
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
6a4540e6f6 Issue 9799: Ensure that the first post date is after the registration date 2021-03-07 10:46:46 +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
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
530cfba71e Offer "follow thread" only when you don't already follow 2021-02-28 07:47:07 +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
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
dcc82bfcf7 Automatically set to "seen" 2021-02-21 11:59:59 +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
c247d5fbeb The item table is now completely removed 2021-02-19 06:30:38 +00:00
Michael
312c01a517 Several speed improvements (magiclink, caching, indexes) 2021-02-17 18:59:19 +00:00
Michael
60a6dfa23c Fix several database issues 2021-02-16 22:04:03 +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
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
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
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
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
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
Michael
15162b4027 New table "post-thread-user" 2021-01-31 18:32:22 +00:00
Michael
998f127cb8 Prevent "No post-content stored" 2021-01-31 12:26:25 +00: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
Michael
722083f9ed Avoid non numeric parameter 2021-01-29 23:41:42 +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
Michael
ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Hypolite Petovan
82e094179c Rename notify classes according the feature name, not the table name 2021-01-24 09:33:23 -05:00
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
e2c38f1347 Prevent hashtag parsing and replacement in image alternative text 2021-01-22 17:45:28 -05:00
Michael
4002bd9b97 Don't create a user-item entry on default 2021-01-22 08:16:41 +00:00
Michael
fbcc59cc1d Some more removed functionality from FileTag class 2021-01-21 20:25:06 +00:00
Michael
d2ea3eabfb Replace legacy file/category handling 2021-01-21 07:16:41 +00:00
Michael
a773a72eaa The "icid" field is deprecated 2021-01-19 23:26:24 +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
4157db5473 "item" is replaced by "post-view" / postupdate check added 2021-01-17 20:32:13 +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
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
b160aa07b6 Issue 9705: Perform an age check when the post isn't fetched 2021-01-11 20:00:51 +00: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
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
c0ac120578 Issue 9736: Fix for undroppable registrations 2021-01-02 09:11:38 +00: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
a294c19d6e Fix several notices 2020-12-29 21:38:23 +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
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
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
2ef4972782 Fix capitalization of Contact::magicLinkById calls 2020-12-22 01:01:43 -05:00
Hypolite Petovan
1414d43597
Merge pull request #9664 from annando/delete-contacts
Delete removed contacts
2020-12-16 11:28:56 -05:00
Michael
a331a8cf0a Delete removed contacts 2020-12-15 22:56:46 +00: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
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
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
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
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
dd94fb1242 Check for bad worker priorities 2020-12-08 21:58:32 +00: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
f9994548c1
Merge pull request #9621 from MrPetovan/bug/9611-bbcode-convert-html-purify
Add HTML Purify to BBCode::convert
2020-12-05 19:27:59 +01:00
Hypolite Petovan
1cc509c5ef Move BBCode version tagging inside of the hash to prevent item-content.rendered-hash overflow 2020-12-04 08:30:51 -05:00
Hypolite Petovan
e712706302 Add BBCode versioning
- This will trigger the re-conversion of displayed items on version update
2020-12-04 07:29:49 -05:00
Michael
9f96f3ef34 Moved updating personal contacts to updatecontact 2020-12-04 05:53:11 +00:00
Michael
8d999f54d0 Check and add a server 2020-12-03 22:32:51 +00:00
Michael
0c9a0ce64e Merge remote-tracking branch 'upstream/develop' into worker-command 2020-12-03 15:48:46 +00:00
Michael
edbdfbae6b workerqueue now has a "command" field 2020-12-03 15:47:50 +00:00
Michael
c1d1b189f7 Cleaned code 2020-12-02 08:36:23 +00:00
Michael
775075c5db Only spool mirrored posts 2020-12-02 05:07:44 +00:00
Michael
b2dadf0f92 Use a combined unique index 2020-12-02 00:34:10 +00:00
Michael
4fbd0a46b5 Reducing parameter list 2020-12-02 00:05:03 +00:00
Michael
a283b1183b Move deletion 2020-12-01 23:04:04 +00:00
Michael Vogel
b3f71d174c Added logging 2020-12-01 23:54:49 +01:00
Michael
2aa302c570 New class for handling delayed posts 2020-12-01 22:11:29 +00:00
Michael
bb823c323b Configuration for the priority of the notification for expired messages 2020-11-30 21:40:55 +00:00
Hypolite Petovan
4f98da88c4
Merge pull request #9614 from annando/issue-8943
Issue 8943: Only check for too old postings for feeds
2020-11-30 16:09:27 -05:00
Michael
b30d2c9c6b Renamed function 2020-11-30 20:59:18 +00:00
Michael
ccc07b06de Issue 9329: prevent "Expression #1 of SELECT list is not in GROUP BY clause" 2020-11-30 20:44:21 +00:00
Michael
8bc799ff38 Issue 8943: Only check for too old postings for feeds 2020-11-30 20:32:56 +00:00
Michael
5f1ea39bad Display posts that are reshared by the contact 2020-11-29 20:42:03 +00:00
Michael
7ab63d2106 Store the protocol of the received message 2020-11-29 09:01:51 +00:00
Michael
8da8d3c4fd Only automatically reshare items from DFRN and AP 2020-11-29 00:05:46 +00:00
Michael
bda5d43f1e New "remote self" option: Native Reshare 2020-11-28 22:53:58 +00:00
Michael
bd9f36622e Cast field data when ATTR_EMULATE_PREPARES is enabled 2020-11-27 11:24:31 +00:00
Michael
818c064c0a The notifications parameters are now simplified 2020-11-25 19:56:39 +00:00
Michael
495252690b available is not vital 2020-11-24 07:49:36 +00:00
Michael
e4e9a20ac8 Don't transmit to archived inboxes 2020-11-23 19:25:22 +00:00
Michael
3ffd40c7da OnePoll reworked, improved "failed" behaviour 2020-11-22 14:42:24 +00:00
Hypolite Petovan
1acc5ffb38
Merge pull request #9553 from annando/insert-mode
Mode switch for insert
2020-11-19 16:25:09 -05:00
Hypolite Petovan
10a4802d81
Merge pull request #9552 from annando/zero-user
Avoid problems with uid=0
2020-11-19 16:23:28 -05:00
Michael
303aaa00ca Mode switch for insert 2020-11-19 19:34:48 +00:00
Michael
bd0e2dc0a8 Avoid problems with uid=0 2020-11-19 17:19:14 +00:00
Hypolite Petovan
a66e66359c Make Model\User::getAuthenticationInfo accessible to addons
- It contains the centralized authentication requirements for user records
2020-11-19 11:20:17 -05:00
Michael
b09ffa0697 Relocate system user creation 2020-11-18 05:33:17 +00:00
Michael
fed1ace311 Fix condition 2020-11-17 23:59:14 +00:00
Michael
3fe7d035d4 Merge remote-tracking branch 'upstream/develop' into post-user 2020-11-17 23:31:41 +00:00
Hypolite Petovan
096cb19d12 Suppress notice when causer-id exists but not causer-link in Model\Item::isAllowedByUser
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-723440980
2020-11-17 18:06:16 -05:00
Hypolite Petovan
93380b8471 Suppress notice while logging in Model\Contact
- Address https://github.com/friendica/friendica/issues/9252#issuecomment-716042132
2020-11-17 17:57:37 -05:00
Michael
7615c022be Improved logging 2020-11-17 22:41:53 +00:00
Michael
219c651289 Removed test logging 2020-11-17 22:38:52 +00:00
Michael
eaa58da25b New table "post-user" and more foreign keys 2020-11-17 22:33:44 +00:00
Hypolite Petovan
ba0d3b2435
Merge pull request #9537 from annando/item-lock
Fallback to database lock if locking fails
2020-11-16 16:05:24 -05:00
Michael
deb6b7a7c3 Fallback to database lock if locking fails 2020-11-16 19:46:20 +00:00
Hypolite Petovan
a69c98e32f
Merge pull request #9535 from annando/ap-relay
Relay code reworked to support AP delivery
2020-11-15 20:27:08 -05:00
Michael
0384bf3e76 Relay code reworked to support AP delivery 2020-11-15 23:28:05 +00:00
Hypolite Petovan
b5d3fcb8d4 Move top-level permission check outside of Model\Item::getTopLevelParentData
- It wasn't checked when the direct parent was also the top-level parent
2020-11-14 10:11:26 -05:00
Hypolite Petovan
cb963a3259 Retrieve local top level parent item separately to check permissions in Model\Item::getTopLevelParentData 2020-11-14 10:11:26 -05:00
Hypolite Petovan
a9d114316d Ensure the parent field isn't set during Item insertion
- Avoid a database error if a null value is provided
2020-11-14 10:08:51 -05:00
Hypolite Petovan
d3708cf1c2 Fix wrong variable use in Model\Item::getTopLevelParent
- It was preventing items at levels 3 and beyond to be inserted
- Logging for missing top level parent has been bumped to notice
2020-11-14 10:08:51 -05:00
Hypolite Petovan
355cd401ae Replace uri fields conditions by gravity condition in Model\Item::insert 2020-11-14 10:08:51 -05:00
Hypolite Petovan
ffc364f2a4 Reject replies when author is blocked by thread owner in Model\Item::insert
- Move user-level item permission to Model\Item::isAllowedByUser
- Add user-level check for comments on top-level item
2020-11-14 10:08:50 -05:00
Hypolite Petovan
0c3a5c815e Remove obsolete references to item.parent-uri 2020-11-14 10:08:50 -05:00
Hypolite Petovan
d7e1ce47bb Use item.thr-parent as expected in Model\Item::insert()
- Rework Model\Item::getTopLevelParent
- Backward compatibility with item.parent-uri is ensured
2020-11-14 10:08:50 -05:00
Michael
ae363b74ad Check for empty body to prevent a fatal error 2020-11-12 16:52:55 +00:00
Hypolite Petovan
ffb4292b0b Improve accuracy of User::getList with type = blocked
- user.blocked is used for pending registrations as well
2020-11-08 12:53:12 -05:00
Michael
43749c3069 The "attach" field is now deprecated 2020-11-07 08:22:59 +00:00
Michael
d383f49f1e The "[attach]" field is replaced by the "post-media" table 2020-11-06 04:14:29 +00:00
Michael
65b07aead4 Indention, documentation 2020-11-03 20:30:59 +00:00
Michael
4965d6aa54 The profile page does now shows reshared items 2020-11-03 19:24:47 +00:00
Michael
e6030e5f82 API: Media attachments are now supported 2020-10-31 16:10:27 +00:00
Michael
6b12ef14f5 Fixed spelling 2020-10-31 14:09:44 +00:00
Michael
8485c8c357 The post-media table now works with the "attach" field as well 2020-10-31 13:26:08 +00:00
Michael
da370c44ba Added lock for contacts, improved logging 2020-10-30 17:26:12 +00:00
Michael
930897046d Merge remote-tracking branch 'upstream/develop' into item-lock 2020-10-29 21:07:24 +00:00
Michael
e3df7eb131 Superfluous to-do removed 2020-10-29 08:50:35 +00:00
Michael
5ac73a847d Functions renamed 2020-10-29 08:48:08 +00:00
Michael
e548d647aa New table for attached media files 2020-10-29 05:20:26 +00:00
Michael
58383f38d7 Alternative item insert lock mechanism 2020-10-24 13:09:35 +00:00
Michael
592ac53ffc Worker priority / no shadow worker 2020-10-24 08:05:03 +00:00
Michael
f405336680 Avoid duplicate item entries 2020-10-23 19:10:17 +00:00
Hypolite Petovan
4719af6724
Merge pull request #9440 from annando/one-click-follow
Follow/Unfollow contact with a single click
2020-10-20 11:09:56 -04:00
Michael
33575a94fa Follow/Unfollow contact with a single click 2020-10-20 03:49:58 +00:00
Philipp
a74d88c4ee
Remove 'headers' option occurrences and add a warning if used. 2020-10-18 22:31:26 +02:00
Philipp
a6fc9cd32e
Remove $binary flag for HTTPRequest::get(), HTTPRequest::fetch(), HTTPRequest::fetchAll() (deprecated since PHP 5.1.3) 2020-10-18 20:56:31 +02:00
Michael
f3fd99da60 Don't change resharer when resharing 2020-10-11 17:37:04 +00:00
Michael
2d4a3f482b Use new function for validity check 2020-10-10 07:14:43 +00:00
Michael
4b9cbac23e Filter for account type for contacts 2020-10-09 19:08:50 +00:00
Michael
00974324fe Don't show failed contacts 2020-10-07 20:06:15 +00:00
Michael
d785af23c1 Display number of group members in contact widget 2020-10-07 06:19:09 +00:00
Michael
bda87e6536 Display language name / only search for available languages 2020-10-07 04:15:02 +00:00
Michael
bb676f780c Changed documentation 2020-10-06 20:36:57 +00:00
Michael
5580b148a6 Added description 2020-10-06 19:51:51 +00:00
Michael
5998c3995e Issue-9358 (now for real) commenting and updating on contact now work 2020-10-06 18:47:23 +00:00
Hypolite Petovan
9954bf8adf
Merge pull request #9365 from annando/better-plaintext
Improve plaintext generation for language detection
2020-10-05 23:11:42 -04:00
Michael
77fcdede9b Fix tests 2020-10-05 18:11:05 +00:00
Michael
79af93405b Update the "commented" field only on several verbs 2020-10-05 17:57:24 +00:00
Michael
16224a7001 Improve plaintext generation for language detection 2020-10-05 12:50:18 +00:00
Michael
b6b28b1541 Display the languages in the post 2020-10-04 18:52:28 +00:00
Hypolite Petovan
6fdab8394a Update wrong assertion regarding a profile being local user's self in Model\Profile
- It was hiding follow links for profiles on the same node
2020-10-03 23:03:33 -04:00
Hypolite Petovan
2bfd9851d3
Merge pull request #9314 from annando/suggestions
New function for contact suggestions
2020-10-03 13:32:21 -04:00
Hypolite Petovan
d4968b4562
Merge pull request #9346 from annando/reduce-contact-update
Reduce the amount of contact updates
2020-10-03 12:43:28 -04:00
Michael
26e9efc746 Added brackets 2020-10-03 16:17:18 +00:00
Michael
2cd54320e4 New language detection 2020-10-03 15:42:21 +00:00
Michael
d504789c34 Reduce the amount of contact updates 2020-10-03 10:52:34 +00:00
Michael
d94e653030 Issue 9344: Update trending tags hourly 2020-10-03 06:10:39 +00:00
Michael
73a7df85f7 Issue 9303: Detect AP accesses as backend, prevent ping pong 2020-10-02 09:31:39 +00:00
Philipp
97f07b7518
Merge pull request #9334 from annando/endless-scroll
Endless scrolling for searches and contact comments
2020-10-01 23:04:56 +02:00