✨ อัปเดตล่าสุด: Chatterino/chatterino/pull/

pajlada · 2024-05-18T09:26:33Z

This PR changes the behaviour of the following commands:

/ban
/timeout
/untimeout
/unban

All of those commands now accept one or more --channel parameters to override which channel the action should take place in.
The --channel parameter accepts a channel ID or channel name with the same syntax as the other "user targets" do (e.g. id:11148817 or pajlada)

examples
Ban user in the chat you're typing in:
/ban weeb123

Ban user in the chat you're typing in, with a reason specified:
/ban weeb123 the ban reason

Ban user in a separate chat, with a reason specified:
/ban --channel pajlada weeb123 the ban reason

Ban user in two separate chats, with a reason specified:
/ban --channel pajlada --channel id:117166826 weeb123 the ban reason

Timeout user in the chat you're typing in:
/timeout weeb123

Timeout user in the chat you're typing in, with a reason specified:
/timeout weeb123 10m the timeout reason

Timeout user in a separate chat, with a reason specified:
/timeout --channel pajlada weeb123 10m the timeout reason

Timeout user in two separate chats, with a reason specified:
/timeout --channel pajlada --channel id:117166826 weeb123 10m the timeout reason

Unban user in the chat you're typing in:
/unban weeb123

Unban user in a separate chat:
/unban --channel pajlada weeb123

Unban user in two separate chats:
/unban --channel pajlada --channel id:117166826 weeb123

github-actions

clang-tidy made some suggestions

github-actions · 2024-05-18T09:34:53Z

-        "from chatting. Reason is optional and will be shown to the target "
-        "user and other moderators. Use \"/unban\" to remove a ban.";
-    if (words.size() < 2)
+    std::vector<PerformChannelAction> actions;


warning: variable 'actions' is not initialized [cppcoreguidelines-init-variables]

Suggested change

std::vector<PerformChannelAction> actions;

std::vector<PerformChannelAction> actions = 0;

github-actions

clang-tidy made some suggestions

github-actions · 2024-05-19T12:31:48Z

@@ -1,5 +1,7 @@
 #pragma once

+#include "expected.hpp"


warning: 'expected.hpp' file not found [clang-diagnostic-error]

#include "expected.hpp" ^

github-actions · 2024-05-19T12:31:48Z

+
+}  // namespace
+
+TEST(Commands, parseBanCommand)


warning: no header providing "TEST" is directly included [misc-include-cleaner]

tests/src/Commands.cpp:8:

+ #include <gtest/gtest.h>

github-actions · 2024-05-19T12:31:48Z

+    };
+    auto oActions = commands::parseChannelAction(ctx, "/ban", "usage", false);
+
+    ASSERT_TRUE(oActions.has_value()) << oActions.error();


warning: no header providing "ASSERT_TRUE" is directly included [misc-include-cleaner]

ASSERT_TRUE(oActions.has_value()) << oActions.error(); ^

github-actions · 2024-05-19T12:31:49Z

+
+    ASSERT_TRUE(oActions.has_value()) << oActions.error();
+    auto actions = *oActions;
+    ASSERT_EQ(actions.size(), 1);


warning: no header providing "ASSERT_EQ" is directly included [misc-include-cleaner]

ASSERT_EQ(actions.size(), 1); ^

jupjohn · 2024-05-21T00:52:05Z

In your example, you're using raw IDs but in other commands IDs have to be prefixed with id:. Could the same behaviour be used here to support both channel names & IDs? Keeps it consistent.

Also, are ---prefixed arguments used anywhere else? I don't have a better idea, but they feel very programmer-y which might feel weird to users.

pajlada · 2024-05-21T16:47:41Z

-- prefixes are used in /openurl - I'm ok with them being a bit programmery since this use case is a bit programmery

I'm fine with --channel accepting the same type of input, e.g. 11148817 or pajlada

github-actions

clang-tidy made some suggestions

