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

Sorted usernames in "Users joined/parted:" messages (#3421)

Browse source
This commit is contained in:
Paweł 2021-12-25 15:04:35 +01:00 committed by GitHub
parent cd77d14485
commit 45e4fc04ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -38,6 +38,7 @@
- Minor: Show picked outcome in prediction badges. (#3357) - Minor: Show picked outcome in prediction badges. (#3357)
- Minor: Add support for Emoji in IRC (#3354) - Minor: Add support for Emoji in IRC (#3354)
- Minor: Moved `/live` logs to its own subdirectory. (Logs from before this change will still be available in `Channels -> live`). (#3393) - Minor: Moved `/live` logs to its own subdirectory. (Logs from before this change will still be available in `Channels -> live`). (#3393)
- Minor: Sorted usernames in `Users joined/parted` messages alphabetically. (#3421)
- Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362) - Bugfix: Fix Split Input hotkeys not being available when input is hidden (#3362)
- Bugfix: Fixed colored usernames sometimes not working. (#3170) - Bugfix: Fixed colored usernames sometimes not working. (#3170)
- Bugfix: Restored ability to send duplicate `/me` messages. (#3166) - Bugfix: Restored ability to send duplicate `/me` messages. (#3166)

7
src/common/ChannelChatters.cpp
View file

@ -34,13 +34,15 @@ void ChannelChatters::addJoinedUser(const QString &user)
QTimer::singleShot(500, &this->lifetimeGuard_, [this] { QTimer::singleShot(500, &this->lifetimeGuard_, [this] {
auto joinedUsers = this->joinedUsers_.access(); auto joinedUsers = this->joinedUsers_.access();
joinedUsers->sort();
MessageBuilder builder; MessageBuilder builder;
TwitchMessageBuilder::listOfUsersSystemMessage( TwitchMessageBuilder::listOfUsersSystemMessage(
"Users joined:", *joinedUsers, &this->channel_, &builder); "Users joined:", *joinedUsers, &this->channel_, &builder);
builder->flags.set(MessageFlag::Collapsed); builder->flags.set(MessageFlag::Collapsed);
joinedUsers->clear();
this->channel_.addMessage(builder.release()); this->channel_.addMessage(builder.release());
joinedUsers->clear();
this->joinedUsersMergeQueued_ = false; this->joinedUsersMergeQueued_ = false;
}); });
} }
@ -57,14 +59,15 @@ void ChannelChatters::addPartedUser(const QString &user)
QTimer::singleShot(500, &this->lifetimeGuard_, [this] { QTimer::singleShot(500, &this->lifetimeGuard_, [this] {
auto partedUsers = this->partedUsers_.access(); auto partedUsers = this->partedUsers_.access();
partedUsers->sort();
MessageBuilder builder; MessageBuilder builder;
TwitchMessageBuilder::listOfUsersSystemMessage( TwitchMessageBuilder::listOfUsersSystemMessage(
"Users parted:", *partedUsers, &this->channel_, &builder); "Users parted:", *partedUsers, &this->channel_, &builder);
builder->flags.set(MessageFlag::Collapsed); builder->flags.set(MessageFlag::Collapsed);
this->channel_.addMessage(builder.release()); this->channel_.addMessage(builder.release());
partedUsers->clear();
partedUsers->clear();
this->partedUsersMergeQueued_ = false; this->partedUsersMergeQueued_ = false;
}); });
} }