chatterino2
Code Issues

refactor: remove use of raw nonstd:: (#6690)

Browse Source 
Reviewed-by: Nerixyz <nerixdev@outlook.de>
This commit is contained in:
pajlada
2025-12-30 11:06:10 +01:00
committed by GitHub
parent 6741d5e359
commit 864216a32e
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/commands/common/ChannelAction.cpp
+6 -6
View File
@@ -58,14 +58,14 @@ void PrintTo(const PerformChannelAction &a, std::ostream *os)
<< ", duration:" << std::to_string(a.duration) << '}';
}
nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
Expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
const CommandContext &ctx, const QString &command, const QString &usage,
bool withDuration, bool withReason)
{
if (ctx.channel == nullptr)
{
// A ban action must be performed with a channel as a context
return nonstd::make_unexpected(
return makeUnexpected(
"A " % command %
" action must be performed with a channel as a context");
}
@@ -93,7 +93,7 @@ nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
auto positionalArguments = parser.positionalArguments();
if (positionalArguments.isEmpty())
{
return nonstd::make_unexpected("Missing target - " % usage);
return makeUnexpected("Missing target - " % usage);
}
auto [targetUserName, targetUserID] =
@@ -121,7 +121,7 @@ nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
base.duration = (int)parseDurationToSeconds(durationStr);
if (base.duration <= 0)
{
return nonstd::make_unexpected("Invalid duration - " % usage);
return makeUnexpected("Invalid duration - " % usage);
}
if (withReason)
{
@@ -144,8 +144,8 @@ nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
{
if (ctx.twitchChannel == nullptr)
{
return nonstd::make_unexpected(
"The " % command % " command only works in Twitch channels");
return makeUnexpected("The " % command %
" command only works in Twitch channels");
}
actions.push_back(PerformChannelAction{
src/controllers/commands/common/ChannelAction.hpp
+1 -1
View File
@@ -64,7 +64,7 @@ std::ostream &operator<<(std::ostream &os, const IncompleteHelixUser &u);
// NOLINTNEXTLINE(readability-identifier-naming)
void PrintTo(const PerformChannelAction &a, std::ostream *os);
nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
Expected<std::vector<PerformChannelAction>, QString> parseChannelAction(
const CommandContext &ctx, const QString &command, const QString &usage,
bool withDuration, bool withReason);