From 2a082fee37a2e7596d357ca8e8e0029a7808f734 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Fri, 7 Feb 2020 19:03:19 +0800
Subject: [PATCH] Bug fix

Fix a bug when more than one import in a group, only the first one will be added.
Add more HTTP status code.
---
 src/main.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 867b83d..da85240 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -123,6 +123,7 @@ int importItems(string_array &target)
             result.emplace_back(strLine);
             itemCount++;
         }
+        ss.clear();
     }
     target.swap(result);
     writeLog(0, "Imported " + std::to_string(itemCount) + " item(s).");
@@ -1230,7 +1231,10 @@ int main(int argc, char *argv[])
         {
             std::string token = getUrlArg(argument, "token");
             if(token != access_token)
-                return "Unauthorized\n";
+            {
+                *status_code = 403;
+                return "Forbidden\n";
+            }
         }
         refreshRulesets(rulesets, ruleset_content_array);
         generateBase();
@@ -1243,7 +1247,10 @@ int main(int argc, char *argv[])
         {
             std::string token = getUrlArg(argument, "token");
             if(token != access_token)
-                return "Unauthorized\n";
+            {
+                *status_code = 403;
+                return "Forbidden\n";
+            }
         }
         readConf();
         generateBase();
@@ -1258,7 +1265,7 @@ int main(int argc, char *argv[])
             if(token != access_token)
             {
                 *status_code = 403;
-                return "Unauthorized\n";
+                return "Forbidden\n";
             }
         }
         std::string type = getUrlArg(argument, "type");
@@ -1267,7 +1274,11 @@ int main(int argc, char *argv[])
         else if(type == "direct")
             fileWrite(pref_path, postdata, true);
         else
-            return "Not implemented\n";
+        {
+            *status_code = 501;
+            return "Not Implemented\n";
+        }
+
         readConf();
         if(!update_ruleset_on_request)
             refreshRulesets(rulesets, ruleset_content_array);