From d6e64482d69205f244738a82c2f1b72e2078ebdb Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 22 Mar 2022 16:52:48 -0500 Subject: [PATCH 1/4] chore(sprites): update CSS --- habitica-images | 2 +- website/client/src/assets/css/sprites/spritesmith-main.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/habitica-images b/habitica-images index 5afe493854..5a79037fca 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 5afe493854d104d9105e627ac6f132885e55f6da +Subproject commit 5a79037fca74f76c9342190b584baeda419c6c47 diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 828d014cde..1e5c04e4e6 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -25953,8 +25953,8 @@ width: 114px; height: 90px; } -.shield_special_spring2022Mage { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Mage.png'); +.shield_special_spring2022Rogue { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Rogue.png'); width: 114px; height: 117px; } From e88b3c2c496e90c4fe5b59e73d11ababd2c78ed2 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 22 Mar 2022 16:52:54 -0500 Subject: [PATCH 2/4] 4.225.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c082cc20df..38421be8a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.225.0", + "version": "4.225.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index edd2ecfd4c..f5b304ef5c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.225.0", + "version": "4.225.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.16.12", From f7f928d1bd68f5222e9594c2a604e665ed359777 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 23 Mar 2022 20:17:49 -0500 Subject: [PATCH 3/4] On-the-fly fix for tasks missing from tasksOrder (#13900) * fix(tasks): revised fix logic, accounting for groups/challenges * fix(tasks): don't grab individual user tasks in shared list Co-authored-by: SabreCat --- website/server/controllers/api-v3/tasks.js | 26 +++++++++++++++++++ .../server/controllers/api-v3/tasks/groups.js | 15 +++++++++++ 2 files changed, 41 insertions(+) diff --git a/website/server/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js index 5c20a9f4d7..c168cd4ca5 100644 --- a/website/server/controllers/api-v3/tasks.js +++ b/website/server/controllers/api-v3/tasks.js @@ -838,6 +838,32 @@ api.moveTask = { // In memory updates const order = owner.tasksOrder[`${task.type}s`]; + + if (order.indexOf(task._id) === -1) { // task is missing from list, list needs repair + const taskListQuery = { type: task.type }; + if (group) { + taskListQuery['group.id'] = owner._id; + taskListQuery.userId = { $exists: false }; + } else if (challenge) { + taskListQuery['challenge.id'] = owner._id; + taskListQuery.userId = { $exists: false }; + } else { + taskListQuery.userId = owner._id; + } + const taskList = await Tasks.Task.find( + taskListQuery, + { _id: 1 }, + ).exec(); + for (const foundTask of taskList) { + if (order.indexOf(foundTask._id) === -1) { + order.push(foundTask._id); + } + } + const fixQuery = { $set: {} }; + fixQuery.$set[`tasksOrder.${task.type}s`] = order; + await owner.update(fixQuery).exec(); + } + moveTask(order, task._id, to); // Server updates diff --git a/website/server/controllers/api-v3/tasks/groups.js b/website/server/controllers/api-v3/tasks/groups.js index 98da938496..ab18f7faad 100644 --- a/website/server/controllers/api-v3/tasks/groups.js +++ b/website/server/controllers/api-v3/tasks/groups.js @@ -160,6 +160,21 @@ api.groupMoveTask = { const order = group.tasksOrder[`${task.type}s`]; + if (order.indexOf(task._id) === -1) { // task is missing from list, list needs repair + const taskList = await Tasks.Task.find( + { 'group.id': group._id, userId: { $exists: false }, type: task.type }, + { _id: 1 }, + ).exec(); + for (const foundTask of taskList) { + if (order.indexOf(foundTask._id) === -1) { + order.push(foundTask._id); + } + } + const fixQuery = { $set: {} }; + fixQuery.$set[`tasksOrder.${task.type}s`] = order; + await group.update(fixQuery).exec(); + } + moveTask(order, task._id, to); await group.save(); From da481ce156901b82f6d8fa7ae5842a48409f09e7 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 23 Mar 2022 20:21:00 -0500 Subject: [PATCH 4/4] 4.225.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 38421be8a9..4d32f5e0da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.225.1", + "version": "4.225.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f5b304ef5c..f26e135aaf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.225.1", + "version": "4.225.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.16.12",