chatterino2
Code Issues

fix: disable reply options where we know it wouldn't work (#6119)

Browse Source
This commit is contained in:
hemirt
2025-06-15 13:35:18 +02:00
committed by GitHub
parent 04ba83b90f
commit faa435c957
9 changed files with 172 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/helper/ChannelView.cpp
+67 -10
View File
@@ -2615,19 +2615,72 @@ void ChannelView::addMessageContextMenuItems(QMenu *menu,
});
// Only display reply option where it makes sense
if (this->canReplyToMessages() && layout->isReplyable())
if (this->canReplyToMessages())
{
const auto &messagePtr = layout->getMessagePtr();
menu->addAction("&Reply to message", [this, &messagePtr] {
this->setInputReply(messagePtr);
});
if (messagePtr->replyThread != nullptr)
switch (messagePtr->isReplyable())
{
menu->addAction("Reply to &original thread", [this, &messagePtr] {
this->setInputReply(messagePtr->replyThread->root());
});
case Message::ReplyStatus::Replyable: {
menu->addAction("&Reply to message", [this, &messagePtr] {
this->setInputReply(messagePtr);
});
break;
}
case Message::ReplyStatus::NotReplyable: {
const auto &replyAction =
menu->addAction("&Reply to message", [this, &messagePtr] {
this->setInputReply(messagePtr);
});
replyAction->setEnabled(false);
break;
}
case Message::ReplyStatus::ReplyableWithThread: {
menu->addAction("&Reply to message", [this, &messagePtr] {
this->setInputReply(messagePtr);
});
menu->addAction(
"Reply to &original thread", [this, &messagePtr] {
this->setInputReply(messagePtr->replyThread->root());
});
break;
}
case Message::ReplyStatus::NotReplyableWithThread: {
const auto &replyAction =
menu->addAction("&Reply to message", [this, &messagePtr] {
this->setInputReply(messagePtr);
});
replyAction->setEnabled(false);
menu->addAction(
"Reply to &original thread", [this, &messagePtr] {
this->setInputReply(messagePtr->replyThread->root());
});
break;
}
case Message::ReplyStatus::NotReplyableDueToThread: {
const auto &replyAction =
menu->addAction("&Reply to message", [this, &messagePtr] {
this->setInputReply(messagePtr);
});
replyAction->setEnabled(false);
const auto &replyThreadAction = menu->addAction(
"Reply to &original thread", [this, &messagePtr] {
this->setInputReply(messagePtr->replyThread->root());
});
replyThreadAction->setEnabled(false);
break;
}
}
if (const auto &messagePtr = layout->getMessagePtr();
messagePtr->replyThread != nullptr)
{
menu->addAction("View &thread", [this, &messagePtr] {
this->showReplyThreadPopup(messagePtr);
});
@@ -3057,7 +3110,11 @@ void ChannelView::handleLinkClick(QMouseEvent *event, const Link &link,
}
break;
case Link::ReplyToMessage: {
this->setInputReply(layout->getMessagePtr());
if (layout->getMessagePtr()->isReplyable() !=
Message::ReplyStatus::NotReplyable)
{
this->setInputReply(layout->getMessagePtr());
}
}
break;
case Link::ViewThread: {