diff --git a/habitica-images b/habitica-images index 7203f4633c..7051701604 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 7203f4633cc90ede5b2f6745393d54493c487ff6 +Subproject commit 7051701604ff6ea246bf96995f4869ca95696d88 diff --git a/package-lock.json b/package-lock.json index 1f1a270bfa..e2b06a9914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.258.0", + "version": "4.259.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1c7d06a247..f5c9da55c7 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.258.0", + "version": "4.259.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12", diff --git a/test/api/unit/libs/payments/skuItem.test.js b/test/api/unit/libs/payments/skuItem.test.js index bc4bbb5c94..41aa180faf 100644 --- a/test/api/unit/libs/payments/skuItem.test.js +++ b/test/api/unit/libs/payments/skuItem.test.js @@ -23,7 +23,7 @@ describe('payments/skuItems', () => { describe('#gryphatrice', () => { const sku = 'Pet-Gryphatrice-Jubilant'; it('returns true during birthday week', () => { - clock = sinon.useFakeTimers(new Date('2023-01-29')); + clock = sinon.useFakeTimers(new Date('2023-01-31')); expect(canBuySkuItem(sku, user)).to.be.true; }); it('returns false outside of birthday week', () => { diff --git a/test/api/v3/integration/chat/POST-groups_id_chat_id_clear_flags.test.js b/test/api/v3/integration/chat/POST-groups_id_chat_id_clear_flags.test.js index 4bb99cc33f..9f98d73d85 100644 --- a/test/api/v3/integration/chat/POST-groups_id_chat_id_clear_flags.test.js +++ b/test/api/v3/integration/chat/POST-groups_id_chat_id_clear_flags.test.js @@ -66,7 +66,7 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { type: 'party', privacy: 'private', }, - members: 1, + members: 2, }); await members[0].update({ 'auth.timestamps.created': new Date('2022-01-01') }); @@ -76,12 +76,17 @@ describe('POST /groups/:id/chat/:id/clearflags', () => { await admin.post(`/groups/${group._id}/chat/${privateMessage.id}/flag`); // first test that the flag was actually successful + // author always sees own message; flag count is hidden from non-admins let messages = await members[0].get(`/groups/${group._id}/chat`); - expect(messages[0].flagCount).to.eql(5); + expect(messages[0].flagCount).to.eql(0); + messages = await members[1].get(`/groups/${group._id}/chat`); + expect(messages.length).to.eql(0); + // admin cannot directly request private group chat, but after unflag, + // message should be revealed again and still have flagCount of 0 await admin.post(`/groups/${group._id}/chat/${privateMessage.id}/clearflags`); - - messages = await members[0].get(`/groups/${group._id}/chat`); + messages = await members[1].get(`/groups/${group._id}/chat`); + expect(messages.length).to.eql(1); expect(messages[0].flagCount).to.eql(0); }); diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 7f3f7c653d..e20700e5c5 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -945,6 +945,11 @@ width: 141px; height: 147px; } +.background_fancy_bedroom { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_fancy_bedroom.png'); + width: 141px; + height: 147px; +} .background_fantastical_shoe_store { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_fantastical_shoe_store.png'); width: 141px; @@ -1164,6 +1169,11 @@ width: 141px; height: 147px; } +.background_golden_birdcage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_golden_birdcage.png'); + width: 141px; + height: 147px; +} .background_gorgeous_greenhouse { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_gorgeous_greenhouse.png'); width: 141px; @@ -1319,6 +1329,11 @@ width: 141px; height: 147px; } +.background_in_front_of_fountain { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_front_of_fountain.png'); + width: 141px; + height: 147px; +} .background_in_the_armory { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_the_armory.png'); width: 141px; @@ -2586,6 +2601,11 @@ width: 68px; height: 68px; } +.icon_background_fancy_bedroom { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_fancy_bedroom.png'); + width: 68px; + height: 68px; +} .icon_background_fantastical_shoe_store { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_fantastical_shoe_store.png'); width: 68px; @@ -2805,6 +2825,11 @@ width: 68px; height: 68px; } +.icon_background_golden_birdcage { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_golden_birdcage.png'); + width: 68px; + height: 68px; +} .icon_background_gorgeous_greenhouse { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_gorgeous_greenhouse.png'); width: 68px; @@ -2960,6 +2985,11 @@ width: 68px; height: 68px; } +.icon_background_in_front_of_fountain { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_front_of_fountain.png'); + width: 68px; + height: 68px; +} .icon_background_in_the_armory { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_the_armory.png'); width: 68px; @@ -18660,6 +18690,11 @@ width: 114px; height: 90px; } +.broad_armor_armoire_teaGown { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_teaGown.png'); + width: 114px; + height: 90px; +} .broad_armor_armoire_vermilionArcherArmor { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_vermilionArcherArmor.png'); width: 90px; @@ -19100,6 +19135,11 @@ width: 90px; height: 90px; } +.head_armoire_teaHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_teaHat.png'); + width: 114px; + height: 90px; +} .head_armoire_toqueBlanche { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_toqueBlanche.png'); width: 114px; @@ -19465,6 +19505,11 @@ width: 114px; height: 87px; } +.shield_armoire_teaKettle { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_teaKettle.png'); + width: 114px; + height: 90px; +} .shield_armoire_treasureMap { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_treasureMap.png'); width: 114px; @@ -19900,6 +19945,11 @@ width: 68px; height: 68px; } +.shop_armor_armoire_teaGown { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_teaGown.png'); + width: 68px; + height: 68px; +} .shop_armor_armoire_vermilionArcherArmor { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_vermilionArcherArmor.png'); width: 68px; @@ -20355,6 +20405,11 @@ width: 68px; height: 68px; } +.shop_head_armoire_teaHat { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_teaHat.png'); + width: 68px; + height: 68px; +} .shop_head_armoire_toqueBlanche { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_toqueBlanche.png'); width: 68px; @@ -20720,6 +20775,11 @@ width: 68px; height: 68px; } +.shop_shield_armoire_teaKettle { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_teaKettle.png'); + width: 68px; + height: 68px; +} .shop_shield_armoire_treasureMap { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_treasureMap.png'); width: 68px; @@ -21615,6 +21675,11 @@ width: 114px; height: 90px; } +.slim_armor_armoire_teaGown { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_teaGown.png'); + width: 114px; + height: 90px; +} .slim_armor_armoire_vermilionArcherArmor { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_vermilionArcherArmor.png'); width: 90px; diff --git a/website/client/src/assets/images/community-guidelines/staff.png b/website/client/src/assets/images/community-guidelines/staff.png index 734b173d73..47ab2b2e19 100644 Binary files a/website/client/src/assets/images/community-guidelines/staff.png and b/website/client/src/assets/images/community-guidelines/staff.png differ diff --git a/website/client/src/components/static/communityGuidelines.vue b/website/client/src/components/static/communityGuidelines.vue index 622439b816..7d26f14d56 100644 --- a/website/client/src/components/static/communityGuidelines.vue +++ b/website/client/src/components/static/communityGuidelines.vue @@ -2,7 +2,7 @@

{{ $t('communityGuidelines') }}

-

{{ $t('lastUpdated') }} July 28, 2021

+

{{ $t('lastUpdated') }} February 8, 2023

{{ $t('commGuideHeadingWelcome') }}

@@ -21,6 +21,7 @@

-
  • @@ -176,50 +177,53 @@

    {{ $t('commGuideHeadingMeet') }}

    -

    -

    -

    -
    - -
    -

    - -
    -
    -

    {{ $t('commGuidePara014') }}
    Lemoness, lefnire, Slappybag, litenull, Shaner, Bobbyroberts99, wc8, - Breadstrings, Megan, Blade, and Daniel the Bard + Breadstrings, Megan, Blade, Daniel the Bard, deilann, shanaqui, Nakonana, + Dewines, Alys, Fox_town, MaybeSteveRogers, and Cantras. +

    @@ -240,6 +244,7 @@