Commit Graph

1024 Commits (e3a32a880c9d446293f80d8178ace322d340fece)

Author SHA1 Message Date
Chocobozzz 64fd6158fd
Fix resolution to transcode hook name 2022-08-09 09:18:07 +02:00
Chocobozzz 84cae54e7a
Add option to not transcode original resolution 2022-08-09 09:18:07 +02:00
Chocobozzz 785f1897a4
Add notification plugin hook 2022-08-03 11:33:43 +02:00
Chocobozzz 0260dc8aca
Add channel server hooks 2022-08-03 11:24:42 +02:00
Chocobozzz 9ca0f688e9
Add channel hooks 2022-08-03 10:39:40 +02:00
Chocobozzz ebb9e53ada
Add plugin hook on transcoding resolutions building 2022-08-02 16:05:44 +02:00
Chocobozzz 22df69fdec
Add job queue hooks 2022-08-02 15:50:05 +02:00
Chocobozzz 1bb4c9ab2e
Add ability to delete a specific video file 2022-08-01 14:55:10 +02:00
Chocobozzz 12d84abeca
Include video file id in API 2022-07-29 11:33:27 +02:00
Chocobozzz 5a9a56b78f
Prevent error on highlighted thread 2022-07-29 10:32:56 +02:00
Chocobozzz e3d6c6434f
Add bulk action on following/followers 2022-07-27 13:52:13 +02:00
Chocobozzz 927fa4b11f
Add rejected state to follows
Prevent reprocessing already rejected follows
2022-07-27 13:52:13 +02:00
Chocobozzz 4f50475c67
Display latest uploaded date for captions 2022-07-25 10:45:40 +02:00
Chocobozzz c8fa571f32
Clearer live session
Get the save replay setting when the session started to prevent
inconsistent behaviour when the setting changed before the session was
processed by the live ending job

