Merge pull request #27 from northis/template_fix

Flash card fix
northis · Oct 21, 2019 · a25e22e · a25e22e
2 parents 8c49c3c + ada415b
commit a25e22e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chinese_duck",
   "url": "https://chineseduck.online",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Chinese Duck Bot",
   "main": "server/index.js",
   "scripts": {

diff --git a/src/bot/chineseDuck.Bot/Providers/FontFlashCardGenerator.cs b/src/bot/chineseDuck.Bot/Providers/FontFlashCardGenerator.cs
@@ -214,7 +214,8 @@ private static string CutToMaxRow(string input, int maxLengthInRow)
             foreach (var ch in input)
             {
                 var curLetter = ch.ToString();
-                if (curLetter != " " && curLetter != Environment.NewLine)
+
+                if (curLetter != Environment.NewLine)
                 {
                     stringCount++;
                     sb.Append(curLetter);

diff --git a/src/bot/chineseDuck.BotService/Commands/FolderCommand.cs b/src/bot/chineseDuck.BotService/Commands/FolderCommand.cs
@@ -42,7 +42,8 @@ public override AnswerItem Reply(MessageItem mItem)
                 {
                     var user = _repository.GetUser(mItem.ChatId);
                     var folders = _repository.GetUserFolders(mItem.ChatId);
-                    var currentFolder = folders.First(a => a.Id == user.CurrentFolderId);
+                    var currentFolder = folders.FirstOrDefault(a => a.Id == user.CurrentFolderId) ??
+                                        folders.First(a => a.Id == 0);
 
                     var answerItem = new AnswerItem
                     {

diff --git a/src/bot/chineseDuck.BotService/ReleaseNotes.txt b/src/bot/chineseDuck.BotService/ReleaseNotes.txt
@@ -1,5 +1,9 @@
 Release notes:
 
+ver.0.6.1.0 (22 october 2019)
+=========================
+[+] pre-installed folders
+
 ver.0.5.0.0 (31 march 2019)
 =========================
 [*] beta is ready

diff --git a/src/server/api/db/modelsHolder.js b/src/server/api/db/modelsHolder.js
@@ -54,7 +54,7 @@ export class ModelsHolder {
 
       mh.idIncrement.findByIdAndUpdate(
         "userid",
-        { $inc: { seq: 1 } },
+        { $inc: { seq: 2 } },
         { upsert: true, new: true },
         function(err, counter) {
           if (err) {

diff --git a/src/shared/hsk/HSK1en.csv b/src/shared/hsk/HSK1en.csv
@@ -1,4 +1,4 @@
-我;I, me
+我;I, me
 我们;we, us (pl.)
 你;you
 你们;you (pl.)