github-actions · 2024-05-25T12:50:02Z

 namespace chatterino::commands {

-QString sendBan(const CommandContext &ctx)
+nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(


warning: no header providing "nonstd::expected_lite::expected" is directly included [misc-include-cleaner]

src/controllers/commands/builtin/twitch/Ban.cpp:7:

- #include "providers/twitch/api/Helix.hpp" + #include "nonstd/expected.hpp" + #include "providers/twitch/api/Helix.hpp"

github-actions · 2024-05-25T12:50:02Z

 namespace chatterino::commands {

-QString sendBan(const CommandContext &ctx)
+nonstd::expected<std::vector<PerformChannelAction>, QString> parseChannelAction(


warning: no header providing "std::vector" is directly included [misc-include-cleaner]

src/controllers/commands/builtin/twitch/Ban.cpp:14:

+ #include <vector>

github-actions · 2024-05-25T12:50:02Z

    {
-        return "";
+        // A ban action must be performed with a channel as a context
+        return nonstd::make_unexpected(


warning: no header providing "nonstd::expected_lite::make_unexpected" is directly included [misc-include-cleaner]

return nonstd::make_unexpected( ^

github-actions · 2024-05-25T12:50:02Z

    }

-    if (twitchChannel == nullptr)
+    QCommandLineParser parser;


warning: no header providing "QCommandLineParser" is directly included [misc-include-cleaner]

src/controllers/commands/builtin/twitch/Ban.cpp:14:

+ #include <qcommandlineparser.h>

github-actions · 2024-05-25T12:50:03Z

+
+}  // namespace
+
+TEST(Commands, parseBanCommand)


warning: no header providing "TEST" is directly included [misc-include-cleaner]

tests/src/Commands.cpp:8:

+ #include <gtest/gtest.h>

github-actions · 2024-05-25T12:50:03Z

+    };
+    auto oActions = commands::parseChannelAction(ctx, "/ban", "usage", false);
+
+    ASSERT_TRUE(oActions.has_value()) << oActions.error();


warning: no header providing "ASSERT_TRUE" is directly included [misc-include-cleaner]

ASSERT_TRUE(oActions.has_value()) << oActions.error(); ^

github-actions · 2024-05-25T12:50:03Z

+
+    ASSERT_TRUE(oActions.has_value()) << oActions.error();
+    auto actions = *oActions;
+    ASSERT_EQ(actions.size(), 1);


warning: no header providing "ASSERT_EQ" is directly included [misc-include-cleaner]

ASSERT_EQ(actions.size(), 1); ^

example: `/ban --channel 11148817 --channel 117166826 forsen game complainer` this would ban forsen with the reason `game complainer` in the two listed channels

https://github.com/martinmoene/expected-lite

github-actions

clang-tidy made some suggestions

…/unban

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 29. Check the log or trigger a new build to see more.

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 29. Check the log or trigger a new build to see more.

github-actions

clang-tidy made some suggestions

github-actions

clang-tidy made some suggestions

…nel id to channel

pajlada

github-actions

clang-tidy made some suggestions

github-actions · 2024-06-16T10:04:30Z

+    LinkResolver() = default;
+    ~LinkResolver() override = default;
+
+    MOCK_METHOD(void, resolve, (LinkInfo * info), (override));


warning: invalid case style for function 'MOCK_METHOD' [readability-identifier-naming]

Suggested change

MOCK_METHOD(void, resolve, (LinkInfo * info), (override));

mockMethod(void, resolve, (LinkInfo * info), (override));

github-actions · 2024-06-16T10:04:30Z

+
+namespace chatterino::mock {
+
+class Logging : public ILogging


warning: class 'Logging' defines a default destructor but does not define a copy constructor, a copy assignment operator, a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions]

class Logging : public ILogging ^

github-actions · 2024-06-16T10:04:31Z

+    Logging() = default;
+    ~Logging() override = default;
+
+    MOCK_METHOD(void, addMessage,


warning: invalid case style for function 'MOCK_METHOD' [readability-identifier-naming]

Suggested change

MOCK_METHOD(void, addMessage,

mockMethod(void, addMessage,

github-actions · 2024-06-16T10:04:31Z

+                (override));
+};
+
+class EmptyLogging : public ILogging


warning: class 'EmptyLogging' defines a default destructor but does not define a copy constructor, a copy assignment operator, a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions]

class EmptyLogging : public ILogging ^

github-actions · 2024-06-16T10:04:31Z

 class LoggingChannel;

-class Logging
+class ILogging


warning: class 'ILogging' defines a default destructor but does not define a copy constructor, a copy assignment operator, a move constructor or a move assignment operator [cppcoreguidelines-special-member-functions]

class ILogging ^

github-actions · 2024-06-16T10:04:31Z

+
+using namespace chatterino;
+
+using ::testing::_;


warning: declaration uses identifier '_', which is reserved in the global namespace; cannot be fixed automatically [bugprone-reserved-identifier]

using ::testing::_; ^

…hatterino#5402) This changes the behaviour of the following commands: - `/ban` - `/timeout` - `/untimeout` - `/unban` All of those commands now accept one or more `--channel` parameters to override which channel the action should take place in. The `--channel` parameter accepts a channel ID or channel name with the same syntax as the other "user targets" do (e.g. `id:11148817` or `pajlada`) examples Ban user in the chat you're typing in: `/ban weeb123` Ban user in the chat you're typing in, with a reason specified: `/ban weeb123 the ban reason` Ban user in a separate chat, with a reason specified: `/ban --channel pajlada weeb123 the ban reason` Ban user in two separate chats, with a reason specified: `/ban --channel pajlada --channel id:117166826 weeb123 the ban reason` Timeout user in the chat you're typing in: `/timeout weeb123` Timeout user in the chat you're typing in, with a reason specified: `/timeout weeb123 10m the timeout reason` Timeout user in a separate chat, with a reason specified: `/timeout --channel pajlada weeb123 10m the timeout reason` Timeout user in two separate chats, with a reason specified: `/timeout --channel pajlada --channel id:117166826 weeb123 10m the timeout reason` Unban user in the chat you're typing in: `/unban weeb123` Unban user in a separate chat: `/unban --channel pajlada weeb123` Unban user in two separate chats: `/unban --channel pajlada --channel id:117166826 weeb123`

github-actions Bot reviewed May 18, 2024

View reviewed changes

pajlada force-pushed the feat/multi-channel-ban branch from b79ed44 to 2ecb541 Compare May 19, 2024 12:24

github-actions Bot reviewed May 19, 2024

View reviewed changes

pajlada changed the title ~~feat: allow /ban to be used in multiple channels at once~~ feat: allow timeout-related commands to be used in multiple channels May 21, 2024

github-actions Bot reviewed May 25, 2024

View reviewed changes

pajlada added 4 commits June 2, 2024 11:50

feat: allow /ban to be used in multiple channels at once

40ce285

example: `/ban --channel 11148817 --channel 117166826 forsen game complainer` this would ban forsen with the reason `game complainer` in the two listed channels

progress

422c6ea

Add expected-lite dependency as a submodule

f96aa26

https://github.com/martinmoene/expected-lite

fix include path for real expected dependency

e03c5e8

pajlada force-pushed the feat/multi-channel-ban branch from 520e12f to e03c5e8 Compare June 2, 2024 09:50

github-actions Bot reviewed Jun 2, 2024

View reviewed changes

pajlada added 2 commits June 2, 2024 14:23

add expected-lite license, and fix it to work on /ban, /timeout, and …

f917a07

…/unban

Add changelog entry

0849447

github-actions Bot reviewed Jun 2, 2024

View reviewed changes

fix for qt5

e5587c1

github-actions Bot reviewed Jun 2, 2024

View reviewed changes

Merge branch 'master' into feat/multi-channel-ban

491b0a6

pajlada marked this pull request as ready for review June 2, 2024 14:31

pajlada added 5 commits June 15, 2024 13:01

Merge remote-tracking branch 'origin/master' into feat/multi-channel-ban

94a0d31

undo sorting

d500459

mock LinkResolver in RecentMessages benchmark

bdf1788

remove commented out code

4dcdc78

fix cv paste error

5f8885f

github-actions Bot reviewed Jun 15, 2024

View reviewed changes

Comment thread mocks/include/mocks/LinkResolver.hpp

Comment thread mocks/include/mocks/LinkResolver.hpp

Comment thread mocks/include/mocks/LinkResolver.hpp

Comment thread mocks/include/mocks/LinkResolver.hpp

Comment thread mocks/include/mocks/LinkResolver.hpp

pajlada added 2 commits June 15, 2024 15:42

use getIApp()->isTest() instead of checking for getApp()

ae6d31b

add more tests

f1c0e82

github-actions Bot reviewed Jun 15, 2024

View reviewed changes

format

1397aef

pajlada added 4 commits June 16, 2024 11:33

add missing direct includes, default-initialize duration, change chan…

d43cf4c

…nel id to channel

Merge remote-tracking branch 'origin/master' into feat/multi-channel-ban

ab3cad0

fix typo in /timeout usage string

a428fb4

comment typo

9ac72ee

pajlada commented Jun 16, 2024

View reviewed changes

github-actions Bot reviewed Jun 16, 2024

View reviewed changes

pajlada merged commit 9b31246 into master Jun 16, 2024

pajlada deleted the feat/multi-channel-ban branch June 16, 2024 10:22

Nerixyz mentioned this pull request Aug 20, 2024

ci: show recent changes in nightly release #5553

Merged

	std::vector<PerformChannelAction> actions;
	std::vector<PerformChannelAction> actions = 0;

	MOCK_METHOD(void, resolve, (LinkInfo * info), (override));
	mockMethod(void, resolve, (LinkInfo * info), (override));

Conversation

pajlada commented May 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 18, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot May 19, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot May 19, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot May 19, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 19, 2024

Choose a reason for hiding this comment

Uh oh!

jupjohn commented May 21, 2024

Uh oh!

pajlada commented May 21, 2024

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot May 25, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

pajlada commented May 18, 2024 •

edited

Loading