Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unversioned

- Minor: Added setting for character limit of truncated deleted messages. (#6491)

## 2.5.4

- Bugfix: Fixed crashes that could occur when Lua functions errored with values other than strings. (#6441)
Expand Down
5 changes: 3 additions & 2 deletions src/messages/MessageBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1257,9 +1257,10 @@ MessagePtr MessageBuilder::makeDeletionMessageFromIRC(
MessageColor::System);

auto deletedMessageText = originalMessage->messageText;
if (deletedMessageText.length() > 50)
auto limit = getSettings()->messageTruncationLimit;
if (limit > 0 && deletedMessageText.length() > limit)
{
deletedMessageText = deletedMessageText.left(50) + "…";
deletedMessageText = deletedMessageText.left(limit) + "…";
}

builder
Expand Down
7 changes: 4 additions & 3 deletions src/providers/twitch/eventsub/MessageBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -331,14 +331,15 @@ void makeModerateMessage(

builder.emplaceSystemTextAndUpdate("saying:", text);

if (action.messageBody.view().length() > 50)
auto limit = getSettings()->messageTruncationLimit;
if (limit > 0 && action.messageBody.view().length() > limit)
{
builder
.emplace<TextElement>(action.messageBody.qt().left(50) + "…",
.emplace<TextElement>(action.messageBody.qt().left(limit) + "…",
MessageElementFlag::Text, MessageColor::Text)
->setLink({Link::JumpToMessage, action.messageID.qt()});

text.append(action.messageBody.qt().left(50) + "…");
text.append(action.messageBody.qt().left(limit) + "…");
}
else
{
Expand Down
3 changes: 3 additions & 0 deletions src/singletons/Settings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ class Settings
true,
};

IntSetting messageTruncationLimit = {"/behaviour/messageTruncationLimit",
50};

// Auto-completion
BoolSetting onlyFetchChattersForSmallerStreamers = {
"/behaviour/autocompletion/onlyFetchChattersForSmallerStreamers", true};
Expand Down
13 changes: 13 additions & 0 deletions src/widgets/settingspages/GeneralPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,19 @@ void GeneralPage::initLayout(GeneralPageView &layout)
[](auto args) {
return fuzzyToInt(args.value, 0);
});
layout.addDropdown<int>(
"Limit truncation of deleted messages",
{"No limit", "50 characters", "100 characters", "200 characters",
"300 characters", "400 characters"},
s.messageTruncationLimit,
[](auto val) {
return val ? QString::number(val) + " characters"
: QString("No limit");
},
[](const auto &args) {
return fuzzyToInt(args.value, 0);
});

layout.addSeparator();

SettingWidget::checkbox("Draw a line below the most recent message before "
Expand Down
Loading