Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle ritual (new viewer announcement) messages #2703

Merged
merged 11 commits into from
May 1, 2021
Merged

Handle ritual (new viewer announcement) messages #2703

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62f629c
Handle ritual message on USERNOTICE
zneix Apr 27, 2021
c8ab785
Remove debug output
zneix Apr 27, 2021
fd37aa9
Added changelog entry
zneix Apr 27, 2021
63a2194
Make sure new variable is static
zneix Apr 27, 2021
77dcae8
Rephrase comment
zneix Apr 27, 2021
f0826c2
Remove test messaage since it's not really necessary
zneix Apr 27, 2021
7460788
Changed `QStringList` to `QSet`
zneix May 1, 2021
a84dcd0
Slight refactor and fix
zneix May 1, 2021
d2fb276
Merge branch 'master' into zneix/handle-ritual-message
zneix May 1, 2021
40f00b7
Undid dirty changes
zneix May 1, 2021
62fdda0
Merge branch 'master' into zneix/handle-ritual-message
pajlada May 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/providers/twitch/IrcMessageHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,18 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(
content = parameters[1];
}

if (msgType == "sub" || msgType == "resub" || msgType == "subgift" ||
msgType == "bitsbadgetier")
{
// Sub-specific and bits badge upgrade specific message.
// It's only allowed for "resub" messages.
// Messages in list below are the ones that might contain special user's message
QStringList specialMessageTypes{
zneix marked this conversation as resolved.
Show resolved Hide resolved
"sub", //
"subgift", //
"resub", // resub messages
"bitsbadgetier", // bits badge upgrade
"ritual", // new viewer ritual
};

if (specialMessageTypes.contains(msgType))
{
// Messages are not required, so they might be empty
if (!content.isEmpty())
{
MessageParseArgs args;
Expand All @@ -596,6 +603,7 @@ std::vector<MessagePtr> IrcMessageHandler::parseUserNoticeMessage(

if (it != tags.end())
{
// By default, we return value of system-msg tag
QString messageText = it.value().toString();

if (msgType == "bitsbadgetier")
Expand Down
3 changes: 3 additions & 0 deletions src/widgets/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ void Window::addDebugStuff()
// resub without message
subMessages.emplace_back(R"(@badges=subscriber/12;color=#CC00C2;display-name=cspice;emotes=;id=6fc4c3e0-ca61-454a-84b8-5669dee69fc9;login=cspice;mod=0;msg-id=resub;msg-param-months=12;msg-param-sub-plan-name=Channel\sSubscription\s(forsenlol):\s$9.99\sSub;msg-param-sub-plan=2000;room-id=22484632;subscriber=1;system-msg=cspice\sjust\ssubscribed\swith\sa\sTier\s2\ssub.\scspice\ssubscribed\sfor\s12\smonths\sin\sa\srow!;tmi-sent-ts=1528192510808;turbo=0;user-id=47894662;user-type= :tmi.twitch.tv USERNOTICE #pajlada)");

// viewer ritual message
subMessages.emplace_back(R"(@badge-info=;badges=premium/1;color=#4922B2;display-name=winter_styx;emotes=81274:0-5;flags=;id=ad2266af-253c-409b-9131-9bc657773a7a;login=winter_styx;mod=0;msg-id=ritual;msg-param-ritual-name=new_chatter;room-id=143917159;subscriber=0;system-msg=@winter_styx\sis\snew\shere.\sSay\shello!;tmi-sent-ts=1619428046297;user-id=642858998;user-type= :tmi.twitch.tv USERNOTICE #indiefoxx :VoHiYo)");
zneix marked this conversation as resolved.
Show resolved Hide resolved

// display name renders strangely
miscMessages.emplace_back(R"(@badges=;color=#00AD2B;display-name=Iamme420\s;emotes=;id=d47a1e4b-a3c6-4b9e-9bf1-51b8f3dbc76e;mod=0;room-id=11148817;subscriber=0;tmi-sent-ts=1529670347537;turbo=0;user-id=56422869;user-type= :iamme420!iamme420@iamme420.tmi.twitch.tv PRIVMSG #pajlada :offline chat gachiBASS)");
miscMessages.emplace_back(R"(@badge-info=founder/47;badges=moderator/1,founder/0,premium/1;color=#00FF80;display-name=gempir;emotes=;flags=;id=d4514490-202e-43cb-b429-ef01a9d9c2fe;mod=1;room-id=11148817;subscriber=0;tmi-sent-ts=1575198233854;turbo=0;user-id=77829817;user-type=mod :gempir!gempir@gempir.tmi.twitch.tv PRIVMSG #pajlada :offline chat gachiBASS)");
Expand Down