Commit graph

484 commits

Author SHA1 Message Date
fourtf fff979b3c0 lock SignalVector with shared_lock to allow reading on other threads 2019-07-31 22:50:12 +02:00
fourtf 96bed498d0 Fixed warnings in TwitchMessageBuilder 2019-07-27 12:49:45 +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 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 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
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 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 1a7a5409ab do a full reformat according to our current .clang-format 2019-05-10 23:31:10 +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 23921f3fed show whispers notices 2019-05-07 20:28:01 +02:00
hemirt add312b609 fix #1062 2019-05-07 19:35:56 +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
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
tetyys 40b4c2fefc Change to new character to make duplicate message error bypass work again 2019-04-27 00:31:15 +03:00
Rasmus Karlsson 3113513290 remove stupid log message 2019-04-23 09:10:34 +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 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
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
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 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
ckath a2fa1bad6b disable requests to resolve link info when its disabled 2019-04-04 12:06:19 +02:00
Rasmus Karlsson 81a4bff131 Implement Randers00's recent-messages API (WIP) 2019-04-04 11:47:54 +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
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
pajlada 3f41dfeff9
Merge pull request #965 from moe-ka/master
Fix for inline whispers being logged
2019-03-02 09:37:09 +01:00
hemirt 3c01af9805 changes and fix displayname of 'is live' message 2019-03-01 21:18:32 +01:00
hemirt ec6b26cd23 fix log message 2019-02-28 19:26:32 +01:00
moe-ka 8516082191 fix lambda captures 2019-02-27 19:26:19 +00:00
moe-ka 3ddac8b12a More accurate name for flag (MessageFlag::DoNotLog), disable logging for
sent whispers.
2019-02-27 18:30:26 +00:00
moe-ka 89f3a3f3ea fixes #952 (replaced unused 'Notification' MessageFlag) 2019-02-27 15:14:25 +00:00
hemirt aef5f6bfd7 add : character to chatrooms 2019-02-26 21:02:53 +01:00
hemirt e1ed3553b5 chatroom emotes 2019-02-26 21:00:57 +01:00
hemirt 441f6189a1 Historic messages behaviour
"Crossed and Greyed" -> default (and is current default)
"Crossed" -> just crossed
"Greyed" -> just greyed
"No change" -> no change in appearance
2019-01-27 22:15:59 +01:00
pajlada 7b51123dad
Merge pull request #929 from apa420/apa-move-turbo-badge
Moved turbo badge to vanity
2019-01-24 11:44:38 +01:00
apa420 bb840da988 Moved turbo badge to vanity 2019-01-23 17:52:53 +01:00
apa420 c87114a640 rewrote the cases with enums 2019-01-22 23:20:43 +01:00
pajlada 9629322ce7
Merge pull request #925 from apa420/apa-automod-implementation
Automod implementation
2019-01-22 22:45:34 +01:00
pajlada b09e87f837
Merge pull request #914 from hemirt/surrogatepairs
Surrogatepairs
2019-01-22 22:22:03 +01:00
apa420 1434225603 Implemented AutoMod and write pubsub automod messages TODO: implement that the AutoMod message gets deleted if dealt with \nFixes #887 2019-01-21 18:33:57 +01:00
apa420 cd5c373e01 smol commit, idk if I will continue this 2019-01-20 17:03:45 +01:00
apa420 e9bd9ddb8e smoler commit 2019-01-20 16:28:25 +01:00
apa420 cc5528ec18 smol commit 2019-01-20 16:07:31 +01:00
apa420 7aa798f924 Forgot to add some small stuff 2019-01-20 14:47:04 +01:00
apa420 7067b0503d Added more functionality and clickable deny and accept buttons that don't do anything, this also fixes the issue with the background not working properly 2019-01-20 14:45:59 +01:00
apa420 0b2480d715 Added a bunch of stuff, we now collect all the pubsub automod messages and also displays a caught message to a mod 2019-01-20 01:02:04 +01:00
Ruben Anders ae18f35dfb Use secure IRC connections 2019-01-01 22:01:42 +01:00
Kllrt 0cf0842b99 Changed both "BTTV" entries for emote tooltip to "BetterTTV"
4HEad
2019-01-01 21:56:54 +01:00
Kllrt 0fcb98eed1 BTTV changed to uppercase 2019-01-01 21:56:54 +01:00
23rd 0d48c04d8a Made cleanUpCode() as static TwitchEmotes's method. 2019-01-01 21:48:30 +01:00
fourtf fc93d7b738 added wip effect for (dis/re)connected messages 2018-12-04 21:07:55 +01:00
fourtf 96328a5e25 fixed pausing while 1k messages are in the channel 2018-12-04 08:56:07 +01:00
hemirt a5bed6d7e4 remove unused variable, format 2018-11-17 11:09:31 +01:00
hemirt d2e43d78fc fixes twitch emotes position
changes the position in unicodepoints to position in char16 array
(qstring)
2018-11-17 11:00:44 +01:00
hemirt 27eb2d8abc fix surrogatepairs messing position of emotes to be removed (mismatch
between actual position, and position in unicode codepoints)
2018-11-15 21:14:58 +01:00
Rasmus Karlsson 9472283d76 fix twitch global badge tooltip and url 2018-11-15 00:52:54 +01:00
Rasmus Karlsson 90309d00ea attempt to load global badges if no channel badge fits
Progress on #875 - Badges now render properly. this should also fix some
other global badges not rendering
2018-11-15 00:43:05 +01:00
fourtf 5453c65f0f implemented pausing on hover 2018-11-03 21:26:57 +01:00
Rasmus Karlsson 221ec4f1e8 revert a setting-related change 2018-11-03 13:22:47 +01:00
Rasmus Karlsson ac4a496a06 Update to latest settings library version 2018-11-03 13:00:07 +01:00
fourtf 3c3be99177 new settings page 2018-10-31 19:49:15 +01:00
ckath 65f54ebac3 load custom badges for old chat as well 2018-10-27 10:31:01 +02:00
pphop 92cc283160 removed unnecessary network request (#828) 2018-10-25 23:27:45 +02:00
pphop 3c9bcd581a custom ffz moderator badges (#827) 2018-10-25 21:53:03 +02:00
hemirt c176d836af render bttv/ffz global emotes in incoming whispers, bttv/ffz/twitch (#824)
emotes in outgoing whispers
2018-10-25 21:51:55 +02:00
pphop 02eeedb338 added toggle for greying out historic messages (#822) 2018-10-25 21:47:52 +02:00
Rasmus Karlsson 5497fec839 fix another link-resolver related crash (non auto url unshort-related) 2018-10-24 11:36:36 +02:00
Rasmus Karlsson 0f44a2e0f4 re-enable link resolver, but fix the underlying issue in the "link changed" signal.
The feature itself still doesn't work for me, but this code does the same thing.
only thing that's really different is it also disconnects the signal properly once
the TextLayoutElement is deleted
2018-10-23 10:32:13 +02:00
fourtf afee4d9d37 disabled LinkResolver due to it crashing 2018-10-22 19:57:34 +02:00
fourtf 27ac236115 grey out historic messages 2018-10-21 14:45:42 +02:00
fourtf e259b9e39f added brace wrapping after if and for 2018-10-21 13:43:02 +02:00
23rd e13d927a4e Removed unused signal in TwitchChannel. 2018-10-14 10:17:48 +00:00
Rasmus Karlsson 230b2006dc Experimental reconnect support 2018-10-13 15:45:41 +02:00
Rasmus Karlsson 1422201570 Make "recent_messages" network request safe in case the channel is closed when the request finished 2018-10-13 14:45:51 +02:00
Rasmus Karlsson 49449379da Added a Live status indicator to tabs 2018-10-13 14:20:06 +02:00
flex3r c65cdbe792 fixed message collapsing (#785) 2018-10-09 18:31:38 +02:00
Marco Schmid 602ae9e874 fixed regex to display links with port correctly (#777) 2018-10-08 12:26:42 +00:00
hemirt 2d3ce59b8b Fix emote replacement to render emotes correctly (#768)
* fix emote replacement rendering from inside the caught string

* \b -> \\b, while -> if

i actually wanted the regex identifier \b and you need to escape the
escape character \
an error in judgement made me use while, as if the api was meant to be
"consume"-like interface that boost regex uses

Fixes #26
2018-10-07 11:18:45 +00:00
apa420 bb6c2b6135 Cleaner flashing code (#774) 2018-10-07 10:55:44 +00:00
Ckat 767197ab48 fix channel suspended showing up in all channels #770 2018-10-07 10:21:47 +00:00
Rasmus Karlsson 7e073f43b6 fix notices about "short channel name" channels being sent to all channels
Fixes #770
2018-10-07 12:19:40 +00:00
apa420 5dce212cb4 Added functionality of making the flash taskbar last until the app is focused again (#767)
* Added functionality of making the flash taskbar last until chatterino is focused again

* added it for every flash taskbar

Fixes #760
2018-10-06 15:51:13 +00:00
Rasmus Karlsson a196129171 Fix wrong format syntax 2018-10-06 17:41:23 +00:00
pajlada 1f1175a034
Merge pull request #746 from DatGuy1/patch-3
Don't change split header for whisper

Fixes #691
2018-10-05 19:41:06 +00:00
Rasmus Karlsson c6bca8e97b Allow addMessage to override message flags 2018-10-05 21:33:01 +00:00
Rasmus Karlsson 39a8e8193c fix whispers crashing if they contained twitch badges 2018-10-02 19:27:08 +02:00
DatGuy1 ad949dc1f6
Don't change split header for whisper
Prevent normal channel split headers from changing colours when receiving a whisper
2018-10-02 10:45:26 +03:00
Rasmus Karlsson a2fb4ca104 reformat 2018-09-30 16:55:41 +00:00
Cranken 753b2cf139 Fixed messages getting added multiple times after roomstate change. 2018-09-30 12:17:58 +00:00
hemirt 6ca4f661a7 clangformat 2018-09-30 11:42:23 +00:00
hemirt 4eefeb80e7 remove dead line 2018-09-30 11:42:23 +00:00
hemirt 3184234c19 Squashed commit of the following:
commit ea07bbef0b
Merge: 0b36f436 5cfcf114
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:05:14 2018 +0200

    Merge branch 'blacklist' into blacklistnew

commit 5cfcf114b6
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:00:16 2018 +0200

    rename second pattern to replacement

commit f08cc4cf88
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 19:52:30 2018 +0200

    delete out commented code

commit 1acb1278aa
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 19:52:03 2018 +0200

    fix replacement with emotes issues

commit 646268ab18
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 01:06:36 2018 +0200

    fix build

commit ad711b4c15
Merge: e8e059f8 8bcc9c48
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 00:52:38 2018 +0200

    Merge branch 'master' of https://github.com/fourtf/chatterino2 into blacklist

commit e8e059f847
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 00:25:58 2018 +0200

    add replaced emotes into twitchEmotes

commit a63454f00d
Merge: e7f2f397 63eaf3b9
Author: hemirt <hemirt@email.cz>
Date:   Sat Aug 11 22:38:16 2018 +0200

    Merge branch 'master' of https://github.com/fourtf/chatterino2 into blacklist

commit e7f2f39737
Author: hemirt <hemirt@email.cz>
Date:   Sat Aug 11 21:54:01 2018 +0200

    emotedata

commit f00d3da537
Author: hemirt <hemirt@email.cz>
Date:   Sat Jul 28 19:53:55 2018 +0200

    rename variables to fit better, emotes in capture groups from regex work

commit 00c9fa080a
Author: hemirt <hemirt@email.cz>
Date:   Mon Jul 9 19:53:53 2018 +0200

    add case sensitivity checkbox and fix validity issues due to isValid
    that checked regex

commit 4385fcd13f
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 21:09:14 2018 +0200

    remove commented code

commit 1834342f74
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 21:03:13 2018 +0200

    IgnorePhrase replacement

    also removes twitch emotes info about the matched and changed parts and
    shifts positions of other emotes from emote infos to the corresponding new
    position

commit d3b6e294ed
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 16:21:33 2018 +0200

    ignore phrases
2018-09-30 11:42:23 +00:00
apa420 d751d1939e used different linebreaking as suggested from 23rd 2018-09-21 13:43:33 +02:00
apa420 f4ba61efc3 fixed tooltip on twitch emotes in a cheesy fasion 2018-09-21 13:43:33 +02:00
apa420 ea17d23224 apa fixed custom subscriber badges tooltip 2018-09-20 21:59:34 +02:00
Rasmus Karlsson 56b1fd6913 Increase timeout on FFZ channel emote requests
We might want to send some message upon these sort of errors happening

Fix #709
2018-09-20 13:39:19 +02:00
23rd 30f51d8137 Removed useless arg from appendTwitchEmote(). 2018-09-20 10:57:36 +02:00
fourtf 47c93fb118 fixed memory corruption 2018-09-17 12:51:16 +02:00
pajlada e2a7765964
Merge branch 'master' into apa-notification-on-live 2018-09-16 17:43:53 +02:00
apa420 56aac47fde fixed chatterino badges (#698)
* fixed chatterino badges
2018-09-16 17:27:51 +02:00
23rd 0d8b5cad63 Added setting to disable auto unshort links. 2018-09-06 17:59:49 +03:00
23rd 5f19a57f5a Refresh links of new messages.
As I understand links update when all message snapshots update, so we need to refresh url manually via signal.
2018-09-06 17:11:25 +03:00
23rd 2d1701cf86 Fixed build. 2018-09-06 13:54:28 +03:00
23rd fe24d09009 Replace url of link with new one from json. 2018-09-05 15:37:51 +03:00
Rasmus Karlsson eb04e1c3df Fix channel badges not scaling properly 2018-09-01 13:03:17 +00:00
Rasmus Karlsson d16307a484 reformat 2018-09-01 12:33:27 +00:00
Rasmus Karlsson afeb7e719b Fix /r not working 2018-09-01 12:32:39 +00:00
apa420 83737996ae Fixed /mentions 2018-08-30 20:18:38 +02:00
apa420 01ca055763 fixed issue where when a channel was going offline it would do a toast if the channel was notified 2018-08-29 22:22:32 +02:00
apa420 c5a88f6af3 fixed stuff 2018-08-29 19:58:55 +02:00
pajlada 873b0b3c67
Merge pull request #693 from apa420/apa-minor
Highlighting whispers works better and looks better
2018-08-29 10:22:16 +02:00
apa420 9a0205bdc9 did request 2018-08-29 01:37:57 +02:00
apa420 a36a2a2939 fixed issue with having the wrong variable 2018-08-29 01:24:35 +02:00
pajlada 6eb21f4b68
Merge pull request #677 from 23rd/patch-4-link-tooltip-bttv
Added tooltip to links.
2018-08-29 01:23:17 +02:00
apa420 c3065db16d highlighting whispers works better and looks better 2018-08-29 01:21:36 +02:00
apa420 c5d5825b5a Added functionality of option of highlightsound on whisper (#692)
Fixes #640
2018-08-29 00:30:11 +02:00
apa420 6a29fbb6dc
Merge branch 'master' into apa-notification-on-live 2018-08-28 23:23:46 +02:00
23rd bf529d5503 Rewritten check for incorrect link. 2018-08-26 16:33:04 +03:00
23rd cb500070f2 Run away from BTTV API. 2018-08-26 15:55:44 +03:00
23rd ce155299e9 Added right-click on nickname to reply on whisper. (#680) 2018-08-26 10:42:00 +02:00
23rd c7e2188582 Added tooltip to original link too. 2018-08-25 21:54:17 +03:00
23rd f4828b7d09 Rename everything. 2018-08-25 21:54:10 +03:00
Rasmus Karlsson 5647c6a80c Fix crash when receiving a whisper
Fix #672
2018-08-25 10:23:58 +00:00
23rd 5253ab3f85 Added tooltip to links via BTTV API. 2018-08-24 13:16:55 +03:00
23rd 8a1c30408a Set displayName to UserInfo link as value. (#675) 2018-08-22 15:16:19 +02:00