noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity
3968 commits 38 branches 37 tags 62 MiB
Commit graph

645 commits

Author SHA1 Message Date
fourtf
8b3fb691a7 renamed Notebook2 to Notebook 2018-05-23 11:59:37 +02:00
fourtf
dafbda6a4a asdf 2018-05-23 04:22:17 +02:00
fourtf
f6d02fffc9 rewrote the pausing chat on hover functionality 2018-05-17 17:27:20 +02:00
fourtf
795758f618 fixed the split overlay not appearing proprly 2018-05-17 16:39:38 +02:00
fourtf
c27a4eec33 fixed the splitoverlay not disappearing when the window is not selected 2018-05-17 14:47:23 +02:00
fourtf
d24e1f8314 fixed selections moving when new messages come in while selecting 2018-05-17 12:17:31 +02:00
fourtf
7b192897da minor fixes 2018-05-16 15:42:45 +02:00
fourtf
5b26cdaa07 added split resizing and splitting 2018-05-16 15:02:01 +02:00
fourtf
28fb877020 updated splitheader 2018-05-16 15:02:01 +02:00
fourtf
27cd953c8c improved splits 2018-05-16 15:02:01 +02:00
fourtf
c1a3764f44 added basic new layout 2018-05-16 15:01:11 +02:00
Rasmus Karlsson
64160e60af Fix right-clicking of emotes 
There are a few more actions that we might want to add at a later date,
      but a simple feature set has been implemented

Fix #386
 2018-05-16 03:55:56 +02:00
Rasmus Karlsson
022c31e315 Don't use our custom up/down arrow actions if shift is pressed 2018-05-13 18:27:17 +02:00
fourtf
5fcf42f1fc disabled drop preview animation 2018-05-08 20:35:31 +02:00
fourtf
463a1f1945 added new overlay for splits when you hold alt that does nothing yet 2018-05-08 16:55:20 +02:00
fourtf
aba8e1a18f fixed freeze when messages get taller when they get higher 2018-05-06 16:12:21 +02:00
fourtf
c2363e17e7 minor fixes 2018-05-06 15:39:03 +02:00
fourtf
3e3cbf0415 alternate message colors now work on replaced messages and when 
changing channels
 2018-05-06 14:57:57 +02:00
fourtf
34a58021bc added basic alternating messages backgrounds 2018-05-06 14:39:27 +02:00
fourtf
ba4173822e created base for all the list based settings 2018-05-06 00:32:45 +02:00
fourtf
4c3f0921e2 changed CommandManager to CommandController 2018-04-30 23:44:01 +02:00
Rasmus Karlsson
2f195891cd Finish up singleton refactoring into one giant class 2018-04-28 15:20:18 +02:00
fourtf
9426a9d633 Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-04-28 13:48:49 +02:00
Rasmus Karlsson
ae26b835b6 Perform initial refactoring work 
Things that were once singletons are no longer singletons, but are
instead stored in the "Application" singleton

Some singletons still remain, and some renaming/renamespacing is left
 2018-04-27 22:11:19 +02:00
