Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

Flash card fix #27

Merged
merged 4 commits into from
Oct 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
3 changes: 2 additions & 1 deletion src/bot/chineseDuck.Bot/Providers/FontFlashCardGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/bot/chineseDuck.BotService/Commands/FolderCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 4 additions & 0 deletions src/bot/chineseDuck.BotService/ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/server/api/db/modelsHolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/shared/hsk/HSK1en.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
我;I, me
我;I, me
我们;we, us (pl.)
你;you
你们;you (pl.)
Expand Down