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

184 commits

Author SHA1 Message Date
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
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
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
apa420
be898e88dd Add setting to stack bits (#1452) 2019-12-21 10:36:46 +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
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
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
fourtf
6f710823ed renamed getInstance() -> instance() for singletons 2019-10-07 22:42:34 +02:00
fourtf
9874bd779a formatted all files with clang 9 2019-09-26 00:51:05 +02:00
fourtf
456065f508 moved resources out of Application 2019-09-22 10:54:32 +02:00
fourtf
3ab7362304 Merge branch 'master' into irc-support 2019-09-18 13:03:16 +02:00
fourtf
84b1efcd24 fixes #1304 emote.name eating the .name 2019-09-15 19:05:04 +02:00
fourtf
22ca20ad2a renamed TwitchServer -> TwitchIrcServer 2019-09-15 13:02:02 +02:00
fourtf
e1a9a437f1 fixed pingsound not playing sometimes 2019-09-08 21:57:14 +02:00
fourtf
9f1eb654fd
Merge branch 'master' into apa-bits 2019-09-08 18:02:58 +02:00
apa420
5c602fea94 Resolved review 2019-09-08 16:01:38 +00: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
apa420
48fcc1a1a1 Fixed cheers not showing up in chat Fixes #1031 2019-09-08 12:45:25 +02:00
Leon Richardt
a62b7ac094 Add setting for case-sensitivity in highlights 2019-09-07 19:01:52 +02:00
fourtf
0577692c99 Updated chatterino badges api 2019-08-23 16:52:44 +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
Rasmus Karlsson
6e1ee84d90 Allow your own username to be set in "highlight users" 
Fixes #1181
 2019-08-10 13:13:00 +02: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
fourtf
e7d9422431 fixes for last commit 2019-08-01 13:30:58 +02:00
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
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
TranRed
b33478d8c6 stored original message text in message 2019-05-01 16:43:52 +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
apa420
4f79d6fc07 Added deleted messages, will also add the disabled tag to denied automod messages 2019-04-19 22:44:02 +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
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
pphop
320d74b287 implement show ignored users setting 2019-04-13 01:12:39 +05:00
Cranken
497c958485 Made links clickable in sent whispers. 2019-03-13 15:26:55 +01:00
apa420
bb840da988 Moved turbo badge to vanity 2019-01-23 17:52:53 +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
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
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
Rasmus Karlsson
5497fec839 fix another link-resolver related crash (non auto url unshort-related) 2018-10-24 11:36:36 +02:00
fourtf
e259b9e39f added brace wrapping after if and for 2018-10-21 13:43:02 +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
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
39a8e8193c fix whispers crashing if they contained twitch badges 2018-10-02 19:27:08 +02: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
23rd
30f51d8137 Removed useless arg from appendTwitchEmote(). 2018-09-20 10:57:36 +02:00
apa420
56aac47fde fixed chatterino badges (#698) 
* fixed chatterino badges
 2018-09-16 17:27:51 +02: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
d16307a484 reformat 2018-09-01 12:33:27 +00: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
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
fourtf
8bcc9c487b Fixes #411, #516 2018-08-16 00:16:33 +02:00
fourtf
44c16f1b3a badges 2018-08-14 17:45:36 +02:00
fourtf
f6e110b7fb fixed and optimized the autocompletion 2018-08-13 14:04:35 +02:00
fourtf
f6414c9d7e remove settings and paths from Application 2018-08-12 12:56:28 +02:00
fourtf
1ec1ecd52b fixed crash when moderation buttons are enabled 2018-08-12 00:02:05 +02:00
fourtf
44f5a15da3 turning a lot of includes into forward declares 2018-08-11 22:23:06 +02:00
fourtf
63eaf3b94c fixed not being able to select text backwards 2018-08-11 17:35:46 +02:00
fourtf
c768bd9bd9 fixed image animations 2018-08-11 17:15:17 +02:00
fourtf
c719bb6b74 categorized emtotepopup 2018-08-11 14:26:02 +02:00
fourtf
edfae49cc9 simplified Image 2018-08-10 18:56:17 +02:00