fourtf
49069beed7 reworked commands settings page 2018-04-27 01:11:09 +02:00
fourtf
b176dc5295 switched up the settings pages 2018-04-25 20:35:32 +02:00
fourtf
859f4aefcb added new TupleTableModel for settingsdialog 2018-04-25 14:51:22 +02:00
fourtf
5015633cc7 improved saving of splits and watching split 2018-04-20 22:33:28 +02:00
fourtf
a16a2b0579 added watching channel 2018-04-20 19:54:45 +02:00
fourtf
1290d28b1a added custom window frame title 2018-04-18 18:55:49 +02:00
fourtf
653e4c6adf fixed some light mode issues 2018-04-18 09:33:05 +02:00
fourtf
3446a623f5 added select channel dialog 2018-04-18 09:15:56 +02:00
pajlada
23cf8cc484
PubSub system (#346) 
* Add websocketpp dependency

* Initial pubsub commit

Renamed selection min and max variables to selectionMin and selectionMax
to bypass windows min/max macros being stupid.

TwitchAccount is now initialized with its User ID. It cannot be changed
after it has been initialized.

* Update openssl folder

* Update installation instructions

* Split up websocketpp dependency to its own code only and openssl.pri

* Add missing include to asio steady_timer

* Update dependencies for linux
 2018-04-15 15:09:31 +02:00
Rasmus Karlsson
b7266b1640 Fix warnings that occured on linux using clang 2018-04-14 21:59:51 +02:00
fourtf
1654130dbc fixed crash when changing theme after closing tab 2018-04-13 23:17:10 +02:00
fourtf
2687da38ba added basic browser extension stuff 2018-04-11 22:53:15 +02:00
Rasmus Karlsson
52afa7b5b7 Ensure we disconnect from signals on exit in SplitHeader 2018-04-11 01:06:13 +02:00
fourtf
ad0a1f3c56 Fixed tabs not highlighting on new messages/highlights 2018-04-10 16:53:40 +02:00
fourtf
bcf0ebd8ef Fixes #270 Copying text is broken 2018-04-10 15:48:56 +02:00
fourtf
829c028009 disabled message layouting limits 2018-04-10 02:07:25 +02:00
fourtf
efdcc64f89 Fixes #326 Shift + EMOTE TAB doesnt work 2018-04-10 01:55:06 +02:00
fourtf
8f4b58ae08 slight changes 2018-04-08 17:37:48 +02:00
Rasmus Karlsson
990ac651ae Differentiate live streams and vodcasts 
Fixes #320
 2018-04-08 15:14:14 +02:00
Cranken
2b3fa06539 Fixed live status not updating when channel is online. (#319) 
* Fixed live status not updating when channel is online.
 2018-04-08 14:45:47 +02:00
pajlada
10f0aadb6c
Merge pull request #318 from Cranken/highlightText 
Now highlights the text in the channel change and tab rename dialogue.
 2018-04-08 14:39:34 +02:00
fourtf
a1cd315ac8 Fixes #288 arrow up behaviour 2018-04-08 14:33:45 +02:00
Cranken
942e8cefcc Also now highlights in tab rename. 2018-04-07 21:42:06 +02:00
fourtf
cb06579c29 rewrote window saveing/serialization system 
fixes #212
 2018-04-06 23:31:34 +02:00
fourtf
4ec2c0d8b3 added cooldown to layouting to reduce lag when opening the emojis tab 2018-04-06 18:27:49 +02:00
fourtf
86c844c791 added debug information on F10 2018-04-06 16:37:30 +02:00
fourtf
68227fa576 repaint tabs when text changes 2018-04-06 01:58:26 +02:00
fourtf
06c3201a1a added dark window to dark theme 2018-04-05 23:45:17 +02:00
Rasmus Karlsson
adf3ff3075 Switch some c-style includes to c++-style includes (i.e. stdint.h to 
cstdint)

Make MessageElement to a class to fit better with the derived classes.
Make MessageLayoutElement to a class to fit better with the derived
classes.

Remove virtual from override functions

Replace all instances of boost::signals2 with pajlada::Signals. This
lets us properly use clang code model to check for issues.

Add missing virtual destructor to AbstractIrcServer
Add missing virtual destructor to MessageLayoutElement

Remove unused "connectedConnection" connection in TwitchChannel

Fix typo in TrimChannelName function
Fix typo in MessageParseArgs

Replace some raw pointers with unique pointers where it made more sense.
This allowed us to remove some manually written destructors whose only
purpose was to delete that raw pointer.

Reformat: Add namespace comments
Reformat: Add empty empty lines between main namespace beginning and end
Reformat: Re-order includes
Reformat: Fix some includes that used quotes where they should use angle
brackets
Reformat: Replace some typedef's with using's

Filter out more useless warnings
 2018-04-03 03:00:34 +02:00
fourtf
56f0e5e76a removed the chrome style tabs 2018-04-01 16:42:00 +02:00
Rasmus Karlsson
be66338fe2 General cleanups/reformats 
- Clean up imports
- Comment EmojiData
- Reorder TwitchAccount constructor
- Fix typo in TwitchChannel
- Add emoji parsing test code at the bottom of EmoteManager
 2018-03-31 13:44:15 +02:00
fourtf
700b15c483 improved new tabs 2018-03-30 16:26:45 +02:00
Rasmus Karlsson
1cac80c8ba Changed how the channel live status is stored 2018-03-30 15:42:08 +02:00
Rasmus Karlsson
1b9fa36e06 add mouseMove signal to SignalLabel 
Make use of the mouseMove signal in SplitHeader for the stream uptime
tooltip
 2018-03-30 14:48:35 +02:00
Rasmus Karlsson
1c7f397f1b Move signallabel code out from its header 2018-03-30 14:39:33 +02:00
Rasmus Karlsson
d4f37f786b Once again reset completion model first time tab is pressed. This ensures we never tab the wrong username, but it's really expensive. 2018-03-30 13:51:15 +02:00
fourtf
ec349f5978 added experimental new tabs 2018-03-30 13:44:01 +02:00
Nikolai Zimmermann
6c56e9cc82 Don't add duplicats to message history (#277) 2018-03-24 12:22:03 +01:00
Rasmus Karlsson
b2f041989c Move CompletionModel to a more appropriate folder 2018-03-24 12:13:22 +01:00
Rasmus Karlsson
d9bd39e8a4 Remove "CompletionManager". Completion models are now stored in Channel 
Chatters list is now updated every 5 minutes
 2018-03-24 12:02:07 +01:00
Rasmus Karlsson
ad12a818b2 change around variables names to make things a bit more clear 2018-03-24 11:15:33 +01:00
hemirt
ab42a30108 Tabbing (#287) 
* change dotted last read message indicator to a line, remove
airbrushgrenade

* sort emotes in tab completion

* implement tabbing usernames

* FeelsOkayMan

* fix emotes and usernames comparing; formatting

* remove private/personal stuff

* change lastmessageindicator back to default verpattern
 2018-03-24 11:12:24 +01:00
fourtf
c3287a1da8 dream come true 2018-02-06 00:10:30 +01:00
fourtf
a44758ad23 Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-02-05 21:20:38 +01:00
fourtf
b351c40d29 refactored irc 2018-02-05 15:11:50 +01:00
fourtf
643486da14 enabled compact emtoes again 2018-01-28 16:29:47 +01:00
fourtf
f474db9443 minor changes in MessageLayout 2018-01-28 04:07:45 +01:00
fourtf
11775071b9 made Link a struct 2018-01-28 03:52:52 +01:00
fourtf
431b9a8c1f Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-01-28 03:39:47 +01:00
fourtf
591ab4d8da simplified message.cpp 2018-01-28 03:29:42 +01:00
fourtf
e518cff06e fixed icon scale in settings dialog 2018-01-27 21:51:08 +01:00
fourtf
34775094f6 fixed #252 clicking emotes in the emote popup 2018-01-27 21:42:47 +01:00
fourtf
d33adff5c9 fixed emotes popup emotes 2018-01-27 21:13:22 +01:00
fourtf
56a7b05103 fixed titlebar scaling 2018-01-25 21:11:14 +01:00
fourtf
0a8073d0e5 refactored SplitInput 2018-01-25 20:49:49 +01:00
fourtf
8ab0fa4378 Fixes #259 dropping split on + button 2018-01-24 22:09:26 +01:00
fourtf
de9e1b641d Fixes #234 links 2018-01-24 21:44:31 +01:00
fourtf
f35ca0d2c8 fixed right clicking links 2018-01-24 21:16:00 +01:00
fourtf
05339aad2d started fixing clicking emtoes 2018-01-24 20:58:53 +01:00
fourtf
74fd6c9663 Fixes #258 theme change doesn't apply 2018-01-24 20:35:26 +01:00
fourtf
f4863cbccb added buttons to the custom window frame 2018-01-24 20:27:56 +01:00
fourtf
36b010e046 added custom window frame for windows 2018-01-24 15:08:22 +01:00
fourtf
2b94c4cd33 renamed SharedChannel to ChannelPtr for consistency 2018-01-24 13:15:41 +01:00
fourtf
fa344deaf0 fixed #237 /mentions 2018-01-23 23:28:06 +01:00
fourtf
0f4ec70bf3 Fixes #53 last read message indicator 2018-01-23 22:48:33 +01:00
fourtf
06be94b9a6 Fixes #179 tabs can't be repositioned 2018-01-22 21:31:45 +01:00
fourtf
305191d4b3 fixed #177 user popup being off the screen 2018-01-22 20:52:32 +01:00
fourtf
d966c24bc3 fixed #250 tooltips don't stay in window geometry 2018-01-22 15:06:36 +01:00
fourtf
3104aae80a fixed crash 2018-01-19 23:41:02 +01:00
fourtf
de3a490257 added streamview widget 2018-01-19 14:49:21 +01:00
Rasmus Karlsson
702d4b2eec Rework the Account Popup Widget 
Fixed Account Popup Widget Follow/Unfollow
Ignoring now also works, but doesn't have the ability to unignore

Add a URL Delete method to the network manager

Fixes #235
 2018-01-18 18:20:40 +01:00
fourtf
f3357cf0f4 Fixes #225 fix am/pm for timestamps 2018-01-17 18:36:12 +01:00
fourtf
4ddb4616ee _ 2018-01-17 17:18:28 +01:00
fourtf
7310f1b888 fix for bur0k 2018-01-17 17:17:26 +01:00
fourtf
b3951262c8 messages refresh when toggeling the button 2018-01-17 17:02:34 +01:00
fourtf
e694214243 added toggle for moderation mode 2018-01-17 16:52:51 +01:00
fourtf
01efa1f447 Fixes #233 manual reconnect 2018-01-17 15:07:55 +01:00
fourtf
6d6b99f3ef added moderation buttons 2018-01-17 14:14:31 +01:00
fourtf
8dc4f8945e fixes empty tooltips showing 2018-01-17 03:26:32 +01:00
fourtf
776a975624 Fixes #232 opening streams in browser 2018-01-17 03:18:47 +01:00
fourtf
1fe7e652b1 added a tip to the SplitHeader when you have >1 tab 2018-01-17 02:04:10 +01:00
fourtf
0a3c6e29c7 added Alt+LeftClick to move splits around 2018-01-17 01:20:19 +01:00
fourtf
0ca916717c added basic buggy text copying 2018-01-16 02:39:31 +01:00
fourtf
a33ac76f99 fixed the default scrollbar size 2018-01-16 01:40:52 +01:00
fourtf
c50e6d7809 started working on a custom window frame 2018-01-15 01:35:35 +01:00
fourtf
177cd734ab centered splitheader title again 2018-01-14 22:24:21 +01:00
fourtf
e19a83679f moved window logic from BaseWidget to BaseWindow 2018-01-14 21:55:36 +01:00
fourtf
8deb096a27 switched to proper icon for SplitHeader 2018-01-13 04:08:39 +01:00
fourtf
61d0229b4c refactored the SplitHeader 2018-01-13 04:05:38 +01:00
fourtf
96feb9b54c _ 2018-01-13 02:18:13 +01:00
fourtf
cec6f7ce9d fixed settingsdialogtab image being offset 2018-01-13 02:17:07 +01:00
fourtf
2073447df7 added highlights page again 2018-01-13 02:00:02 +01:00
Rasmus Karlsson
7772f245f6 refactor the refactor 2018-01-12 23:33:04 +01:00
fourtf
e0bb061c81 refactored the settings dialog 2018-01-12 23:09:27 +01:00
fourtf
a339c4ca0a fixes #221 2018-01-11 21:03:40 +01:00
fourtf
10850c0ec7 I BROKE EVERYTHING 
refactored the rendering process
 2018-01-11 20:17:41 +01:00
nuuls
92cc1f354b
fixed scaling issue on mac and compilation issue 2018-01-07 23:26:11 +01:00
coral
6377331364 Changed the global emoji symbol 2018-01-06 23:05:09 -08:00
fourtf
a32d1c063c searching is now case insensitive 2018-01-07 00:05:32 +01:00
Rasmus Karlsson
26170e4fdb Add CTRL+SHIFT+T and CTRL+SHIFT+W to Open and Close tabs 
Fixes #21
 2018-01-06 21:00:41 +01:00
Rasmus Karlsson
8aa459d826 Move shortcut creation code to its own helper file 2018-01-06 20:24:04 +01:00
fourtf
e5b8e33eb3 removed fps limit 
it didn't increase performance and just made it look 'laggier'
 2018-01-06 18:21:00 +01:00
fourtf
20eab57db5 added highlights to the scrollbar 2018-01-06 03:48:56 +01:00
fourtf
a4656f3ab5 added slight offset when notebook has no button 2018-01-05 23:55:41 +01:00
fourtf
315cfd8605 bundling timeouts from same user 2018-01-05 23:14:55 +01:00
fourtf
47a813d5d6 added search popup 2018-01-05 13:42:23 +01:00
fourtf
02b73cfa27 I accidently an assignment 2018-01-05 12:22:03 +01:00
fourtf
df81a0e5a5 Pause chat while hovering. Fixes #208 
Also pauses when clicking with double-click-links enabled and while
selecting text
 2018-01-05 11:22:51 +01:00
fourtf
8418e36e49 Fixed a bug where scrolling layouts wrong 
It used the wrong with to layout the messages.
 2018-01-05 10:41:21 +01:00
fourtf
69488eb2ea fixed off by one error 2018-01-05 03:41:31 +01:00
fourtf
1606ea648b added smoothscrolling on new message 2018-01-05 03:15:04 +01:00
Rasmus Karlsson
334860dad2 Remove unused appdatapath class 
Reformat some code
 2018-01-05 03:00:29 +01:00
fourtf
fd8ddcff55 fixes #113 2018-01-05 02:55:28 +01:00
fourtf
947589358b fixed #15 2018-01-05 02:05:59 +01:00
fourtf
23e5100227 refresh rate lock for ChannelView 2018-01-05 00:15:03 +01:00
fourtf
fc1fb35947 changed text of the jump-to-bottom-button 2018-01-05 00:01:31 +01:00
fourtf
4a2850c4f5 moved selection into its own file 2018-01-04 23:50:30 +01:00
fourtf
4a91372f8f fixed #182 2018-01-04 23:35:36 +01:00
fourtf
8693203c6d added command tab to settings but they don't save 2018-01-04 04:03:51 +01:00
coral
0e8b50c4e9 New setting menu icons! (#189) 
* LUL

* Added system icon for OSX
 2018-01-02 03:44:52 +01:00
eb4ba30d9f omited struct names in ThemeManager 2018-01-02 02:21:38 +01:00
3e5937011a the rewrite that nobody wanted 2018-01-02 02:15:11 +01:00
330a79f6f1 made message grey out when user it timed out 2018-01-01 23:29:54 +01:00
3fc4ddea56 I hate c++ and everything it stands for 2018-01-01 22:29:21 +01:00
5a26d5f17f put singletons into their namespace 2017-12-31 22:58:35 +01:00
bfa2f1637e refactored the managers 2017-12-31 00:50:07 +01:00
Rasmus Karlsson
caddb2c778 Add the "Close Tabs" feature 
Also made notebooks open a container if no tabs are loaded

Fixes #166
 2017-12-28 18:17:25 +01:00
0cdf974310 Merge branch 'master' of https://github.com/fourtf/chatterino2 2017-12-28 17:50:24 +01:00
e0bdc5ccf9 forgot to remove this xD 2017-12-28 16:56:24 +01:00
Rasmus Karlsson
c9c2aa6dce Fixed crash bug described by Cranken in #165 2017-12-28 16:26:35 +01:00
ece0482502 removed autoscoll and gotobottom from emotepopup 2017-12-28 00:48:21 +01:00
4f3f9906f1 commented code out that didn't compile 2017-12-27 21:29:56 +01:00
fourtf
9dd6966e8c graphicbuffers of msgs offscreen get discarded now 2017-12-26 18:24:02 +01:00
fourtf
6c23925406 fixed render hints at wrong places 2017-12-26 17:41:03 +01:00
fourtf
5df7651670 removed a debug log 2017-12-26 17:31:15 +01:00
fourtf
285c72a83d fixed "jump to bottom" now disapearing after click 2017-12-26 17:15:23 +01:00
fourtf
4e4cc9223e tweaked the light themes 2017-12-26 16:54:39 +01:00
Rasmus Karlsson
13b39e374b Tabs now highlight when a highlight is received 
Work on #88
 2017-12-26 12:32:24 +01:00
Rasmus Karlsson
7a8cc91eec Move HighlightState to common.hpp 2017-12-26 12:30:32 +01:00
Rasmus Karlsson
ebd682730a rename highlight style to highlight state 2017-12-26 12:05:14 +01:00
fourtf
91099c028e moved the tooltip close logic to basewidget 2017-12-24 16:01:01 +01:00
fourtf
2bf53f73f8 oh no the bad commit descriptions are back D: 2017-12-23 23:24:35 +01:00
Cranken
a617873f6a Implemented a new, better looking tooltip. (#158) 
* Implemented a new, better looking tooltip.

* Pajlada fix.

* Fixed dragging behaving incorrectly.

* Fixed out of focus hovering getting stuck.
 2017-12-23 22:17:38 +01:00
fourtf
fc81b118c7 replaced qt font scaling 
remove the qt font scaling and added code that uses the actual scale/dpi value
 2017-12-23 21:18:13 +01:00
Rasmus Karlsson
ec63bc59be Fix autocomplete not being refreshed properly upon first TAB 2017-12-22 16:50:33 +01:00
Rasmus Karlsson
2bd80763e7 Fix some obvious warnings 
Ignore some stupid warnings
 2017-12-22 15:13:42 +01:00
Rasmus Karlsson
d8c01ce374 Save chats and tabs in new settings system 2017-12-22 14:44:31 +01:00
Rasmus Karlsson
4b36893818 Add simple tooltip system 2017-12-19 03:38:42 +01:00
Rasmus Karlsson
14e80d5012 Implement mouse scroll speed setting 
Fixes #145
 2017-12-19 02:48:19 +01:00
fourtf
e39b9093f9 fixed selection color for light theme 2017-12-19 02:37:58 +01:00
fourtf
f8e4d9a737 changes for light theme 
- fixed light colored text being too bright
- fixed the ripple effect being white on grey
 2017-12-19 02:24:05 +01:00
Rasmus Karlsson
1a870685b0 Implement the "inline" account switch button 
Make the account switch listview into a widget
 2017-12-19 02:17:01 +01:00
fourtf
c950e9c58a added some code for collapsing messages 2017-12-19 00:10:03 +01:00
fourtf
e46357ad9b small fixes for the scrollbar 2017-12-18 22:13:46 +01:00
fourtf
f8cf983b7c added an option to disable smooth scrolling 2017-12-18 20:18:20 +01:00
fourtf
929552f74d fixed emote popup not having the right default size on hidpi 2017-12-18 01:23:22 +01:00
fourtf
01e9c723fa fixed hidpi scaling for the settings window 2017-12-18 00:54:53 +01:00
Rasmus Karlsson
03958420be We now also add localized names to the autocompletion 
Changed the login name in autocompletion to the display name
Autocompletion model is now only updated on the "first completion"
 2017-12-17 21:05:48 +01:00
Rasmus Karlsson
151ff057a6 Implement "hide empty input" option 
Fixes #144
 2017-12-17 16:19:28 +01:00
Rasmus Karlsson
bb081b710e Update settings and signals library version 2017-12-17 03:37:46 +01:00
c1ac7db24c Merge branch 'master' of https://github.com/fourtf/chatterino2 2017-12-17 03:27:03 +01:00
5cb33647dc fixed splits not redrawing after font changed 2017-12-17 03:26:23 +01:00
Rasmus Karlsson
633423640e Completion models are now updated on-demand (whenever user presses Tab) 
We might want some dirty-checking here, but for now it's okay
 2017-12-17 03:06:39 +01:00
266ad36de3 Merge branch 'master' of https://github.com/fourtf/chatterino2 2017-12-17 02:42:04 +01:00
31a76e46d1 fix message length label, fixes #140 2017-12-17 02:40:05 +01:00
Rasmus Karlsson
70cbb9df7f Make more use of single pattern 2017-12-17 02:18:13 +01:00
Rasmus Karlsson
eb8e14b8fe Move more settings over to pajlada settings system 2017-12-17 01:19:56 +01:00
269a5500d8 Merge branch 'master' of https://github.com/fourtf/chatterino2 2017-12-17 00:07:03 +01:00
f36d346a4f dpi 2017-12-17 00:06:24 +01:00
Rasmus Karlsson
a8afdf4565 remove some debug output 2017-12-16 02:09:51 +01:00
7f18cefee4 renamed a bunch of files and classes 2017-11-12 17:21:50 +01:00