Commit Graph

1199 Commits

Author SHA1 Message Date
Michael 7b7132971a Raw content is now stored with announce messages as well 2020-03-04 06:04:27 +00:00
Michael 79986c1fe5 Spaces removed 2020-03-03 22:57:29 +00:00
Michael 8410c5e283 The direction field needs to be removed 2020-03-03 22:43:19 +00:00
Michael 986877b1cf Restore previous state 2020-03-03 22:22:59 +00:00
Michael e38640da76 The original content of the post hadn't always been stored 2020-03-03 21:58:03 +00:00
Michael e3d3dc50e5 Store the direction only when there is content to store 2020-03-03 08:04:14 +00:00
Michael af6db65961 Store the push/pull direction in the conversation table 2020-03-03 08:01:04 +00:00
Michael 6f0d40c6c0 Merge remote-tracking branch 'upstream/develop' into push-pull 2020-03-03 06:55:13 +00:00
Hypolite Petovan 6ae5f705b6 Rename Item::delete* methods to Item::markForDeletion* 2020-03-03 01:48:29 -05:00
Michael a19151fa6a Improved description, support for "unlisted" via DFRN as well. 2020-03-02 22:35:25 +00:00
Michael 72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
Michael ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Philipp b2198c7510
Merge pull request #8345 from annando/store-raw
Store the raw data in a different way
2020-02-29 16:20:48 +01:00
Michael 1743682153 We don't need to pass the protocol that way 2020-02-28 09:46:53 +00:00
Michael a9896ecdb1 Store the conversation data as well 2020-02-28 09:42:04 +00:00
Michael bcb3a81988 Store the protocol as well 2020-02-28 09:25:41 +00:00
Michael 26cffd379a Store the raw data in a different way 2020-02-28 09:21:40 +00:00
Michael acd99b9010 Push/Pull indicator 2020-02-27 05:01:43 +00:00
Hypolite Petovan 064cc227c0 Remove simple_html parameter from about field conversion in Protocol\ActivityPub\Transmitter 2020-02-25 07:41:26 -05:00
Hypolite Petovan 0f85f5d167 Convert outgoing profile description to Markdown in Protocol\Diaspora 2020-02-24 07:59:53 -05:00
Hypolite Petovan c147446c93 Add about field conversion to HTML in Protocol\ActivityPub\Transmitter 2020-02-23 20:36:04 -05:00
Hypolite Petovan bfea5d42ad Simplify about field conversion to plaintext in Protocol\Diaspora 2020-02-23 20:35:36 -05:00
Michael cceb497bd5 Avoid a fatal error 2020-02-16 15:45:26 +00:00
Michael ee6cceba30 Clarify the effect of "net-publish" 2020-02-16 15:39:44 +00:00
Michael 3bd1f3a836 No more gender 2020-02-16 10:55:18 +00:00
nupplaPhil 85dc9bb96b
Add license info at Friendica PHP files 2020-02-09 16:18:46 +01:00
nupplaPhil 23c64b9a11
Add license info at Friendica classes 2020-02-09 15:45:36 +01:00
nupplaPhil a78e19ea76
Move Notify::TYPE_POKE 2020-02-05 21:41:05 +01:00
nupplaPhil 88dc3efdc9
Move Notify::TYPE_SUGGEST 2020-02-05 21:41:03 +01:00
Hypolite Petovan 42775d53b2
Merge pull request #8222 from annando/ap-gnusocial
AP comments from GNU Social are now working
2020-02-02 15:21:23 -05:00
Michael 56816ea9d5 AP comments from GNU Social are now working 2020-02-02 19:59:14 +00:00
nupplaPhil 34f4aedb87
Move mod/fsuggest to src/Module/SuggestFriends 2020-01-31 23:50:46 +01:00
Hypolite Petovan 18cfd8dfaa Remove references to deprecated profile.is-default and profile.profile-name fields 2020-01-22 19:42:37 -05:00
Michael 34b813bbfa Fix for AP posts where the URL don't match 2020-01-20 22:30:34 +00:00
Hypolite Petovan 04d620fc2f
Merge pull request #8142 from nupplaphil/task/di_config
CleanUp Config namespace
2020-01-19 22:22:57 -05:00
nupplaPhil ed9392469e
Remove unneeded Config namespace usages 2020-01-19 22:50:44 +01:00
Michael dcbd44ab88 Removed the rest of the @brief fields 2020-01-19 20:44:01 +00:00
nupplaPhil 21640ec5d8
Add missing Friendica\DI namespace to files (PHPStorm inspection) 2020-01-19 21:26:42 +01:00
nupplaPhil 3411ced833
Move Config::set() to DI::config()->set() 2020-01-19 21:21:53 +01:00
nupplaPhil 6c36fd9e01
Move Config::get() to DI::config()->get() 2020-01-19 21:21:13 +01:00
Hypolite Petovan 1bc4b2e078
Merge pull request #8134 from nupplaphil/task/di_l10n
Cleanup L10n namespace
2020-01-19 11:30:19 -05:00
nupplaPhil d6efc90194
cleanup namespace usages for L10n 2020-01-19 16:31:33 +01:00
nupplaPhil 5dfee31108
Move L10n::t() calls to DI::l10n()->t() calls 2020-01-19 16:31:16 +01:00
Michael bb253ceeaa AP: Create a GUID out of an URL 2020-01-19 14:33:16 +00:00
Michael 0a4119adaf @brief is removed completely 2020-01-19 06:05:23 +00:00
Hypolite Petovan 58f69481e6
Merge pull request #8130 from nupplaphil/task/di_pconfig
Move PConfig to DI::pConfig()
2020-01-18 13:57:57 -05:00
nupplaPhil 800694e9b3
Remove unused use statements & remove PConfig class 2020-01-18 17:02:59 +01:00
nupplaPhil 9e9429b56d
Move PConfig::get() to DI::pConfig()->get() 2020-01-18 16:50:57 +01:00
nupplaPhil 424c87195b
CleanUp Cache namespace
- Introduce enum "Duration"
- Introduce enum "Type"
- Move "Cache\Cache" to "BaseCache"
2020-01-18 15:41:19 +01:00
Michael ccc7a71e54 Ensure that local contacts always are DFRN contacts 2020-01-16 06:43:21 +00:00
Hypolite Petovan 36190d1e79
Merge pull request #8072 from nupplaphil/task/Cache_to_DI
Replace Core\Cache wrapper with DI::cache() method
2020-01-10 08:46:03 -05:00
Hypolite Petovan b8f85f0484
Merge pull request #8075 from annando/html-escaping
Fix: removed unneeded HTML escaping
2020-01-08 16:18:36 -05:00
Hypolite Petovan f67f398fe1
Merge pull request #8071 from nupplaphil/task/Lock_to_lock
Replace Core\Lock wrapper with DI::lock() method
2020-01-08 14:25:46 -05:00
Michael 8e87c5f05f Fix: removed unneeded HTML escaping 2020-01-07 22:00:39 +00:00
Michael 5b755f0f23 Issue 8067: Posts from Mastodon had been wrongly parsed 2020-01-07 00:16:42 +00:00
nupplaPhil a38b0f7eaf
Move remaining namespaces and delete Core\Cache.php 2020-01-07 00:51:02 +01:00
nupplaPhil fe078410a1
Move Cache::get() to DI::cache()->get() 2020-01-07 00:45:49 +01:00
nupplaPhil f68929633b
Move Cache::set() to DI::cache()->set() 2020-01-07 00:41:20 +01:00
nupplaPhil 31457b8566
Replace Lock::release() with DI::lock()->release() and remove Core\Lock 2020-01-07 00:24:10 +01:00
nupplaPhil 634e657d23
Replace Lock::acquire() with DI::lock()->acquire() 2020-01-07 00:20:31 +01:00
Michael ab43d3ddc4 AP: ensure that incoming posts are reaching all receivers 2020-01-05 17:20:23 +00:00
Michael 8878b3864f Fix an error and a notice 2020-01-05 02:19:02 +00:00
Michael Vogel c8a322baf0
Merge pull request #8053 from nupplaphil/task/remove_get_app
Remove get_app() in favor of DI::app()
2020-01-04 23:41:51 +01:00
nupplaPhil f0eea6f875
Remove get_app() in favor of DI::app() 2020-01-04 23:42:01 +01:00
Michael b08c9692ca Added parameter type 2020-01-04 21:48:26 +00:00
Michael 7cf27e9cb0 AP: Transmit the language in the contentMap 2020-01-04 14:35:14 +00:00
Hypolite Petovan ebaf726744 Rework Feed::import parameters
- Remove unused $hub
- Replace $simulate with an implicit condition
2020-01-03 09:26:28 -05:00
Hypolite Petovan 38fe3b8994 Fix formatting in Feed::import 2020-01-03 09:12:32 -05:00
Michael fb550a0172 Relocated functions from PortableContact to GServer 2020-01-01 21:29:36 +00:00
Philipp 75c74e8562
Merge pull request #8044 from annando/contact-adding
Don't add contacts when not needed
2020-01-01 20:38:34 +01:00
Michael 73b82d1455 Don't add contacts when not needed 2020-01-01 17:54:36 +00:00
nupplaPhil 9bdb4db887
Replace comment 2019-12-30 23:45:42 +01:00
nupplaPhil 3f34229752
Move redundant System::baseUrl() to DI::baseUrl() calls 2019-12-30 23:00:08 +01:00
Michael 74f4637ff3 Fix fatal errors caused by PR 8019 2019-12-30 01:17:16 +00:00
nupplaPhil e944d7bed6
Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get() 2019-12-29 20:17:48 +01:00
nupplaPhil 50be94aa5e
Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName() 2019-12-29 20:17:47 +01:00
nupplaPhil 388b963714
Replace BaseObject class with DI::* calls 2019-12-29 20:17:38 +01:00
nupplaPhil 1de3f186d7
Introduce new DI container
- Adding Friendica\DI class for getting dynamic classes
- Replacing BaseObject::getApp() with this class
2019-12-29 20:16:55 +01:00
Michael 26ac9a0063 "CheckServer" is now "UpdateGServer" 2019-12-21 18:11:51 +00:00
Michael fab85255b6 Relocated functions 2019-12-21 06:39:22 +00:00
Michael b4f690839a "CheckServer" added 2019-12-20 21:46:30 +00:00
Michael 3c4f44a4ab "FetchPoCo" added 2019-12-20 21:21:25 +00:00
Michael a1ad549e0b Added UpdateServerDirectory 2019-12-20 20:37:21 +00:00
Michael 2a31b2383f Issue 7691: We can now switch to BCC for ActivityPub 2019-12-09 21:37:31 +00:00
Michael ca0a961ad2 Merge remote-tracking branch 'upstream/develop' into reshare-delivery 2019-12-08 08:49:47 +00:00
Michael 484b99f7cf Fix: Don't automatically mention a post creator on private posts 2019-12-07 21:42:55 +00:00
Michael 41f8796ffc Delivery of reshares 2019-12-06 06:39:50 +00:00
Michael 4b2acb74d5 Fix a notice about an undefined "attach" index 2019-12-06 04:34:20 +00:00
Michael 4e77321be8 Replaced all preg calls in the calls with the new function 2019-12-05 06:42:10 +00:00
Michael e435102089 Added logging, fixed indentation, call it from DFRN as well 2019-12-05 05:28:28 +00:00
Michael 838a233bfc Handling reshares of Friendica posts with titles via Diaspora 2019-12-05 05:11:14 +00:00
Michael 8f4f3e00e2 Return more data in the announce object 2019-12-04 09:36:46 +00:00
Michael 276d6fddd1 Function renamed - we don't return an object 2019-12-04 09:15:03 +00:00
Michael ef3664e6d4 Check if reshared item is an AP item 2019-12-04 08:08:48 +00:00
Michael abed3ba906 Remove unused function 2019-12-04 07:13:29 +00:00
Michael d34052b332 Make quoted announces look better / more announce improvements 2019-12-04 07:02:39 +00:00
Michael 7ffd6d0bc7 Attached photos from pixelfed are now added to the body again 2019-11-28 06:34:35 +00:00
Michael 99945f21cb Only read undeleted mails / improved structure 2019-11-23 20:02:21 +00:00
Michael 84244b1450 Now it works 2019-11-23 12:54:39 +00:00
Michael e220698ea1 E-Mail import: The item is now provided to the hook 2019-11-23 11:42:03 +00:00
Hypolite Petovan 17c934aa07
Merge pull request #7859 from annando/mail-reply-to
Use the "reply-to" header of the original post when answering via mail
2019-11-22 23:33:10 -05:00
Michael 37bdafcc96 Use the "reply-to" header of the original post when answering via mail 2019-11-22 22:15:04 +00:00
Hypolite Petovan 20dc285f9d
Merge pull request #7858 from annando/diaspora-date
Don't use the creation date when transmitting to Diaspora
2019-11-22 15:36:27 -05:00
Michael Vogel f0ffc6df38 Don't use the creation date when transmitting to Diaspora 2019-11-22 21:24:02 +01:00
Michael e539c74fa4 Removed the word "test" 2019-11-22 19:47:35 +00:00
Michael 5bf8c895a9 Improvement for PR 7854: Avoid leaking of BCC header data 2019-11-22 18:39:51 +00:00
Michael d8da580869 Fix mail delivery via AP when the contact is hidden 2019-11-22 08:01:23 +00:00
Michael d3e12c58e2 Fix some notices/warnings again 2019-11-21 22:40:54 +00:00
Michael a6ae6a83b8 Added hooks for the email fetch process 2019-11-20 20:57:34 +00:00
Michael 7c1f8a0597 Renamed config name 2019-11-19 16:31:22 +00:00
Michael fa876d770e Make the automatic title appending optional 2019-11-19 12:59:21 +00:00
Michael Vogel 100dfea524 Fix further notes and warnings 2019-11-19 11:02:35 +01:00
Michael Vogel 287c55722e Show title for posts with attached pages 2019-11-18 19:52:00 +01:00
Michael Vogel 80917018e9 Fix warnings 2019-11-18 19:09:21 +01:00
Michael Vogel 0733ae6aae Improve the look of fetched feeds and the BBCode processing of attachments 2019-11-18 13:29:27 +01:00
Michael 8644d300d0 Readded empty line 2019-11-17 18:12:20 +00:00
Michael 28ca0d6fab AP: Remove the link description from the "rich html" and adds it to the attachment 2019-11-17 18:10:12 +00:00
Michael fa57fead2e AP: Read different content types for the source and the content 2019-11-13 16:22:20 +00:00
Michael 85b3c880ef Fix: Mentions in the HTML part of the "contentMap" now are links 2019-11-13 06:43:36 +00:00
Michael 1fb485af1c Use the contentMap to transmit additional content encodings 2019-11-12 20:22:35 +00:00
Michael 8997361609 Better function name 2019-11-11 23:13:36 +00:00
Michael 1b5fa55bdc Fix image links with descriptions in API and AP transmission 2019-11-11 22:37:50 +00:00
Michael 48ab31f451 Fix a notice 2019-11-06 19:17:40 +00:00
Michael 17704d2458 Diaspora: Use the standard function for adding a relationship 2019-11-03 13:35:41 +00:00
Michael 6f9302f389 Another duplicated "use" removed 2019-11-02 21:29:16 +00:00
Michael 04c889270b Removed duplicated "use system" 2019-11-02 21:24:22 +00:00
Hypolite Petovan 03bf1dcbd3 Move Object\Image static methods to Util\Images
- Optimize imports in modified files
2019-11-02 07:48:45 -04:00
Michael 44cc750f79 Some more warnings removed 2019-10-31 07:33:25 +00:00
Philipp Holzer 7343ee5108
Move Namespace of ActivityNamespace 2019-10-25 00:41:48 +02:00
Philipp Holzer dc2858938d
Renamed to ActivityNamespace 2019-10-25 00:32:35 +02:00
Philipp Holzer 3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Philipp Holzer 2fba7ed477
Rename namespace 2019-10-24 21:40:13 +02:00
Philipp Holzer 07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Philipp Holzer 52c42491c4
Move activity_match() to Protocol\Activity::match()
- With tests
2019-10-23 02:05:11 +02:00
Philipp Holzer 7716374593
Move mod/receive to src/Module/Diaspora/receive
- Added routes
- Make Diaspora::decode(Raw) more explicit
- Add new User::getByGuid() method
2019-10-20 13:07:16 +02:00
Hypolite Petovan f8c0f24e34
Merge pull request #7752 from kPherox/develop
Change Model type to `OrderedCollectionPage`
2019-10-18 06:54:42 -04:00
kPherox 0da36b839c
Change Model type to OrderedCollectionPage
Use type `OrderedCollectionPage` instead of `OrderedCollection` in pages or distinct subsets
FYI: https://www.w3.org/TR/activitystreams-core/#h-paging
2019-10-18 12:58:47 +09:00
Hypolite Petovan 5dcf6bfc58 Remove extra spaces before closing parentheses in src/ 2019-10-16 08:58:09 -04:00
Hypolite Petovan 146646c4d4 Replace deprecated calls to defaults() by ?? and ?: in src/ 2019-10-16 08:38:52 -04:00
Michael 8238081d87 Replace obsolete functionality in "PortableContact" 2019-10-05 23:30:47 +00:00
Michael a7e518acbd Readded the network parameter 2019-10-04 05:42:54 +00:00
Michael d9a74bd5dd Code transitioning from PortableContacts.php to GServer.php 2019-10-03 23:33:41 +00:00
Michael 21e9e9f3c2 Remove obsolete function to guess the base url of a contact 2019-10-02 15:10:42 +00:00
Michael c494b158c8 Fix notice "Undefined index: openRegistrations" 2019-10-01 19:27:33 +00:00
Michael 5eeca432fe removed unused "f" parameter 2019-09-29 18:59:03 +00:00
Michael 1ddd2df4b8 Removed obsolete code 2019-09-28 05:37:24 +00:00
Michael 704cdf1b5a New function to store the "remote" session value / making the changes work 2019-09-26 04:47:42 +00:00
Michael c364a77d63 Always use direct DFRN transport on local contacts 2019-09-21 12:39:07 +00:00
Hypolite Petovan 888f7ffd1c Use correct data key to compare authors before appending mention in Protocol\Diaspora 2019-09-15 07:05:47 -04:00
Hypolite Petovan 69752fd945 Prevent prepending implicit mention if replied to item is ours in Protocol\Diaspora 2019-09-14 17:42:02 -04:00
Michael 3c1380fdcc Fix enduring follow requests to Pleroma 2019-09-11 16:54:13 +00:00
Michael 33006d8455 Merge remote-tracking branch 'upstream/2019.09-rc' into performance 2019-09-03 15:02:16 +00:00
Michael 52d8b618f0 Type hints 2019-09-03 03:59:46 +00:00
Michael Vogel 046b5a1eac Fix performance issues due to relay contact requests 2019-09-02 15:11:07 +02:00
Michael 6af4c90dff Fix delivery counter / archive relay contacts 2019-09-02 03:25:05 +00:00
Michael Vogel ef02a1cb7b Check fpr duplicated contacts upon inserting them 2019-08-29 06:07:07 +02:00
Michael Vogel 9b7432781b Don't transmit content to already archived contacts 2019-08-27 21:01:11 +02:00
Tobias Diekershoff 1c3a5e1e6f added USE statement and changed statement as requested in #7305#discussion_r296461181 2019-08-27 07:10:51 +02:00
Hypolite Petovan 20a6b368fb Replace mb_convert_encoding with html_entity_decode for feed item title conversion
- Prevents already UTF-8 strings to be corrupted
2019-08-22 06:00:21 -04:00
Hypolite Petovan 9de59d5c4d Add entry title HTML entities conversion in Protocol\Feed
- Prevents literal entities display in generated post title
2019-08-18 09:37:36 -04:00
Hypolite Petovan cf8177461e Prune unavailable contacts from AP envelope 2019-08-17 00:00:49 -04:00
Philipp Holzer 08be92a862
Moved BaseURL to App namespace (because similar type as Arguments/Modules/Modes) 2019-08-15 17:23:00 +02:00
Hypolite Petovan 2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael 8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
Michael 7d79d48f6e Fix: The field "contact-id" now contains the correct contact id again 2019-07-30 13:08:14 +00:00
Michael bcc8ed378c ActivityPub: We now do support transmitting alternative image descriptions 2019-07-29 05:09:11 +00:00
Michael ab7db9944d ActivityPub: Support for incoming picture descriptions 2019-07-29 04:35:13 +00:00
Hypolite Petovan 8b344141da
Merge pull request #7434 from annando/contact-protocol
New functions to check if a contact supports that protocol
2019-07-27 17:47:54 -04:00
Michael f5cb6148cf Improved documentation 2019-07-27 21:45:36 +00:00
Michael 975ff86bae Fix: The $contact error is expected to be a single row array 2019-07-27 15:40:43 +00:00
Michael 264936100f New functions to check if a contact supports that protocol 2019-07-27 11:09:12 +00:00
Hypolite Petovan 1d8b809227
Merge pull request #7414 from annando/fetch-diaspora
Fetch Diaspora posts by url
2019-07-22 07:01:42 -04:00
Michael 105378f5a4 Changed regexp 2019-07-22 06:03:18 +00:00
Michael 53ffe5a2e1 Fetch Diaspora posts by url 2019-07-21 07:37:50 +00:00
Michael a11206dbcd Issue 6675: Improved check for follower, removed global setting 2019-07-21 05:56:57 +00:00
Michael 23830dc45f Preparation for quoted reshares on AP 2019-07-20 21:32:19 +00:00
Michael c771c575a7 Fix PR 7399: Added missing "use" 2019-07-18 06:12:43 +00:00
Michael e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Michael a80a6bec74 Preparation for being able to fetch AP posts by proving the URL 2019-07-17 19:36:32 +00:00
Michael 8c2f50eb72 Issue 7315: Set the forum's contact id for forum posts 2019-07-16 05:07:26 +00:00
Michael 1a213bd8e8 Issue 7315: Changed handling of "Group" posts 2019-07-15 20:05:36 +00:00
Michael 9ba3ee13a8 Use an insert to avoid duplicates and for analyzing 2019-07-14 10:22:19 +00:00
Michael 5bba0e7d39 Hopefully avoiding duplicated relay entries 2019-07-13 23:53:15 +00:00
Michael c34204cf50 Merge remote-tracking branch 'upstream/develop' into contact-update 2019-07-12 20:51:27 +00:00
Michael 8cbdc7939e Fetch more comtact data from probing, remove duplicated contacts 2019-07-12 14:55:23 +00:00
Michael Vogel 807d2665ea Use standard function to update the contact to avoid SQL errors 2019-07-11 22:11:51 +02:00
Michael Vogel 6b25fd5b2f added logging 2019-07-10 05:19:54 +02:00
Michael Vogel 54d96da94a Fix fatal error with incomplete contact data upon delivery 2019-07-10 05:16:50 +02:00
Michael d1435bef61 Add ActivityPub related fields to the "uri" function 2019-07-08 12:00:11 +00:00
Michael 6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Michael be0a102333 Simplified the Contact update 2019-07-04 21:19:23 +00:00
Michael c9666a9f1d We don't update inside the probing anymore 2019-07-04 19:40:48 +00:00
Michael 8d6aa9914c We now handling the contact type 2019-07-04 19:31:42 +00:00
Michael ef5be9668f New fields in contact table / don't update on probe 2019-07-04 04:08:55 +00:00
Michael 6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
Michael 0a15222576 Collect data about used protocols for delivery 2019-06-28 09:03:58 +00:00
Hypolite Petovan fa191bd821
Merge pull request #7305 from deantownsley/imageauthfix
Make authentication work for local private images
2019-06-23 15:18:15 -04:00
Dean Townsley 0c6a0942cc Clarify comment and log message 2019-06-22 19:08:34 -05:00
Dean Townsley 9dff3d2b6d Use User:: API insteadd of direct database read 2019-06-22 18:56:33 -05:00
Michael Vogel 449305e527 Fix the processing of event activities 2019-06-23 00:38:52 +02:00