noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
3510 commits 39 branches 37 tags 61 MiB
Commit graph

2689 commits

Author SHA1 Message Date
pajlada 214afc8fc2
Simplify Tooltip flags on Linux for Sway (#1824) 2020-07-25 15:00:12 +02:00
Matthew Marlow caa11dda3e
removed linebreak after wrapped TextElements (#1813) 2020-07-19 12:16:58 +02:00
pajlada 382dfbc2fa
[SearchPopup] CTRL+F now focuses the search input (#1812) 2020-07-18 17:52:12 +02:00
Rasmus Karlsson d25dee10b2 Keep last menu in memory 
Might do something about #1790
 2020-07-18 17:51:31 +02:00
Daniel ba06b10135
Open usercard on mention click (#1674) 2020-07-18 16:03:51 +02:00
pajlada 276f3e1d98
[SettingDialog] CTRL+F now selects the Find input (#1811) 
* Sneakily make SettingsDialog constructor private at the same time 🕵
 2020-07-18 15:56:33 +02:00
pajlada 6ba9c5ec31
Reset the lastMessageHasAlternateBackground{Reverse} values when clearing all messages in a ChannelView. (#1810) 
This makes it so that we consistently start with the same values after
having cleared a ChannelView.
Example place where this happens: UserInfoPopup when user messages are
loaded and refreshed
 2020-07-18 14:44:10 +02:00
pajlada ffdf5a144c
Handle conversion of historical CLEARCHAT messages to NOTICE messages in Chatterino instead of relying on the Recent Messages API to handle it for us (#1804) 
This has historically been done in the Recent Messages API, but this functionality is being moved to Chatterino instead

* Remove `clearchatToNotice=true` query parameter to the Recent Messages API
 2020-07-18 14:12:11 +02:00
fourtf e928cde2d5 removed debug log 2020-07-12 22:48:29 +02:00
fourtf 9739d8d9c3 hide user profile avatar if obs is running 2020-07-12 22:44:33 +02:00
pajlada 515657be19
Add proper IRC text/word wrapping (#1802) 
Fixes #1781
 2020-07-11 15:12:17 +02:00
Mm2PL c80cdc25b3
Adds support for \x0f formatting character in IRC. (#1794) 
The \x0f character unsets the current foreground and background colors
as well as other formatting which is currently not interpreted by
Chatterino
 2020-07-11 14:57:30 +02:00
Paweł 682caf6b69
Add support for more image uploader services (#1741) 
The list of links that have been uploaded is now also stored in the json format instead of csv
 2020-07-05 14:32:10 +02:00
Paweł b66c2478a0
Added higher tier information to sub badge tooltip (#1759) 2020-07-05 14:08:28 +02:00
mmb L 0b0fdb4ba2
Fix emote popup remember last position by moving setStayInScreenRect into EmotePopup constructor (#1752) 2020-07-05 14:07:03 +02:00
Paweł defc12c129
Added missing Keybinds to settings page (#1770) 
Added:
- Zoom out/in
- reset zoom
- reopen last closed split
- select last tab
Also updated alt + arrows, so its a bit more readable
 2020-07-05 14:05:39 +02:00
Paweł 208e7a68b7
Added account name to window title (#1771) 2020-07-05 14:04:39 +02:00
alazymeme 1277c72b02
Fix a spelling mistake in the settings dialog (#1786) 
from "seperate" to "separate"
 2020-07-05 13:55:32 +02:00
pajlada cdf85c5084
Message menu now holds a shared pointer to a layout (#1787) 
This ensures that the layout will survive for the lifetime of the menu,
     so any of the menu actions can with confidence do things with the
     layout, not having to worry whether it's dead or not.

This means that the user, while having the message menu open, could have
one extra MessageLayout alive. I have ensured that when the menu dies
the reference to the shared pointer dies with it.
 2020-07-05 13:52:24 +02:00
pajlada e4af009fda
[irc] Partially fix IRC colors (#1594) 
Doesn't fix #1379 but it is a big step forward.

Needs some "real life" testing, but should be good.
 2020-07-04 15:15:59 +02:00
Mm2PL 0f9a612c55
Move over wiki documentation to repo in Markdown format (#1760) 
* Change in-client regex help link to point to the github repository
 2020-07-04 13:40:13 +02:00
Daniel de2108b8c5
Fix highlighted whisper crash (#1756) (#1757) 2020-06-27 13:20:21 +02:00
Paweł 205d658f80
Fixed /usercard on linux (#1755) 
- /usercard command doesn't close imidiatelly
- removed "Dialog" window flag. It seems to be unnecessary and causes issues (on left-clicking user name it sometimes didnt render unless you clicked 2-3 times.
 2020-06-27 12:58:44 +02:00
Mm2PL ddd4a54e0e
Add missing tab completion for commands (#1754) 
adds completion for /usercard, /follow, /unfollow, /ignore, /unignore
 2020-06-27 11:30:05 +02:00
0xRainy 0e564065ba
Added recent messages to UserInfoPopup (#1729) 
There's a Refresh button added to the popup to refresh the users messages in the popup. Not automatic now while we figure out how fast/slow it would be.

Co-authored-by: dnsge <sagedanielr@gmail.com>
 2020-06-21 14:15:14 +02:00
Paweł c5f6fd7568
made --version output consistent with AboutPage (#1739) 
When using "chatterino --version" it now also outputs commit and date of build (if on nightly), just like in Settings -> About
 2020-06-16 03:30:35 -04:00
Paweł 5e0ac814cf
Removed help tooltip for splits (#1728) 2020-06-14 12:39:17 +02:00
Rasmus Karlsson 666b577bd5 Close UserInfoPopup when Escape is pressed 2020-06-14 12:26:50 +02:00
Rasmus Karlsson dad9677bba BaseWindow: Make sure windowTopMost signal is attached to our list of managed connections 2020-06-14 12:26:23 +02:00
23rd 78dab081d8
Added missed line break to header with empty thumbnail. (#1705) 2020-06-14 11:51:54 +02:00
Paweł a2f2cac3fd
Added logging for uploaded images (#1712) 
A list of uploaded images are stored under the message logs directory as a csv file
 2020-06-13 14:53:09 +02:00
Roger Chavez 1eeb09a78e
Display authors name on hover for supported emotes (FFZ only for now) (#1721) 
Co-authored-by: Paweł <44851575+zneix@users.noreply.github.com>
 2020-06-13 14:15:22 +02:00
alazymeme f3f8b2d024
Fix popout player url (#1730) 
* Update TwitchChannel.cpp

* Reformatting forsenY

* fixed other things

* xd

* Update TwitchChannel.cpp
 2020-06-12 19:44:05 +02:00
alazymeme 39cc421f95
Improve web extension position (#1717) 2020-06-07 11:33:45 +02:00
Paweł 50d669a1af
Added possibility to change image uploader's form body with Enviroment Variables (#1709) 2020-05-30 12:30:30 +02:00
Daniel ccdbedb93c
Fix "Always on top" setting for MacOS and Linux (#1708) 
Closes #1166
 2020-05-30 11:32:25 +02:00
apa420 6d5ba0c442
Show thumbnails for live streams inside of the split header tooltip (#1702) 
This feature is enabled by default and can be disabled in the Settings dialog with the "Show stream thumbnail" setting
 2020-05-24 11:57:15 +02:00
Daniel Pasch a230bc7c89
improve tooltips by only positioning the element once we know it's in… (#1693) 
Things like tooltips now only sets its position once. The position used to be set twice and could cause some annoying flickering.
 2020-05-24 11:51:16 +02:00
thekalio 56d09ac198
Show visual feedback when BTTV and FFZ emotes are loaded (#1671) 
Upon joining a channel or pressing F5, BTTV and FFZ emotes are
(re)loaded. This change adds visual feedback of the network requests and
their outcome, in the form of a system message in the associated
channel's chat window. 

Non-error messages are suppressed when joining a
channel (which automatically loads emotes).
 2020-05-16 12:43:44 +02:00
Daniel Pasch dd5455d1cf
Improve window "move within desktop rectangle" code (#1685) 
This is used by tooltips to make sure they're always visible

Behaviour changed to stick to screen instead and flip up if no space left below cursor
 2020-05-16 12:16:17 +02:00
Daniel 680b500993
Fix update checker not working on macOS (#1642) 
* Prevent update dialog from going off screen

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
 2020-05-10 13:13:47 +02:00
Daniel Pasch c5a7205d12
move pause-icon to the left and increase size and visibility (#1660) 2020-05-10 12:55:13 +02:00
Daniel Pasch be6ef6dcd5
open twitch usercard on middle mouse (#1669) 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
 2020-05-10 12:45:19 +02:00
Daniel Pasch 8532c6d3bc
Add thumbnails to link tooltips if available (#1664) 
This feature is off by default and can be enabled in the settings with the "Show link thumbnail" setting. This feature also requires the "Show link info when hovering" setting to be enabled.

thumbnails support is only there for direct image links, twitch clips, and youtube links. can be expanded in the future in the /api repo

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
 2020-05-10 12:11:10 +02:00
apa420 1a4a468ab1
Set the application name, version, and domain (#1680) 
This helps window and desktop managers figure out what to do with Chatterino
 2020-05-10 10:54:55 +02:00
pajlada 001dce5da1
Create uploader to i.nuuls.com (#1332) 
This commit adds support for uploading images to i.nuuls.com from clipboard or by dragging an image into a split.

Documentation for how to self-host the image uploader is available in ENV.md

By default, you will be asked before an image upload takes place. There's an option in the dialog to not be asked again, if that option is chosen you can revert that choice in the settings dialog.
 2020-05-09 07:34:27 -04:00
Mm2PL 2b1c9794b7
Add confirmation box for uploads. 2020-05-09 13:14:41 +02:00
pajlada a08754b409
Remove more debug output (#1677) 2020-05-09 13:13:30 +02:00
SLCH 14783d52a7
fix typo (#1675) 2020-05-07 00:21:08 +02:00
pajlada ef9c631c65
Only listen to new pubsub "moderator added" syntax (#1659) 2020-05-03 12:21:00 +02:00
Daniel Pasch 7719816891
Middle mouse button can now also open links (#1644) 2020-05-02 13:19:58 +02:00
pajlada b4eb56f362
Remove "Online Logs" functionality (#1649) 
The /logs command will direct users to the /user command instead

Changelog has been updated to reflect this change
 2020-05-02 12:18:35 +02:00
Mm2PL 84007d2edb Merge remote-tracking branch 'main_repo/master' into git_is_pepega 
check if works with new changes from master
 2020-04-29 00:42:12 +02:00
fourtf 370e6dc61b fixed scrollbar thumb not moving 2020-04-21 20:57:16 +02:00
fourtf 354ad6a362 Merge branch 'master' of https://github.com/chatterino/Chatterino2 2020-04-19 21:06:06 +02:00
fourtf 6052846bc3 added checks to mitigate floating point crashes 2020-04-19 21:05:40 +02:00
pajlada 3091842ddc
Clarified that Redeemed Highlights are from Channel Points, not Bits (#1635) 2020-04-19 12:18:28 +02:00
fourtf 6b512d1052 Merge branch 'master' of https://github.com/chatterino/Chatterino2 2020-04-18 20:06:15 +02:00
fourtf 120f73db13 added additional checkbox for highlighted bits messages, fixes #1637 2020-04-18 20:05:05 +02:00
Mm2PL 3d1950b32e Merge remote-tracking branch 'main_repo/master' into git_is_pepega 2020-04-18 13:39:01 +02:00
Leon Richardt b4a2ced180
Scroll Using Click-and-Drag with Middle Mouse Button (#1559) 
* ChannelView: Rename mouse event related members

This is more in line with the naming of the other members as well as
future members.

* ChannelView: Add ability to scroll with middle mouse button

* Add scrolling resources

* Use custom icons for scroll cursor

* Slightly refactor scrolling logic

* Respect screen scaling when calculating scroll offset

* Nicer scrolling UX

This change allows scrolling to be feel smoother when close to the
starting point.

* Add scrolling with keeping middle mouse pressed

This mimics the behavior of browsers as well.

* Refactor ChannelView::enableScrolling

* Disable drag-scrolling on left or right click
 2020-04-18 11:09:22 +02:00
mmb L 2076715e23
prevent moveTo from changing popup position on every launch (#1630) 2020-04-18 10:59:27 +02:00
fourtf beda9e555f fixed scrollbar meme 2020-04-15 23:25:57 +02:00
fourtf 097f4ccb3a refined highlight and added bits highlights 2020-04-15 23:15:45 +02:00
mmb L ebfcb49e8c
Make emote popup remember last position (#1580) 
* Use existing moveTo to ensure window stay within desktop geometry
 2020-04-13 13:15:51 +02:00
pajlada 6f926e7d77
Get better timeout messages for self (#1629) 
* Don't require mod rights to listen to moderation actions topic

* Format timeout messages directed at you differently

e.g. "You were banned" or "You were timed out for 4h20m", also including
reason if specified.
 2020-04-13 12:31:06 +02:00
apa420 2ac0b60952
option to hide viewer count and duration of the stream when you hover on the split (#1626) 
Fixes #1621
 2020-04-13 12:24:27 +02:00
apa420 3138efba25
Fixes #1620 (#1627) 
Fixes #1620
 2020-04-11 12:13:38 +02:00
23rd f489d23a8d
Added ability to open stream in external video player via URI scheme. (#1623) 2020-04-11 11:43:35 +02:00
Rasmus Karlsson 5afb2800c9 Make the "user info popup" crash less likely (hack v2) 2020-04-05 13:00:16 +02:00
apa420 3a05700744
Changed text to moderator (#1619) 2020-04-05 12:34:16 +02:00
Mm2PL 8f076d8075
Internal changes 
Add missing `static` and `const`
 2020-03-29 13:47:52 +02:00
Mm2PL 175e41c586
Bring back seconds in timestamps (#1616) 
Fixes #1605
 2020-03-29 13:06:44 +02:00
Mm2PL d1d17d4e4b
Add new zero-width emotes from BTTV (#1613) 
New zero-width emotes are cvMask and cvHazmat

Fixes #1612
 2020-03-27 21:23:32 +01:00
Leon Richardt 95c909b337
Better Highlights: Fix Wrong Color for Migrated Phrases (#1568) 
* Better Highlights: Fix wrong color for migrated phrases

Prior to this commit, no default color was set when an "old" highlight
phrase (one added prior to #1320 / 5957551) was deserialized. This
commit makes highlight phrases uses the default self-highlight color for
these situations. This approach is reasonably sensible since that color
is also similar to the old highlight color.

Fixes #1565.

* Update default self-highlight color

The new default color was suggested in [1] by @RAnders00. Refer to the
link for further information.

[1]: https://github.com/Chatterino/chatterino2/issues/1565#issuecomment-590441625

* Theme: Remove highlight color

As highlight color is independent of the selected theme now, the member
has been removed from the `Theme` singleton. Instead, the fallback theme
color is defined in `HighlightPhrase` now.

Uses of `themes->messages.backgrounds.highlighted` have been replaced
with `HighlightPhrase::FALLBACK_COLOR` accordingly.

* Update src/controllers/highlights/HighlightPhrase.hpp

attempt to just remove constexpr

Co-Authored-By: Ruben Anders <ruben.anders@robotty.de>

* Initialize FALLBACK_COLOR outside header file

* Rename FALLBACK_COLOR to FALLBACK_HIGHLIGHT_COLOR

In preparation for the next commit introducing a new variable.

* Moved subscription highlight color into HighlightPhrase

* Use actual subscription color as a fallback

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
Co-authored-by: Ruben Anders <ruben.anders@robotty.de>
 2020-03-22 13:14:07 +01:00
pajlada 15cf8bfcfa
Don't set game to game id, always wait for the game name to be resolved (#1609) 
Fixes #1606
 2020-03-22 11:22:36 +01:00
Leon Richardt 17aa3f71cd
Remove Debug Output In Many Different Places (#1607) 
* Application.cpp: Remove whisper debug output

* TwitchAccount.cpp: Remove AutoMod debug output

* BaseWindow.cpp: Remove mouse tracking debug output

* RunGui.cpp: Remove debug output for cleared cache items

* Notebook.cpp: Remove debug output for selected widgets

* LimitedQueue.hpp: Remove commented debug output

* IrcMessageHandler.cpp: Remove debug output when receiving whispers

* UserInfoPopup.cpp: Remove user name debug output

* ChannelView.cpp: Remove debug output when clicking a message

* Image.cpp: Remove commented debug output

* AttachedWindow.cpp: Remove commented debug output

* SplitOverlay.cpp: Remove commented debug output

* TwitchMessageBuilder.cpp: Remove debug output for highlights

* TwitchMessageBuilder.cpp: Remove debug output for blocked messages

* PubsubClient.cpp: Remove debug output on PubSub::listen

* PubsubClient.cpp: Remove debug output on PubSub::tryListen

* IncognitoBrowser.cpp: Remove debug output of browser command

* NativeMessaging.cpp: Remove debug output of message
 2020-03-19 18:06:21 +01:00
pajlada 0f2355459d
Make ModBadgeElement a descendant of BadgeElement instead of EmoteElement (#1602) 
this causes it to behave as it should, and not be scaled when emotes are
scaled. :)
 2020-03-14 13:06:24 +01:00
pajlada 9a8b85e338
Twitch API: v5 to Helix migration (#1560) 
There's a document in src/providers/twitch/api which describes how we interact with the Twitch API.
Keeping this up to date might be a healthy way for us to ensure we keep using the right APIs for the right job.
 2020-03-14 12:13:57 +01:00
pajlada 20612a1381
Fix repeated signal connects on reconnect in irc server (#1576) 2020-03-01 06:05:08 -05:00
fourtf 26d3078def removed unused variables 2020-02-29 13:58:26 +01:00
mmb L 82354327e5
Add option for username tab completion only with an @ prefix (#1573) 
* add an additional check for username completion without an @ prefix

* Changed setting name

* default userCompletionOnlyWithAt to false
 2020-02-29 11:52:49 +01:00
fourtf 1e1a56bb87 fixed position of user icon head 2020-02-28 19:52:15 +01:00
fourtf 269d2ee67f improved user and settings icon 2020-02-28 19:48:04 +01:00
fourtf d83b597c75 removed unused function in SettingsDialog 2020-02-28 19:12:22 +01:00
fourtf b887f1c90e fix crash 2020-02-28 19:05:50 +01:00
fourtf ba5d842767 removed MutedChannelController 2020-02-28 19:04:25 +01:00
fourtf e537277fa8 did some more things and stuff 2020-02-23 23:07:28 +01:00
fourtf 5ad427bd61 moved some Settings from Application to Settings 2020-02-23 22:15:13 +01:00
fourtf f8a9850151 absorbed HighlightController into Application 2020-02-23 21:18:40 +01:00
fourtf d0a81f3fe7 refactored TaggedUsers and Ping 2020-02-23 20:34:00 +01:00
fourtf df91ea44c4 refactored ModeratinActions 2020-02-23 20:10:47 +01:00
fourtf 8ae9abb250 refactored IgnoredController 2020-02-23 20:01:35 +01:00
fourtf 89389608e9 removed compat class for SignalVector 2020-02-23 19:52:10 +01:00
fourtf 7e49371ba1 fixed formatting 2020-02-23 19:44:37 +01:00
fourtf 2ebe07bace removed compat functions in SignalVector 2020-02-23 19:44:13 +01:00
fourtf e2c493f369 removed compat aliases for SignalVector 2020-02-23 19:37:02 +01:00
fourtf 843e2ad994 refactored HighlightController 2020-02-23 19:31:43 +01:00
fourtf 4a5dc80bc6 some more refactoring 2020-02-23 17:45:59 +01:00
fourtf e1838154ff refactored SignalVector 2020-02-23 17:11:15 +01:00
pajlada 2b5c6ffe33
Remove chatroom code (#1561) 
People who had chatrooms still open should notice no difference at all, since it will just try to join a channel with the chatroom name.

Documentation for the closing/deprecation of twitch chat rooms:
    https://discuss.dev.twitch.tv/t/rooms-are-closing-how-it-affects-the-api-and-irc/22996
    https://dev.twitch.tv/docs/change-log (see 2020-01-10 entry)
 2020-02-22 06:05:36 -05:00
fourtf 03cf6e81ff fixed spaces and margins in general settings 2020-02-21 03:01:48 +01:00
fourtf 5a2633ef5c fixed bug 2020-02-21 02:16:35 +01:00
fourtf 927ee09221 reordered resize call 2020-02-21 02:07:34 +01:00
fourtf 70e5bd1bfd lazily initialize settings pages 2020-02-21 01:59:58 +01:00
fourtf 78ca0cb84f moved settings tab icons to SettingsDialog 2020-02-21 01:22:50 +01:00
fourtf 39d40d6db6 some settings refactorings 2020-02-21 01:17:22 +01:00
fourtf fbbf34878f getSettingsPage -> page 2020-02-21 00:46:19 +01:00
fourtf 0bb112a3c2 improved performance of opening the settings dialog 2020-02-20 23:47:25 +01:00
fourtf 4a69095d5f fix 2020-02-20 23:43:54 +01:00
fourtf d6c3c99605 list settings can be reordered now 2020-02-20 23:16:46 +01:00
Leon Richardt d0839ac36e
Make pre-defined highlight columns unselectable 
Fixes #1539.
 2020-02-20 00:10:10 +01:00
fourtf 6229b2f434 sync gif emotes of same length 2020-02-16 14:24:11 +01:00
Rasmus Karlsson 7a08d73434 Fix preview on hover not working when Animated emotes options was disabled. 
Fixes #1546

This change introduces a "window timer" that runs every 100ms that we
use to update the pixmap if necessary, since there is no signal for "let
me know when this image is done loading".
 2020-02-15 17:16:10 +01:00
Rasmus Karlsson 64c58e724a Use same sorting method in emote popup as in the completion model 
Fixes #1549
 2020-02-15 15:52:42 +01:00
Rasmus Karlsson b5764c6a1f Remove stupid assert in PubSubClient 
Fixes #1550
 2020-02-15 14:49:22 +01:00
tuckerrrrrrrrrrrr 3fd05849a2 ctrl + end scrolls to the bottom of chat 2020-02-10 17:00:33 -08:00
fourtf da59232913 "Open in player in browser" -> "Open player in browser" 2020-02-10 17:49:45 +01:00
fourtf 59aa59106e updated R9K shortcut text 2020-02-10 17:26:51 +01:00
fourtf d16732f023 moved and renamed similarity settings to R9K 2020-02-10 17:25:13 +01:00
Mm2PL 979bf5e74a
Add missing return 2020-02-10 16:55:59 +01:00
fourtf 0d519b479c changed wording in settings 2020-02-10 16:41:49 +01:00
Mm2PL dc9acf1bf3
Sort imports 2020-02-09 11:15:39 +01:00
Mm2PL d7a7df7427
Merge branch 'master' into git_is_pepega 2020-02-08 16:42:47 +01:00
Mm2PL a929053c4b
Dropping images now works on the whole split :) 2020-02-08 16:41:01 +01:00
Mm2PL d53bfbfdf2
Fixes and more changes Pajlada requested :) 
- get rid of `getImageFileFormat`, now uses QMimeDatabase
 - now uses a `QMutex` to be thread safe,
 - uploading two things at the same time is now impossible
 2020-02-08 16:26:32 +01:00
Mm2PL 553e8f2f7b
Delete useless else block 2020-02-08 15:47:27 +01:00
Mm2PL 916fbb2551
Fix a couple things Pajlada pointed out :) 
Change `CHATTERINO2_IMAGE_PASTE_SITE_URL` to `CHATTERINO2_IMAGE_UPLOADER_URL`
Remove newline at the end of `docs/ENV.md`
 2020-02-08 15:44:03 +01:00
Leon Richardt b8953157cc
Better Highlights: Rework highlight parsing order (#1524) 
This commit is in response to #1523.

Whispers are now only added to the `/mentions` tab if they also match a
user name or phrase highlight. On a related note, the `highlightVisual_`
member has been removed as it is no longer necessary.
 2020-02-02 08:33:25 -05:00
hemirt 1fd64be7f5
Makes it possible to hide one man spam (#1496) 2020-02-02 08:31:37 -05:00
Leon Richardt 497ce2d2f2 Better Highlights: Fix Unintentional Color Update (#1522) 
* HighlightPhrase: Fix wrong documentation

* Use right constructor for new HighlightPhrases

* Fix preset highlights changing unintentionally

Prior to this commit, the callback for reacting to user input on the
highlight table (namely, `HighlightingPage::tableCellClicked`) only
checked for the row number in order to determine whether preset
highlights (self highlights, whispers, and subscriptions) need to be
updated. Hence, changing rows 0 through 2 in the "User Highlights" tab
would also update the preset highlights.

This commit adds a check to determine whether the callback was triggered
by the "Messages" highlight tab, or not.
 2020-01-27 00:16:09 +01:00
Mm2PL bfee75ec58 Show the toggle mod mode button when mod buttons are enabled. (#1518) 
* Fix #1288

Show the toggle mod mode button when mod buttons are enabled.

* Automatic formatting ain't good enough i guess.
 2020-01-26 10:10:40 +01:00
Leon Richardt 93a6c55ed3 Fix subscription messages triggering split highlights (#1519) 
Since #1320, subscription messages are treated as highlights in order to
allow customization. This caused subscription messages to highlight the
split(s) the message was received in. This is not intended behavior.

This commit fixes the issue by additionally checking if the
`Subscription` flag is set on a highlighted message.
 2020-01-26 10:08:25 +01:00
pajlada a078d116d2
Fix ping payload not breaking portable mode (#1516) 
This payload was initialized before main was called, so before the
QApplication was initialized. This broke our portable checker

Fixes #1481
 2020-01-25 14:33:38 +01:00
apa420 4b1202437b Sort emotes alphabetically in emote picker (#1499) 2020-01-25 13:05:59 +01:00
Mm2PL 410de82261 Make a command that shows the Chatterino user card (/usercard) (#1375) 
* Make UserInfoPopup be able to show that fetching the information failed.
 2020-01-25 12:59:31 +01:00
Rasmus Karlsson 71337c4dbe Add missing include in ColorPickerDialog.hpp for MSVC2017 2020-01-25 11:28:10 +01:00
Leon Richardt 5957551d06 Better Highlights (#1320) 
* Support for user-defined sounds and colors

* Make color & sound columns selectable

* Add custom row for subscription highlights

* Add subscriptions to custom highlights and centrally manage highlight colors

* Dynamically update message highlight colors
 2020-01-25 11:03:10 +01:00
Alexey Kutepov 00414eb779 Synchronize Clipboard with Primary Selection on Linux when copying (#1502) 
* Introduce crossPlatformCopy()

It sets the text of the clipboard and also syncs it with the selection
clipboard if it is supported. Such behaviour is pretty common for X11
application on Unix-like Operating Systems.

* Fix clang-format remarks

* Fix weird clang-format config discrepancy between my machine and CI

* Remove clipboard argument from crossPlatformCopy

* Fix clang-format remarks
 2020-01-24 21:36:51 +01:00
Marcin Moskal 809b63bb5e Change CHATTERINO2_TWITCH_SERVER_PORT env default to 443 (#1513) 2020-01-24 21:30:35 +01:00
Rasmus Karlsson 81b79e14b5 Fix a crash in TwitchChannel::refreshCheerEmotes 
If you closed down the split right after the refreshCheerEmotes call was
made, then refreshCheerEmotes used this after it was free'd
 2020-01-12 10:06:01 +01:00
pajlada 265bab1ce6
Add the ability to tab through the emote menu (#1483) 
Fixes #1478
 2020-01-05 09:45:10 +01:00
DatGuy1 a6c91afde4 Remove support for CBenni's Logviewer (#1458) 2020-01-03 21:11:00 +01:00
Rasmus Karlsson 7f4b7564da Fix a windows-only occurence of log() 2020-01-03 21:08:27 +01:00
pajlada 90296a2d85
Expect a PONG response to our PINGs (#1476) 
If no PONG was received, force a reconnection

Fixes #1164
 2020-01-03 20:55:13 +01:00
pajlada 3c8992cac1
Remove FMT dependency (#1472) 
All occurrences of log() have been replaced with qDebug()

bonus meme: remove a bunch of std::string usages in the pubsub client

Fixes #1467
 2020-01-03 20:51:37 +01:00
Mm2PL 6c0b53a996
Fix wrong QSrting::arg() being called by using two calls. 2020-01-03 15:31:39 +01:00
Mm2PL a86367f4be
Fix issues pointed out in reviews :) 
Fixed PR BabyRage
 2020-01-03 14:43:05 +01:00
Mm2PL 86318590bf
Fix formatting. 2020-01-01 21:27:13 +01:00
Mm2PL 20d8da8f2d
Merge branch 'master' into git_is_pepega 2020-01-01 21:06:29 +01:00
Rasmus Karlsson f02988b657 Correct "Emote Link" for BTTV Global and Channel emotes 2019-12-31 21:21:53 +01:00
fourtf 845c8fa638 2.1.7 2019-12-29 17:35:58 +01:00
Rasmus Karlsson db860b5907 fix semi-deterministic bug with link parser 2019-12-29 16:42:20 +01:00
Rasmus Karlsson 25a2c04b02 Add lists of valid and invalid links 2019-12-29 15:46:29 +01:00
fourtf 17ff0b9d83 fixed case sensitivity in link matching 2019-12-29 15:45:19 +01:00
fourtf e12f76387a replaced link regex with object oriented assembly 2019-12-29 14:15:45 +01:00
fourtf 443aba3f9c fixed tooltip deselect issue 2019-12-29 11:14:55 +01:00
fourtf c5e8c5396f oops 2019-12-26 23:41:31 +01:00
fourtf b70806409d workaround for white border 2019-12-26 23:23:59 +01:00
fourtf 4911c62764 2.1.6 2019-12-26 22:18:46 +01:00
fourtf 6111985b77 replaced link regex 2019-12-26 22:00:31 +01:00
apa420 be898e88dd Add setting to stack bits (#1452) 2019-12-21 10:36:46 +01:00
pajlada d5001b97f4
allow customizing twitch server parameters through environment variables (#1449) 2019-12-21 10:11:23 +01:00
apa420 0d227ab2f5 Various bits fixes (#1443) 
We now make sure we don't render any fake bits
Bits now show their real value properly
 2019-12-19 21:36:02 +01:00
Rasmus Karlsson 11442bba20 move titleRefreshPeriod out of the TwitchChannel class 
this fixes a "use of uninitialized variable" error
 2019-12-16 08:55:38 +01:00
SupDos ba685b291f Typo in Settings (#1441) 
small one character typo
 2019-12-15 15:58:58 +01:00
Mm2PL 62cf7cbea2 Remove unmod button for moderators (#1439) 
Fixes #1419
 2019-12-14 13:22:49 +01:00
Rasmus Karlsson 58e909067e the EmotePopup now inherits from the BasePopup instead of BaseWindow 
Fixes #1437
 2019-12-14 12:58:15 +01:00
Rasmus Karlsson 55080bd354 Add a "BasePopup" class, which helps add default functionality to any popups (like the search popup) 2019-12-14 12:58:15 +01:00
Rasmus Karlsson bb9eb582ec replace the QStringList with a QSet<QString> as suggested by RAnders00 
2d3fb8950e (r36317456)
 2019-12-14 12:13:19 +01:00
Rasmus Karlsson 2d3fb8950e hardcoded list of BTTV's christmas emotes 2019-12-05 20:10:56 -08:00
Rasmus Karlsson bcc53c9aa7 Clean up Twitch badge appending code 2019-12-01 13:32:41 +01:00
apa420 c00f97ac53 Show exact months subscribed in Subscriber and Founder badge tooltip (#1424) 2019-12-01 02:20:56 -08:00
23rd d99102cd23 Fixed closing tab with middle button when tab management is not allowed. (#1426) 2019-12-01 02:00:06 -08:00
Ian e3d3f12425 Fixes C1001 compiler error on release builds with MSVC (#1417) 2019-11-16 02:58:13 -08:00
Rasmus Karlsson d4474c4ed4 Fixes a bug where the insecure credential store could not save credentials. 
Part of the fix for #1377
 2019-11-02 14:05:59 +01:00
Rasmus Karlsson 0e1f1196d6 reformat 2019-11-02 12:36:42 +01:00
W Gomes ce90253aac Removed unused variables (#1394) 
* Removed unused variables

Fixes compiler warning C4189: Local variable is initialized but not
referenced

* fixed typo
 2019-10-29 21:15:06 +01:00
Felanbird 6f5c4cacf8 moved hardcoded global-badges to be more inline with browser chat (#1392) 2019-10-27 13:18:07 -07:00
Felanbird 0a8d50223d switch badge tooltips from description to title (#1384) 2019-10-27 07:46:08 -07:00
Mm2PL 6c261459cf
Renamed TypedBytes to RawImageData, type to format. 
FeelsGoodMan Clap
 2019-10-22 17:21:46 +02:00
Mm2PL 736df48788
Smol fix. 2019-10-22 16:04:36 +02:00
apa420 a12bd3df18 Now show joined setting doesn't also show parted and parted shows parted (#1376) 2019-10-20 20:11:12 +02:00
Mm2PL e005fe806a
Comment stuff 
This includes:
 - Adding two comments
 - Fixing one spelling mistake.
 2019-10-19 11:41:23 +02:00
CommName dc1e4d2544 Show the title when offline (#1347) 
* Channel text for offline chats

* Title refresh timer

* Fixed typo

* Refresh title when room id is loaded

* removed timer

* Typo

* Loaded on demand when hovered over

* removed the extra api request

* Moved refreshTitle function call

* Added thottling for 10s

* Fixed formating style

* reformat

* make status fetcher safer

* Requested changes from fourtf
 2019-10-12 15:09:12 +02:00
fourtf 8153aa7d40 fixed #1362 rightclick on empty split crash 2019-10-12 11:17:40 +02:00
Mm2PL 77af5d54cf
Change more things. 
Things changed:
 - make getImageFileFormat case insensitive
 - use QTextEdit::dragEnterEvent instead of QAbstractScrollArea::dragEnterEvent,
 - Make dragEnterEvent() and dropEvent() overrides.
 2019-10-11 17:00:26 +02:00
Mm2PL bf434f3ac5
Fix the stupid things. 
This includes:
 - NuulsUploader.cpp
   - changing upload delay to a #define
   - moving png conversion code to `boost::optional<QByteArray> convertToPng(QImage image)`
   - in uploadImageToNuuls: moving content type definition to a variable, move things around a bit to eliminate an if
   - in upload: adding a comment about `source->hasUrls()` and `source->urls()`, change `uploadQueue.size()` to `!uploadQueue.empty()`
 - ResizingTextEdit.cpp
   - changing #include order
 2019-10-11 15:41:33 +02:00
fourtf 6f710823ed renamed getInstance() -> instance() for singletons 2019-10-07 22:42:34 +02:00
fourtf aeab038bc8 removed get function prefix in Version 2019-10-07 22:32:11 +02:00
fourtf ec2a2f30b7 fixed windows compilation 2019-10-07 22:29:35 +02:00
fourtf bc55a05480 clears cache files > 14 days 1 min after start 2019-10-07 22:14:00 +02:00
fourtf a894753596 renamed isVIP -> isVip 2019-10-07 20:31:34 +02:00
fourtf f25e52b218 attach extension to opera/vivaldi or all windows 2019-10-07 20:23:28 +02:00
fourtf 2fc799f85a run destructor of Frames in gui thread 2019-10-07 20:03:15 +02:00
fourtf 0ada53a3c1 tell user they might downgrade in update popup 2019-10-07 19:53:46 +02:00
fourtf 594c0fb255 print version on --version switch 2019-10-07 18:57:33 +02:00
fourtf 05bcf22af4 clear search field when reopening settings 2019-10-07 17:30:47 +02:00
fourtf b1cbf09427 removed appbase directory 2019-10-07 15:46:41 +02:00
fourtf 9f52564b9c fixes tab and split header title text size 2019-10-06 21:31:59 +02:00
fourtf 4ab8a7e9dd Fixes #1312 pixelated scaling on kde 2019-10-06 20:31:29 +02:00
Cranken f89ca517ce Fix first line of emotes in emote picker window being shifted. 2019-10-06 17:29:18 +02:00
fourtf c6e1a1de2e Revert "changed default port from 443 to 6697" 
It doens't appear to be the issue that builds aren't working

This reverts commit 56b7a3616f.
 2019-10-05 19:42:46 +02:00
fourtf 56b7a3616f changed default port from 443 to 6697 2019-10-05 19:29:19 +02:00
fourtf 16b2b2458c Fixes #1331 emote picker out of bounds 2019-10-05 18:17:29 +02:00
Cranken 252e2e8bae Fix tooltips in chat not showing on ctrl hover. 2019-10-05 17:36:03 +02:00
fourtf b64e2e9b70 Revert "Revert "added error message if settings initalizion failed"" 
This reverts commit f3ff40385d.
 2019-10-05 16:40:04 +02:00
fourtf 50a68e380c Revert "test #7" 
This reverts commit 645272718e.
 2019-10-05 16:13:15 +02:00
fourtf 96a6d94699 Revert "Test #6" 
This reverts commit 533516a9ed.
 2019-10-05 16:13:11 +02:00
fourtf 645272718e test #7 2019-10-05 15:12:02 +02:00
fourtf 533516a9ed Test #6 2019-10-05 14:40:42 +02:00
Rasmus Karlsson 3a8f91d6f6 Change default port from 6697 to 443 2019-10-04 13:06:15 +02:00
pajlada 2284b713c1
Merge pull request #1353 from leon-richardt/comma-mention-fix 
Fix Bug Regarding Mentions with Comma
 2019-10-04 04:01:37 -07:00
fourtf c46a65d173 Revert "disabled updates as a test" 
This reverts commit f8c4ac8c17.
 2019-10-03 22:18:03 +02:00
fourtf 245001c2f0 Revert "test #2" 
This reverts commit 30587e18c9.
 2019-10-03 22:18:01 +02:00
fourtf 44551b4009 Revert "test #3" 
This reverts commit 08004b9181.
 2019-10-03 22:17:59 +02:00
fourtf 9d1213ecad Revert "test #4" 
This reverts commit a08ca1333f.
 2019-10-03 22:17:57 +02:00
fourtf 34749c9d3d Revert "test #5" 
This reverts commit 5aff7b0b40.
 2019-10-03 22:17:54 +02:00
fourtf f3ff40385d Revert "added error message if settings initalizion failed" 
This reverts commit 2b9b96abb5.
 2019-10-03 22:12:22 +02:00
fourtf 5aff7b0b40 test #5 2019-10-03 21:52:10 +02:00
fourtf a08ca1333f test #4 2019-10-03 21:40:59 +02:00
fourtf 08004b9181 test #3 2019-10-03 21:29:18 +02:00
fourtf 30587e18c9 test #2 2019-10-03 20:36:22 +02:00
fourtf f8c4ac8c17 disabled updates as a test 2019-10-03 20:09:58 +02:00
fourtf 2b9b96abb5 added error message if settings initalizion failed 2019-10-03 18:05:56 +02:00
fourtf 7fa2c7b4a5 init irc and restart on crash is false by default 2019-10-03 17:37:09 +02:00
Leon Richardt d6bcd61289
Fix bug regarding mentions with comma 
While tab-completing user names already respected the setting for
mentions with commas, right-clicking user names did not.

This commit adds the missing check in ChannelView::handleMouseClick.
 2019-10-03 15:30:51 +02:00
fourtf 375aa221eb messed up the operator 2019-10-03 10:13:49 +02:00
fourtf 033c97e85d disabled hash<QString> for Qt 5.14 2019-10-03 10:07:14 +02:00
fourtf e31371fdf5 Fixes #1344 Copying user id adds "ID: " 2019-10-01 22:38:21 +02:00
TranRed 1d306c1dd9 Revert "broke everything (revert if needed)" 
This reverts commit f9d50954d9.
 2019-09-27 14:05:03 +02:00
TranRed f9d50954d9 broke everything (revert if needed) 2019-09-27 13:51:12 +02:00
Mm2PL 970503b755
Apply last suggestion and fix mistake not letting the user upload an 
image after attempting to upload a file that is not an image.
 2019-09-26 14:42:30 +02:00
Mm2PL 205122ee68
Avoid copying a QUrl in upload() when pasting files from the filesystem. 2019-09-26 14:24:41 +02:00
fourtf 9874bd779a formatted all files with clang 9 2019-09-26 00:51:05 +02:00
fourtf e47a043a27 updated .clang-format for clang 9 2019-09-26 00:15:07 +02:00
fourtf 848d5c8789 Fixes #1336 Pause on hover breaks moves selection 2019-09-25 23:49:30 +02:00
Mm2PL b55d08df8e
Renamed the pastedImage signal to imagePasted. 2019-09-25 22:39:02 +02:00
Mm2PL 4e9951371f
Applied a bit of foutf's suggestions. Replace uploadQueue.size() with .empty() and swap if/else bodies, move non empty queue check outside of the timer on line 60, move getImageFileFormat to an anonymous namespace, rename pasteFromClipoard to upload(), removed usesless comment, shortened message on line 83, use QMimeData.hasUrls() and QMimeData.urls(), moved GIF format case in upload() more to the top, call original functions in canInsertFromMimeData and dragEnterEvent which are overriden 2019-09-25 22:21:26 +02:00
Mm2PL 298c013fa0
Rename Env::imagePasteSiteUrl to Env::imageUploaderUrl. 2019-09-25 12:51:17 +02:00
Mm2PL 1a77df1674
Delete overloads for uploadImageToNuuls(). Use TypedBytes in the main 
definition. Use QHttpMultiPart instead of manually creating the
request.
 2019-09-24 18:28:28 +02:00
Mm2PL e0eb4e5a6d
I'm Pepega too. Added two missing files. 2019-09-24 16:08:12 +02:00
Mm2PL 65fab779c5
Redo all changes done before breaking the branch. 2019-09-23 19:36:52 +02:00
fourtf 367b1970fd use C_DEBUG instead of QT_DEBUG 2019-09-22 18:09:11 +02:00
fourtf ca0db97d09 ammend 2.1.5 added setting for experimental irc support 2019-09-22 17:12:09 +02:00
fourtf 2c25c8a5f5 2.1.5 2019-09-22 16:59:51 +02:00
fourtf fc049d8f45 disabled irc and fixed notice messages in write conn not showing 2019-09-22 16:16:08 +02:00
fourtf f27c8eb1b4 fixed crash restart conditions 2019-09-22 16:14:16 +02:00
fourtf 431d35e528 added setting to restart on SIGSEGV 2019-09-22 15:32:36 +02:00
fourtf 7e555843ca added class containing program arguments 2019-09-22 15:30:04 +02:00
fourtf 456065f508 moved resources out of Application 2019-09-22 10:54:32 +02:00
fourtf da4714944d small fixes in Image 2019-09-22 10:54:32 +02:00
pajlada 038fdd5446
Merge pull request #1326 from CommName/MentionsFix 
[Bug fix] Highlights in /mentions
 2019-09-22 10:43:13 +02:00
pajlada 1256a7b631
Fix formatting 2019-09-22 10:42:22 +02:00
CommName 5078ecbef1 Highlight bug fix 2019-09-21 22:19:03 +02:00
Leon Richardt 19b2102fed Fix Version::dateOfBuild_ on Windows 
The `CHATTERINO_NIGHTLY_VERSION_STRING` defines differ on Windows and
MacOS/Linux. (See `appveyor.yml` and `travis.yml`, respectively.)
Therefore, the Windows version string looked really messed up but it
should be fixed now.
 2019-09-21 20:44:49 +02:00
Rasmus Karlsson 5871414e6b Possibly fixed PubSub over 50 listens 
Keep an eye out on #1189
 2019-09-21 12:46:10 +02:00
Rasmus Karlsson 137d7910c0 move more handlers from write to read 2019-09-21 11:57:09 +02:00
Rasmus Karlsson d94be74007 handle clearchat in read connection 2019-09-21 11:54:30 +02:00
Rasmus Karlsson 88da9501f7 handle ROOMSTATE in read connection too 
this fixes the "recent messages not loading" issue
 2019-09-21 11:45:55 +02:00
Rasmus Karlsson 8312d4b112 Fix USERSTATE not being handled unless you write in a channel. 
This commit might re-enable some duplicate messages like host requests
and what-not.
 2019-09-21 11:38:08 +02:00
pajlada 452b65b4dd
Merge pull request #1315 from leon-richardt/commit-hash-settings 
Add Version Information to "About" Page
 2019-09-21 10:10:04 +02:00
Leon Richardt baf52d7563 Add version information to "About" page 2019-09-19 23:31:04 +02:00
Leon Richardt ddcce73111 Use Version singleton to set window title 2019-09-19 23:30:18 +02:00
Leon Richardt 9c59efb985 Provide singleton class for version information 2019-09-19 23:30:18 +02:00
fourtf 758a6bb41c NetworkRequest onError now uses NetworkResult 2019-09-19 19:03:50 +02:00
fourtf 986694e4bc added multipart support to NetworkRequest 2019-09-19 18:26:38 +02:00
fourtf ce53653ecd remoed nullableptr 2019-09-19 12:19:50 +02:00
fourtf 88d8bf7cec renamed members in Helpers.cpp 2019-09-18 16:32:07 +02:00
fourtf 5ca0fc0c8f
Merge branch 'master' into moderation 2019-09-18 16:14:45 +02:00
fourtf 277bd5b179 maybe?? 2019-09-18 16:01:41 +02:00
fourtf 4d99d2dade maybe? 2019-09-18 15:30:17 +02:00
fourtf 4bb0b79348 fix compilation on macos maybe 2019-09-18 15:12:23 +02:00
fourtf 99f99f0cff smol fixes 2019-09-18 14:20:21 +02:00
fourtf 3ab7362304 Merge branch 'master' into irc-support 2019-09-18 13:03:16 +02:00
fourtf 997a0598cd changed tab title to "Irc (beta)" 2019-09-18 11:16:07 +02:00
fourtf 07133166d9 added setting to show unhandled irc commands 2019-09-18 11:11:50 +02:00
fourtf 765a75f158 added irc commands 2019-09-18 10:59:28 +02:00
fourtf 27d6cf2bfd reconnect for irc + show errors + nickRequired 2019-09-18 08:05:51 +02:00
fourtf 96dac0fd3d moved chatters to ChannelChatters 2019-09-17 12:11:11 +02:00
fourtf 6298b74884 fixed compilation on non-msvc 2019-09-16 21:08:14 +02:00
fourtf 13c9aabf29 show all irc messages for debugging 2019-09-16 18:01:32 +02:00
fourtf cadff4c430 Fixes #1259 highlight not added when changing channel 2019-09-16 11:54:34 +02:00
fourtf 89fd3bfce9 hide tooltip on split::leaveEvent 2019-09-16 11:48:17 +02:00
fourtf 40c1857c90 added additional dropdown for moderation mode 2019-09-16 11:44:03 +02:00
fourtf 3a9f9fa17b added setting for pause on hover length 2019-09-16 11:36:19 +02:00
fourtf 602a66f5bc Fixes #963 Highlights move while paused 2019-09-16 10:55:54 +02:00
fourtf fd8987cf1b fixed typo 2019-09-16 10:44:05 +02:00
fourtf 63126899ec added pause while key is down 2019-09-16 10:43:20 +02:00
fourtf b06918eb47 2.1.4 2019-09-15 19:32:31 +02:00
fourtf 84b1efcd24 fixes #1304 emote.name eating the .name 2019-09-15 19:05:04 +02:00
fourtf 04f8875c4d fixes #1303 now searches using search text instead of message text 2019-09-15 18:29:50 +02:00
fourtf 0cb918b96a fixed spaces in the wrong place 2019-09-15 17:01:18 +02:00
fourtf b1bf60f286 added a critical detail 2019-09-15 16:56:44 +02:00
fourtf 7cbbd72e7f disable updates on windows nightlies 2019-09-15 15:45:04 +02:00
fourtf a390649d0f added sasl auth 2019-09-15 13:15:29 +02:00
fourtf 22ca20ad2a renamed TwitchServer -> TwitchIrcServer 2019-09-15 13:02:02 +02:00
fourtf c3b65b4db0 select the right server in the dialog 2019-09-15 11:42:22 +02:00
fourtf 67ffb0e34b irc default now uses ssl 2019-09-15 11:36:59 +02:00
fourtf 2a56cef848 added irc authentificate type 2019-09-15 11:35:17 +02:00
fourtf d451b31cee fixed loading cached files twice 2019-09-14 23:23:09 +02:00
fourtf 9bbc4f8a5e queue for erase/set credentials 2019-09-14 22:58:53 +02:00
fourtf 13d1fab303 credentials are now loaded when needed 2019-09-14 20:45:01 +02:00
fourtf d33a8b1b3a now loads passwords for irc 2019-09-14 18:38:09 +02:00
fourtf b45a6eea22 fixed missing include 2019-09-14 15:50:05 +02:00
fourtf 7c6f744e73 added insecure credential store 2019-09-13 19:26:52 +02:00
fourtf eadf5355ee renamed IrcConnection_ to IrcServerData 2019-09-11 13:51:48 +02:00
fourtf 158564d0c2 disabled twitch dropdown items for irc chats 2019-09-11 13:34:59 +02:00
fourtf b20fdc0da6 smol irc fixes 2019-09-11 13:17:36 +02:00
fourtf 2f39f4246c fixed warning + added more checks to SignalVectorModel 2019-09-11 13:12:08 +02:00
fourtf 2a8c5e654f saving irc splits now 2019-09-11 00:10:49 +02:00
fourtf c4d0efacff added loading and saving of irc servers 2019-09-10 23:55:43 +02:00
fourtf fe67bda136 moved .clang-format into src directory so submodules don't get formatted 2019-09-10 17:00:23 +02:00
fourtf 82f63d2f7e added send and receive for irc messages 2019-09-10 14:46:43 +02:00
fourtf 25f75f7580 added Credential class 2019-09-09 22:27:46 +02:00
fourtf 5974438edf added irc tab in SelectChannelView 2019-09-09 22:26:56 +02:00
fourtf fd0c11964e added new function and classes for irc support 2019-09-09 22:26:14 +02:00
fourtf 9f1a5b900e fixed single connection code and deleting abstractircserver 2019-09-09 22:22:47 +02:00
fourtf 8241ce7097 added qtkeychain dependency 2019-09-09 22:18:56 +02:00
Leon Richardt 720e5aa25f Improvements to Message Search (#1237) 
* Ran clang-format

* Implement user-specific search in message history

This functionality was originally requested in #1236.

This commit changes the SearchPopup::performSearch method so that only
messages from specific users can be shown.

In order to filter for a specific user, enter their username with a
leading '@' in the search popup. You can also add an additional search
phrase which will also be considered in the search.

* Naive implementation for "from:" tags

Rebase later?

* Cleverer (?) version using Predicates

Commit adds two POC predicates: one for the author of messages, and one
for substring search in messages.

Problems/TODOs:
* Best way to register new predicates?
* Clean up tags (e.g. "from:") or not?
* Test combinations of different predicates

* Add a predicate to check for links in messages

* Remove a dumb TODO

* Rewrite SearchPopup::performSearch to be cleaner

* Ran clang-format on all files

* Remove TODO I missed earlier

* Forgot to run clang-format

peepoSadDank

* Re-use {}-initialization

Was accidentally removed when fixing earlier merge conflict.

* Does this fix line endings?

No diffs are shown locally, hopefully Git doesn't lie to me.

* Rename "predicates" directory to "search"

Resolving one conversation in the review of #1237.

* Use LinkParser in LinkPredicate

Resolving a conversation in the review of #1237.

* Predicates: Use unique_ptr instead of shared_ptr

Resolves a conversation in the review of #1237.

* Refactor of SearchPopup and AuthorPredicate

Resolving some points from the review in #1237.

* Moved parsing of comma-seperated values into AuthorPredicate
  constructor.
* Rewrite SearchPopup::parsePredicates as suggested.
* Deleted now redundant methods in SearchPopup.

* MessagePredicate::appliesTo now takes a Message&

... instead of a MessagePtr.

This resolves a conversation in the review of #1237.

* Run clang-format on two files I missed

* AuthorPredicate: Check for displayName & loginName

Resolving conversation on #1237.
 2019-09-09 15:21:49 +02:00
Leon Richardt b6f632701f Fix merge conflicts 2019-09-08 22:58:17 +02:00
Leon Richardt b06eb9df83 Normalize line endings in already existing files 2019-09-08 22:27:57 +02:00
fourtf e1a9a437f1 fixed pingsound not playing sometimes 2019-09-08 21:57:14 +02:00
fourtf 4f356f80cf BaseWindow smol refactor 2019-09-08 21:45:46 +02:00
fourtf 3158ed4085 fixed user popup size issues 2019-09-08 20:05:40 +02:00
fourtf 343cd3970a bump version 2019-09-08 18:46:57 +02:00
fourtf cf23838099 added irc support 2019-09-08 18:06:43 +02:00
fourtf 9f1eb654fd
Merge branch 'master' into apa-bits 2019-09-08 18:02:58 +02:00
apa420 0c6a26d897 IFDEF QT_DEBUG 2019-09-08 17:40:30 +00:00
apa420 ffc483049c Pepega 2019-09-08 17:36:26 +00:00
apa420 0eb633cfa0 Removed some examples 2019-09-08 17:31:00 +00:00
apa420 3f411805b7 Forgot to add file 2019-09-08 17:27:04 +00:00
apa420 289811dc7d Moved example cheers to new file 2019-09-08 17:25:42 +00:00
apa420 5c602fea94 Resolved review 2019-09-08 16:01:38 +00:00
fourtf c6a05f289d removed useless table column in user highlights 2019-09-08 15:10:10 +02:00
fourtf 87c0ff76e7 added setting to open links in incognito by default 2019-09-08 14:59:51 +02:00
Rasmus Karlsson 94048595f6 Split parseChannelResponse into two functions: parseModBadge and 
parseChannelEmotes
 2019-09-08 14:08:18 +02:00
Rasmus Karlsson 862164bc2b make ffz custom mod badge atomic 2019-09-08 14:08:18 +02:00
Rasmus Karlsson 2cd07435bd Remove more unused includes 2019-09-08 14:08:18 +02:00
Rasmus Karlsson 57ba829775 Remove previously added includes to Image 2019-09-08 14:08:18 +02:00
Rasmus Karlsson dbce128cc3 Remove "custom on success" logic from Image. 
Create a new message element and message layout element type for mod badges.
 2019-09-08 14:08:18 +02:00
Rasmus Karlsson 256a65a12e Load mod badge information from the FFZ API instead of assuming the URL. 
This lets us load all sizes of the emote if they are available.

Channel with all versions of the mod badge: https://api.frankerfacez.com/v1/room/pajlada
Channel with only one version of the mod badge: https://api.frankerfacez.com/v1/room/apa420
Channel with no mod badge: https://api.frankerfacez.com/v1/room/forsen
 2019-09-08 14:08:18 +02:00
apa420 c08eaa4640 Higher cheer tiers now show and added tests 2019-09-08 13:40:11 +02:00
apa420 cd64b5eff5 Removed old tests 2019-09-08 12:47:36 +02:00
apa420 48fcc1a1a1 Fixed cheers not showing up in chat Fixes #1031 2019-09-08 12:45:25 +02:00
fourtf 4ec10e720c adjusted size of user switch popup 2019-09-08 12:43:12 +02:00
fourtf b14154a811 Fixes #996 can't ctrl+c in search popup 2019-09-08 12:31:27 +02:00
TranRed 21f65b716d Merge branch 'Ch2Usercard' of https://github.com/TranRed/chatterino2 into Ch2Usercard 2019-09-08 12:05:46 +02:00
TranRed d3c4d4b8cf moved anonymous namespace into chatterino namespace 2019-09-08 12:05:41 +02:00
pajlada dd996d1b8a
Merge pull request #1281 from Chatterino/logsGtSearch 
Allow searching in LogsPopup
 2019-09-08 10:59:13 +02:00
Leon Richardt a62b7ac094 Add setting for case-sensitivity in highlights 2019-09-07 19:01:52 +02:00
fourtf a268abfd4c Allow searching in LogsPopup 2019-09-04 00:29:58 +02:00
fourtf 9ee286f60f Fixes #1279 bttv global V3 2019-09-03 23:32:22 +02:00
fourtf 69aa5db2be changed version format 2019-09-03 19:54:17 +02:00
fourtf 3e85a29ab6 2.1.4 Beta 1 2019-09-03 19:19:57 +02:00
Rasmus Karlsson f94b44188d Use BTTV V3 API 
Fixes #1275
 2019-09-03 15:09:49 +02:00
fourtf 1c0ed6b1aa slightly changed layout for logs and cache 2019-09-03 13:09:33 +02:00
fourtf 577e2e0a21 moved cache into general page 2019-09-03 12:46:22 +02:00
fourtf 299cc84e04 fixed compilation 2019-09-03 12:02:58 +02:00
fourtf 6aa6e084af removed unused settings pages 2019-09-03 11:49:44 +02:00
fourtf ac26bd8d2d fixed "open appdata button" always showing 2019-09-03 11:38:15 +02:00
fourtf ab816e18bd Merge branch 'search-settings' 2019-09-03 11:28:10 +02:00
fourtf 3ab40b280b fixed some margins 2019-09-03 11:24:40 +02:00
fourtf f7ee778af6 some style changes to settings 2019-09-03 11:15:38 +02:00
fourtf 0ada2e51c6 fixed spacing 2019-09-02 19:14:19 +02:00
fourtf eaaa52260e smol fixes 2019-09-02 19:00:17 +02:00
fourtf 125426dbf1 added header for search 2019-09-02 18:59:37 +02:00
fourtf 234cdb041b sort paths in Resources to eliminate merge conflicts 2019-09-02 18:53:08 +02:00
fourtf 661a36c2e4 prefere user selected tab in settings search 2019-09-02 17:22:14 +02:00
fourtf a6fd6300c9 hide duplicate spaces in settings tab list 2019-09-02 17:21:17 +02:00
fourtf b0459ba646 add basic hiding of SettingsTabs 2019-09-02 16:39:21 +02:00
fourtf 0e62192732 post update 2019-09-02 14:01:43 +02:00
fourtf dc1c7cb419 2.1.3 2019-09-02 12:29:18 +02:00
fourtf e1e953272b moved some settings around 2019-09-02 10:55:17 +02:00
fourtf 42581598e1 added "beta update" settings 2019-09-02 10:55:17 +02:00
fourtf 54c26d2228 fixed width when searching 2019-09-02 09:44:25 +02:00
fourtf 0b49f696ce added filtering to general page and greying out some items to the other 
pages
 2019-09-01 23:23:20 +02:00
fourtf ae20acb7ea renamed AccountSwitchPopupWidget -> AccountSwitchPopup 
This has been triggering me forever
 2019-09-01 14:13:44 +02:00
fourtf 19960b5d8f Fixes #1261 size on startup 2019-09-01 14:06:30 +02:00
fourtf 5c0f81defd Fixed stuff in user popup 2019-09-01 13:06:56 +02:00
Mm2PL b441e3e159 Add copy button for user ids 2019-09-01 11:06:07 +02:00
Mm2PL 6732aab323 Add user IDs to user cards (#1247) 
* Add user ids to user cards and a setting to the misc section of the settings

* Fix letter casing

* Forgot to run clang-format, now it's fixed

* Fix crash in UserInfoPopup::updateUserData()

* Removed setting as per Apa420's and fourtf's advice

* Removed remnants of the setting
 2019-08-31 17:58:28 +02:00
Rasmus Karlsson a878ca8062 Remove unused lambda capture to fix warnings 2019-08-31 17:45:13 +02:00
Rasmus Karlsson 7ff567d584 rename "messageReceived" to "readConnectionMessageReceived" to match the "readConnected/writeConnected" and "writeConnectionMessageReceived" functions 2019-08-31 17:44:41 +02:00
Rasmus Karlsson 829c63be51 Change in which "message received" handler IRC commands are handled after the change in CAP REQs. 
Fixes #1252
 2019-08-31 17:41:49 +02:00
fourtf 671c9ed654 fixed commands like /mods not working 2019-08-27 20:45:42 +02:00
Mm2PL 7aa2bf4fec Fix build and rename variables to be camelCase 2019-08-27 20:10:30 +02:00
Mm2PL 1c242a51dd Create a copy icon. Change the copy button text to be an icon 2019-08-27 20:10:30 +02:00
Mm2PL f2f5ae9c93 Add a copy button near the username in usercards 2019-08-27 20:10:30 +02:00
apa420 a624d14a4f Fetch FFZ channel emotes with channel id instead of name 2019-08-27 20:08:17 +02:00
fourtf 450f3bc492 removed useless const 2019-08-27 20:08:17 +02:00
apa420 677017a8bd Now shows connect and reconnect messages 2019-08-27 19:54:37 +02:00
fourtf 2d64d79c17 enabled commit titles 2019-08-27 10:19:39 +02:00
fourtf 7b43f0a30a 2.1.2 2019-08-26 23:04:55 +02:00
TranRed 18349ed9b3 Revert "Merge pull request #1 from TranRed/subbutton" 
This reverts commit d3aa3694f2.
 2019-08-26 23:02:04 +02:00
fourtf 810acbcfcc fixed window frame for minimized and maximized windows on startup 2019-08-26 22:32:17 +02:00
fourtf a831c1d5d8 enabled commit number again 2019-08-26 17:45:58 +02:00
fourtf 377a30fd9e 2.1.1 2019-08-26 17:16:22 +02:00
fourtf f949605477 added descriptions to collection settings 2019-08-26 14:36:06 +02:00
fourtf e7b4527a0f added regex help link 2019-08-26 14:07:21 +02:00
fourtf a64e5b2834 made follow mode text shorter 2019-08-26 13:48:07 +02:00
fourtf 238d213072 punctuation changes 2019-08-26 13:29:04 +02:00
fourtf a6ab9be8d6 fixed double : in general settings 2019-08-26 13:22:44 +02:00
fourtf e095db87bc changed screen out of bounds detection from contains() to intersects() 2019-08-26 13:18:40 +02:00
fourtf 20e978ad85 changed up settings 2019-08-26 13:18:23 +02:00
fourtf cced199eaf added button to import commands from chatterino 1 2019-08-26 11:46:52 +02:00
fourtf ea28269951 attempt to fix the tabs that sometimes get added 2019-08-26 11:26:58 +02:00
fourtf 748920e8fd fixed shift+(home/end) 2019-08-26 11:11:02 +02:00
fourtf 77aec1d3eb improved description of double click link setting 2019-08-26 10:58:47 +02:00
fourtf 6cb82307e6 switched std::optional to boost::optional 2019-08-25 22:58:19 +02:00
fourtf 84c7c40e86 added some flush() calls just to be sure 2019-08-25 21:26:14 +02:00
fourtf 38bceba5ec improved browser extension 2019-08-25 21:25:31 +02:00
fourtf 68a96e3be8 added prompt to move windows into bounds 2019-08-25 21:24:43 +02:00
Mm2PL 1a25c5afe8 Add a switch for follower only mode (#1241) 
* Add a switch follower only mode

* Format the code
 2019-08-25 19:08:04 +02:00
TranRed 23c2fa8ee5 made fillLatestMessages into a free standing function 2019-08-25 15:09:30 +02:00
TranRed 288ea5036b did first requested refactors 2019-08-25 14:57:31 +02:00
23rd a893be796c Refactored UserInfoPopup::TimeoutWidget. 2019-08-25 12:24:35 +02:00
TranRed d63438c351 added some improvements suggested by 23rd 2019-08-25 11:56:15 +02:00
TranRed 89a60ceea8 turned QString::compare() call into a bool 
create self-similarity with bool isMyself further up in the class implementation
 2019-08-25 10:02:26 +02:00
23rd cdc7051e56 Considerably refactored code of Usercard. 2019-08-25 09:47:00 +02:00
TranRed f7fa000266 fixed bug that terminates chatterino 
seems like durationUnits[i++] tried to access a non existing element and chatterino crashed while opening the user card.

this tweek fixed it
 2019-08-24 17:26:37 +02:00
23rd 25871bdc2f Slightly refactored code of Usercard. 2019-08-24 17:09:41 +02:00
TranRed 0ce5e7f529 added border to Buttons 
added border to Buttons
deleted unused variables
renamed some vars
 2019-08-24 11:00:55 +02:00
pajlada def839bef9
Merge pull request #1232 from Chatterino/pajlada-manually-send-req 
manually send req, this ensures we send it before JOIN
 2019-08-23 22:37:52 +02:00
fourtf 0577692c99 Updated chatterino badges api 2019-08-23 16:52:44 +02:00
Rasmus Karlsson ab0d70300c manually send req, this ensures we send it before JOIN 
Fixes #1229
 2019-08-22 22:04:26 +02:00
TranRed 5cd067aab0 readded used "unused" variable 2019-08-22 21:33:50 +02:00
apa420 0c6760d0ca Fixes the remove button '''crash''' #1226 2019-08-22 16:34:26 +02:00
fourtf d709b98331 switched order in loaded image selection 2019-08-21 02:21:12 +02:00
fourtf e140905faf ? 2019-08-21 02:16:33 +02:00
fourtf 978d5aa1c1 Special message when login expired. 2019-08-21 02:14:01 +02:00
fourtf 3b3791e43a Special message when login expired. 2019-08-21 02:00:42 +02:00
fourtf 6d9545157e Fixes #1215 Allow previewing badges 2019-08-21 01:52:01 +02:00
fourtf dbc20baa65 fixed emote preview not using 3x images 2019-08-21 01:44:19 +02:00
fourtf 67aadfe61f Fixes #1218 Usercard link from search popup 2019-08-21 01:19:41 +02:00
fourtf b513caf572 added settings to mention users with , 2019-08-21 01:08:15 +02:00
fourtf b84c3ac3be Fixes #1220 Added setting do disable timeout stacking 2019-08-21 00:41:48 +02:00
fourtf f3e48c1325 smoll changes 2019-08-21 00:07:59 +02:00
fourtf d98318e1cc fixed compilation on linux 2019-08-20 23:54:45 +02:00
fourtf 7643c0d20d fixed deleting QTimer on wrong thread 2019-08-20 23:46:27 +02:00
fourtf 14222f84f2 made caller/concurrent rules tighter 2019-08-20 23:46:27 +02:00
fourtf 7d842e6cf7 Writing cache files async 2019-08-20 22:16:17 +02:00
fourtf d6627b531e removed old NetworkRequest api 2019-08-20 22:16:17 +02:00
fourtf 7697ec01b4 removed old NetworkRequest api 2019-08-20 22:16:17 +02:00
fourtf a7cd1fbf97 removed unused files 2019-08-20 22:16:17 +02:00
fourtf 4713862620 load cache files async 2019-08-20 22:16:17 +02:00
fourtf 0b8e0ff7cf deprecated old NetworkRequest api 2019-08-20 22:16:17 +02:00
fourtf 98053fdadf deprecated old NetworkRequest api 2019-08-20 22:16:17 +02:00
fourtf 4f6c1a8519 added NetworkRequest builder functions 2019-08-20 22:16:17 +02:00
Rasmus Karlsson d3224e7a4e Fix linux/macos compilation 2019-08-20 09:08:25 +02:00
fourtf 1b0102c948 Added fullscreen support to browser extension 2019-08-20 03:13:42 +02:00
fourtf e07d11e9a3 enabled browser extension 2019-08-19 23:15:24 +02:00
fourtf 9a7bb973b5 Re-enabled nightly title with commit hash 2019-08-19 00:27:13 +02:00
pajlada c45657da82
Merge pull request #1209 from leon-richardt/emote-autocompletion-fix 
Fix Emote Completion Bug
 2019-08-19 00:12:43 +02:00
fourtf 0a81a358b5 fixed manual updates for portable mode on windows 2019-08-18 23:51:10 +02:00
Leon Richardt f2b2e3142f Implement simpler fix for emote completion bug 
This commit implements a simpler fix for the problem described in #1209.
The setting's signal is connected to a reset of `completionInProgress_`
so that the completion model is updated on the next word already.

This commit also removes the older approach tackling this issue.
 2019-08-18 21:37:20 +02:00
fourtf 23f1dd4646 update 2.1.0 2019-08-18 21:21:48 +02:00
TranRed 0e3ab64bd2 deleted unused QStringList 2019-08-18 18:57:30 +02:00
TranRed ebce0c985a added missing empty line 2019-08-18 18:44:49 +02:00
TranRed 015fc155d5 Refactored settings 
made settings use Vectors instead of 8 single setting entries
 2019-08-18 18:42:48 +02:00
Leon Richardt 23a5f0bfb2 Remove unused method declaration 2019-08-17 22:10:27 +02:00
Leon Richardt be5318f275 Fix emote completion bug 
This commit fixes a bug that would occur when changing the completion
mode from prefix-only to substring while mid-completion.
In that case, the suggestion list was not updated until the next
completion attempt.

This is fixed by forcing a suggestion list refresh whenever the
setting's checkbox is updated.
 2019-08-17 21:31:31 +02:00
Leon Richardt 58d892a8c2 Make Emote Tab Completion Search for Substrings (#1204) 
* Make emote tab completion search for substrings

Previously, tab completion only searched for emotes that start
with the current prefix under the cursor. This commit makes tab
completion look for the current prefix as a substring in any position,
not just the start.

Examples:
    * In forsen's channel, tabbing on "pls" will cycle through "DonaldPls", "forsenPls",
    "GachiPls", "nyanPls" and "SourPls".

    * As a forsen subscriber, tabbing on "sen1" will complete to "forsen1".

    * As a pajlada subscriber, tabbing on "shrug" will cycle through
    "pajaShrugL" and "pajaShrugR". (Unless you are in a channel with
    more "shrug" emotes, of course.)

* Add a setting for prefix and substring completion

This commit adds a setting under the "Miscellaneous" section to allow
user to choose whether they want prefix-only or substring emote
completion.

The QCompleter filter mode and `addString` function are now chosen
according to the user's setting.

* Improve description of emote completion setting

Also reintroduce a blank line that went missing.
 2019-08-17 17:17:38 +02:00
pajlada 3dcbe89e28
Merge pull request #1208 from leon-richardt/fix-account-popup 
Fix "Manage Accounts" button
 2019-08-17 11:05:09 +02:00
Leon Richardt 4a1712f9a2 Fix "Manage Accounts" button 
This commit fixes the unresponsiveness of the "Manage Account" button
(described in #1188).

Apparently, focus was lost when pressing down the mouse button. This is
circumvented by setting the focus policy of the button to `Qt::NoFocus`.
The button then works as expected and opens the "Account" page in the
preferences.
 2019-08-17 01:35:24 +02:00
23rd f9e9ed8ed0 Improved stream header creation. 2019-08-16 23:40:30 +03:00
fourtf bdb82b6818 fixed crash related to concurrent network request 2019-08-15 20:39:35 +02:00
Mateusz Ż eb38b53c04 Fix Settings UI inconsistencies (#1202) 
* Move "About" tab in Settings

* Resize Settings window

This prevents from spawning horizontal scroll (which is caused by too long line
in "Attributions" group)

* Fix "show license" link width

If you clicked empty space next to link application assumed you clicked link.
I fixed that by using QLabels instead of SignalLabel (there's something "wrong"
with them, but I couldn't find what)
 2019-08-14 20:03:42 +02:00
fourtf 4679fd6753 gcc Pepega 2019-08-13 18:48:22 +02:00
fourtf 7bf5a79f8a Delete emote popup when it is closed. 2019-08-13 16:39:22 +02:00
fourtf 18f3a816ed re-enabled loading recent messages concurrently 
@pajlada please check if the code can stay commented out
 2019-08-13 15:03:33 +02:00
fourtf 6274c05520 Fixed always loading 1x, 2x and 3x images 2019-08-13 13:51:27 +02:00
fourtf 294c2aecdc disabled concurrent loading of recent messages 
it caused some twitch emotes to load improperly
 2019-08-13 13:12:09 +02:00
fourtf 96532be765 removed unused function 2019-08-13 13:02:11 +02:00
fourtf 23f1ec9ac2 Fixed using non existant 2x and 3x versions of ffz emotes and badges 2019-08-13 13:00:16 +02:00
Rasmus Karlsson e56c90c33d fix crash in name-colorizer 2019-08-11 22:18:01 +02:00
Rasmus Karlsson cd5972522b reformat 2019-08-11 21:08:18 +02:00
Rasmus Karlsson 391d75f208 try to improve readability of the "grayname colorize" function 2019-08-11 21:07:54 +02:00
23rd da039bfdfa Added setting to colorize usernames who have not set own color. 2019-08-11 19:48:43 +03:00
23rd fdb0b62dee Fixed switching tabs using trackpad scroll. 2019-08-10 13:34:59 +02:00
pajlada 0c245fbc4e
Merge pull request #1178 from 23rd/patch-29-mac-ctrl-tab 
Added new submenu in menu bar for OS X to switch tabs with hotkeys.
 2019-08-10 13:22:33 +02:00
pajlada 989dad1a6d
Merge pull request #1179 from 23rd/patch-30-simplified-tab-hotkeys 
Moved to one place and simplified hotkeys of switching tabs.
 2019-08-10 13:18:11 +02:00
Rasmus Karlsson 6e1ee84d90 Allow your own username to be set in "highlight users" 
Fixes #1181
 2019-08-10 13:13:00 +02:00
23rd 34841543c7 Replaced repetitive code of Ctrl+1-8 hotkeys with single loop. 2019-08-04 17:57:34 +03:00
23rd 838fd6bab6 Added ability to open last tab with Ctrl+9. (Chromium behaviour.) 
- Fixed #1106.
 2019-08-04 17:23:41 +03:00
23rd 485715ef30 Moved to one place and simplified hotkeys of switching tabs. 2019-08-04 17:03:58 +03:00
23rd 79a87e740a Added new submenu in menu bar for OS X to switch tabs with hotkeys. 
- Fixed #1176.
 - https://bugreports.qt.io/browse/QTBUG-8596
 2019-08-04 16:43:35 +03:00
Rasmus Karlsson c578cd47e1 Highlight parsing is now done after Ignores have been respected. 
In the same commit, because I misunderstood the original issue, I also
split out the parsing of the highlights and triggering of the highlight
sounds/alerts into separate functions.

Fixes #1160

I also re-enabled the "sound url changer" that was commented out in an
earlier commit.

Fixes #1170
 2019-08-04 14:31:57 +02:00
Rasmus Karlsson 45e2887ce8 Set our own custom User-Agent on network requests. 
Format: chatterino/VERSION (COMMIT HASH)

Fixes #1169
 2019-08-03 11:20:19 +02:00
fourtf e7d9422431 fixes for last commit 2019-08-01 13:30:58 +02:00
fourtf aac27c2a0d Fixes #1162 2019-07-31 23:03:55 +02:00
fourtf fff979b3c0 lock SignalVector with shared_lock to allow reading on other threads 2019-07-31 22:50:12 +02:00
fourtf 4e4c7d4c0b Set default username boldness to DemiBold (63) 2019-07-28 20:24:39 +02:00
Rasmus Karlsson 3679125e2f Reformat 2019-07-28 13:21:54 +02:00
Rasmus Karlsson 954b1b138a Add a setting for the timeout stack style: 
"Stack" is the default behaviour, it will search 20 messages up and 5
seconds back in time to stack the timeout.
"Stack sparingly" will try to do the same, but only if the user has not
typed a message inbetween the this and the last timeout.

Fixes #1157
 2019-07-28 13:21:54 +02:00
Rasmus Karlsson ba1a56c3b7 Don't early out after replacing a timeout message. 
Otherwise, this could lead us to not gray out messages after the timeout we're stacking on

Work on #1157
 2019-07-28 13:21:54 +02:00
Rasmus Karlsson 1ae66f3b7d Run newline replacer before sending message input to command executor 
Fixes #1123
 2019-07-28 12:19:33 +02:00
fourtf 96bed498d0 Fixed warnings in TwitchMessageBuilder 2019-07-27 12:49:45 +02:00
TranRed 54b162afdd removed experimental profile banner code for now 2019-07-25 13:55:37 +02:00
fourtf 39f44d74b3 Added autorun on boot setting for windows. 2019-07-23 23:56:14 +02:00
Rasmus Karlsson 628c64d138 Move "How to" options to their own sub-menu 2019-07-21 13:01:35 +02:00
TranRed 125774ecb2 excluded inline whispers from latest messages in userpopup 2019-07-21 09:36:18 +02:00
TranRed 94ffc66b2a extracted latest messages logic into its own method 2019-07-20 22:42:01 +02:00
TranRed f417006d6a Added channelView with last messages to user popup 
currently uses last messages from that channel - might want to use online logs later (or make a setting for that)
 2019-07-20 18:49:17 +02:00
TranRed dc01cbf2a3 simplified settings page UI 
simplfied UI and removed unneccessary code
 2019-07-19 17:34:25 +02:00
TranRed 00ad80d93d unscuffed settings tab 
removed copy past cody in favor of an itsy-bitsy more flexible solution
 2019-07-19 16:20:31 +02:00
TranRed c45bb144e9 Fixed spinbox ranges 2019-07-19 13:15:50 +02:00
TranRed 7a3673e9f6 changed max custom timeout input to 99 
simplicity
 2019-07-18 23:34:40 +02:00
TranRed 24faaf8734 created first version of settingstab: Timeouts 
scuffed prototype

To-Dos:
- make the UI look cleaner
- clean up copy&pasted coding
 2019-07-18 23:02:55 +02:00
TranRed e64f37d288 Made 8 customizable timeout buttons 
changed fixed timeout buttons to be read from settings
 2019-07-17 16:50:03 +02:00
TranRed d3aa3694f2 Merge pull request #1 from TranRed/subbutton 
Added Subscribe option to channel menu
 2019-07-17 16:49:16 +02:00
TranRed a768515849 Added Subscribe option to channel menu 
Added the option to visit the subscription page of a channel from chatterino
 2019-07-16 21:59:04 +02:00
pajlada fb6a55847d
Merge pull request #1140 from TranRed/inlineWhisperHighlight 
Added setting and functionality to highlight inline whispers
 2019-07-14 19:32:09 +02:00
pajlada 645f7c74d0
Merge pull request #1139 from RAnders00/patch-4 
Add VIP to settings description of badge toggle
 2019-07-14 18:51:30 +02:00
pajlada dd353a56a1
Merge pull request #1136 from TranRed/viewerlist-quickfix 
Make viewer list float by default
 2019-07-14 18:45:50 +02:00
TranRed d725155569 Added setting and functionality to highlight inline whispers 
Inline whispers will be displayed with highlighted background color.

New Flag needed to differentiate between normal whisper (highlighted) and whisper with mention.
 2019-07-14 16:35:32 +02:00
Ruben Anders 667d2dbdda
Add VIP to settings description of badge toggle 2019-07-14 15:31:40 +02:00
TranRed 32d4383d5f Make button "Manage Accounts" open the Accounts tab 
fixes #1135
 2019-07-14 12:36:53 +02:00
TranRed 6c14fca216 Make viewer list float 
- makes viewer list float
- changed Vip to VIP
- added myself as contributor
 2019-07-14 11:43:57 +02:00
Ruben Anders feef6c6aaa Marked VIP badge as "channel authority" badge (#1117) 
* Marked VIP badge as authority badge

* Added vip.png resource

* Registered VIP icon resource

* Update ResourcesAutogen.cpp

* Update ResourcesAutogen.hpp

* Update ResourcesAutogen.hpp
 2019-07-13 15:55:15 +02:00
Rasmus Karlsson c483a87605 Right-clicking split header now opens the same menu as the hamburger icon 
Fixes #1131
 2019-07-13 12:17:42 +02:00
pajlada fe69dfb5e0
Merge pull request #1108 from tsoding/1100 
(#1100) Clean TooltipPreviewImage on SplitHeader enterEvent
 2019-06-23 09:32:55 +02:00
rexim 4cde28f29b (#1100) Clean TooltipPreviewImage on SplitHeader enterEvent 
Supa quick fix for #1100

Looks like this bug may come back in other places where we use
`TooltipWidget`. For a permanent fix we have to go through all of the
places that touch `TooltipWidget` and check if they clean the preview
image correctly.

It would be better to merge TooltipPreviewImage and TooltipWidget
together and change `TooltipWidget::setText` to be

```c++
void TooltipWidget::setText(const QString &text, ImagePtr image = ptrnull);
```

But it's impossible right now, because TooltipWidget is located in
appbase and `ImagePtr` is not visible there (it's located in the main
chatterino repo). Plus we also need an access to
`getApp()->windows->gifRepaintRequested`.

First step in implementing the permanent fix would be moving
TooltipWidget to chatterino from appbase.

Any thoughts on the situation?
 2019-06-22 21:39:59 +07:00
Rasmus Karlsson 27114c5154 Restore option to disable emote images 
Condensed into a single option, which will disable/enable all emote and emoji images

Also moved badges into their own element
 2019-06-22 14:34:54 +02:00
Rasmus Karlsson a34e3084df Clean up emote parsing 2019-06-22 14:22:43 +02:00
Rasmus Karlsson 9cb5e3abb3 Fix a bug where tabbing too early would break any future tab completions 
Fixes #1107
 2019-06-22 13:16:16 +02:00
Rasmus Karlsson 64dc7f5d73 Fix a bug with messages jumping if you were scrolled up 
The bug appeared every 100 messages (so whenever a chunk was deleted)

To fix this, we only perform the first chunk offset increment if the
item we deleted was not the last item in a chunk
 2019-06-22 13:04:31 +02:00
Rasmus Karlsson c631434cee Make use of our "Chunk" and "ChunkVector" aliases better 2019-06-22 13:03:57 +02:00
Rasmus Karlsson 8d85b9c071 Override Home and End behaviour. 
Home now brings you to the beginning of the message (previously of the line)
End now brings you to the end of the message (previously of the line)
 2019-06-21 22:22:43 +02:00
Rasmus Karlsson 406c0b9af8 Stop "up arrow" keyboard event from propagating furthern when we're going through message history 
Fixes #1102
 2019-06-21 22:15:17 +02:00
apa420 3226ab6c68 ran clang 2019-06-12 00:31:02 +02:00
apa420 70bb63d20f Added option for shift, used clang and made setting uneditable 2019-06-11 22:54:20 +02:00
rexim f362548e28 (#976) Use int for emotesTooltipPreview 2019-06-12 02:05:18 +07:00
rexim 244252f610 (#976) Make TooltipPreviewImage non-copyable 2019-06-12 02:04:57 +07:00
rexim 483e177a39 (#976) Fix compilation errors 
Which were not visible because of incremental build or something
 2019-06-12 01:16:56 +07:00
rexim 3838157d82 Extract TooltipWidget updating into a separate class 2019-06-12 01:03:04 +07:00
rexim 3f4d3ce14a (#976) Make currentPreviewImage shareable between ChannelView-s 2019-06-12 00:22:26 +07:00
rexim e1a901aa98 Adjust tooltip size after setting the text 2019-06-11 23:20:04 +07:00
rexim 0fb16d150b Preview images instead of emotes 2019-06-11 23:20:04 +07:00
rexim a84716547b Animate gifs in the tooltip preview 2019-06-11 23:20:04 +07:00
rexim 94e705ec1b Inject Emotes into TooltipWidget directly 2019-06-11 23:20:04 +07:00
rexim 8b79faf958 Make Emotes Tooltip Preview disablable in the Settings 2019-06-11 23:20:04 +07:00
rexim a569985315 Remove dead code 2019-06-11 23:20:04 +07:00
rexim 7251a20dfb Get the biggest version of emote from EmoteElement 2019-06-11 23:20:04 +07:00
rexim 959aa4616f pixmap() -> imagePreview() 2019-06-11 23:20:04 +07:00
rexim aa4e7f13e7 Get rid of dynamic_cast 2019-06-11 23:20:04 +07:00
rexim cbb1ec2d7a Remove dead code 2019-06-11 23:20:04 +07:00
rexim f002d44370 If hover over ImageLayoutElement show the preview of image 2019-06-11 23:20:04 +07:00
rexim d4a6defed6 Introduce a way to extract QPixmap from ImageLayoutElement 
Probably should be a part of MessageLayoutElement interface, but good
for now
 2019-06-11 23:20:04 +07:00
23rd d2645b03f8 Added Preferences item in menu bar for OS X. 2019-06-10 12:43:37 +02:00
TranRed 5c350de329 overrides QTextEdit insert methods 
fixes Chatterino#635
prepares for future implementation of Chatterino#79

Was a little bit hard to find the right combination for now. Pasting images from clipboard surpasses the check for dragging images in canInsertFromMimeData OMGScoots
 2019-06-10 12:20:45 +02:00
apa420 99045e42da Adds support for /user 2019-06-09 10:08:04 +02:00
apa420 74d55941a0 added usercard button to link to twitch's userbutton 2019-06-09 10:08:04 +02:00
ckath afe5e826a1 fix searchtext format again 2019-05-31 08:58:15 +02:00
ckath 83cf03fb09 format with extra : for user search 2019-05-31 08:58:15 +02:00
ckath 2e9b0cad44 make it possible to search localized names 2019-05-31 08:58:15 +02:00
Rasmus Karlsson b872f83c9e add missing files pepega 2019-05-26 21:48:45 +02:00
Rasmus Karlsson 8ba8bbeef6 Move environment variable parsing and storage to its own class 
Make the Link resolver and Twitch emotes set resolver urls modifiable with
environment variables
 2019-05-26 21:44:37 +02:00
Rasmus Karlsson e1483bfd8a Make Twitch message history loading optional (On by default) 2019-05-25 11:24:10 +02:00
Rasmus Karlsson 79e4e05a4a Fix compilation issue 2019-05-25 11:23:58 +02:00
Ruben Anders 9dbe66a19b Change emote parsing order to FFZ -> BTTV -> GlobalFFZ -> GlobalBTTV 
Fixes #877
 2019-05-25 10:58:51 +02:00
Rasmus Karlsson 0263248668 Add attribution for Twitch emote data provided by twitchemotes.com 2019-05-21 22:53:40 +02:00
fourtf 42cb0e4ec3 Removed left padding from general settings page 2019-05-19 01:03:31 +02:00
apa420 9a7365821d Fixed issue #1071 (#1073) 2019-05-18 17:37:26 +02:00
Rasmus Karlsson 8bf9fc92c3 Add a != operator to match the Prefix's == operator 2019-05-11 14:17:52 +02:00
Rasmus Karlsson ee9b0f4c12 Fix tab completion 
Fixes #813

This has the "quirk" of not updating names that are already there, which
means that display names might not always be used, instead the users
lowercase name might just be there and stick
 2019-05-11 14:17:24 +02:00
Rasmus Karlsson 2492a0ba21 reformat usernamset 2019-05-11 13:59:03 +02:00
Rasmus Karlsson 1a7a5409ab do a full reformat according to our current .clang-format 2019-05-10 23:31:10 +02:00
Rasmus Karlsson fa6c9f2fba make paths cachedirectory formatting nicer 2019-05-10 23:28:05 +02:00
apa420 834b1f3c53 Option to hide system moderation messages (#1066) 2019-05-10 23:16:34 +02:00
apa420 3ea496a99b Added boldness adjustment for fonts (#1057) 
* Added boldness adjustment for fonts

* Moved setting and changed description of it
 2019-05-10 22:37:44 +02:00
hemirt c43c1dc207 Adds option to mute ping sound for specific channels (#990) 
Co-Authored-By: hemirt <hemirt@hemirt.com>
 2019-05-10 22:36:37 +02:00
23rd 9654650bee Renamed variables to clear some warnings. 2019-05-10 22:18:05 +02:00
23rd efec76df5b Removed unused local vars. Slightly refactored code. 2019-05-10 22:18:05 +02:00
hemirt 411502de44 fix comments 2019-05-07 20:28:01 +02:00
hemirt 4f5e3f6a27 fixes #1058 2019-05-07 20:28:01 +02:00
hemirt 23921f3fed show whispers notices 2019-05-07 20:28:01 +02:00
hemirt bc8175d9ce fix #1053 2019-05-07 20:28:01 +02:00
hemirt add312b609 fix #1062 2019-05-07 19:35:56 +02:00
Alexandr Kondratev 14eb302c3d Close search popup window on Escape pressed 2019-05-06 21:16:40 +02:00
23rd a3f6d2b773 Fixed display of text in Go to Bottom button for Retina screen. 2019-05-04 11:55:41 +02:00
TranRed cff1aa0959 changed some variables to const 2019-05-04 11:40:52 +02:00
TranRed 7ad6db550d made links in system messages clickable 
needed to make sub ticket in sub only chat accessible.
 2019-05-04 11:40:52 +02:00
Rasmus Karlsson 30430b0fb3 this ctor was used to create a system message 
we now only use the ctor that takes an explicit SystemMessageTag
 2019-05-02 00:28:53 +02:00
TranRed b5efe12f56 renamed enum ToastReactions to ToastReaction (singular) 2019-05-02 00:01:18 +02:00
TranRed cd1f717c36 deleted dead code 
not needed anymore since latest commit
 2019-05-02 00:01:18 +02:00
TranRed a592a3e882 Connected ComboBox to currentIndexChanged 
implemented proper connection to combobox (currentIndexChanged instead of currentTextChanged)

Thanks, pajlada! FeelsGoodMan
 2019-05-02 00:01:18 +02:00
TranRed 2a590adba7 Implemented requested changes 
changed setting from String to int.
changed EnumCase

I used createComboBox only has an implementation that handles stringsettings. I implemented my own combobox to handle the ToastsSettings now. Not sure if this is the best way. Won't come up with something smarter for now.
 2019-05-02 00:01:18 +02:00
TranRed c20629c165 Refactored opening from toasts 
implemented maps and map look up functions
 2019-05-02 00:01:18 +02:00
TranRed d749a4771a made CommonTexts.hpp look like other headers 2019-05-02 00:01:18 +02:00
TranRed f76df80575 creates common texts for opening streams 
Texts for opening streams were used in multiple locations. Created a file to store GUI texts like this and replaced were applicable
 2019-05-02 00:01:18 +02:00
pajlada 01082b123f
Merge pull request #1050 from apa420/apa-pubsub-fix 
Changed to ref for better performance #1049
 2019-05-01 22:36:32 +02:00
pajlada 8aa2d42ca9
Merge pull request #1045 from TranRed/patch-3 
Added {message} parameter for moderation buttons
 2019-05-01 22:35:07 +02:00
apa420 8d80eab649 Changed to ref for better performance 2019-05-01 22:28:46 +02:00
pajlada 216b21e0c3
Merge pull request #1049 from apa420/apa-pubsub-fix 
Pubsub messages now go into the correct channel
 2019-05-01 22:22:03 +02:00
Rasmus Karlsson effe91badc clean up magic message suffix stuff 2019-05-01 22:10:51 +02:00
apa420 c60b717b98 Pubsub messages now go into the correct channel 2019-05-01 21:46:53 +02:00
TranRed b33478d8c6 stored original message text in message 2019-05-01 16:43:52 +02:00
TranRed bbf649bf70
Added {message} parameter for moderation buttons 2019-05-01 16:08:45 +02:00
TranRed 34f820be18 implemented fallback logic for corrupted window layout (#1039) 
* fallback logic for corrupted window layout

1. before saving the window-layout a backup will created to avoid corruption due to crashes while saving

2. when starting chatterino and the window-layout file returns and empty window layout (due to corruptio) the backup will be read and the layout will be build from this data

* Update WindowManager.hpp

* used QSaveFile instead of crude custom implementation

* implemented suggested feedback from review

* proper method call

was tired and slightly drunk Kapp
 2019-05-01 09:58:13 +02:00
pajlada ad559f9d97
Merge pull request #1038 from hemirt/master 
remove unprofessional (puke) inside comments
 2019-04-29 20:59:16 +02:00
hemirt e0e7d366d3 remove useless comment 2019-04-29 20:33:04 +02:00
hemirt 56956eea58 remove weeb hate 2019-04-28 23:23:04 +02:00
pajlada 77f57bcff2
Merge pull request #1012 from apa420/apa-deleted-messages 
Added support for single deleted messages
 2019-04-28 12:51:57 +02:00
apa420 ae0122e389 Added a message when an invalid /delete appears 2019-04-28 11:31:34 +02:00
apa420 3c1d264689 Added trashcan, replaced messageID var with this-message().id, removed pubsub stuff that didn't belong 2019-04-28 02:25:05 +02:00
23rd 53640a9097 Fixed display of text message in empty tabs for Retina screen. 2019-04-27 14:19:03 +03:00
tetyys 40b4c2fefc Change to new character to make duplicate message error bypass work again 2019-04-27 00:31:15 +03:00
pajlada a5a0ad59b8
Merge pull request #1017 from TranRed/nightly 
Opening streams from toast + quickfix highlights in light theme
 2019-04-26 23:02:48 +02:00
Rasmus Karlsson 3113513290 remove stupid log message 2019-04-23 09:10:34 +02:00
TranRed ac1957ff68 Quick fix for highlighting in light themes 
set defaults for highlighting colors. Only use "hidden setting" when populated.
 2019-04-22 18:32:58 +02:00
TranRed ad38d0ca1c Added setting for opening streams from toast 
Implemented #710

Added options for opening streams from clicking the toas notficiation: (according to options in splits)
- open in browser
- open player in browser
- open in streamlink (needs to be tested, but should in theory work, since I only use the already existing function)
- don't open the stream (in case someone wants to prevent opening streams "by accident")
 2019-04-22 09:03:52 +02:00
apa420 4f79d6fc07 Added deleted messages, will also add the disabled tag to denied automod messages 2019-04-19 22:44:02 +02:00
fourtf 9be0d7d458 removed red stripes and connected tape cut visuals 2019-04-17 17:02:13 +02:00
pajlada 97faec15e0
Merge pull request #979 from hemirt/whispers 
do not disable whispers on clears and timeouts
 2019-04-16 15:06:42 +02:00
pajlada d846b723c7
Merge pull request #983 from Ckath/savemoderation 
Save chat moderation state in splits
 2019-04-16 14:57:45 +02:00
pajlada 0737922915
Merge pull request #998 from apa420/apa-remove-moderated-messages 
Option to hide moderated messages (timed out messages)
 2019-04-16 14:38:20 +02:00
apa420 817c40d733 Added continue for readability and removed to hide moderated messages 2019-04-16 14:36:15 +02:00
pajlada 43504114b5
Merge pull request #994 from apa420/apa-after-x-lines 
Made wording more consistent in generalpage
 2019-04-16 14:33:01 +02:00
apa420 ac9106e2f5 Will now also remove the messages when the timeout occurs, it's a bad implementation of it though, should be better 2019-04-15 22:55:10 +02:00
pajlada d7f0bcd80a
Merge pull request #977 from Cranken/master 
Made links clickable in sent whispers.
 2019-04-14 17:15:09 +02:00
pajlada 695d200d79
Merge pull request #1007 from pphop/pphop-show-ignored 
Show ignored users messages anyway setting
 2019-04-14 16:59:40 +02:00
pphop e4d3e6de7f requested changes 2019-04-14 19:57:41 +05:00
pajlada a1918144e4
Merge pull request #1002 from RAnders00/mod-action-channel-replacement 
Mod action channel replacement
 2019-04-14 16:50:41 +02:00
Rasmus Karlsson de4bc02b66 Add ability to easily swap out the recent messages API with your own 
Environment variable: CHATTERINO2_RECENT_MESSAGES_URL

For now, the API structure of the recent messages API is undocumented,
    but once it's released it will have some documentation that
    describes how to run it yourself, and it should be easy enough to
    just make your own API that fits
 2019-04-13 19:23:11 +02:00
Rasmus Karlsson 8b3867fa7d Switch to v2 of RAnders00's recent-messages API, so we support showing 
old sub messages and stuff
 2019-04-13 19:14:58 +02:00
Rasmus Karlsson a4cba22bcb reformat 2019-04-13 16:38:01 +02:00
Rasmus Karlsson 13475332fb Adds VIP rate limit support 
Closes #875
 2019-04-13 15:26:47 +02:00
pphop 320d74b287 implement show ignored users setting 2019-04-13 01:12:39 +05:00
pajlada ef81029374
Merge pull request #1003 from Ckath/fixscale 
stop emotes from being cut off (pajlada-dev)
 2019-04-11 16:14:07 +02:00
Ruben Anders 00d4fbf9ed Add {channel} replacement 2019-04-11 12:21:11 +02:00
apa420 562bdae09f Option to hide moderated messages (timed out messages) 2019-04-10 15:32:18 +02:00
apa420 12600b553f Made wording more consistent in generalpage 2019-04-05 21:39:04 +02:00
ckath a2fa1bad6b disable requests to resolve link info when its disabled 2019-04-04 12:06:19 +02:00
ckath fac1a6d00c comply to style guies 2019-04-04 11:51:18 +02:00
ckath b3af777382 add back settings for hiding buttons 2019-04-04 11:51:18 +02:00
Rasmus Karlsson 81a4bff131 Implement Randers00's recent-messages API (WIP) 2019-04-04 11:47:54 +02:00
ckath 66294ed99b add account switcher popup flag for linux 2019-04-04 11:41:12 +02:00
hemirt da1b2f91d9 add broadcaster and vips to viewers list and chatters list (#991) 2019-04-04 11:30:50 +02:00
Ruben Anders 28967cb014 Add broadcaster + VIPs to tabbable users 2019-04-04 11:29:16 +02:00
ckath 9ca4befd9b Save chat moderation state in splits 2019-03-24 15:38:09 +01:00
ckath b49c21a515 change comment to original so it doesnt cause a change 2019-03-23 23:55:11 +01:00
ckath 1c8373432c but dont fuck up the (dis/re)connected messages 2019-03-23 23:49:55 +01:00
hemirt d6c5dd6d6c do not disable whispers on timeout 
changed order to short-out the if clause when its not the correct user
of the message
 2019-03-20 20:59:57 +01:00
hemirt 1a1d0f305c make whispers not disabled on clear 2019-03-20 20:53:24 +01:00
Cranken 497c958485 Made links clickable in sent whispers. 2019-03-13 15:26:55 +01:00
Rasmus Karlsson 777ac017df add vim bindings to split input movement 2019-03-02 09:37:43 +01:00
pajlada 3f41dfeff9
Merge pull request #965 from moe-ka/master 
Fix for inline whispers being logged
 2019-03-02 09:37:09 +01:00
pajlada d739cb72d9
Merge pull request #966 from hemirt/master 
Use ffz/bttv channel emotes for chatrooms
 2019-03-02 09:31:29 +01:00
hemirt 3c01af9805 changes and fix displayname of 'is live' message 2019-03-01 21:18:32 +01:00