Fix usage of existing WebShortcuts in search suggestions

Author: alex1701c

install.sh

@@ -8,7 +8,7 @@ fi
 mkdir -p build
 cd build
 
-cmake -DKDE_INSTALL_QTPLUGINDIR=$(kf5-config --qt-plugins)  -DCMAKE_BUILD_TYPE=Release ..
+cmake -DKDE_INSTALL_QTPLUGINDIR=$(kf5-config --qt-plugins) -DCMAKE_BUILD_TYPE=Release ..
 make -j$(nproc)
 sudo make install
 

src/quick_web_shortcuts.cpp

@@ -129,6 +129,7 @@ void QuickWebShortcuts::reloadPluginConfiguration(const QString &configFile) {
         requiredData.runner = this;
         requiredData.maxResults = configGroup.readEntry(Config::MaxSuggestionResults, Config::MaxSuggestionResultsDefault);
         requiredData.searchOptionTemplate = searchOptionTemplate;
+        requiredData.isWebShortcut = isWebShortcut;
     }
 
     // Proxy settings
@@ -203,7 +204,7 @@ void QuickWebShortcuts::match(Plasma::RunnerContext &context) {
         data.insert(QStringLiteral("browser"), privateBrowser);
         QString url;
         if (isWebShortcut) {
-            url = currentSearchEngine.url.replace(QStringLiteral("\\{@}"), QUrl::toPercentEncoding(term));
+            url = QString(currentSearchEngine.url).replace(QStringLiteral("\\{@}"), QUrl::toPercentEncoding(term));
         } else {
             url = currentSearchEngine.url + QUrl::toPercentEncoding(term);
         }

src/searchproviders/Bing.h

@@ -100,7 +100,13 @@ public Q_SLOTS:
                         match.setRelevance((float) (19 - i) / 20);
 
                         QMap<QString, QVariant> runData;
-                        runData.insert(QStringLiteral("url"), data.searchEngine + QUrl::toPercentEncoding(suggestion));
+                        QString url;
+                        if (data.isWebShortcut) {
+                            url = QString(data.searchEngine).replace(QStringLiteral("\\{@}"), QUrl::toPercentEncoding(suggestion));
+                        } else {
+                            url = data.searchEngine + QUrl::toPercentEncoding(suggestion);
+                        }
+                        runData.insert(QStringLiteral("url"), url);
                         if (!browserLaunchCommand.isEmpty()) { runData.insert(QStringLiteral("browser"), browserLaunchCommand); }
                         match.setData(runData);
                         context.addMatch(match);

src/searchproviders/Google.h

@@ -97,7 +97,13 @@ public Q_SLOTS:
                 match.setRelevance((float) (19 - i) / 20);
 
                 QMap<QString, QVariant> runData;
-                runData.insert(QStringLiteral("url"), data.searchEngine + QUrl::toPercentEncoding(suggestion));
+                QString url;
+                if (data.isWebShortcut) {
+                    url = QString(data.searchEngine).replace(QStringLiteral("\\{@}"), QUrl::toPercentEncoding(suggestion));
+                } else {
+                    url = data.searchEngine + QUrl::toPercentEncoding(suggestion);
+                }
+                runData.insert(QStringLiteral("url"), url);
                 if (!browserLaunchCommand.isEmpty()) {
                     runData.insert(QStringLiteral("browser"), browserLaunchCommand);
                 }

src/searchproviders/RequiredData.h

@@ -8,6 +8,7 @@ class RequiredData {
     QNetworkProxy *proxy = nullptr;
     Plasma::AbstractRunner *runner;
     QString searchEngine;
+    bool isWebShortcut;
     QIcon icon;
     int maxResults;
     bool showNetworkErrors = true;