Improvements to Message Search (#1237)

* Ran clang-format * Implement user-specific search in message history This functionality was originally requested in #1236. This commit changes the SearchPopup::performSearch method so that only messages from specific users can be shown. In order to filter for a specific user, enter their username with a leading '@' in the search popup. You can also add an additional search phrase which will also be considered in the search. * Naive implementation for "from:" tags Rebase later? * Cleverer (?) version using Predicates Commit adds two POC predicates: one for the author of messages, and one for substring search in messages. Problems/TODOs: * Best way to register new predicates? * Clean up tags (e.g. "from:") or not? * Test combinations of different predicates * Add a predicate to check for links in messages * Remove a dumb TODO * Rewrite SearchPopup::performSearch to be cleaner * Ran clang-format on all files * Remove TODO I missed earlier * Forgot to run clang-format peepoSadDank * Re-use {}-initialization Was accidentally removed when fixing earlier merge conflict. * Does this fix line endings? No diffs are shown locally, hopefully Git doesn't lie to me. * Rename "predicates" directory to "search" Resolving one conversation in the review of #1237. * Use LinkParser in LinkPredicate Resolving a conversation in the review of #1237. * Predicates: Use unique_ptr instead of shared_ptr Resolves a conversation in the review of #1237. * Refactor of SearchPopup and AuthorPredicate Resolving some points from the review in #1237. * Moved parsing of comma-seperated values into AuthorPredicate constructor. * Rewrite SearchPopup::parsePredicates as suggested. * Deleted now redundant methods in SearchPopup. * MessagePredicate::appliesTo now takes a Message& ... instead of a MessagePtr. This resolves a conversation in the review of #1237. * Run clang-format on two files I missed * AuthorPredicate: Check for displayName & loginName Resolving conversation on #1237.
2019-09-09 15:21:49 +02:00
parent 6cd3cfe79f
commit 720e5aa25f
15 changed files with 323 additions and 26 deletions
@@ -95,7 +95,7 @@ void TwitchAccount::loadIgnores()
                "/blocks");

    NetworkRequest(url)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onSuccess([=](auto result) -> Outcome {
            auto document = result.parseRapidJson();
@@ -168,7 +168,7 @@ void TwitchAccount::ignoreByID(
                "/blocks/" + targetUserID);

    NetworkRequest(url, NetworkRequestType::Put)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([=](int errorCode) {
            onFinished(IgnoreResult_Failed,
@@ -245,7 +245,7 @@ void TwitchAccount::unignoreByID(
                "/blocks/" + targetUserID);

    NetworkRequest(url, NetworkRequestType::Delete)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([=](int errorCode) {
            onFinished(
@@ -279,7 +279,7 @@ void TwitchAccount::checkFollow(const QString targetUserID,
                "/follows/channels/" + targetUserID);

    NetworkRequest(url)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([=](int errorCode) {
            if (errorCode == 203)
@@ -308,7 +308,7 @@ void TwitchAccount::followUser(const QString userID,
                    "/follows/channels/" + userID);

    NetworkRequest(requestUrl, NetworkRequestType::Put)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onSuccess([successCallback](auto result) -> Outcome {
            // TODO: Properly check result of follow request
@@ -326,7 +326,7 @@ void TwitchAccount::unfollowUser(const QString userID,
                    "/follows/channels/" + userID);

    NetworkRequest(requestUrl, NetworkRequestType::Delete)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([successCallback](int code) {
            if (code >= 200 && code <= 299)
@@ -368,7 +368,7 @@ void TwitchAccount::loadEmotes()
                "/emotes");

    NetworkRequest(url)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([=](int errorCode) {
            log("[TwitchAccount::loadEmotes] Error {}", errorCode);
@@ -409,7 +409,7 @@ void TwitchAccount::autoModAllow(const QString msgID)
        .header("Content-Type", "application/json")
        .header("Content-Length", QByteArray::number(qba.size()))
        .payload(qba)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([=](int errorCode) {
            log("[TwitchAccounts::autoModAllow] Error {}", errorCode);
@@ -429,7 +429,7 @@ void TwitchAccount::autoModDeny(const QString msgID)
        .header("Content-Type", "application/json")
        .header("Content-Length", QByteArray::number(qba.size()))
        .payload(qba)
-    
+
        .authorizeTwitchV5(this->getOAuthClient(), this->getOAuthToken())
        .onError([=](int errorCode) {
            log("[TwitchAccounts::autoModDeny] Error {}", errorCode);
@@ -16,7 +16,7 @@ void TwitchApi::findUserId(const QString user,
    QString requestUrl("https://api.twitch.tv/kraken/users?login=" + user);

    NetworkRequest(requestUrl)
-    
+
        .authorizeTwitchV5(getDefaultClientID())
        .timeout(30000)
        .onSuccess([successCallback](auto result) mutable -> Outcome {
@@ -65,7 +65,7 @@ void TwitchApi::findUserName(const QString userid,
    QString requestUrl("https://api.twitch.tv/kraken/users/" + userid);

    NetworkRequest(requestUrl)
-    
+
        .authorizeTwitchV5(getDefaultClientID())
        .timeout(30000)
        .onSuccess([successCallback](auto result) mutable -> Outcome {
@@ -18,7 +18,7 @@ void TwitchBadges::loadTwitchBadges()
        "https://badges.twitch.tv/v1/badges/global/display?language=en");

    NetworkRequest(url)
-    
+
        .onSuccess([this](auto result) -> Outcome {
            auto root = result.parseJson();
            auto badgeSets = this->badgeSets_.access();