Display more information about the potential session replay in live
modal information
2022-07-22 15:22:21 +02:00
Chocobozzz 42b4063699
Add ability for client to create server logs 2022-07-18 11:37:18 +02:00
Chocobozzz ba2684cedd
Fix lint 2022-07-13 12:14:26 +02:00
Chocobozzz f686f5ed0a
Fix audio file merge
Image streams are considered as video streams by ffmpeg
Filter out image codec name
2022-07-12 16:00:15 +02:00
Chocobozzz 0f7195fa40
Support hr locale 2022-07-11 16:25:43 +02:00
kontrollanten f8b4a71d42
hooks filter:api.my-lib.playlist-elems.get.* (#5098)
* hooks filter:api.my-lib.playlist-elems.get.*

closes #4776

* Introduce my-library plugin scope

Co-authored-by: Chocobozzz <me@florianbigard.com>
2022-07-08 10:50:10 +02:00
Chocobozzz 630d0a1bf5
Introduce experimental telemetry 2022-07-06 15:13:55 +02:00
Chocobozzz e722fb5923
Merge branch 'release/4.2.0' into develop 2022-06-27 10:36:31 +02:00
Chocobozzz 41e74ec9cd
Fix broken feeds with published live 2022-06-27 10:36:16 +02:00
Chocobozzz 4c1ce3d44c
Support tok in client 2022-06-24 11:51:30 +02:00
Chocobozzz 64324ac646
Merge branch 'release/4.2.0' into develop 2022-06-23 10:53:16 +02:00
Chocobozzz 53023be33a
Fix fast restream in saved permanent live 2022-06-23 10:30:48 +02:00
kontrollanten 2e401e8575
store uploaded video filename (#4885)
* store uploaded video filename

closes #4731

* dont crash if videos channel exist

* migration: use raw query

* video source: fixes after code review

* cleanup

* bump migration

* updates after code review

* refactor: use checkUserCanManageVideo

* videoSource: add openapi doc

* test(check-params/video-source): fix timeout

* Styling

* Correctly set original filename as source

Co-authored-by: Chocobozzz <me@florianbigard.com>
2022-06-21 15:31:25 +02:00
Chocobozzz 714e33a742
Merge branch 'release/4.2.0' into develop 2022-06-20 10:23:19 +02:00
Chocobozzz d3976db269
Fix searching in blocklist 2022-06-17 16:06:58 +02:00
Chocobozzz fba911e2c8
Merge branch 'release/4.2.0' into develop 2022-06-17 14:17:06 +02:00
Chocobozzz f27b7a750f
Send views in a dedicated queue 2022-06-17 14:08:13 +02:00
Chocobozzz 0c9a835466
Merge branch 'release/4.2.0' into develop 2022-06-16 14:11:31 +02:00
Chocobozzz cdd838168d
Fix live ending job that breaks new live session 2022-06-16 13:39:57 +02:00
luz paz 7a4fd56ccd Fix various typos
Found via `codespell -q 3 -S ./CREDITS.md,./CHANGELOG.md,./client/src/locale,./yarn.lock,./client/yarn.lock -L doubleclick,followings,nd,ot,ro,serie,splitted,tread,truthy`
2022-06-07 16:41:21 +02:00
Chocobozzz e771ff815d
Merge branch 'release/4.2.0' into develop 2022-06-03 14:32:44 +02:00
Chocobozzz 010382b603
Completely remove best default trending algorithm 2022-06-03 14:04:52 +02:00
Florian CUNY c6f8ca4d65
Added "total views" in the my channels list (#5007)
* Added "total views" in the my channels list

Implements https://github.com/Chocobozzz/PeerTube/issues/4331

* Fix lint

* applied suggested change

* updated openAPI spec for the use "withStats" when getting video channels

* applied code change

* removed GROUP BY in query

* Fixed test
2022-05-31 16:01:11 +02:00
Jlll1 bf28e1daf1
(#4959) Add 'Originally Published At' sort option in videos pages (#4977)
* Add Original Publication Date sort dropdown option in video filters

* Make the minimal sort dropdown width 250px to acomodate for 'Originally Published At' option

* Improve label

Co-authored-by: Chocobozzz <me@florianbigard.com>
2022-05-24 11:42:50 +02:00
Chocobozzz 60f013e103
Add control bar option for peertube player 2022-05-20 09:59:53 +02:00
Chocobozzz 305ec38496
Add total viewers overall stat 2022-05-18 09:18:39 +02:00
Chocobozzz 49f0468d44
Add filter by start/end date overall stats in api 2022-05-05 14:13:14 +02:00
Chocobozzz f18a060a83
Remove comments, rates and views from stats
It prevent us to apply date filters
2022-05-05 13:47:51 +02:00
Chocobozzz 26e3e98ff0
Support live session in server 2022-05-03 14:49:15 +02:00
Chocobozzz 42efd780a2
Support HTML entities in markdown fields 2022-05-02 14:14:30 +02:00
Chocobozzz 961cbe4269
Fix getting live by anonymous user 2022-04-22 09:50:20 +02:00
Chocobozzz 4ec52d04dc
Add ability to save replay of permanent lives 2022-04-21 11:47:57 +02:00
Chocobozzz 33ac85bf61
Test digest check for resumable upload 2022-04-19 14:25:33 +02:00
Chocobozzz 3eda9b775a Support interactive video stats graph 2022-04-15 09:49:35 +02:00
Chocobozzz 901bcf5c18 Add ability to set start/end date to timeserie 2022-04-15 09:49:35 +02:00
Chocobozzz bfbdfc584a Add event doc to view endpoint 2022-04-15 09:49:35 +02:00
Chocobozzz b211106695 Support video views/viewers stats in server
* Add "currentTime" and "event" body params to view endpoint
 * Merge watching and view endpoints
 * Introduce WatchAction AP activity
 * Add tables to store viewer information of local videos
 * Add endpoints to fetch video views/viewers stats of local videos
 * Refactor views/viewers handlers
 * Support "views" and "viewers" counters for both VOD and live videos
2022-04-15 09:49:35 +02:00
Chocobozzz a219c9100b
Refactor AP context builder 2022-03-24 09:40:46 +01:00
Chocobozzz 92e66e04f7
Rename studio to editor 2022-03-22 17:24:32 +01:00
Chocobozzz 1808a1f8e4
Add video edition finished notification 2022-03-22 16:25:14 +01:00
Chocobozzz 57e4e1c1a9
Don't store remote rates of remote videos
In the future we'll stop to expose all available rates to improve users
privacy
2022-03-18 11:21:50 +01:00
Chocobozzz 2769876fb2
Fix client html cache on theme update 2022-03-17 09:09:06 +01:00
Chocobozzz f012319a64
Process video torrents in order
Prevent update before video torrent generation for example
2022-03-16 15:45:58 +01:00
kontrollanten 60233e90d2
add client.videos.upload.maxChunkSize config (#4857)
* add client.videos.upload.maxChunkSize config

* updates after review

* remove maxChunkSize from custom-config
2022-03-16 10:57:36 +01:00
Chocobozzz f443a74649 Add latency setting support 2022-03-09 09:23:10 +01:00
kontrollanten 2c102aac13
Display avatar in video miniatures (#4823)
* show avatar in video miniatures

closes #4040

* fix: videos for api, include avatars

* add config for display video miniature avatar

* Revert "fix: videos for api, include avatars"

This reverts commit 5520a3eda6.

* video-min: set display avatar to false as default

* remove empty line

* rename display_avatar > display_author_avatar

* fix renaming displayAvatar > displayAuthorAvatar
2022-03-08 13:39:27 +01:00
Chocobozzz 55f0a7a762
Update translations and support fa 2022-03-03 10:54:52 +01:00
Chocobozzz cba7977552
Correctly cleanup server tests 2022-02-28 15:51:41 +01:00
kontrollanten c5ca7e1e0c add filter:api.video-playlist.videos.list.* hooks
closes #4775
2022-02-28 10:56:37 +01:00
Chocobozzz c729caf6cc Add basic video editor support 2022-02-28 10:42:19 +01:00
kontrollanten d0800f7661
Implement avatar miniatures (#4639)
* client: remove unused file

* refactor(client/my-actor-avatar): size from input

Read size from component input instead of scss, to make it possible to
use smaller avatar images when implemented.

* implement avatar miniatures

close #4560

* fix(test): max file size

* fix(search-index): normalize res acc to avatarMini

* refactor avatars to an array

* client/search: resize channel avatar to 120

* refactor(client/videos): remove unused function

* client(actor-avatar): set default size

* fix tests and avatars full result

When findOne is used only an array containting one avatar is returned.

* update migration version and version notations

* server/search: harmonize normalizing

* Cleanup avatar miniature PR

Co-authored-by: Chocobozzz <me@florianbigard.com>
2022-02-28 08:34:43 +01:00
Chocobozzz c68e2b2d22
Fix plaintext markdown converter 2022-02-04 10:38:32 +01:00
Chocobozzz 0f11ec8dd3
Prevent HLS transcoding after webtorrent transcoding 2022-02-01 11:27:38 +01:00
lutangar d2d4a5a999 Fix plugin settings manager definition
This mainly fix the `onSettingsChange` argument typing.
I'm not 100% sure the setting `value` can be a boolean though.
But this is how it was typed before so I just made it consistent.

Feel free to change - or suggest change - to the type names / location.
2022-01-20 13:43:20 +01:00
Chocobozzz 071f3e519c
Plugins can add custom instance infobox 2022-01-20 09:35:06 +01:00
Chocobozzz d511df2890
Add ability to filter my imports by target URL 2022-01-19 14:58:16 +01:00
Chocobozzz 419b520ca4
Add ability to cancel & delete video imports 2022-01-19 14:31:05 +01:00
Chocobozzz 7177b46ca1
Add ability to delete history element 2022-01-18 11:23:41 +01:00
Chocobozzz 3726c37255
Add missing mediaType info to AP objects 2022-01-13 14:16:32 +01:00
Chocobozzz cbe2f36d93
Fix audio transcoding with video only file 2022-01-06 17:55:37 +01:00
Chocobozzz f8360396ff
Stop using tsconfig register
Prefer to replace paths at compile time
2022-01-06 08:26:14 +01:00
Chocobozzz 8f5a1f36b5
Try to fix tests 2022-01-04 09:16:43 +01:00
Chocobozzz 7298cad6ce
Fix tests 2022-01-03 17:17:12 +01:00
Chocobozzz 9270bd3a7e
Migrate to --enable-source-maps option 2022-01-03 16:37:16 +01:00
Chocobozzz cc4bf76c13
Handle async validators 2022-01-03 14:20:52 +01:00
Chocobozzz 0628157fe9
Move uuid stuff in extra utils
Since it requires an external dependency
2021-12-29 14:44:58 +01:00
Chocobozzz fb3c9e2bf5
Translate plugin settings 2021-12-29 14:08:07 +01:00
Chocobozzz 3c065fe3b3
Enhance plugin video fields
Add video form tab selection
Add ability to display an error
2021-12-29 10:10:01 +01:00
Chocobozzz 61cc1c03bf
Support official plugins 2021-12-28 16:43:03 +01:00
Chocobozzz fba87e27c1
Resolve enums at compile time 2021-12-28 15:34:55 +01:00
Chocobozzz 6627dbc957
Move types package in packages/ 2021-12-28 10:18:15 +01:00
Chocobozzz c7cdac4409
Fix type conflict 2021-12-24 10:40:51 +01:00
Chocobozzz d17c7b4e8c
Fix shared imports 2021-12-24 10:14:47 +01:00
Chocobozzz dbd9fb44dd
Don't stuck state when move transcoding job failed 2021-12-23 11:13:06 +01:00
Chocobozzz 482b26231b
Fix audio only transcoding 2021-12-23 10:57:55 +01:00
lutangar 5e3d29ab21 Add video caption created and deleted hooks 2021-12-23 09:35:35 +01:00
Chocobozzz f304a1580b
Fix build 2021-12-17 13:58:07 +01:00
Chocobozzz c55e3d7227
Move test functions outside extra-utils 2021-12-17 12:24:03 +01:00
Chocobozzz bf54587a3e
shared/ typescript types dir server-commands 2021-12-17 09:29:23 +01:00
Chocobozzz 6b5f72beda
Move typescript utils in its own directory 2021-12-16 18:04:16 +01:00
Chocobozzz 8530211822
Add ability to disable p2p in embed with URL 2021-12-16 10:08:55 +01:00
Chocobozzz b65de1be4d
Use different p2p policy for embeds and webapp 2021-12-16 10:08:55 +01:00
Chocobozzz a9bfa85d2c
Add ability for admins to set default p2p policy 2021-12-16 10:08:55 +01:00
Chocobozzz 75278e2890 Support sourceMaps 2021-12-16 10:08:43 +01:00
lutangar b8fa3e8c73 refactor(types): create dedicated folder for types package src
fix guide examples and add types package readme

refactor(tsconfig): move back base tsconfig to base directory
2021-12-16 10:08:43 +01:00
lutangar 8b03e2ce1a feat(types): create peertube-types package
Create dedicated Typescript "types" configuration file for each "projects".
Create a types folder which includes every useful ts definition:
- client
- server
- shared
Add tooling to create a proper package, extract dependencies, etc...
Add CI Github task.

refactor(types): publish types package in release script
2021-12-16 10:08:43 +01:00
lutangar 06aad80165 chore(refactor): remove shared folder dependencies to the server
Many files from the `shared` folder were importing files from the `server` folder.
When attempting to use Typescript project references to describe dependencies,
it highlighted a circular dependency beetween `shared` <-> `server`.

The Typescript project forbid such usages.
Using project references greatly improve performance by rebuilding only
the updated project and not all source files.
> see https://www.typescriptlang.org/docs/handbook/project-references.html
2021-12-16 10:08:43 +01:00
Chocobozzz 3cf68b869d
Ability for admins to set default upload values 2021-12-14 17:17:01 +01:00
Chocobozzz 66175ae8b4
Support nn and nb locales 2021-12-13 17:06:44 +01:00
kontrollanten a37e9e74ff
Give moderators access to edit channels (#4608)
* give admins access to edit all channels

closes #4598

* test(channels): +admin update another users channel

* Fix tests

* fix(server): delete another users channel

Since the channel owner isn't necessary the auth user we need to check
the right account whether it's the last video or not.

* REMOVE_ANY_VIDEO_CHANNEL > MANAGE_ANY_VIDEO_CHANNEL

Merge REMOVE_ANY_VIDEO_CHANNEL and MANY_VIDEO_CHANNELS to
MANAGE_ANY_VIDEO_CHANNEL.

* user-right: moderator can't manage admins channel

* client: MyVideoChannelCreateComponent > VideoChannelCreateComponent

* client: MyVideoChannelEdit > VideoChannelEdit

* Revert "user-right: moderator can't manage admins channel"

This reverts commit 2c627c154e.

* server: clean dupl validator functionality

* fix ensureUserCanManageChannel usage

It's not async anymore.

* server: merge channel validator middleares

ensureAuthUserOwnsChannelValidator & ensureUserCanManageChannel gets
merged into one middleware.

* client(VideoChannelEdit): redirect to prev route

* fix(VideoChannels): handle anon users

* client: new routes for create/update channel

* Refactor channel validators

Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-12-13 15:29:13 +01:00
Chocobozzz d63e6d4604
Add ability for plugins to register client routes 2021-12-10 15:01:12 +01:00
Chocobozzz d17d743051
Add upload/import/go live video attributes hooks 2021-12-10 13:51:44 +01:00
Chocobozzz 650580504c
Add filter:api.server.stats.get.result hook 2021-12-09 14:09:24 +01:00
Chocobozzz 9b293cd6a2
Update torrent metadata on video update 2021-12-08 11:07:19 +01:00
Chocobozzz f307255e69
Display server logs when server run fails 2021-12-07 15:20:03 +01:00
Chocobozzz 80badf493a
Add mute status in account and channel pages 2021-12-07 09:46:01 +01:00
Chocobozzz 0bc53e2029
Add ability to redirect users on external auth 2021-12-03 17:04:47 +01:00
kontrollanten 28c6556789
add plugin selector to about/menu elements (#4597)
* add plugin selector to about/menu elements

closes #4586

* Update plugin selector names

Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-12-03 10:47:47 +01:00
John Livingston 3a1157a68a
CLI: plugins install command accept a --plugin-version parameter. (#4599)
* CLI: plugins install command accept a --plugin-version parameter.

* Unit tests for plugins install --plugin-version.

* Fix linting.

* Styling

Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-12-03 10:14:01 +01:00
Chocobozzz 8afade2607
Introduce plugin id selectors 2021-11-26 17:36:55 +01:00
lutangar 7226e90fdc Add `req` and `res` as controllers hooks parameters
Hooks prefixed by `action:api` now give access the original express req and res.
Checkout guide.md for possible usage.
2021-11-25 09:54:22 +01:00
Chocobozzz 17e2705f64
Fix tests 2021-11-24 09:19:02 +01:00
Chocobozzz 842a15732b
Ensure we don't run transcoding after import file 2021-11-23 15:22:07 +01:00
Chocobozzz 5d3c5f2797
Fix typo 2021-11-19 08:26:22 +01:00
Chocobozzz ad5db1044c
Add ability to run transcoding jobs 2021-11-18 15:20:57 +01:00
Chocobozzz b46cf4b920
Add ability to remove hls/webtorrent files 2021-11-18 09:04:30 +01:00
Chocobozzz 5678353d4f
Add bin directory creation for parallel tests 2021-11-17 08:44:46 +01:00
Chocobozzz 3455c2656e
Test and log request retries 2021-11-16 11:34:24 +01:00
Chocobozzz 527a52ac42
Add ability to filter out public videos from admin 2021-11-12 14:23:22 +01:00
Chocobozzz 5cf027bdc4
Force video updatedAt update on update 2021-11-10 14:34:02 +01:00
Chocobozzz 67eeec8b95
Add minimum bitrate limit 2021-11-10 11:04:00 +01:00
Chocobozzz 020d3d3d79
Remove resumable cache after upload success 2021-11-10 09:43:33 +01:00
Chocobozzz 51353d9a03 Refactor video views
Introduce viewers attribute for live videos
Count views for live videos
Reduce delay to see the viewer update for lives
Add ability to configure video views buffer interval and view ip
expiration
2021-11-09 15:00:31 +01:00
kontrollanten 4e29f4fe23 video: add video stranscoding_failed state 2021-11-09 15:00:21 +01:00
kontrollanten e1ab52d7ec
Add migrate-to-object-storage script (#4481)
* add migrate-to-object-storage-script

closes #4467

* add migrate-to-unique-playlist-filenames script

* fix(migrate-to-unique-playlist-filenames): update master/segments256

run updateMasterHLSPlaylist and updateSha256VODSegments after
file rename.

* Improve move to object storage scripts

* PR remarks

Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-11-09 11:05:35 +01:00
Chocobozzz df1db951c5
Support RTMPS 2021-11-05 11:38:17 +01:00
Florian CUNY 8dd754c767
Added 144p encoding (#4492)
* Added 144p encoding

Implements https://github.com/Chocobozzz/PeerTube/issues/4428

* Fixed typo in core-utils

* Increased BitPerPixel for 144p

* Disabled 144p by default in test.yaml

* Another try at fixing tests

* Fixed test in video-transcoder (api-3)

* Fixed test in video-imports (api-4)

* Fixed test in live-constraints (api-2)

* Tried to fix tests in api-3 again

* Revert "Tried to fix tests in api-3 again"

This reverts commit 266e1143fa37f333d149c2c2791c7bd33621ac14.

* Fixed test in config.ts (api-2)

* Try to fix test in video-hls.ts (api-3)

* Fixed test in video-transcoder.ts (api-3)

* Fix tests

Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-11-05 10:23:02 +01:00
Chocobozzz dd6d2a7ce5
Improve advanced input filter 2021-11-03 14:23:55 +01:00
Chocobozzz d324756edb
Add ability to filter by file type 2021-11-03 11:32:41 +01:00
Chocobozzz 3c10840fa9 Add video file size info in admin videos list 2021-10-29 11:48:21 +02:00
Chocobozzz 2760b454a7 Deprecate filter video query
Introduce include and isLocal instead
2021-10-29 11:48:21 +02:00
Florian CUNY 754b6f5f41
Made the video channels limit (per user) server-wide configurable (#4491)
* Made the video channels limit (per user) server-wide configurable

Implements https://github.com/Chocobozzz/PeerTube/issues/3092

Also added a "quota bar" in the account's settings page

* Fixed lint errors

* Another pass at fixing lint errors

* Applied code suggestions

* Removed 'video channels quota'
2021-10-26 16:42:10 +02:00
Chocobozzz 605450a6f7
Fix dependency security alert 2021-10-26 16:04:09 +02:00
Rigel Kent 276250f0a3
prevent multiple post-process triggering of upload-resumable (#4175)
* prevent multiple post-process triggering of upload-resumable

* switch from 409 to 503 for upload being processed

* Improve resumable upload check

Co-authored-by: Chocobozzz <me@florianbigard.com>
2021-10-25 17:42:20 +02:00
Chocobozzz d1bfbdeb20
Random listen for mocked servers 2021-10-22 14:31:38 +02:00
Chocobozzz ab4001aade
Provide origin URL to client and fix remote share 2021-10-22 14:11:58 +02:00
Chocobozzz 62549e6c98
Rewrite youtube-dl import
Use python3 binary
Allows to use a custom youtube-dl release URL
Allows to use yt-dlp (youtube-dl fork)
Remove proxy config from configuration to use HTTP_PROXY and HTTPS_PROXY
env variables
2021-10-22 10:25:24 +02:00
Chocobozzz 64553e8809
Add ability to filter logs by tags 2021-10-20 14:33:38 +02:00
Chocobozzz 978c87e7f5
Add channel filters for my videos/followers 2021-10-20 09:25:44 +02:00
Chocobozzz 906f46d084
Split check user params tests 2021-10-20 09:25:44 +02:00
Chocobozzz 4beda9e12a
Add ability to view my followers 2021-10-20 09:25:44 +02:00
Chocobozzz f0ab2aed3d
Fix lint 2021-10-14 14:14:57 +02:00
Chocobozzz cf0c8ee588
Fix admin edition disabling feature 2021-10-14 11:35:43 +02:00
Chocobozzz 179bfea5e0
Fix import tests 2021-10-14 09:36:55 +02:00
Chocobozzz 80dea8f4d6
Rename config key 2021-10-12 14:25:30 +02:00
kontrollanten 7399a79f73
add option to always show channel display name (#4422)
* add option to always show channel display name

closes #4040

* show avatar in video miniatures

closes #4040

* Revert "show avatar in video miniatures"

This reverts commit 79b1a84140.

* channel display name: fix review comments
2021-10-12 14:23:44 +02:00
Chocobozzz 10ef089102
Merge branch 'release/3.4.0' into develop 2021-10-12 13:50:48 +02:00