\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Sokół (jajo)", + "questFalconUnlockText": "Odblokowuje dostęp do kupna jaj sokoła na Targu.", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/pl/rebirth.json b/common/locales/pl/rebirth.json index ca3085242d..e00b2b2cdb 100644 --- a/common/locales/pl/rebirth.json +++ b/common/locales/pl/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "Po odrodzeniu twoja postać rozpocznie grę na poziomie 1.", "rebirthAdvList1": "Odzyskujesz pełnię zdrowia.", "rebirthAdvList2": "Nie posiadasz żadnych punktów doświadczenia, złota ani ekwipunku (z pominięciem darmowych przedmiotów takich jak tajemnicze przedmioty).", - "rebirthAdvList3": "Twoje Nawyki, Codzienne, oraz Do-Zrobienia zostaną zresetowane do poziomu żółtego, a ich serie wyzerowane.", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "Na początku jesteś w klasie Wojownika, dopóki nie zapracujesz sobie na zmianę klasy.", "rebirthInherit": "Twoja postać dziedziczy pewne cechy ze swojego poprzedniego wcielenia.", "rebirthInList1": "Zadania, historia oraz ustawienia konta pozostają bez zmian.", @@ -24,5 +24,6 @@ "rebirthPop": "Stwórz nową postać na Poziomie 1 zachowując osiągnięcia, przedmioty kolekcjonerskie oraz zadania wraz z historią.", "rebirthName": "Kula Odrodzenia", "reborn": "Odrodzony, najwyższy poziom <%= reLevel %>", - "confirmReborn": "Na pewno?" + "confirmReborn": "Na pewno?", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/pl/settings.json b/common/locales/pl/settings.json index 2b06b44ab7..4deebbbaec 100644 --- a/common/locales/pl/settings.json +++ b/common/locales/pl/settings.json @@ -47,6 +47,7 @@ "customDayStart": "Własny początek dnia", "changeCustomDayStart": "Zmienić własny początek dnia?", "sureChangeCustomDayStart": "Czy na pewno chcesz zmienić własny początek dnia?", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "Twoje Codzienne zresetują się po pierwszym użyciu Habitiki po <%= time %>. Upewnij się, że ukończyłeś swoje Codzienne przed tym czasem!", "customDayStartInfo1": "Habitica domyślnie sprawdza i resetuje twoje Codzienne o północy każdego dnia w twojej strefie czasowej. Tutaj możesz zmienić ten czas.", "misc": "Pozostałe", @@ -61,12 +62,23 @@ "newUsername": "Nowa nazwa użytkownika", "dangerZone": "Strefa zagrożenia", "resetText1": "UWAGA! Ta opcja zresetuje wiele części twojego konta. Odradzamy taki krok, jednak niektórzy gracze mogą uznać tę funkcję za przydatną po wstępnym wypróbowaniu strony.", - "resetText2": "Stracisz swój poziom, całe złoto i punkty doświadczenia. Wszystkie Twoje zadania zostaną na zawsze usunięte, razem z historią ich wypełnienia. Stracisz także wyposażenie, choć będziesz mógł je kupić ponownie, włączając w to przedmioty limitowane i tylko dla subskrybentów, które już posiadasz (aby odkupić wyposażenie przeznaczone dla konkretnej klasy, musisz do niej przynależeć). Zachowasz swoją klasę, chowańce i wierzchowce. Być może lepiej będzie jeśli użyjesz Kuli Odrodzenia – to bezpieczniejsze i zachowa wszystkie Twoje zadania.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Jesteś pewien? Usunie to twoje konto na zawsze i nie będzie można go nigdy odzyskać! Będziesz musiał zarejestrować się ponownie na nowym koncie by używać Habitica ponownie. Posiadane lub wydane Klejnoty nie zostaną zwrócone. Jeśli jesteś absolutnie pewien swojej decyzji, wpisz <%= deleteWord %> w okno dialogowe poniżej.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Skopiuj, by używać w innych aplikacjach. Traktuj jednak swój token API jak hasło i nie dziel się nim z innymi. Czasem możesz zostać poproszony o swoje ID użytkownika, ale nigdy nie publikuj swojego tokenu API tam, gdzie mogą go zobaczyć inne osoby, włączając w to Github.", "APIToken": "Token API (to Twoje hasło – zobacz ostrzeżenie powyżej!)", + "thirdPartyApps": "Aplikacje osób trzecich", + "dataToolDesc": "Strona internetowa, która pokazuje ci niektóre informacje na temat twojego konta Habitica, takie jak statystyki twoich zadań, ekwipunku i umiejętności.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Habitica chat - rozszerzenie dla Chrome ", + "chromeChatExtensionDesc": "Rozszerzenie z Czatem dla przeglądarki Chrome dodaje intuicyjny czas dla całego habitica.com. Pozwala użytkownikom rozmawiać w Tawernie, razem z drużyną i gildiami.", + "otherExtensions": "Inne Rozszerzenia", + "otherDesc": "Znajdź inne aplikacje, rozszerzenia i narzędzia na Habitica wiki.", "resetDo": "Zrób to, zresetuj moje konto!", + "resetComplete": "Reset complete!", "fixValues": "Napraw wartości", "fixValuesText1": "Jeśli napotkałeś na błąd lub popełniłeś pomyłkę która niesłusznie zmieniła twoją postać (otrzymałeś niesłusznie obrażenia, Złoto na które nie zasłużyłeś, itp.), możesz tutaj ręcznie zmienić wartości liczbowe. Tak, pozwala to na oszukiwanie: używaj tej funkcji mądrze, lub będziesz sabotował własne wysiłki w budowaniu nawyków!", "fixValuesText2": "Zauważ, że nie możesz przywrócić tutaj Serii w indywidualnych zadaniach. Aby to zrobić, edytuj Codzienne: w Zaawansowanych Opcjach znajdziesz pole do przywracania Serii.", @@ -96,6 +108,7 @@ "emailNotifications": "Powiadomienia e-mail", "wonChallenge": "Wygrałeś wyzwanie!", "newPM": "Otrzymane wiadomości prywatne", + "sentGems": "Sent gems!", "giftedGems": "Podarowane klejnoty", "giftedGemsInfo": "<%= amount %> klejnotów - przez <%= name %>", "giftedSubscription": "Podarowane abonamenty", @@ -135,6 +148,11 @@ "webhooks": "Webhooki", "enabled": "Włączone", "webhookURL": "Link do webhooka", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Dodaj", "buyGemsGoldCap": "Limit podniesiony do <%= amount %>", "mysticHourglass": "<%= amount %> Mistyczne Klepsydry", @@ -149,5 +167,5 @@ "amazonPayments": "Płatności Amazon", "timezone": "Strefa czasowa", "timezoneUTC": "Habitica korzysta ze strefy czasowej ustawionej na twoim komputerze, to znaczy: <%= utc %>", - "timezoneInfo": "Jeżeli wyświetlana strefa czasowa się nie zgadza, najpierw przeładuj stronę korzystając z przycisków \"odśwież\" lub \"przeładuj\" w twojej przeglądarce, aby wysłać do Habitica najnowsze dane. Jeśli nadal się nie zgadza, zmień ustawienia strefy czasowej na swoim komputerze i ponownie przeładuj stronę.
Jeśli korzystasz z Habitica na innym komputerze lub urządzeniach przenośnych, ustawiona strefa czasowa musi być identyczna na każdym z nich. Jeśli twoje Codzienne resetują się w niewłaściwym czasie, powtórz powyższy test na pozostałych komputerach i przeglądarkach na urządzeniach mobilnych." + "timezoneInfo": "Jeśli strefa czasowa jest błędna, spróbuj najpierw odświeżyć stronę przyciskiem odświeżania w przeglądarce, aby upewnić się, że Habitica ma dostęp do najnowszych danych. Jeśli strefa wciąż jest nieprawidłowa, ustaw ją na swoim komputerze i znów odśwież stronę.
Jeśli używasz Habitiki na innych komputerach lub urządzeniach mobilnych, strefa czasowa na każdym z nich musi być taka sama. Jeśli twoje codzienne zadania resetują się o niewłaściwej porze, sprawdź w ten sam sposób inne komputery oraz przeglądarki w twoich urządzeniach mobilnych." } \ No newline at end of file diff --git a/common/locales/pl/spells.json b/common/locales/pl/spells.json index bf6f116970..d3633eb829 100644 --- a/common/locales/pl/spells.json +++ b/common/locales/pl/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Rzuć w członka drużyny śnieżną pigułą! Co może pójść nie tak? Trwa aż do jego następnego dnia.", "spellSpecialSaltText": "Sól", "spellSpecialSaltNotes": "Ktoś rzucił w ciebie kulą śnieżną. Ha ha, bardzo śmieszne. A teraz otrzepcie mnie z tego śniegu!", - "spellSpecialSpookDustText": "Straszne iskierki", - "spellSpecialSpookDustNotes": "Zamień przyjaciela w latający koc z oczami!", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Nieprzejrzysty eliksir", "spellSpecialOpaquePotionNotes": "Anuluje efekt strasznych iskierek.", "spellSpecialShinySeedText": "Lśniące nasiono", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Piana morska", "spellSpecialSeafoamNotes": "Zamień przyjaciela w morskie stworzenie!", "spellSpecialSandText": "Piasek", - "spellSpecialSandNotes": "Anuluj skutki Piany Morskiej" + "spellSpecialSandNotes": "Anuluj skutki Piany Morskiej", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/pl/subscriber.json b/common/locales/pl/subscriber.json index f217f57087..c388402e12 100644 --- a/common/locales/pl/subscriber.json +++ b/common/locales/pl/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Kupuj Klejnoty za złoto, otrzymuj co miesiąc tajemnicze przedmioty, zachowaj historię postępu, powiększ dwukrotnie limit znajdowanych przedmiotów, wspieraj twórców. Kliknij, żeby dowiedzieć się więcej.", "buyGemsGold": "Kup Klejnoty za Złoto", "buyGemsGoldText": "Kupiec Alexander sprzeda ci Klejnoty za <%= gemCost %> złota za klejnot. Jego comiesięczne dostawy są ograniczone do <%= gemLimit %> Klejnotów na miesiąc, ale ten limit rośnie o 5 Klejnotów na każde trzy miesiące ciągłego abonamentu, aż do maksymalnie 50 Klejnotów miesięcznie!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Zachowuj dodatkowe wpisy w historii konta", "retainHistoryText": "Historia ukończonych Do-Zrobienia i zadań jest dostępna dłużej.", "doubleDrops": "Codzienny limit łupów podwojony", @@ -29,6 +31,7 @@ "manageSub": "Kliknij by zarządzać abonamentem", "cancelSub": "Anuluj abonament", "canceledSubscription": "Anulowany Abonament", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Abonament administratora", "morePlans": "Więcej możliwości
wkrótce", "organizationSub": "Organizacja prywatna", @@ -73,6 +76,9 @@ "timeTravelersPopover": "Widzimy że zdobyłeś Mistyczną Klepsydrę, więc z chęcią zakrzywimy dla ciebie czas. Wybierz proszę chowańca, wierzchowca lub Tajemniczy Zestaw Przedmiotów, który ci się podoba. Listę z poprzednimi zestawami znajdziesz tutaj! Jeśli nie podoba ci się żaden z tych, może byłbyś zainteresowany jednym z naszych modnych futurystycznych Steampunkowych Zestawów Przedmiotów?", "timeTravelersAlreadyOwned": "Gratulacje! Posiadasz już wszystko,co Podróżnicy w Czasie aktualnie oferują. Dziękujemy za wspieranie strony!", "mysticHourglassPopover": "Mistyczna Klepsydra pozwala na kupienie pewnych przedmiotów o ograniczonej czasowo dostępności, takich jak comiesięczne Zestawy Tajemniczych Przedmiotów i nagrody od Światowych bossów z przeszłości.", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Zestaw skrzydlatego posłańca", "mysterySet201403": "Zestaw przemierzania lasów", "mysterySet201404": "Zestaw motyla zmierzchu", @@ -99,6 +105,8 @@ "mysterySet201601": "Zestaw czempiona postanowień", "mysterySet201602": "Zestaw Łamacza Serc", "mysterySet201603": "Zestaw Szczęśliwej Koniczyny", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Standardowy zestaw steampunkowy", "mysterySet301405": "Zestaw steampunkowych akcesoriów", "mysterySetwondercon": "Konwent Wspaniałości", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Kupić ten przedmiot za 1 Mistyczną Klepsydrę?", "petsAlreadyOwned": "Masz już tego chowańca.", "mountsAlreadyOwned": "Masz już tego wierzchowca.", - "typeNotAllowedHourglass": "Tego przedmiotu nie można kupić za Mistyczne Klepsydry. Dostępne typy przedmiotów:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Tego chowańca nie można kupić za Mistyczne Klepsydry.", "mountsNotAllowedHourglass": "Tego wierzchowca nie można kupić za Mistyczne Klepsydry.", "hourglassPurchase": "Kupiłeś przedmiot używając Mistycznej Klepsydry!", - "hourglassPurchaseSet": "Kupiłeś zestaw przedmiotów używając Mistycznej Klepsydry!" + "hourglassPurchaseSet": "Kupiłeś zestaw przedmiotów używając Mistycznej Klepsydry!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/pl/tasks.json b/common/locales/pl/tasks.json index c35ee991dc..33394743db 100644 --- a/common/locales/pl/tasks.json +++ b/common/locales/pl/tasks.json @@ -73,6 +73,7 @@ "clearTags": "Wyczyść", "hideTags": "Ukryj", "showTags": "Pokaż", + "toRequired": "You must supply a to value", "startDate": "Data rozpoczęcia", "startDateHelpTitle": "Kiedy to zadanie powinno się rozpocząć?", "startDateHelp": "Wyznacz termin wykonania tego zadania. Przed wybraną datą nie będą z nim związane żadne efekty.", @@ -88,8 +89,9 @@ "fortifyName": "Mikstura wzmocnienia", "fortifyPop": "Przywraca wszystkie zadania do neutralnej wartości (żółty kolor), oraz uzdrawia całe stracone Zdrowie.", "fortify": "Wzmocnij", - "fortifyText": "Wzmocnienie przywróci wszystkie zadania do wartości neutralnej (żółty kolor), tak jakbyś dopiero co je dodał, a w dodatku uzdrowi cię do pełna. Jest to świetne rozwiązanie, jeśli czerwone zadania sprawiają w grze zbyt wiele trudności lub z powodu niebieskich zadań gra jest zbyt łatwa. Jeśli rozpoczęcie od zera brzmi znacznie bardziej motywująco, to poświęć Klejnoty i poczuj ulgę!", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "Na pewno?", + "fortifyComplete": "Fortify complete!", "sureDelete": "Czy na pewno chcesz usunąć <%= taskType %> opisany \"<%= taskText %>\"?", "streakCoins": "Premia za serię!", "pushTaskToTop": "Umieść zadanie na górze listy. Przytrzymaj CTRL lub CMD, aby umieścić je na samym dole.", @@ -112,5 +114,18 @@ "rewardHelp2": "Wyposażenie wpływa na Twoje statystyki (<%= linkStart %>Użytkownik > Statystyki<%= linkEnd %>).", "rewardHelp3": "Specjalne elementy wyposażenia będą się pojawiały podczas wydarzeń o skali światowej.", "rewardHelp4": "Nie bój się ustalać własnych nagród! Sprawdź przykłady tutaj.", - "clickForHelp": "Kliknij po pomoc" + "clickForHelp": "Kliknij po pomoc", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/pt/backgrounds.json b/common/locales/pt/backgrounds.json index b95de39463..75757f890e 100644 --- a/common/locales/pt/backgrounds.json +++ b/common/locales/pt/backgrounds.json @@ -149,16 +149,23 @@ "backgroundGrandStaircaseNotes": "Descer pela Grande Escadaria", "backgrounds032016": "Conjunto 22: Lançado em Março de 2016", "backgroundDeepMineText": "Mina Profunda", - "backgroundDeepMineNotes": "Encontre metais preciosos em uma Mina Profunda.", + "backgroundDeepMineNotes": "Encontre metais preciosos na Mina Profunda.", "backgroundRainforestText": "Floresta Tropical", "backgroundRainforestNotes": "Aventure-se em uma Floresta Tropical.", "backgroundStoneCircleText": "Círculo de Pedras", - "backgroundStoneCircleNotes": "Lance feitiços em um Círculo de Pedras.", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", - "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgroundStoneCircleNotes": "Lançar feitiços em um Círculo de Pedras.", + "backgrounds042016": "Conjunto 23: Lançado em Abril de 2016", + "backgroundArcheryRangeText": "Campo de tiro com arco", + "backgroundArcheryRangeNotes": "Praticar no campo de tiro com arco.", + "backgroundGiantFlowersText": "Flores gigantes", + "backgroundGiantFlowersNotes": "Divirta-se em cima de Flores Gigantes.", + "backgroundRainbowsEndText": "Final do arco-íris.", + "backgroundRainbowsEndNotes": "Descubra ouro no final do arco-íris", + "backgrounds052016": "Conjunto 24: Lançado em Maio de 2016.", + "backgroundBeehiveText": "Colmeia", + "backgroundBeehiveNotes": "Buzz and dance in a Beehive.", + "backgroundGazeboText": "Gazebo", + "backgroundGazeboNotes": "Battle a Gazebo.", + "backgroundTreeRootsText": "Raízes de árvore", + "backgroundTreeRootsNotes": "Explore as raízes de árvores." } \ No newline at end of file diff --git a/common/locales/pt/challenge.json b/common/locales/pt/challenge.json index 9c9d98966e..5ad710ea47 100644 --- a/common/locales/pt/challenge.json +++ b/common/locales/pt/challenge.json @@ -63,5 +63,21 @@ "congratulations": "Parabéns!", "hurray": "Hurra!", "noChallengeOwner": "sem dono", - "noChallengeOwnerPopover": "Esse desafio não possui um dono porque quem criou o desafio deletou sua conta." + "noChallengeOwnerPopover": "Esse desafio não possui um dono porque quem criou o desafio deletou sua conta.", + "challengeMemberNotFound": "Usuário não encontrado entre os membros do desafio.", + "onlyGroupLeaderChal": "Somente o líder do grupo pode criar desafios", + "tavChalsMinPrize": "O prêmio precisa ser de no mínimo 1 gema para desafios da Taverna.", + "cantAfford": "Você não consegue pagar esse prêmio. Compre mais gemas ou reduza o tamanho do prêmio.", + "challengeIdRequired": "\"challengeId\" precisa ser um UUID válido.", + "winnerIdRequired": "\"winnerId\" precisa ser um UUID válido.", + "challengeNotFound": "Desafio não encontrado.", + "onlyLeaderDeleteChal": "Apenas o líder desafio pode excluí-lo.", + "onlyLeaderUpdateChal": "Apenas o líder desafio pode atualizá-lo.", + "winnerNotFound": "Vencedor com id \"<%= userId %>\" não encontrado ou não faz parte do desafio.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tarefas pertencentes a um desafio só podem ser editadas pelo líder.", + "userAlreadyInChallenge": "Usuário já está participando desse desafio.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked.", + "shortNameTooShort": "Nome da etiqueta deve ter pelo menos 3 caracteres." } \ No newline at end of file diff --git a/common/locales/pt/character.json b/common/locales/pt/character.json index 724cd0fa1d..3cbf750480 100644 --- a/common/locales/pt/character.json +++ b/common/locales/pt/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Por favor, tenha em mente que seu Nome de exibição, foto de perfil, e sinopse devem estar de acordo com as Diretrizes da Comunidade (ou seja, sem profanidades, sem tópicos adultos, sem insultos, etc). Se você tem qualquer dúvida sobre se algo é ou não apropriado, entre em contato pelo email leslie@habitica.com!", "statsAch": "Estatísticas & Conquistas", "profile": "Perfil", "avatar": "Personalizar Avatar", @@ -34,7 +35,7 @@ "beard": "Barba", "mustache": "Bigode", "flower": "Flor", - "wheelchair": "Wheelchair", + "wheelchair": "Cadeira de rodas", "basicSkins": "Peles Básicas", "rainbowSkins": "Peles de Arco-Íris", "pastelSkins": "Peles em Tons Pastel", @@ -109,6 +110,7 @@ "mage": "Mago", "mystery": "Mistério", "changeClass": "Alterar Classe, Restituir Pontos de Atributo", + "lvl10ChangeClass": "Para mudar de classe você precisa ser pelo menos nível 10.", "levelPopover": "A cada nível que alcançar você terá um ponto para distribuir para um atributo de sua escolha. Você pode fazer isso manualmente, ou deixar o jogo decidir por você usando uma das opções de Distribuição Automática.", "unallocated": "Pontos de Atributo não Distribuídos", "haveUnallocated": "Você tem <%= points %> Ponto(s) de Atributo não usados", @@ -164,5 +166,7 @@ "int": "INT", "showQuickAllocation": "Mostrar distribuição de status", "hideQuickAllocation": "Esconder distribuição de status", - "quickAllocationLevelPopover": "Cada nível concederá a você um ponto para distribuir em um atributo de sua escolha. Você pode fazer isso manualmente, ou deixar o jogo decidir por você usando uma das opções de Distribuição Automática encontradas em Usuário -> Status do Avatar." + "quickAllocationLevelPopover": "Cada nível concederá à você um ponto para distribuir em um atributo de sua escolha. Você pode fazer isso manualmente, ou deixar o jogo decidir por você usando uma das opções de Distribuição Automática encontradas em Usuário -> Status do Avatar.", + "invalidAttribute": "\"<%= attr %>\" não é um atributo válido.", + "notEnoughAttrPoints": "Você não tem pontos de atributo suficientes." } \ No newline at end of file diff --git a/common/locales/pt/content.json b/common/locales/pt/content.json index 45068be301..c27340bd4f 100644 --- a/common/locales/pt/content.json +++ b/common/locales/pt/content.json @@ -31,7 +31,7 @@ "dropEggCactusAdjective": "um espinhoso", "dropEggBearCubText": "Urso Filhote", "dropEggBearCubMountText": "Urso", - "dropEggBearCubAdjective": "um bravo", + "dropEggBearCubAdjective": "um corajoso", "questEggGryphonText": "Grifo", "questEggGryphonMountText": "Grifo", "questEggGryphonAdjective": "um orgulhoso", @@ -112,7 +112,13 @@ "questEggMonkeyAdjective": "um travesso", "questEggSnailText": "Caracol", "questEggSnailMountText": "Caracol", - "questEggSnailAdjective": "um devagar mas estável", + "questEggSnailAdjective": "um devagar, mas estável", + "questEggFalconText": "Falcão", + "questEggFalconMountText": "Falcão", + "questEggFalconAdjective": "um rápido", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", "eggNotes": "Ache uma poção de eclosão para usar nesse ovo e ele irá eclodir em um <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Básico", "hatchingPotionWhite": "Branco", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "Dourado", "hatchingPotionSpooky": "Assustador", "hatchingPotionPeppermint": "Hortelã", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Use-o em um ovo, e ele chocará como um mascote <%= potText(locale) %>.", "premiumPotionAddlNotes": "Não utilizável em ovos de mascote de missão.", "foodMeat": "Carne", diff --git a/common/locales/pt/contrib.json b/common/locales/pt/contrib.json index aa979de33c..e892c4e1ce 100644 --- a/common/locales/pt/contrib.json +++ b/common/locales/pt/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "Salão dos Contribuidores", "hallPatrons": "Salão dos Patrões", "rewardUser": "Recompensar Usuário", - "UUID": "UUID", + "UUID": "ID do Usuário", "loadUser": "Carregar Usuário", + "noAdminAccess": "Você não possui acesso de administrador.", + "pageMustBeNumber": "req.query.page precisa ser um número", + "userNotFound": "Usuário não encontrado.", + "invalidUUID": "UUID precisa ser válido", "title": "Título", "moreDetails": "Mais detalhes (1-7)", "moreDetails2": "mais detalhes (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "Visite o Salão de Heróis (colaboradores e apoiadores)", "conLearn": "Saiba mais sobre recompensas de colaboradores", "conLearnHow": "Saiba como contribuir ao Habitica", - "surveysSingle": "Ajudou Habitica a crescer participando de uma pesquisa. Não existem pesquisas ativas.", - "surveysMultiple": "Ajudou Habitica a crescer participando de <%= surveys %> pesquisas. Não existem pesquisas ativas.", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Pesquisa Atual", "surveyWhen": "A insígnia será ofertada a todos os participantes quando as pesquisas tiverem sido processadas, no final de março.", "blurbInbox": "É aqui que suas mensagens particulares ficam guardadas! Você pode enviar uma mensagem à alguém clicando no ícone do envelope próximo a seu nome na Taverna, Equipe, ou nas Conversas da Guilda. Se você recebeu uma MP inapropriada, você deve enviar uma imagem da mensagem para Lemoness (leslie@habitica.com)", diff --git a/common/locales/pt/death.json b/common/locales/pt/death.json index e9ebb8f243..23331708eb 100644 --- a/common/locales/pt/death.json +++ b/common/locales/pt/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Perdendo vida rapidamente?", "lowHealthTips3": "Tarefas diárias incompletas prejudicam você de um dia para o outro, tenha o cuidado de não adicionar muitas de uma só vez!", "lowHealthTips4": "Se a tarefa diária não for cumprida no dia, você pode desabilitá-la clicando no ícone do lápis.", - "goodLuck": "Boa Sorte!" + "goodLuck": "Boa Sorte!", + "cannotRevive": "Não pode reviver se não está morto" } \ No newline at end of file diff --git a/common/locales/pt/front.json b/common/locales/pt/front.json index 138fbe5b90..1046bc9ff6 100644 --- a/common/locales/pt/front.json +++ b/common/locales/pt/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "Como Funciona", "companyBlog": "Blog", + "devBlog": "Blog do desenvolvedor", "companyDonate": "Doar", "companyExtensions": "Extensões", "companyPrivacy": "Privacidade", @@ -51,6 +52,7 @@ "featureSocialHeading": "Jogo social", "featuredIn": "Visto em", "featuresHeading": "Nós também temos...", + "footerDevs": "Desenvolvedores", "footerCommunity": "Comunidade", "footerCompany": "Companhia", "footerMobile": "Celular", @@ -165,7 +167,7 @@ "teams": "Equipes", "terms": "Termos e Condições", "testimonialHeading": "O que as pessoas estão dizendo...", - "localStorageTryFirst": "Se você estiver tendo problemas com o Habitica, clique no botão abaixo para limpar os dados armazenados para este site (outros sites não serão afetados). Você precisará logar novamente depois de fazer isso, então primeiro certifique-se de saber todos os seus dados de login, que podem ser encontrados em Configurações -> <%= linkStart %>Site<%= linkEnd %>.", + "localStorageTryFirst": "Se você estiver tendo problemas com o Habitica, clique no botão abaixo para limpar os dados locais armazenados para este site (outros sites não serão afetados). Você precisará logar novamente depois de fazer isso, então primeiro certifique-se que sabe todos os seus dados de login, que podem ser encontrados em Configurações -> <%= linkStart %>Site<%= linkEnd %>.", "localStorageTryNext": "Se os problemas persistirem, por favor <%= linkStart %>Relate um Bug<%= linkEnd %> se ainda não o fez.", "localStorageClearing": "Limpando dados locais", "localStorageClearingExplanation": "Os dados do seu navegador estão sendo excluídos. Você será desconectado e redirecionado à página principal. Por favor, aguarde.", @@ -182,6 +184,7 @@ "zelahQuote": "Com o [Habitica], eu sou persuadido a ir para a cama na hora pelos pontos que ganho por dormir cedo ou pela vida que perco dormindo tarde!", "reportAccountProblems": "Reportar Problemas na Conta", "reportCommunityIssues": "Reportar Problemas com a Comunidade", + "subscriptionPaymentIssues": "Assinatura e questões sobre pagamento.", "generalQuestionsSite": "Perguntas Gerais sobre o Site", "businessInquiries": "Consultas de Negócios", "merchandiseInquiries": "Consultas de Merchandise", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Faltando cabeçalhos de autenticação.", + "missingAuthParams": "Faltando parâmetros de autenticação.", + "missingUsernameEmail": "Faltando nome de usuário ou email.", + "missingEmail": "Faltando email.", + "missingUsername": "Faltando nome de usuário.", + "missingPassword": "Faltando senha.", + "missingNewPassword": "Faltando nova senha.", + "wrongPassword": "Senha incorreta.", + "notAnEmail": "Endereço de e-mail inválido.", + "emailTaken": "Endereço de email já está sendo usado em uma conta.", + "newEmailRequired": "Faltando novo endereço de email.", + "usernameTaken": "Nome de usuário já está sendo utilizado.", + "passwordConfirmationMatch": "A confirmação de senha não corresponde à senha.", + "invalidLoginCredentials": "Nome de usuário e/ou email e/ou senha incorretos.", + "passwordReset": "Se nós tivermos seu email em arquivo, o link para restauração da sua senha será enviado ao seu email.", + "passwordResetEmailSubject": "Reiniciar senha para o Habitica", + "passwordResetEmailText": "A senha para <%= username %> foi reiniciada para <%= newPassword %>. Importante! Tanto o nome de usuário quanto a senha diferenciam maiúsculas de minúsculas - você precisa escrever exatamente como mostrado aqui. Nós recomendamos que copie e cole ambas em vez de digitá-las. Entre em <%= baseUrl %>. Depois de entrar, vá para <%= baseUrl %>/#/options/settings/settings e mude sua senha.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Oh não - seu nome de usuário ou senha está incorreto.\n- Tenha certeza de que seu nome de usuário e senha estão digitados corretamente. \n- Você pode ter se cadastrado com o Facebook, não com o email. Cheque tentando login com o Facebook.\n- Se você esqueceu sua senha, clique \"Esqueci Senha\".", + "invalidCredentials": "Não há conta que use essas credenciais.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Somente Facebook é suportado atualmente.", + "cantDetachFb": "A conta não possui outro método de autenticação, não pode desvincular Facebook.", + "onlySocialAttachLocal": "Autenticação local só pode ser adicionada a uma conta social.", + "invalidReqParams": "Parâmetros requeridos inválidos.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/pt/gear.json b/common/locales/pt/gear.json index 80bbef0a5b..e194465937 100644 --- a/common/locales/pt/gear.json +++ b/common/locales/pt/gear.json @@ -149,7 +149,7 @@ "weaponSpecialSpring2016WarriorNotes": "Ninguem tem tantos amigos quanto o rato com queijos tenros. Aumenta a força em <%= str %>. Edição Limitada 2016 Equipamento de Primavera.", "weaponSpecialSpring2016MageText": "Cajado de Sinos", "weaponSpecialSpring2016MageNotes": "Abra-Gata-Bra! Tão deslumbrante, você devia se hipnotizar! Ooh. Ele brilha... Aumenta Inteligência em <%= int %>. e percepção em <%= per %>. Edição Limitada 2016 Equipamento de Primavera ", - "weaponSpecialSpring2016HealerText": "Varinha de Flor de Primavera", + "weaponSpecialSpring2016HealerText": "Varinha de Flor da Primavera", "weaponSpecialSpring2016HealerNotes": "Com o aceno e uma piscada, você faz os campos e florestas florescerem! ou acerta ratos problemáticos na cabeça. Aumenta a inteligência em <%=int%> . Equipamento de Edição Limitada da Primavera 2016.", "weaponMystery201411Text": "Forcado de Banquete", "weaponMystery201411Notes": "Apunhale seus inimigos ou cave pelas suas comidas favoritas - esse garfo versátil faz de tudo! Não confere benefícios. Item de Assinante de Novembro 2014.", @@ -187,8 +187,10 @@ "weaponArmoireJesterBatonNotes": "Com um balanço do seu bastão e algumas réplicas espirituosas, até mesmo a situação mais complicada fica simples. Aumenta Inteligência e Percepção em <%= attrs %> cada. Armário Encantado: Conjunto de Bobo da Corte (Item 3 de 3).", "weaponArmoireMiningPickaxText": "Picareta de mineração", "weaponArmoireMiningPickaxNotes": "Extraia a quantidade máxima de ouro de suas tarefas! Aumenta a Percepção em <%= per %>. Armadura Encantada: Conjunto \"Minerador\" (Item 3 de 3).", - "weaponArmoireBasicLongbowText": "Basic Longbow", - "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireBasicLongbowText": "Arco Longo basico", + "weaponArmoireBasicLongbowNotes": "Um arco em segunda mão ainda em condição de uso. Aumenta Força em <%= str %> pontos. Armário Encantado: Conjunto básico de Arqueiro (item 1 de 3).", + "weaponArmoireHabiticanDiplomaText": "Diploma Habiticano", + "weaponArmoireHabiticanDiplomaNotes": "Um certificado de conquista significativa - parabéns! Aumenta a Inteligência em <%= int %>. Armário Encantado: Conjunto de Graduação (Item 1 de 3).", "armor": "armadura", "armorBase0Text": "Roupas Modestas", "armorBase0Notes": "Vestimenta ordinária Não concede benefícios.", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Invoca as chamas frias do inverno. Não confere benefícios. Item de Assinante de dezembro de 2015.", "armorMystery201603Text": "Terno da sorte", "armorMystery201603Notes": "Esse terno foi costurado com milhares de trevos de 4 folhas. Não concede benefícios. Item do Assinante de Março 2016", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Fantasia Steampunk", "armorMystery301404Notes": "Elegante e distinto. Não concede benefícios. Item de Assinante de Fevereiro 3015.", "armorArmoireLunarArmorText": "Armadura Lunar Tranquilizadora", @@ -392,8 +398,10 @@ "armorArmoireJesterCostumeNotes": "Tra-la-la! Apesar da aparência da sua fantasia, você não é bobo. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto de Bobo da Corte (Item 2 de 3).", "armorArmoireMinerOverallsText": "Macacão de Minerador", "armorArmoireMinerOverallsNotes": "Eles podem parecer estragados, mas estão encantados para repelir sujeira. Aumenta Constituição em <%= con %>. Armário Encantado: Set de Minerador (Item 2 de 3).", - "armorArmoireBasicArcherArmorText": "Basic Archer Armor", - "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireBasicArcherArmorText": "Armadura de arqueiro básica", + "armorArmoireBasicArcherArmorNotes": "Este colete com camuflagem permite-te passar despercebido em florestas. Aumenta Percepção em <%= per %> pontos. Armário Encantado: Conjunto básico de Arqueiro (item 2 de 3).", + "armorArmoireGraduateRobeText": "Beca de Graduado", + "armorArmoireGraduateRobeNotes": "Parabéns! Essa beca pesada se pendura solidamente junto com todo o conhecimento que você acumulou. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto de Graduação (Item 2 de 3).", "headgear": "capacete", "headBase0Text": "Sem Elmo", "headBase0Notes": "Sem capacete.", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Proteja sua identidade de todos os seus admiradores. Não confere benefícios. Item de assinante de Fevereiro 2016", "headMystery201603Text": "Chapéu da sorte", "headMystery201603Notes": "Essa cartola é um amuleto da sorte mágico. Não concede benefícios. Item do Assinante de Março 2016 ", + "headMystery201604Text": "Coroa de Flores", + "headMystery201604Notes": "Essas flores entrelaçadas fazem um capacete surpreendentemente forte! Não confere benefício. Item de Assinante de Abril de 2016.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Cartola Chique", "headMystery301404Notes": "Uma cartola chique para as damas e cavalheiros mais finos! Item de Assinante de Janeiro 3015. Não concede benefícios.", "headMystery301405Text": "Cartola Básica", @@ -611,8 +623,10 @@ "headArmoireJesterCapNotes": "Os sinos nesse chapéu podem distrair seus oponentes, mas eles só ajudam no seu foco. Aumenta Percepção em <%= per %>. Armário Encantado: Conjunto de Bobo da Corte (Item 1 de 3).", "headArmoireMinerHelmetText": "Elmo de Minerador", "headArmoireMinerHelmetNotes": "Proteja sua cabeça de Tarefas caindo! Aumenta Inteligência em <%= int %>. Armário Encantado. Set de Minerador (Item 1 de 3).", - "headArmoireBasicArcherCapText": "Basic Archer Cap", - "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireBasicArcherCapText": "Chapéu de arqueiro básico", + "headArmoireBasicArcherCapNotes": "Nenhum arqueiro estaria completo sem um chapéu janota! Aumenta Percepção em <%= per %> pontos. Armário Encantado: Conjunto básico de Arqueiro (item 3 de 3).", + "headArmoireGraduateCapText": "Chapéu de Graduação", + "headArmoireGraduateCapNotes": "Parabéns! Seus pensamentos profundos te deram esse chapéu da compreensão. Aumenta Inteligência em <%= int %>. Armário Encantado: Conjunto de Graduação (Item 3 de 3).", "offhand": "item da segunda mão", "shieldBase0Text": "Sem Equipamento na Segunda Mão", "shieldBase0Notes": "Sem escudo ou segundo armamento.", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Escudo Alentador", "shieldSpecialWinter2015HealerNotes": "Este escudo deflete o vento congelante. Aumenta Constituição em <%= con %>. Equipamento Edição Limitada de Inverno 2014-2015.", "shieldSpecialSpring2015RogueText": "Guinchado Explosivo", - "shieldSpecialSpring2015RogueNotes": "Não deixe o som te enganar - esses explosivos são poderosos. Aumenta Força em <%= str %>. Equipamento Edição Limitada de Primavera 2015.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Prato Pires", "shieldSpecialSpring2015WarriorNotes": "Jogue nos seus inimigos... ou só segure, porque vai se encher de ração gostosa na hora da janta. Aumenta Constituição em <%= con %>. Equipamento Edição Limitada de Primavera 2015.", "shieldSpecialSpring2015HealerText": "Travesseiro Estampado", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Distraia os inimigos com esse escudo em forma de dragão; Aumenta sua Percepção em <%= per %>. Armário Encantado: Conjunto do Domador de Dragões (Item 2 de 3).", "shieldArmoireMysticLampText": "Lâmpada Mistíca", "shieldArmoireMysticLampNotes": "Ilumine as cavernas mais sombrias com essa lâmpada mística! Aumenta percepção por <%= per %>. Armário Encantado: Item Independente", + "shieldArmoireFloralBouquetText": "Buquê de Flores", + "shieldArmoireFloralBouquetNotes": "Não ajudam muito em uma batalha, mas não são lindas? Aumenta Constituição em <%= con %>. Armário Encantado: Item Independente.", "back": "Acessório de Costas", "backBase0Text": "Sem Acessório de Fundo", "backBase0Notes": "Sem Acessório de Fundo.", @@ -815,11 +831,25 @@ "headAccessoryMystery201510Notes": "Esses chifres amedrontadores são pegajosos. Não concede benefícios. Item de Assinante de Outubro 2015.", "headAccessoryMystery301405Text": "Óculos de Proteção para Cabeça", "headAccessoryMystery301405Notes": "\"Óculos de proteção são para os olhos,\" eles disseram. \"Ninguém quer óculos que você só pode usar na cabeça,\" eles disseram. Ha! Você mostrou pra eles. Não concede benefícios. Item de Assinante de Agosto 3015.", - "headAccessoryArmoireComicalArrowText": "Comical Arrow", - "headAccessoryArmoireComicalArrowNotes": "This whimsical item doesn't provide a stat boost, but it sure is good for a laugh! Confers no benefit. Enchanted Armoire: Independent Item.", + "headAccessoryArmoireComicalArrowText": "Flecha cómica.", + "headAccessoryArmoireComicalArrowNotes": "Este objecto cómico não aumenta qualquer stat, mas é válido para uma boa gargalhada! Não confere qualquer benefício. Armário Encantado: Item independente.", "eyewear": "Óculos", "eyewearBase0Text": "Sem Acessório Para os Olhos", "eyewearBase0Notes": "Sem Acessório Para os Olhos.", + "eyewearSpecialBlackTopFrameText": "Óculos Pretos Padrão", + "eyewearSpecialBlackTopFrameNotes": "Óculos com uma armação preta sobre as lentes. Não confere benefício.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Tapa-Olho Bandoleiro", "eyewearSpecialSummerRogueNotes": "Não precisa de um biltre para ver como isso é estiloso! Não concede benefícios. Equipamento Edição Limitada de Verão 2014.", "eyewearSpecialSummerWarriorText": "Tapa-Olho Elegalante", diff --git a/common/locales/pt/generic.json b/common/locales/pt/generic.json index 53d7476bda..8c2d56e0dd 100644 --- a/common/locales/pt/generic.json +++ b/common/locales/pt/generic.json @@ -137,8 +137,8 @@ "achievementStressbeastText": "Ajudou a derrotar a Abominável Besta do Estresse durante o Evento de Inverno do País das Maravilhas em 2014!", "achievementBurnout": "Salvador dos Campos Prósperos", "achievementBurnoutText": "Ajudou a derrotar o Desgaste e recuperar os Espíritos Exaustos durante o evento do Festival de Outono de 2015!", - "achievementBewilder": "Savior of Mistiflying", - "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!", + "achievementBewilder": "Salvador de Mistiflying", + "achievementBewilderText": "Ajudou a derrotar o Be-Wilder durante o event do festival do Caso de Primavera de 2016!", "checkOutProgress": "Veja o meu progresso em Habitica! ", "cardReceived": "Recebeu um cartão!", "cardReceivedFrom": "<%= cardType %> de <%= userName %>", diff --git a/common/locales/pt/groups.json b/common/locales/pt/groups.json index 833b45628b..bb069daf32 100644 --- a/common/locales/pt/groups.json +++ b/common/locales/pt/groups.json @@ -92,6 +92,7 @@ "send": "Enviar", "messageSentAlert": "Mensagem enviada", "pmHeading": "Mensagem privada para <%= name %>", + "pmsMarkedRead": "Suas mensagens privadas foram marcadas como lidas.", "clearAll": "Deletar Todas as Mensagens", "confirmDeleteAllMessages": "Tem certeza que desja deletar todas as mensagens na sua caixa de entrada? Outros usuários ainda irão ver as mensagens que você enviou para eles.", "optOutPopover": "Não gosta de mensagens privadas? Clique para desativar completamente", @@ -99,6 +100,15 @@ "unblock": "Desbloquear", "pm-reply": "Enviar uma resposta", "inbox": "Caixa de Entrada", + "messageRequired": "Uma mensagem é necessária.", + "toUserIDRequired": "Um ID de usuário é necessário", + "gemAmountRequired": "Um número de gemas é necessário", + "notAuthorizedToSendMessageToThisUser": "Não pode enviar mensagem para esse usuário.", + "privateMessageGiftIntro": "Olá <%= receiverName %>, <%= senderName %> te enviou", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gemas!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> meses de assinatura!", + "cannotSendGemsToYourself": "Não é possível enviar gemas para si mesmo. Tente uma assinatura.", + "badAmountOfGemsToSend": "Quantidade precisa ser entre 1 e seu número atual de gemas.", "abuseFlag": "Reportar violação das Diretrizes de Comunidade", "abuseFlagModalHeading": "Reportar <%= name %> por violação?", "abuseFlagModalBody": "Tem certeza que deseja denunciar essa publicação? Você deve denunciar APENAS uma publicação que viola as <%= firstLinkStart %>Diretrizes de Comunidade<%= linkEnd %> e/ou <%= secondLinkStart %>Termos de Serviço<%= linkEnd %>. Denunciar inapropriadamente uma publicação é uma violação das Diretrizes da Comunidade e pode resultar em uma infração. Razões apropriadas para reportar uma publicação incluem, mas não se limitam a:
- xingamentos, blasfêmias religiosas
- intolerância, insultos
- tópicos adultos
- violência, inclusive como brincadeira
- spam, mensagens sem sentido
The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
“Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
“As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
“Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
“My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
PainterProphet ducks as lightning bolts crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.", - "questBewilderCompletion": "The Be-Wilder is DEFEATED!
We've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.
Mistiflying is saved!
The April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”
The crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.
“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”
Redphoenix coughs meaningfully.
“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”
Encouraged, the marching band starts up.
It isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.
As Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", - "questBewilderCompletionChat": "`The Be-Wilder is DEFEATED!`\n\nWe've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.\n\n`Mistiflying is saved!`\n\nThe April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”\n\nThe crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.\n\n“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”\n\nRedphoenix coughs meaningfully.\n\n“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”\n\nEncouraged, the marching band starts up.\n\nIt isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.\n\nAs Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", - "questBewilderBossRageTitle": "Beguilement Strike", - "questBewilderBossRageDescription": "When this gauge fills, The Be-Wilder will unleash its Beguilement Strike on Habitica!", - "questBewilderDropBumblebeePet": "Bumblebee (Pet)", - "questBewilderDropBumblebeeMount": "Bumblebee (Mount)", - "questBewilderBossRageMarket": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nOh no! Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.\n\nHurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.", - "questBewilderBossRageStables": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nAhh!!! Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!", - "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!" + "questBewilderText": "O Be-Wilder", + "questBewilderNotes": "A festa começa como qualquer outra.
Os aperitivos estão excelentes, a música está a animar o ambiente e até os elefantes dançarinos já são parte da rotina. Os Habiticanos riem e conversam entre os centros de mesa florais abastados, contentes por se distrairem das suas tarefas mais fastidiosas e o Palhaço de Abril rodopia entre eles, ansiosamente executando truques e fazendo piadas.
Assim que a torre-relógio de Mistyflying bate à meia-noite, o Palhaço de Abril salta para o palco e começa um discurso.
\"Amigos! Inimigos! Conheçidos toleráveis! Dêem-me a vossa atenção.\" A multidão ri quando orelhas de animais aparecem nas suas cabeças e fazem poses com os seus novos acessórios.
\"Como sabem\", continua o Palhaço, \"as minhas ilusões confusas normalmente duram somente um dia. No entanto, é o meu prazer anunciar que descobri uma forma de nos garantir diversão sem fim sem o peso intrometido das nossas responsabilidades. Ilustres Habiticanos, conheçam o meu novo amigo mágico...O Be-Wilder!\"
Lemoness empalidece subitamente, deixando cair os seus aperitivos. \"Esperem! Não confiem--\"
Subitamente uma névoa espessa e brilhante preenche a sala, rodopiando à volta do Palhaço de Abril, formando penas e um pescoço alongado. A multidão fica sem palavras enquanto um pássaro monstruoso se materializa à sua frente, soltando um riso estridente.
\"Ah! Faz épocas desde que um Habiticano foi tolo o suficiente para me invocar! Que maravilhosa esta sensação de ter uma forma tangível finalmente.\"
Zumbindo de terror, as abelhas de Mistiflying fogem da cidade flutuante, que começa a descer do céu. Uma a uma, as flores brilhantes começam a secar e a flutuar ao vento.
\"Meus caros amigos, porquê este pânico?\", grita o Be-Wilder, batendo as suas asas. \"Não é necessário trabalhar pelas vossas recompensas. Eu simplesmente dar-vos-ei tudo o que desejam!\"
Moedas começam a chover do céu, batendo no solo com força e a multidão foge em busca de abrigo. \"Mas isto é uma piada?\" pergunta Baconsaur enquanto o ouro parte janelas e telhas.
PainterProphet agacha-se enquanto relâmpagos caem e um nevoeiro tapa o Sol. \"Não! Desta vez, não creio que seja!\"
Depressa Habiticanos, não deixem que este Chefão Global vos distraia dos vossos objectivos! Mantenham o foco nas Tarefas que precisam de completar para salvar Mistiflying -- e esperemos, vocês.", + "questBewilderCompletion": "O Be-Wilder foi DERROTADO!
Conseguimos! O Be-Wilder deixa sair um grito final enquanto se torce todo no ar, largando penas como se fosse uma chuva. Gradualmente, transforma-se numa nuvem de névoa. Com o Sol começando a furar o nevoeiro, este dissipa-se revelando as silhuetas de Bailey, Matt, Alex... e o Palhaço de Abril.
Mistiflying está salva!
O Palhaço de Abril tem um ar envergonhado. \"Ah, hmmm,\" diz ele. \"Talvez me tenha...entusiasmado um pouco.\"
A multidão murmura. Flores ensopadas enchem os passeios. Algures, um telhado cai, fazendo soar o som de água a salpicar.
\"Pois...\" diz o Palhaço de Abril, \"Bom. O que quero dizer é que quero pedir desculpa\". Ele solta um suspiro. \"Bom, parece que tudo não pode ser tudo diversão e jogos. Não magoa focar-nos de vez em quando. Acho que vou começar a preparar a partida do próximo ano.\"
Redphoenix tosse de forma ameaçadora.
\"Quero dizer, começar a limpeza de primavera deste ano!\" diz o Palhaço de Abril. \"Nada a temer! Vou deixar a Cidade de Habit toda arrumada em pouco tempo. Felizmente ninguém é melhor que eu a manusear duas esfregonas ao mesmo tempo.\"
Encorajada, a banda de cerimónias começa a tocar.
Não demora muito até que tudo esteja de volta ao normal na Cidade de Habit. Mais, agora que o Be-Wilder se evaporou, as abelhas mágicas de Mistiflying voltaram ao trabalho e em pouco tempo as flores estão de novo a despontar e a cidade flutua de novo.
Enquanto os Habiticanos dão festas às abelhas mágicas, os olhos do Palhaço de Abril iluminam-se. \"Oho! Tive um pensamento! Porque não mantemos algumas destas abelhas como Bichos de Estimação ou Montadas? É uma prenda que representa perfeitamente o balanço entre trabalho árduo e recompensas, isto se for para ser simbólico e aborrecido convosco.\" Ele pisca o olho. \"Além disso, não têm ferrões! Honra de Palhaço.\"", + "questBewilderCompletionChat": "`O Be-Wilder foi DERROTADO!`\n\nConseguimos! O Be-Wilder deixa sair um grito final enquanto se torce todo no ar, largando penas como se fosse uma chuva. Gradualmente, transforma-se numa nuvem de névoa. Com o Sol começando a furar o nevoeiro, este dissipa-se revelando as silhuetas de Bailey, Matt, Alex... e o Palhaço de Abril.\n\n`Mistiflying está salva!`\n\nO Palhaço de Abril tem um ar envergonhado. \"Ah, hmmm,\" diz ele. \"Talvez me tenha...entusiasmado um pouco.\"\n\nA multidão murmura. Flores ensopadas enchem os passeios. Algures, um telhado cai, fazendo soar o som de água a salpicar.\n\n\"Pois...\" diz o Palhaço de Abril, \"Bom. O que quero dizer é que quero pedir desculpa\". Ele solta um suspiro. \"Bom, parece que tudo não pode ser tudo diversão e jogos. Não magoa focar-nos de vez em quando. Acho que vou começar a preparar a partida do próximo ano.\"\n\nRedphoenix tosse de forma ameaçadora.\n\n\"Quero dizer, começar a limpeza de primavera deste ano!\" diz o Palhaço de Abril. \"Nada a temer! Vou deixar a Cidade de Habit toda arrumada em pouco tempo. Felizmente ninguém é melhor que eu a manusear duas esfregonas ao mesmo tempo.\"\n\nEncorajada, a banda de cerimónias começa a tocar.\n\nNão demora muito até que tudo esteja de volta ao normal na Cidade de Habit. Mais, agora que o Be-Wilder se evaporou, as abelhas mágicas de Mistiflying voltaram ao trabalho e em pouco tempo as flores estão de novo a despontar e a cidade flutua de novo.\n\nEnquanto os Habiticanos dão festas às abelhas mágicas, os olhos do Palhaço de Abril iluminam-se. \"Oho! Tive um pensamento! Porque não mantemos algumas destas abelhas como Bichos de Estimação ou Montadas? É uma prenda que representa perfeitamente o balanço entre trabalho árduo e recompensas, isto se for para ser simbólico e aborrecido convosco.\" Ele pisca o olho. \"Além disso, não têm ferrões! Honra de Palhaço.\"", + "questBewilderBossRageTitle": "Ataque de Decepção", + "questBewilderBossRageDescription": "Quando esta barra enche, o Be-Wilder libertará o seu Ataque de Decepção sobre Habitica!", + "questBewilderDropBumblebeePet": "Abelha Mágica (Mascote)", + "questBewilderDropBumblebeeMount": "Abelha Mágica (Montaria)", + "questBewilderBossRageMarket": "`O Be-Wilder usa o ATAQUE DE DECEPÇÃO!`\n\nOh não! Apesar do nosso melhor esforço, fomos distraídos pelas ilusões do Be-Wilder e esquecemo-nos de completar algumas das nossas Tarefas Diárias! Com um riso cacarejante, a besta brilhante bate as suas asas, levantando uma névoa à volta de Alex, o comerciante. Quando se dissipa, ele está possuido! \"Tomem algumas amostras grátis!\" grita com prazer, lançando ovos explosivos e poções aos Habiticanos em fuga. Não são os saldos mais favoráveis, sem dúvida.\n\nDepressa! Vamos manter-nos focados nas nossas Tarefas Diárias para derrotar este monstro antes que possua mais alguém.", + "questBewilderBossRageStables": "`O Be-Wilder usa o ATAQUE DE DECEPÇÃO!`\n\nAhhh!!! Uma vez mais, o Be-WIlder distraiu-nos o suficiente para negligenciarmos as nossas Tarefas Diárias, e agora atacou Matt, o Mestre das Bestas! Com um remoinho de névoa, Matt transforma-se numa criatura alada terrível e todos os animais e montadas uivam de tristeza nos seus estábulos. Depressa, mantenham-se focados nas vossas Tarefas para derrotar esta distração terrível!", + "questBewilderBossRageBailey": "`O Be-Wilder usa o ATAQUE DE DECEPÇÃO!`\n\nCuidado! Enquanto reporta as notícias, Bailey, a Arauto, é possuída pelo Be-Wilder! Ela solta um guincho maléfico e sem significado enquanto começa a flutuar no ar. Como é que vamos saber agora o que se está a passar?\n\nNão desistam...estamos tão perto de derrotar este pássaro incómodo de uma vez para todas!", + "questFalconText": "As Aves de Rapinrolação", + "questFalconNotes": "Montanha Habitica está sendo ofuscada por uma crescente montanha de Afazeres. Ela costumava ser um lugar ter piqueniques e aproveitar a sensação de dever cumprido, até que as tarefas negligenciadas cresceram fora de controle. Agora é a casa das temidas Aves de Rapinrolação, criaturas abomináveis que impedem os Habiticanos de completarem suas tarefas!
\"Está muito quente!\" elas grasnam para @JonArinbjorn e @Onheiron. \"Demorará muito para fazer agora. Não fará diferença alguma se você quiser esperar até amanhã! Por que você não faz algo divertido no lugar?\"
Basta, você jura. Você escalará sua montanha pessoal de Afazeres e derrotará as Aves de Rapinrolação!", + "questFalconCompletion": "Tendo finalmente triunfado sobre as Aves de Rapinrolação, você se acalma para aproveitar a vista e seu bem-merecido descanso.
\"Uau!\" diz @Trogdorina. \"Você venceu!\"
@Squish acrescenta, \"Aqui, pegue estes ovos que achei como recompensa.\"", + "questFalconBoss": "Aves de Rapinrolação", + "questFalconDropFalconEgg": "Falcão (Ovo)", + "questFalconUnlockText": "Desbloqueia ovos de Falcão para compra no Mercado", + "questTreelingText": "A Árvore Emaranhada", + "questTreelingNotes": "É a Competição de Jardinagem anual e todos estão falando sobre o projeto misterioso que @aurakami prometeu revelar. Você se junta à multidão naquele dia do grande anúncio e se admira com a entrada de uma árvore que se mexe. @fuzzytrees explica que a árvore ajudará com a manutenção do jardim, mostrando como ela pode cortar a grama, aparar os arbustos e podar as roseiras tudo ao mesmo tempo - até que de repente a árvore fica louca, virando suas tesouras de poda contra o seu criador! A multidão entra em pânico e todo mundo tenta fugir, mas você não tem medo - você se inclina para a frente, pronto para batalhar.", + "questTreelingCompletion": "Você tira seu pó quando as últimas folhas caem no chão. Em vez de triste, a Competição de Jardinagem agora está segura - apesar de que a árvore que você reduziu a uma pilha de lascas de madeira não ganhará nenhum prêmio! \"Ainda alguns nós para serem trabalhados aqui\", diz @PainterProphet. \"Talvez alguém mais faça um bom trabalho treinando os brotos. Você arrisca uma tentativa?\"", + "questTreelingBoss": "Árvore Emaranhada", + "questTreelingDropTreelingEgg": "Arvorezinha (Ovo)", + "questTreelingUnlockText": "Desbloqueia ovos de Arvorezinhas compráveis no Mercado" } \ No newline at end of file diff --git a/common/locales/pt/rebirth.json b/common/locales/pt/rebirth.json index 4e2ceeac36..116a697607 100644 --- a/common/locales/pt/rebirth.json +++ b/common/locales/pt/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "Renascer reinicia seu personagem no nível 1.", "rebirthAdvList1": "Você recupera a Vida toda.", "rebirthAdvList2": "Você ficará sem Experiência, Ouro ou Equipamentos (com exceção dos itens grátis como os Itens Misteriosos). ", - "rebirthAdvList3": "Seus Hábitos, Tarefas Diárias, e Afazeres reiniciam em amarelo, e seus combos resetam.", + "rebirthAdvList3": "Seus Hábitos, Tarefas Diárias e Afazeres reiniciaram para amarelo, seus combos reiniciaram, exceto as tarefas de desafios.", "rebirthAdvList4": "Sua classe inicial será Guerreiro até liberar uma nova classe.", "rebirthInherit": "Seu novo personagem herda algumas coisas de seu antecessor:", "rebirthInList1": "Tarefas, histórico, e configurações permanecem.", @@ -24,5 +24,6 @@ "rebirthPop": "Comece um novo personagem do Nível 1 mantendo conquistas, colecionáveis, e tarefas com histórico.", "rebirthName": "Orbe do Renascimento", "reborn": "Renascido, nível max <%= reLevel %>", - "confirmReborn": "Tem certeza?" + "confirmReborn": "Tem certeza?", + "rebirthComplete": "Você renasceu!" } \ No newline at end of file diff --git a/common/locales/pt/settings.json b/common/locales/pt/settings.json index fb74efc854..b8e4b134b8 100644 --- a/common/locales/pt/settings.json +++ b/common/locales/pt/settings.json @@ -47,6 +47,7 @@ "customDayStart": "Início do Dia Personalizado", "changeCustomDayStart": "Deseja mudar o Início de dia customizado?", "sureChangeCustomDayStart": "Você tem certeza que quer mudar o início customizado de dia?", + "customDayStartHasChanged": "Seu início de dia personalizado mudou.", "nextCron": "As suas tarefas diárias serão reiniciadas ao utilizar Habitica depois de <%= time %>. Certifique-se de que completou as suas tarefas diárias antes deste horário!", "customDayStartInfo1": "Habitica está predefinido para verificar e reiniciar as suas tarefas diárias à meia noite de seu fuso horária a cada dia. Você pode personalizar esse horário aqui.", "misc": "Variados", @@ -61,12 +62,23 @@ "newUsername": "Novo nome de usuário", "dangerZone": "Zona de Perigo", "resetText1": "ATENÇÃO! Isso redefine várias partes da sua conta. Isso é altamente desencorajado, mas algumas pessoas acham útil no início, após brincarem com o site por um curto período de tempo.", - "resetText2": "Você perderá todos os seus níveis, ouro e pontos de experiência. Todas as suas tarefas serão deletadas permanentemente e você perderá todo o histórico das suas tarefas. Você perderá todo seu equipamento, porém poderá comprá-lo novamente, incluindo todos os equipamentos de edição limitada ou Itens Misteriosos de assinante que você já possui (você precisará de estar na classe correta para comprar novamente os equipamentos específicos da classe). Você manterá sua classe atual, seus mascotes e montarias. Você pode preferir usar uma Orbe do Renascimento em vez disso, que é uma opção muito mais segura e manterá suas tarefas.", + "resetText2": "Você perderá todos os seus níveis, ouro, e pontos de experiência. Todas as suas tarefas (exceto aquelas de desafios) serão deletadas permanentemente e você perderá todo os dados históricos delas. Você perderá todo o seu equipamento, mas poderá comprá-lo de volta, incluindo todo o equipamento de edição limitada ou os itens misteriosos dos assinantes que você já possua (você precisará ter a classe correta para recomprar equipamento classe-específico). Você manterá sua classe atual e seus mascotes e montarias. Você pode preferir usar a Orbe do Renascimento em vez disso, que é uma opção muito mais segura e que preservará suas tarefas.", "deleteText": "Tem certeza? Isso deletará sua conta para sempre, e nunca poderá ser recuperada! Você precisará registrar uma nova conta para usar Habitica de novo. Gemas gastas ou no banco não serão restituídas. Se tiver certeza absoluta, digite <%= deleteWord %> na caixa de texto abaixo.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Copie isso para uso em aplicações de terceiros. Entretanto, pense no seu API Token como uma senha, não divulgue publicamente. Seu ID de Usuário pode ser, ocasionalmente, solicitado, mas nunca divulgue seu API Token em lugares onde outros possam ver, incluindo o Github.", "APIToken": "API Token (isso é uma senha - veja o aviso acima!)", + "thirdPartyApps": "Aplicativos Terceirizados", + "dataToolDesc": "Uma página que mostra certas informações da sua conta de Habitica, como estatísticas sobre suas tarefas, equipamentos e habilidades.", + "beeminder": "Beeminder", + "beeminderDesc": "Deixe o Beeminder monitorar automaticamente suas tarefas do Habitica. Você pode se propor a manter um número alvo de tarefas completadas por dia ou por semana, ou você pode propor reduzir o seu numero de tarefas remanescentes incompletas gradualmente. (Por \"propor\" Beeminder quer dizer sobre aviso de pagar dinheiro real! Mas você também pode gostar dos gráficos chiques do Beeminder.)", + "chromeChatExtension": "Extensão de Chat do Chrome", + "chromeChatExtensionDesc": "A extensão de Chat em Habitica para o Chrome adiciona uma caixa de Chat intuitiva em habitica.com. Isso permite os usuários conversarem na Taverna, com sua equipe e qualquer guilda que esteja participando.", + "otherExtensions": "Outras Extensões", + "otherDesc": "Encontre outros aplicativos, extensões e ferramentas na Wiki de Habitica.", "resetDo": "Faça, reinicie minha conta!", + "resetComplete": "Reset completo!", "fixValues": "Corrigir Valores", "fixValuesText1": "Se encontrou um bug ou cometeu algum erro que alterou seu personagem injustamente (dano que não deveria ter tomado, Ouro que você não mereceu, etc.), você pode manualmente corrigir seus números aqui. Sim, isso cria a possibilidade de trapacear: use essa ferramenta com sabedoria, ou sabotará sua própria construção de hábitos.", "fixValuesText2": "Note que você não pode restaurar Combos de tarefas individuais aqui. Para fazer isso, edite a Tarefa Diária e vá nas Opções Avançadas, onde você encontrará o campo de Restauração de Combos.", @@ -96,6 +108,7 @@ "emailNotifications": "Notificações de E-mail", "wonChallenge": "Você venceu um desafio!", "newPM": "Recebeu Mensagem Privada", + "sentGems": "Gemas enviadas!", "giftedGems": "Gemas Presenteadas", "giftedGemsInfo": "<%= amount %> Gemas - por <%= name %>", "giftedSubscription": "Assinaturas Presenteadas", @@ -135,6 +148,11 @@ "webhooks": "Webhooks", "enabled": "Habilitado", "webhookURL": "URL do Webhook", + "invalidUrl": "url inválida", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Adicionar", "buyGemsGoldCap": "Máximo aumentado para <%= amount %>", "mysticHourglass": "<%= amount %> Ampulhetas Místicas", @@ -149,5 +167,5 @@ "amazonPayments": "Amazon Payments", "timezone": "Fuso Horário", "timezoneUTC": "O Habitica usa o fuso horário definido no seu computador, que é <%= utc %>", - "timezoneInfo": "Se este fuso horário estiver incorreto, primeiro atualize esta página para garantir que Habitica tem as informações mais recentes. Caso continue errado, ajuste o fuso horário do seu computador e então atualize esta página novamente.
Se você utiliza Habitica em outros computadores ou aparelhos móveis, o fuso horário deve ser o mesmo em todos eles. Se suas Tarefas Diárias estiverem sendo redefinidas no horário errado, faça uma nova verificação em todos os outros computadores e navegadores de dispositivos móveis. " + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/pt/spells.json b/common/locales/pt/spells.json index 94cb8579cb..b18e618b41 100644 --- a/common/locales/pt/spells.json +++ b/common/locales/pt/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Jogue uma bola de neve em um membro da equipe! O que poderia dar errado? Dura até o novo dia do membro.", "spellSpecialSaltText": "Sal", "spellSpecialSaltNotes": "Alguém jogou uma bola de neve em você. Ha ha, muito engraçado. Agora tire essa neve de mim!", - "spellSpecialSpookDustText": "Brilhos Assustadores", - "spellSpecialSpookDustNotes": "Transforme um amigo em um lençol flutuante com olhos!", + "spellSpecialSpookySparklesText": "Brilhos Assustadores", + "spellSpecialSpookySparklesNotes": "Transforme um amigo em um lençol voador com olhos!", "spellSpecialOpaquePotionText": "Poção Opaca", "spellSpecialOpaquePotionNotes": "Cancela os efeitos de Brilhos Assustadores.", "spellSpecialShinySeedText": "Semente Cintilante", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Espuma do mar", "spellSpecialSeafoamNotes": "Transforma um amigo em uma criatura marinha!", "spellSpecialSandText": "Areia", - "spellSpecialSandNotes": "Cancela os efeitos da espuma do mar." -} + "spellSpecialSandNotes": "Cancela os efeitos da espuma do mar.", + "spellNotFound": "Habilidade \"<%= spellId %>\" não encontrada.", + "partyNotFound": "Equipe não encontrada.", + "targetIdUUID": "\"targetId\" precisa ser um ID de usuário válido.", + "challengeTasksNoCast": "O uso de habilidade em tarefas de desafio não é permitido.", + "spellNotOwned": "Você não possui essa habilidade.", + "spellLevelTooHigh": "Você precisa ter nível <%= level %> para usar essa habilidade." +} \ No newline at end of file diff --git a/common/locales/pt/subscriber.json b/common/locales/pt/subscriber.json index 98f11c8e22..511da225f2 100644 --- a/common/locales/pt/subscriber.json +++ b/common/locales/pt/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Compre Gemas com ouro, ganhe itens misteriosos mensalmente, mantenha o histórico do progresso, dobre o limite de \"drop\" diário, ajude os desenvolvedores. Clique para mais informações.", "buyGemsGold": "Comprar Gemas com Ouro", "buyGemsGoldText": "Alexander, o Comerciante, venderá a você Gemas por <%= gemCost %> ouro cada gema. Suas entregas mensais são inicialmente limitadas a <%= gemLimit %> Gemas por mês, mas esse limite aumenta em 5 Gemas a cada três meses consecutivos de assinatura , até o máximo de 50 Gemas por mês!", + "mustSubscribeToPurchaseGems": "É necessário assinar para comprar gemas com ouro.", + "reachedGoldToGemCap": "Você atingiu o limite de conversão de ouro para gemas <%= convCap %> permitido para esse mês. Nós temos isso para prevenir abuso. O limite irá reiniciar dentro dos três primeiros dias do próximo mês.", "retainHistory": "Guardar Itens adicionais no histórico", "retainHistoryText": "Deixa os Afazeres completos e o histórico de tarefas disponíveis por mais tempo.", "doubleDrops": "Capacidade de drop diário dobrado", @@ -29,8 +31,9 @@ "manageSub": "Clique para gerenciar assinatura", "cancelSub": "Cancelar Assinatura", "canceledSubscription": "Assinatura Cancelada", + "cancelingSubscription": "Cancelando a assinatura.", "adminSub": "Assinaturas Administrativas", - "morePlans": "Mais Planos
Vindo em Breve", + "morePlans": "Mais Planos
em Breve", "organizationSub": "Organização Privada", "organizationSubText": "Membros da organização participam fora do Habitica, oferecendo foco para seus participantes.", "hostingType": "Tipo de Hospedagem", @@ -73,6 +76,9 @@ "timeTravelersPopover": "Notamos que você tem uma Ampulheta Mística, então estamos felizes viajar de volta no tempo por você! Por favor escolha um mascote, montaria ou Conjunto de Itens Misteriosos que deseja. Você pode ver a lista de conjuntos passados aqui! Se esses não te agradarem, talvez você esteja interessado em um de nossos elegantes novos conjuntos futurísticos Steampunk?", "timeTravelersAlreadyOwned": "Parabéns! Você já possui todos os itens que os Viajantes do Tempo oferecem no momento. Obrigado por apoiar o site!", "mysticHourglassPopover": "A Ampulheta Mística permite a compra de certos itens oferecidos por tempo limitado, como os Conjuntos de Itens Misteriosos Mensais e recompensas de Chefões do passado!", + "mysterySetNotFound": "Conjunto misterioso não encontrado, ou conjunto já possuído.", + "mysteryItemIsEmpty": "Itens misteriosos estão vazios.", + "mysteryItemOpened": "Item misterioso aberto.", "mysterySet201402": "Conjunto \"Mensageiro Alado\"", "mysterySet201403": "Conjunto \"Andarilho da Floresta\"", "mysterySet201404": "Conjunto \"Borboleta Crepuscular\"", @@ -99,6 +105,8 @@ "mysterySet201601": "Conjunto \"Campeão de Resolução\"", "mysterySet201602": "Conjunto \"Destruidor de Corações\"", "mysterySet201603": "Conjunto Trevo de 4 Folhas da Sorte", + "mysterySet201604": "Conjunto Guerreiro de Folha", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Conjunto \"Steampunk Padrão\"", "mysterySet301405": "Conjunto \"Acessórios Steampunk\"", "mysterySetwondercon": "WonderCon", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Comprar este item por 1 Ampulheta Mística?", "petsAlreadyOwned": "Você já possui este mascote.", "mountsAlreadyOwned": "Você já possui esta montaria.", - "typeNotAllowedHourglass": "Tipo de item não disponível para compra usando Ampulhetas Místicas. Tipos permitidos:", + "typeNotAllowedHourglass": "Tipo de item não permitido para compra com a Ampulheta Mística. Tipos permitidos: <%= allowedTypes %>", "petsNotAllowedHourglass": "Mascore não disponível para compra com Ampulheta Mística.", "mountsNotAllowedHourglass": "Montaria não disponível para compra usando Ampulheta Mística.", "hourglassPurchase": "Você comprou um item usando uma Ampulheta Mística!", - "hourglassPurchaseSet": "Você comprou um conjunto de itens usando uma Ampulheta Mística!" + "hourglassPurchaseSet": "Você comprou um conjunto de itens usando uma Ampulheta Mística!", + "missingUnsubscriptionCode": "Código de cancelamento de assinatura faltando.", + "missingSubscription": "Usuário não possui um plano de assinatura.", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "Você possui um cadastro ativo, cancele seu plano antes de deletar sua conta.", + "paymentNotSuccessful": "O pagamento não foi bem-sucedido.", + "planNotActive": "O plano ainda não foi ativado (devido a um erro com o PayPal). Ele iniciará <%= nextBillingDate %>, depois disso você poderá cancelar para manter seus benefícios completos.", + "notAllowedHourglass": "Mascote/Montaria não disponíveis para compra com a Ampulheta Mística.", + "readCard": "<%= cardType %> foi lida", + "cardTypeRequired": "Tipo de cartão requerido.", + "cardTypeNotAllowed": "Tipo de carta desconhecido.", + "invalidCoupon": "Código de cupom inválido.", + "couponUsed": "Código de cupom já utilizado.", + "noSudoAccess": "Você não possui acesso de administrador.", + "couponCodeRequired": "O código do cupom é requerido.", + "eventRequired": "\"req.params.event\" é necessário.", + "countRequired": "\"req.query.count\" é necessário." } \ No newline at end of file diff --git a/common/locales/pt/tasks.json b/common/locales/pt/tasks.json index e07e14b2d5..51e877e7e2 100644 --- a/common/locales/pt/tasks.json +++ b/common/locales/pt/tasks.json @@ -73,6 +73,7 @@ "clearTags": "Limpar", "hideTags": "Ocultar", "showTags": "Mostrar", + "toRequired": "Você precisa fornecer um valor", "startDate": "Data Inicial", "startDateHelpTitle": "Quando esta tarefa deve começar?", "startDateHelp": "Defina a data para a qual esta tarefa entra em vigor. Não será debitada nos dias anteriores.", @@ -88,8 +89,9 @@ "fortifyName": "Poção de Fortificação", "fortifyPop": "Reverte todas tarefas para o valor neutro (cor amarela), e recupera toda Vida perdida.", "fortify": "Fortificar", - "fortifyText": "Fortificar reverterá todas as suas tarefas para o valor neutro (amarelo), como se tivesse acabado de adicioná-las, e completará sua vida até estar cheia. Esta é uma ótima opção caso suas tarefas vermelhas estejam tornando o jogo muito difícil, ou suas tarefas azuis tornando-o muito fácil. Se começar de novo parece mais empolgante, gaste suas Gemas e aproveite!", + "fortifyText": "A poção fortificante retornará todas as suas tarefas, exceto as tarefas de desafios, para um estado neutro (amarelo), como se você tivesse acabado de adicioná-las, e aumentará sua Saúde para a barra cheia. Isso é ótimo se suas tarefas vermelhas estão deixando o jogo muito difícil, ou se suas tarefas azuis estão deixando o jogo fácil demais. Se começar do zero te parecer mais motivador, gaste suas gemas e ganhe uma moratória!", "confirmFortify": "Tem certeza?", + "fortifyComplete": "Fortificação completa!", "sureDelete": "Você tem certeza de que deseja deletar <%= taskType %> com o texto \"<%= taskText %>\"?", "streakCoins": "Bônus de Combo!", "pushTaskToTop": "Enviar tarefa para o topo. Segure CTRL ou CMD para enviar para baixo.", @@ -112,5 +114,18 @@ "rewardHelp2": "Equipamentos afetam suas estatísticas (<%= linkStart %>Usuário > Estatísticas & Conquistas<%= linkEnd %>).", "rewardHelp3": "Equipamentos Especiais irão aparecer durante os Eventos Mundiais.", "rewardHelp4": "Não tenha medo de definir Recompensas Personalizadas! Confira algumas amostras aqui.", - "clickForHelp": "Clique para ajuda" + "clickForHelp": "Clique para ajuda", + "taskIdRequired": "\"taskId\" precisa ser um UUID válido.", + "taskNotFound": "Tarefa não encontrada.", + "invalidTaskType": "O tipo de tarefa precisa ser um de \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "Uma tarefa que pertença a um desafio não pode ser deletada.", + "checklistOnlyDailyTodo": "Listas só são suportadas em tarefas diárias e afazeres.", + "checklistItemNotFound": "Nenhum item de lista foi encontrado com o id dado.", + "itemIdRequired": "\"itemId\" precisa ser um UUID válido.", + "tagNotFound": "Nenhum item de etiqueta foi encontrado com esse id.", + "tagIdRequired": "\"tagId\" precisa ser um UUID válido correspondente a uma etiqueta pertencente ao usuário.", + "positionRequired": "\"position\" é necessária e precisa ser um número.", + "cantMoveCompletedTodo": "Não é possível mover um afazer concluído.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "A tarefa fá foi etiquetada com essa etiqueta." } \ No newline at end of file diff --git a/common/locales/ro/backgrounds.json b/common/locales/ro/backgrounds.json index 2149f6f0c1..7f3d0801d9 100644 --- a/common/locales/ro/backgrounds.json +++ b/common/locales/ro/backgrounds.json @@ -160,5 +160,12 @@ "backgroundGiantFlowersText": "Giant Flowers", "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow.", + "backgrounds052016": "SET 24: Released May 2016", + "backgroundBeehiveText": "Beehive", + "backgroundBeehiveNotes": "Buzz and dance in a Beehive.", + "backgroundGazeboText": "Gazebo", + "backgroundGazeboNotes": "Battle a Gazebo.", + "backgroundTreeRootsText": "Tree Roots", + "backgroundTreeRootsNotes": "Explore the Tree Roots." } \ No newline at end of file diff --git a/common/locales/ro/challenge.json b/common/locales/ro/challenge.json index cc7158e0cc..802f477975 100644 --- a/common/locales/ro/challenge.json +++ b/common/locales/ro/challenge.json @@ -63,5 +63,20 @@ "congratulations": "Congratulations!", "hurray": "Hurray!", "noChallengeOwner": "no owner", - "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account." + "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account.", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/ro/character.json b/common/locales/ro/character.json index ef3350480e..cd1bfe95b8 100644 --- a/common/locales/ro/character.json +++ b/common/locales/ro/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the Community Guidelines (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email leslie@habitica.com!", "statsAch": "Atribute și Realizări", "profile": "Profil", "avatar": "Customize Avatar", @@ -109,6 +110,7 @@ "mage": "Mag", "mystery": "Mister", "changeClass": "Schimbă-ți Clasa, Restituie Punctele de atribut", + "lvl10ChangeClass": "To change class you must be at least level 10.", "levelPopover": "Fiecare nivel îți oferă un punct pe care-l poți repartiza unui atribut la alegerea ta. Poți face acest lucru manual, sau poți lăsa jocul să decidă pentru tine folosind una din opțiunile de Alocare Automată.", "unallocated": "Puncte de Atribut Nealocate", "haveUnallocated": "You have <%= points %> unallocated Attribute Point(s)", @@ -164,5 +166,7 @@ "int": "INT", "showQuickAllocation": "Show stat allocation", "hideQuickAllocation": "Hide stat allocation", - "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats." + "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats.", + "invalidAttribute": "\"<%= attr %>\" is not a valid attribute.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/ro/content.json b/common/locales/ro/content.json index 81eb783655..e7fbd62026 100644 --- a/common/locales/ro/content.json +++ b/common/locales/ro/content.json @@ -31,7 +31,7 @@ "dropEggCactusAdjective": "spinos", "dropEggBearCubText": "Pui de urs", "dropEggBearCubMountText": "Urs", - "dropEggBearCubAdjective": "a brave", + "dropEggBearCubAdjective": "curajos", "questEggGryphonText": "Grifon", "questEggGryphonMountText": "Grifon", "questEggGryphonAdjective": "mândru", @@ -46,7 +46,7 @@ "questEggEggAdjective": "colorat", "questEggRatText": "Șobolan", "questEggRatMountText": "Șobolan", - "questEggRatAdjective": "a sociable", + "questEggRatAdjective": "sociabil", "questEggOctopusText": "Caracatiță", "questEggOctopusMountText": "Caracatiță", "questEggOctopusAdjective": "alunecoasă", @@ -98,21 +98,27 @@ "questEggFrogText": "Broască", "questEggFrogMountText": "Broască", "questEggFrogAdjective": "princiară", - "questEggSnakeText": "Snake", - "questEggSnakeMountText": "Snake", - "questEggSnakeAdjective": "a slithering", + "questEggSnakeText": "Șarpe", + "questEggSnakeMountText": "Șarpe", + "questEggSnakeAdjective": "alunecoasă", "questEggUnicornText": "Unicorn", - "questEggUnicornMountText": "Winged Unicorn", - "questEggUnicornAdjective": "a magical", - "questEggSabretoothText": "Sabretooth Tiger", - "questEggSabretoothMountText": "Sabretooth Tiger", - "questEggSabretoothAdjective": "a ferocious", - "questEggMonkeyText": "Monkey", - "questEggMonkeyMountText": "Monkey", - "questEggMonkeyAdjective": "a mischievous", - "questEggSnailText": "Snail", - "questEggSnailMountText": "Snail", - "questEggSnailAdjective": "a slow but steady", + "questEggUnicornMountText": "Unicorn Înaripat", + "questEggUnicornAdjective": "magic", + "questEggSabretoothText": "Tigru Preistoric", + "questEggSabretoothMountText": "Tigru Preistoric", + "questEggSabretoothAdjective": "feroce", + "questEggMonkeyText": "Maimuță", + "questEggMonkeyMountText": "Maimuță", + "questEggMonkeyAdjective": "neastâmpărat", + "questEggSnailText": "Melc", + "questEggSnailMountText": "Melc", + "questEggSnailAdjective": "încet dar sigur", + "questEggFalconText": "Șoim", + "questEggFalconMountText": "Șoim", + "questEggFalconAdjective": "iute", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", "eggNotes": "Găsește o licoare de eclozat pentru a turna peste acest ou și va ecloza în <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "de bază", "hatchingPotionWhite": "Alb", @@ -125,7 +131,8 @@ "hatchingPotionCottonCandyBlue": "Bleu", "hatchingPotionGolden": "Auriu", "hatchingPotionSpooky": "Înfricoșător", - "hatchingPotionPeppermint": "Peppermint", + "hatchingPotionPeppermint": "Mentă", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Toarnă aceasta pe un ou și va ecloza ca un companion <%= potText(locale) %>.", "premiumPotionAddlNotes": "Neutilizabil pe ouă de companioni obținute din expediții.", "foodMeat": "Carne", diff --git a/common/locales/ro/contrib.json b/common/locales/ro/contrib.json index 5b1211f0c1..b7a04f2018 100644 --- a/common/locales/ro/contrib.json +++ b/common/locales/ro/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "Hall of Contributors", "hallPatrons": "Hala Patronilor", "rewardUser": "Răsplătește utilizatorul", - "UUID": "UUID", + "UUID": "User ID", "loadUser": "Încarcă utilizator", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "Titlu", "moreDetails": "Mai multe detalii (1-7)", "moreDetails2": "mai multe detalii (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "Vizitează Hala Eroilor (contribuitori și susținători)", "conLearn": "Află mai mult despre răsplățile de contribuitor", "conLearnHow": "Află cum să contribui la Habitica", - "surveysSingle": "Helped Habitica grow by filling out a survey. There are no active surveys.", - "surveysMultiple": "Helped Habitica grow by filling out <%= surveys %> surveys. There are no active surveys.", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Current Survey", "surveyWhen": "The badge will be awarded to all participants when surveys have been processed, in late March.", "blurbInbox": "This is where your private messages are stored! You can send someone a message by clicking on the envelope icon next to their name in Tavern, Party, or Guild Chat. If you've received an inappropriate PM, you should email a screenshot of it to Lemoness (leslie@habitica.com)", diff --git a/common/locales/ro/death.json b/common/locales/ro/death.json index b67ccec897..f540eb6c98 100644 --- a/common/locales/ro/death.json +++ b/common/locales/ro/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Pierzi sănătate prea rapid?", "lowHealthTips3": "Sarcini zilnice necompletate te rănesc peste noapte, așa că ai grijă să nu adaugi prea multe la început.", "lowHealthTips4": "Dacă o sarcină zilnică nu trebuie realizată ziua respectivă, o poți dezactiva printr-un clic pe iconița cu creion.", - "goodLuck": "Baftă!" + "goodLuck": "Baftă!", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/ro/front.json b/common/locales/ro/front.json index 6297a49584..8bec41aa35 100644 --- a/common/locales/ro/front.json +++ b/common/locales/ro/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "How it Works", "companyBlog": "Blog", + "devBlog": "Developer Blog", "companyDonate": "Donează", "companyExtensions": "Extensii", "companyPrivacy": "Confidențialitate", @@ -51,6 +52,7 @@ "featureSocialHeading": "Social play", "featuredIn": "Featured in", "featuresHeading": "We also feature...", + "footerDevs": "Developers", "footerCommunity": "Comunitate", "footerCompany": "Companie", "footerMobile": "Mobil", @@ -182,6 +184,7 @@ "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", "reportAccountProblems": "Report Account Problems", "reportCommunityIssues": "Report Community Issues", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "General Questions about the Site", "businessInquiries": "Business Inquiries", "merchandiseInquiries": "Merchandise Inquiries", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/ro/gear.json b/common/locales/ro/gear.json index ec334408c3..7f85401369 100644 --- a/common/locales/ro/gear.json +++ b/common/locales/ro/gear.json @@ -189,6 +189,8 @@ "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).", "weaponArmoireBasicLongbowText": "Basic Longbow", "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "armură", "armorBase0Text": "Îmbrăcăminte simplă", "armorBase0Notes": "Haine obișnuite. Nu conferă niciun beneficiu.", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery201603Text": "Lucky Suit", "armorMystery201603Notes": "This suit is sewn from thousands of four-leafed clovers! Confers no benefit. March 2016 Subscriber Item.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorArmoireLunarArmorText": "Soothing Lunar Armor", @@ -394,6 +400,8 @@ "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).", "armorArmoireBasicArcherArmorText": "Basic Archer Armor", "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "echipament pentru cap", "headBase0Text": "Fără cască", "headBase0Notes": "Fără echipament pentru cap", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.", "headMystery201603Text": "Lucky Hat", "headMystery201603Notes": "This top hat is a magical good-luck charm. Confers no benefit. March 2016 Subscriber Item.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -613,6 +625,8 @@ "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).", "headArmoireBasicArcherCapText": "Basic Archer Cap", "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "shield-hand item", "shieldBase0Text": "No Shield-Hand Equipment", "shieldBase0Notes": "Niciun scut sau a doua armă", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Soothing Shield", "shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.", "shieldSpecialSpring2015RogueText": "Exploding Squeak", - "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength <%= str %>. Limited Edition 2015 Spring Gear.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Dish Discus", "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015HealerText": "Patterned Pillow", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).", "shieldArmoireMysticLampText": "Mystic Lamp", "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "Back Accessory", "backBase0Text": "Niciun accesoriu pentru spate", "backBase0Notes": "Niciun accesoriu pentru spate", @@ -820,6 +836,20 @@ "eyewear": "Eyewear", "eyewearBase0Text": "No Eyewear", "eyewearBase0Notes": "No Eyewear.", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Roguish Eyepatch", "eyewearSpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.", "eyewearSpecialSummerWarriorText": "Dashing Eyepatch", diff --git a/common/locales/ro/groups.json b/common/locales/ro/groups.json index 23d46f4996..89946fc398 100644 --- a/common/locales/ro/groups.json +++ b/common/locales/ro/groups.json @@ -92,6 +92,7 @@ "send": "Send", "messageSentAlert": "Message sent", "pmHeading": "Private message to <%= name %>", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "Delete All Messages", "confirmDeleteAllMessages": "Are you sure you want to delete all messages in your inbox? Other users will still see messages you have sent to them.", "optOutPopover": "Don't like private messages? Click to completely opt out", @@ -99,6 +100,15 @@ "unblock": "Un-block", "pm-reply": "Send a reply", "inbox": "Inbox", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "Report violation of Community Guidelines", "abuseFlagModalHeading": "Report <%= name %> for violation?", "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction. Appropriate reasons to flag a post include but are not limited to:
- swearing, religous oaths
- bigotry, slurs
- adult topics
- violence, including as a joke
- spam, nonsensical messages
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Falcon (Egg)", + "questFalconUnlockText": "Unlocks purchasable Falcon eggs in the Market", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/ro/rebirth.json b/common/locales/ro/rebirth.json index 43d4c22fdb..383f8a1533 100644 --- a/common/locales/ro/rebirth.json +++ b/common/locales/ro/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "Renaștere repornește personajul de la Nivelul 1.", "rebirthAdvList1": "Ai revenit la Sănătate deplină.", "rebirthAdvList2": "You have no Experience, Gold, or Equipment (with the exception of free items like Mystery items).", - "rebirthAdvList3": "Obiceiurile, Cotidienele și Sarcinile sunt resetate la galben, iar șirurile se resetează.", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "Ai clasa de început a Războinicului până când vei câștiga o altă clasă.", "rebirthInherit": "Noul tău personaj va moșteni unele lucruri de la predecesorul lui:", "rebirthInList1": "Țelurile, istoricul și setările rămân.", @@ -24,5 +24,6 @@ "rebirthPop": "Începe un nou personaj la Nivelul 1 păstrând realizările, obiectele de colecție și țelurile cu istoric.", "rebirthName": "Globul Renașterii", "reborn": "Renăscut, nivel maxim <%= reLevel %>", - "confirmReborn": "Are you sure?" + "confirmReborn": "Are you sure?", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/ro/settings.json b/common/locales/ro/settings.json index 3d32a126f9..cad9e6df41 100644 --- a/common/locales/ro/settings.json +++ b/common/locales/ro/settings.json @@ -47,6 +47,7 @@ "customDayStart": "Când începe ziua", "changeCustomDayStart": "Dorești schimbarea orei de început a zilei?", "sureChangeCustomDayStart": "Sigur dorești schimbarea orei de început a zilei?", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "Sarcinile tale zilnice se vor reseta prima dată când folosești Habitica după ora <%= time %>. Ai grijă să completezi sarcinile zilnice înainte de această oră!", "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "Altele", @@ -61,12 +62,23 @@ "newUsername": "New Login Name", "dangerZone": "Zona de pericol", "resetText1": "ATENȚIE! Aceasta îți va reseta multe setari ale contului. Este foarte nerecomandat dar totuși unii utilizatori găsesc aceasta resetare folositoare la început după ce s-au distrat cu site-ul pentru puțin timp.", - "resetText2": "Vei pierde toate nivelurile, aurul și punctele de exepriență. Toate sarcinile vor fi șterse permanent și vei pierde și istoricul lor. Vei pierde tot echipamentul dar îl vei putea cumpăra din nou incluzând toate edițiile limitate say itemurile misterioase de abonat pe care deja le dețineai (va trebui să fi setat pe clasa respectivului echipament specific). Vei păstra clasa curentă și companionii împreună cu animalele de călărit. Poate preferi să utilizezi Globul Renașterii care este o opțiune mai sigură și care-ți păstrează sarcinile curente.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Ești sigur(ă)? Asta îți va șterge contul pentru totdeauna și nu va mai putea fi niciodată restaurat! Va trebui să înregistrezi un nou cont pentru a folosi Habitica din nou. Nestematele deținute sau cheltuite nu vor fi restituite. Dacă ești absolut sigur(ă), tastează <%= deleteWord %> în căsuța pentru text de mai jos.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Folosește acestea la cererea unor aplicații externe. Totuși consideră Tokenul API ca o parolă și nu o afișa public. Ocazional ți se va cere ID-ul tău de utilizatăr dar nu afișa Token-ul API nicăieri unde ar putea fi văzut de ceilalți inclusiv în Github.", "APIToken": "Tokern API (aceasta este ca o parolă - a se vedea atenționarea de mai sus!)", + "thirdPartyApps": "Third Party Apps", + "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Chrome Chat Extension", + "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.", + "otherExtensions": "Other Extensions", + "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.", "resetDo": "Fă-o, resetează-mi contul!", + "resetComplete": "Reset complete!", "fixValues": "Aranjează valori", "fixValuesText1": "Dacă ai găsit o eroare sau ai făcut o greșeală care ți-a schimbat în mod nedrept personajul (vătămări pe care nu trebuia să le fi primit, Aur pe care nu l-ai primit etc.), poți corecta manual numerele aici. Da, asta îți permite să trișezi: folosește facilitatea aceasta cu chibzuință sau îți vei sabota propria încercare de a deprinde obiceiuri!", "fixValuesText2": "Atenție! Nu poți restabili Șirurile țelurilor individuale aici. Pentru a face asta, modifică Cotidiana și mergi la Opțiuni Avansate, unde vei găsi un câmp de Restabilire Șir.", @@ -96,6 +108,7 @@ "emailNotifications": "Email Notifications", "wonChallenge": "You won a Challenge!", "newPM": "Received Private Message", + "sentGems": "Sent gems!", "giftedGems": "Gifted Gems", "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>", "giftedSubscription": "Gifted Subscription", @@ -135,6 +148,11 @@ "webhooks": "Webhooks", "enabled": "Enabled", "webhookURL": "Webhook URL", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Add", "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", @@ -149,5 +167,5 @@ "amazonPayments": "Amazon Payments", "timezone": "Time Zone", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been reseting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/ro/spells.json b/common/locales/ro/spells.json index 935d76c41b..a513e6f9cf 100644 --- a/common/locales/ro/spells.json +++ b/common/locales/ro/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Throw a snowball at a party member! What could possibly go wrong? Lasts until member's new day.", "spellSpecialSaltText": "Sare", "spellSpecialSaltNotes": "Cineva te-a lovit cu un bulgăre de zăpadă. Ha ha, foarte amuzant. Acum dă zăpada asta jos de pe mine!", - "spellSpecialSpookDustText": "Spooky Sparkles", - "spellSpecialSpookDustNotes": "Turn a friend into a floating blanket with eyes!", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Poțiune opacă", "spellSpecialOpaquePotionNotes": "Cancel the effects of Spooky Sparkles.", "spellSpecialShinySeedText": "Shiny Seed", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Seafoam", "spellSpecialSeafoamNotes": "Turn a friend into a sea creature!", "spellSpecialSandText": "Sand", - "spellSpecialSandNotes": "Cancel the effects of Seafoam." + "spellSpecialSandNotes": "Cancel the effects of Seafoam.", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/ro/subscriber.json b/common/locales/ro/subscriber.json index b9bed50ba5..12ecc776df 100644 --- a/common/locales/ro/subscriber.json +++ b/common/locales/ro/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Cumpără nestemate cu aur, obține articole misterioase în fiecare lună, păstrează istoricul progresului, dublează limitele zilnice de picări, sprijină dezvoltatorii. Clic pentru mai multe informații.", "buyGemsGold": "Cumpără Nestemate cu Aur", "buyGemsGoldText": "Alexandru Negustoru îți va vinde nestematele la un preț de <%= gemCost %> aur pe nestemată. Livrările sale lunare sunt limitate inițial la <%= gemLimit %> nestemate pe lună, dar această limită crește cu câte 5 nestemate la fiecare trei luni de abonament consecuriv, până la un maxim de 50 de nestemate pe lună!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Reține mai mult din istoric", "retainHistoryText": "Makes completed To-Dos and task history available for longer.", "doubleDrops": "Limita maximă de obiecte câștigate este dublată", @@ -29,6 +31,7 @@ "manageSub": "Apasă ca să gestionezi abonamentul", "cancelSub": "Anulează abonamentul", "canceledSubscription": "Anulează abonamentul", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Abonamente de administrator", "morePlans": "More Plans
Coming Soon", "organizationSub": "Organizație privată", @@ -73,6 +76,9 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Felicitări! Deja deții tot ce este oferit de călătorii în timp. Mulțumim că susții site-ul!", "mysticHourglassPopover": "O clepsidră mistică îți permite să cumperi anumite articole disponibile o perioadă limitată, cum ar fi seturi misterioase de articole disponibile lunar și premii de la căpcăunii șef din trecut!", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Winged Messenger Set", "mysterySet201403": "Forest Walker Set", "mysterySet201404": "Twilight Butterfly Set", @@ -99,6 +105,8 @@ "mysterySet201601": "Champion of Resolution Set", "mysterySet201602": "Heartbreaker Set", "mysterySet201603": "Lucky Clover Set", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySetwondercon": "Wondercon", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Cumperi acest articol pentru 1 clepsidră mistică?", "petsAlreadyOwned": "Companionul este deja deținut.", "mountsAlreadyOwned": "Bidiviul este deja deținut.", - "typeNotAllowedHourglass": "Tipul de articol nu poate fi cumpărat cu clepsidra mistică. Tipurile permise:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Companionul nu poate fi cumpărat cu clepsidra mistică.", "mountsNotAllowedHourglass": "Bidiviul nu poate fi cumpărat cu clepsidra mistică.", "hourglassPurchase": "Ai cumpărat un articol cu clepsidra mistică!", - "hourglassPurchaseSet": "Ai cumpărat un set de articole cu clepsidra mistică!" + "hourglassPurchaseSet": "Ai cumpărat un set de articole cu clepsidra mistică!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/ro/tasks.json b/common/locales/ro/tasks.json index a943d9b118..ce7b1d6799 100644 --- a/common/locales/ro/tasks.json +++ b/common/locales/ro/tasks.json @@ -73,6 +73,7 @@ "clearTags": "Șterge", "hideTags": "Ascunde", "showTags": "Arată", + "toRequired": "You must supply a to value", "startDate": "Start Date", "startDateHelpTitle": "When should this task start?", "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.", @@ -88,8 +89,9 @@ "fortifyName": "Poțiune fortifiantă", "fortifyPop": "Readu toate țelurile la valoarea neutră (culoarea galbenă) și refă toată Sănătatea pierdută.", "fortify": "Fortifică", - "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "Are you sure?", + "fortifyComplete": "Fortify complete!", "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Bonus de realizare în șir!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", @@ -112,5 +114,18 @@ "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).", "rewardHelp3": "Special equipment will appear here during World Events.", "rewardHelp4": "Don't be afraid to set custom Rewards! Check out some samples here.", - "clickForHelp": "Click for help" + "clickForHelp": "Click for help", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/ru/backgrounds.json b/common/locales/ru/backgrounds.json index 0f464dffc5..12cf313cc5 100644 --- a/common/locales/ru/backgrounds.json +++ b/common/locales/ru/backgrounds.json @@ -154,11 +154,18 @@ "backgroundRainforestNotes": "Отправьтесь в тропический лес.", "backgroundStoneCircleText": "Круг Каменных глыб", "backgroundStoneCircleNotes": "Творите заклинания в круге Каменных глыб!", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", - "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgrounds042016": "Набор 23: Выпущен в апреле 2016", + "backgroundArcheryRangeText": "Лучное стрельбище", + "backgroundArcheryRangeNotes": "Практикуйтесь на лучном стрельбище", + "backgroundGiantFlowersText": "Гигантские цветы", + "backgroundGiantFlowersNotes": "Веселитесь над Гигантскими Цветами", + "backgroundRainbowsEndText": "Там, где кончается радуга", + "backgroundRainbowsEndNotes": "Отыщите золото там, где кончается радуга", + "backgrounds052016": "SET 24: Released May 2016", + "backgroundBeehiveText": "Beehive", + "backgroundBeehiveNotes": "Buzz and dance in a Beehive.", + "backgroundGazeboText": "Gazebo", + "backgroundGazeboNotes": "Battle a Gazebo.", + "backgroundTreeRootsText": "Tree Roots", + "backgroundTreeRootsNotes": "Explore the Tree Roots." } \ No newline at end of file diff --git a/common/locales/ru/challenge.json b/common/locales/ru/challenge.json index d6d5f77814..3571b491d4 100644 --- a/common/locales/ru/challenge.json +++ b/common/locales/ru/challenge.json @@ -63,5 +63,20 @@ "congratulations": "Поздравляю!", "hurray": "Ура!", "noChallengeOwner": "нет владельца", - "noChallengeOwnerPopover": "Это испытание не имеет владельца, потому что игрок, который его создал, удалил свой аккаунт." + "noChallengeOwnerPopover": "Это испытание не имеет владельца, потому что игрок, который его создал, удалил свой аккаунт.", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/ru/character.json b/common/locales/ru/character.json index f16d5cc3a8..de1edb242e 100644 --- a/common/locales/ru/character.json +++ b/common/locales/ru/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Пожалуйста, помните: ваше имя, фото профиля, а также заметка о себе должны соответствовать Правилам сообщества (например, не содержать пошлости, материалы для взрослых, оскорбления, и тому подобное). Если у вас есть вопросы относительно того, что допустимо, а что нет, пишите нам на почту leslie@habitica.com!", "statsAch": "Характеристики и достижения", "profile": "Профиль", "avatar": "Персонализировать аватар", @@ -34,7 +35,7 @@ "beard": "Борода", "mustache": "Усы", "flower": "Цветок", - "wheelchair": "Wheelchair", + "wheelchair": "Кресло-каталка", "basicSkins": "Базовые цвета", "rainbowSkins": "Радужные цвета", "pastelSkins": "Пастельные цвета", @@ -109,6 +110,7 @@ "mage": "Маг", "mystery": "Таинственный", "changeClass": "Сменить класс, перераспределить очки навыков", + "lvl10ChangeClass": "To change class you must be at least level 10.", "levelPopover": "Каждый уровень приносит вам одно очко, которое можно направить на улучшение характеристик по вашему выбору. Это можно сделать вручную, а можно позволить игре решать за вас, выбрав один из вариантов автоматического распределения.", "unallocated": "Осталось неиспользованных очков", "haveUnallocated": "Вы не распределили <%= points %> очков", @@ -164,5 +166,7 @@ "int": "ИНТ", "showQuickAllocation": "Показать распределение характеристик", "hideQuickAllocation": "Спрятать распределение характеристик", - "quickAllocationLevelPopover": "Каждый уровень приносит вам одно очко для распределения характеристики по вашему выбору. Вы можете сделать это вручную, или позволить игре решить за вас, используя параметры Автоматического распределения, которые находятся на странице Пользователь -> Характеристики аватара " + "quickAllocationLevelPopover": "Каждый уровень приносит вам одно очко для распределения характеристики по вашему выбору. Вы можете сделать это вручную, или позволить игре решить за вас, используя параметры Автоматического распределения, которые находятся на странице Пользователь -> Характеристики аватара ", + "invalidAttribute": "\"<%= attr %>\" is not a valid attribute.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/ru/content.json b/common/locales/ru/content.json index 3af04206d5..aea58e33c6 100644 --- a/common/locales/ru/content.json +++ b/common/locales/ru/content.json @@ -113,6 +113,12 @@ "questEggSnailText": "Моллюск", "questEggSnailMountText": "Моллюск", "questEggSnailAdjective": "медленный, но непоколебимый", + "questEggFalconText": "Сокол", + "questEggFalconMountText": "Сокол", + "questEggFalconAdjective": "быстрый", + "questEggTreelingText": "Кустик", + "questEggTreelingMountText": "Куст", + "questEggTreelingAdjective": "ветвистый", "eggNotes": "Найдите инкубационный эликсир, чтобы полить им это яйцо, и из него вылупится <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Обыкновенный", "hatchingPotionWhite": "Белый", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "Золотой", "hatchingPotionSpooky": "Зловещий", "hatchingPotionPeppermint": "Мята", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Полейте это на яйцо и из него вылупится <%= potText(locale) %> питомец.", "premiumPotionAddlNotes": "Несовместим с яйцами квестовых питомцев.", "foodMeat": "Мясо", diff --git a/common/locales/ru/contrib.json b/common/locales/ru/contrib.json index 3ce14640a6..7f5995e042 100644 --- a/common/locales/ru/contrib.json +++ b/common/locales/ru/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "Зал участников", "hallPatrons": "Зал покровителей", "rewardUser": "Наградить пользователя", - "UUID": "UUID", + "UUID": "ID пользователя", "loadUser": "Загрузить пользователя", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "Звание", "moreDetails": "Подробнее (1-7)", "moreDetails2": "подробнее (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "Посетите Зал героев (участники и спонсоры)", "conLearn": "Подробнее о наградах для участников", "conLearnHow": "Как внести свой вклад в Habitica", - "surveysSingle": "Помог развитию Habitica, заполнив опрос. Сейчас нет опросов для заполнения.", - "surveysMultiple": "Помог развитию HabitPRG, заполнив опросы: <%= surveys %>. Сейчас нет опросов для заполнения.", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Текущий опрос", "surveyWhen": "Участники получат этот значок после обработки опросов, в конце марта.", "blurbInbox": "Здесь хранятся ваши личные сообщения! Вы можете послать кому-нибудь сообщение, нажав на иконку конверта рядом с их именем в Таверне, Команде или в чате Гильдии. Если вы получили неуместное сообщение, вам следует послать скриншот этого сообщения Lemoness (leslie@habitica.com).", diff --git a/common/locales/ru/death.json b/common/locales/ru/death.json index 7a0d94b507..25c511fbbf 100644 --- a/common/locales/ru/death.json +++ b/common/locales/ru/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Слишком быстро теряете очки здоровья?", "lowHealthTips3": "Невыполненные ежедневные задания наносят вам урон ночью, так что будьте осторожны и не создавайте слишком много заданий на первых порах!", "lowHealthTips4": "Если нет необходимости в выполнении ежедневного задания в определенный день, вы можете отключить его, нажав значок карандаша.", - "goodLuck": "Удачи!" + "goodLuck": "Удачи!", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/ru/front.json b/common/locales/ru/front.json index c23179217f..d307c764c8 100644 --- a/common/locales/ru/front.json +++ b/common/locales/ru/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "Как это работает", "companyBlog": "Блог", + "devBlog": "Блог разработчиков", "companyDonate": "Пожертвования", "companyExtensions": "Расширения", "companyPrivacy": "Конфиденциальность", @@ -51,6 +52,7 @@ "featureSocialHeading": "Коллективная игра", "featuredIn": "О Habitica пишут", "featuresHeading": "Мы также предлагаем...", + "footerDevs": "Разработчики", "footerCommunity": "Сообщество", "footerCompany": "Компания", "footerMobile": "Мобильные приложения", @@ -175,13 +177,14 @@ "unlockByline1": "Достигайте целей и повышайте свой уровень.", "unlockByline2": "Откройте новые инструменты мотивации, включая коллекционирование питомцев, случайные награды, заклинания и другое!", "unlockHeadline": "Пока вы остаетесь продуктивными, вы открываете что-то новое!", - "useUUID": "Используйте UUID / API Token (для пользователей Facebook)", + "useUUID": "Используйте UUID / токен API (для пользователей Facebook)", "username": "Имя", "watchVideos": "Смотреть видео", "work": "Работа", "zelahQuote": "Благодаря [Habitica], я чаще стараюсь ложиться спать вовремя, потому что знаю, что получу очки, если лягу пораньше, и потеряю здоровье, если долго засижусь.", "reportAccountProblems": "Сообщить о проблеме с учетной записью", "reportCommunityIssues": "Сообщить о проблеме с сообществом", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "Общие Вопросы по Сайту", "businessInquiries": "Бизнес предложения", "merchandiseInquiries": "Предложения по использованию торговой марки", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/ru/gear.json b/common/locales/ru/gear.json index 879dd22009..b61f9243be 100644 --- a/common/locales/ru/gear.json +++ b/common/locales/ru/gear.json @@ -187,8 +187,10 @@ "weaponArmoireJesterBatonNotes": "Один взмах вашей дубинки и капелька шутовской находчивости - и даже самая сложная ситуация немедленно прояснится. Увеличивает интеллект и восприятие на <%= attrs %>. Зачарованный сундук: Набор Шута (предмет 3 из 3).", "weaponArmoireMiningPickaxText": "Кирка", "weaponArmoireMiningPickaxNotes": "Добудьте как можно больше золота из ваших задач! Увеличивает восприятие на <%= per %>. Зачарованный сундук: Набор Горняка (предмет 3 из 3).", - "weaponArmoireBasicLongbowText": "Basic Longbow", - "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireBasicLongbowText": "Базовый лук", + "weaponArmoireBasicLongbowNotes": "Прочный и недорогой лук. Увеличивает силу на <%= str %>. Зачарованный сундук: Базовый набор Лучника (предмет 1 из 3).", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "Броня", "armorBase0Text": "Обычная одежда", "armorBase0Notes": "Обычная одежда. Бонусов не дает.", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Вызови ледяное пламя зимы! Преимуществ не дает. Предмет для подписчиков декабря 2015.", "armorMystery201603Text": "Счастливый костюм", "armorMystery201603Notes": "Этот костюм пошит из тысяч четырехлистных клеверов! Бонусов не дают. Подарок подписчикам марта 2016.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Стимпанковский костюм", "armorMystery301404Notes": "Чудной и лихой! Бонусов не дает. Подарок подписчикам февраля 3015.", "armorArmoireLunarArmorText": "Лунные доспехи успокоения", @@ -392,8 +398,10 @@ "armorArmoireJesterCostumeNotes": "Тра-ля-ля! По этому костюму так сразу и не скажешь, но вы вовсе не дурак. Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор Шута (предмет 2 из 3).", "armorArmoireMinerOverallsText": "Комбинезон шахтера", "armorArmoireMinerOverallsNotes": "Да, он выглядит поношенным, но специальное заклятие отталкивает от него грязь. Увеличивает телосложение на <%= con %>. Зачарованный сундук: Набор Горняка (предмет 2 из 3).", - "armorArmoireBasicArcherArmorText": "Basic Archer Armor", - "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireBasicArcherArmorText": "Базовые доспехи лучника", + "armorArmoireBasicArcherArmorNotes": "Эта камуфляжная безрукавка позволит вам ускользать незамеченным через леса. Увеличивает восприятие на <%= per %>. Зачарованный сундук: Базовый набор Лучника (предмет 2 из 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "Головной убор", "headBase0Text": "Нет шлема", "headBase0Notes": "Нет головного убора.", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Оградите свою индивидуальность от всех своих поклонников. Бонусов не дает. Подарок подписчикам февраля 2016.", "headMystery201603Text": "Счастливая шляпа", "headMystery201603Notes": "Эта шляпа - магический амулет, приносящий удачу. Бонусов не дает. Подарок подписчикам марта 2016.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Модный цилиндр", "headMystery301404Notes": "Модный цилиндр для самых уважаемых господ! Подарок подписчикам января 3015. Бонусов не дает.", "headMystery301405Text": "Обычный цилиндр", @@ -611,8 +623,10 @@ "headArmoireJesterCapNotes": "Колокольчики на шляпе отвлекают врагов, а вам помогают сосредоточиться. Увеличивает восприятие на <%= per %>. Зачарованный сундук: Набор Шута (предмет 1 из 3).", "headArmoireMinerHelmetText": "Каска шахтера", "headArmoireMinerHelmetNotes": "Защитите свою голову от падающих задач! Увеличивает интеллект на <%= int %>. Зачарованный сундук: Набор Шахтера (предмет 1 из 3).", - "headArmoireBasicArcherCapText": "Basic Archer Cap", - "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireBasicArcherCapText": "Базовая шляпа лучника", + "headArmoireBasicArcherCapNotes": "Ни один лучник не обходиться без своей веселой шляпы! Увеличивает восприятие на <%= per %>. Зачарованный сундук: Базовый набор Лучника (предмет 3 из 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "предмет для защитной руки", "shieldBase0Text": "Нет снаряжения для защитной руки", "shieldBase0Notes": "Нет щита или второго оружия.", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Щит Успокоения", "shieldSpecialWinter2015HealerNotes": "Этот щит отражает леденящий ветер. Увеличивает телосложение на <%= con %>. Экипировка ограниченного выпуска зимы 2014-2015.", "shieldSpecialSpring2015RogueText": "Взрывной Писк", - "shieldSpecialSpring2015RogueNotes": "Не дайте звуку обмануть вас – эта взрывчатка просто сбивает с ног. Увеличивает силу на <%= str %>. Экипировка ограниченного выпуска весны 2015.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Метательная Тарелка", "shieldSpecialSpring2015WarriorNotes": "Швырните ей во врага! Ну или оставьте себе, потому что к обеду в ней будет полно вкусного корма. Увеличивает телосложение на <%= con %>. Экипировка ограниченного выпуска весны 2015.", "shieldSpecialSpring2015HealerText": "Узорчатая Подушка", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Отвлеките врагов этим щитом в форме дракона. Увеличивает восприятие на <%= per %>. Зачарованный сундук: Набор Укротителя драконов (предмет 2 из 3).", "shieldArmoireMysticLampText": "Таинственная лампа", "shieldArmoireMysticLampNotes": "Осветите темные пещеры с помощью этой таинственной лампы! Увеличивает восприятие на <%= per %>. Зачарованный сундук: Независимый предмет.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "Аксессуар на спину", "backBase0Text": "Нет аксессуаров на спине", "backBase0Notes": "Нет аксессуаров на спине.", @@ -815,11 +831,25 @@ "headAccessoryMystery201510Notes": "Эти грозные рога немного склизкие. Бонусов не даёт. Подарок подписчикам октября 2015.", "headAccessoryMystery301405Text": "Очки на голове", "headAccessoryMystery301405Notes": "\"Защищать очками надо глаза,\" говорили они. \"Кому сдались защитные очки на макушке,\" говорили они. Ха! Вы им показали! Подарок подписчикам августа 3015. Бонусов не дает.", - "headAccessoryArmoireComicalArrowText": "Comical Arrow", - "headAccessoryArmoireComicalArrowNotes": "This whimsical item doesn't provide a stat boost, but it sure is good for a laugh! Confers no benefit. Enchanted Armoire: Independent Item.", + "headAccessoryArmoireComicalArrowText": "Забавная Стрела", + "headAccessoryArmoireComicalArrowNotes": "Причудливый предмет не дает усиление характеристикам, но определенно подходит для потехи! Бонусов не дает. Зачарованный сундук: Независимый предмет.", "eyewear": "Очки", "eyewearBase0Text": "Нет очков или маски", "eyewearBase0Notes": "Нет очков или маски.", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Разбойничья повязка", "eyewearSpecialSummerRogueNotes": "Не нужно быть негодяем, чтобы понять, насколько она стильная! Бонусов не дает. Экипировка ограниченного выпуска лета 2014.", "eyewearSpecialSummerWarriorText": "Пиратская повязка", diff --git a/common/locales/ru/generic.json b/common/locales/ru/generic.json index 3995fe288a..6caa6a045d 100644 --- a/common/locales/ru/generic.json +++ b/common/locales/ru/generic.json @@ -137,9 +137,9 @@ "achievementStressbeastText": "Помог победить Отвратительного Стрессозверя в 2014 во время Зимнего События Чудостраны!", "achievementBurnout": "Спаситель Процветающих Полей", "achievementBurnoutText": "Помог победить Перегорание и восстановить Истощённых Духов во время Осеннего Фестиваля 2015 года!", - "achievementBewilder": "Savior of Mistiflying", - "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!", - "checkOutProgress": "Отметить мои достижения в Habitica!", + "achievementBewilder": "Спаситель Летящейдымки", + "achievementBewilderText": "Помог(ла) победить С-толку-сбивателя во время события Весенней Веселухи 2016!", + "checkOutProgress": "Оцените мои достижения в Habitica!", "cardReceived": "Получено письмо!", "cardReceivedFrom": "<%= cardType %> от <%= userName %>", "greetingCard": "Приветственное письмо", diff --git a/common/locales/ru/groups.json b/common/locales/ru/groups.json index 68f9085afa..c74a8d6d6a 100644 --- a/common/locales/ru/groups.json +++ b/common/locales/ru/groups.json @@ -72,11 +72,11 @@ "optionalMessage": "Необязательное сообщение", "yesRemove": "Да, удалить", "foreverAlone": "Вы не можете лайкать свое собственное сообщение. Не будьте таким человеком.", - "sortLevel": "Отсортировать по уровню", + "sortLevel": "Сортировать по уровню", "sortRandom": "В случайном порядке", "sortPets": "Сортировать по количеству питомцев", - "sortJoined": "Отсортировать по дате вступления", - "sortName": "Отсортировать в алфавитном порядке", + "sortJoined": "Сортировать по дате присоединения к команде", + "sortName": "Сортировать по имени", "sortBackgrounds": "Сортировать по фону", "sortHabitrpgJoined": "Сортировать по дате присоединения к Habitica", "sortHabitrpgLastLoggedIn": "Сортировать по времени последнего входа", @@ -92,6 +92,7 @@ "send": "Отправить", "messageSentAlert": "Сообщение отправлено", "pmHeading": "Личное сообщение для <%= name %>", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "Удалить все сообщения", "confirmDeleteAllMessages": "Вы действительно хотите удалить входящие сообщения? Сообщения, отправленные вами другим пользователям, все еще будут им доступны.", "optOutPopover": "Не любите личные сообщения? Нажмите, чтобы отказаться от использования", @@ -99,6 +100,15 @@ "unblock": "Разблокировать", "pm-reply": "Ответить", "inbox": "Почта", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "Сообщить о нарушении Правил сообщества", "abuseFlagModalHeading": "Сообщить о нарушении со стороны <%= name %>?", "abuseFlagModalBody": "Вы уверены, что хотите пожаловаться на этот пост? На пост следует жаловаться ИСКЛЮЧИТЕЛЬНО в случае, если в нем нарушаются <%= firstLinkStart %>Правила сообщества<%= linkEnd %> и/или <%= secondLinkStart %>Условия использования<%= linkEnd %>. Неуместная жалоба на пост является нарушением Правил сообщества и может послужить поводом для принятия соответствующих мер. Допустимые поводы подачи жалобы на пост включают, но не ограничены следующим:
- ругань, религиозные проклятья
- оскорбления, нецензурные выражения
- \"взрослые\" темы
- насилие, включая \"шуточное\"
- спам, бессмысленные сообщения
The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
“Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
“As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
“Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
“My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
PainterProphet ducks as lightning bolts crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.", + "questBewilderText": "С-толку-сбиватель", + "questBewilderNotes": "Вечеринка начинается, как обычно.
Отличные закуски, задорная музыка, и даже танцующие слоны уже не вызывают недоумения. Жители страны Habitica смеются и кружатся среди переполненных цветами корзин, с готовностью исполняя ловкие трюки и элегантные повороты.
Часы на Таинственной башне бьют полночь, и Апрельский Дурак запрыгивает на сцену, чтобы произнести речь.
\"Друзья! Враги! Терпящие меня знакомые! Послушайте меня\". В толпе посмеиваются при виде звериных ушей, вылезающих из голов, и жители позируют со своими новыми аксессуарами.
\"Как вы знаете\", - продолжает Дурак, - \"обычно мои путающие иллюзии длятся только один день. Но я с радостью сообщаю, что я нашел простой способ сделать веселье бесконечным и не иметь дела с нашими неприятными повседневными обязанностями. Дорогие жители страны Habitica, встречайте, мой новый волшебный друг - Раз О'зли!\"
", "questBewilderCompletion": "The Be-Wilder is DEFEATED!
We've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.
Mistiflying is saved!
The April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”
The crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.
“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”
Redphoenix coughs meaningfully.
“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”
Encouraged, the marching band starts up.
It isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.
As Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", "questBewilderCompletionChat": "`The Be-Wilder is DEFEATED!`\n\nWe've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.\n\n`Mistiflying is saved!`\n\nThe April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”\n\nThe crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.\n\n“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”\n\nRedphoenix coughs meaningfully.\n\n“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”\n\nEncouraged, the marching band starts up.\n\nIt isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.\n\nAs Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", - "questBewilderBossRageTitle": "Beguilement Strike", + "questBewilderBossRageTitle": "Отвлекающий удар", "questBewilderBossRageDescription": "When this gauge fills, The Be-Wilder will unleash its Beguilement Strike on Habitica!", - "questBewilderDropBumblebeePet": "Bumblebee (Pet)", - "questBewilderDropBumblebeeMount": "Bumblebee (Mount)", + "questBewilderDropBumblebeePet": "Волшебная пчелка (Питомец)", + "questBewilderDropBumblebeeMount": "Волшебная пчелка (Скакун)", "questBewilderBossRageMarket": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nOh no! Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.\n\nHurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.", "questBewilderBossRageStables": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nAhh!!! Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!", - "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!" + "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!", + "questFalconText": "Птицы прокрастинации", + "questFalconNotes": "Mt. Habitica is being overshadowed by a looming mountain of To-Dos. It used to be a place to picnic and enjoy a sense of accomplishment, until the neglected tasks grew out of control. Now it's home to fearsome Birds of Preycrastination, foul creatures which stop Habiticans from completing their tasks!
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Одержав окончательную победу над Птицами Прокрастинации вы присели чтобы, насладится видом и заслуженным отдыхом.
\"Вау!\" - сказал @Trogdorina. \"Ты выйграл!\"
@Squish добавил: \"Вот, возьми эти яйца, которые я нашел, в качестве награды.\"", + "questFalconBoss": "Птицы прокрастинации", + "questFalconDropFalconEgg": "Сокол (яйцо)", + "questFalconUnlockText": "Позволяет покупать на рынке сокола в яйце.", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/ru/rebirth.json b/common/locales/ru/rebirth.json index 507a0ba69a..a987c202ab 100644 --- a/common/locales/ru/rebirth.json +++ b/common/locales/ru/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "Перерождение позволит вашему персонажу начать всё сначала с 1 уровня.", "rebirthAdvList1": "Ваше здоровье полностью восстанавливается.", "rebirthAdvList2": "У вас нет ни опыта, ни золота, ни предметов (за исключением бесплатных, например мистических).", - "rebirthAdvList3": "Ваши привычки, ежедневные задачи и список дел станут вновь желтыми, а счетчики серий выполненных подряд заданий обнулятся.", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "У вас будет начальный класс воина, пока вы не заработаете новый класс.", "rebirthInherit": "Ваш новый персонаж унаследует несколько вещей от своего предшественника:", "rebirthInList1": "Задания, история и настройки останутся.", @@ -24,5 +24,6 @@ "rebirthPop": "Начните заново с персонажем 1 уровня, сохранив достижения, коллекционные предметы и задания с историей.", "rebirthName": "Шар возрождения", "reborn": "Возрождение, макс. уровень <%= reLevel %>", - "confirmReborn": "Вы уверены?" + "confirmReborn": "Вы уверены?", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/ru/settings.json b/common/locales/ru/settings.json index 36164edc36..24abe566a5 100644 --- a/common/locales/ru/settings.json +++ b/common/locales/ru/settings.json @@ -47,6 +47,7 @@ "customDayStart": "Персональное начало суток", "changeCustomDayStart": "Изменить персональное начало суток?", "sureChangeCustomDayStart": "Вы уверены, что хотите изменить персональное начало суток?", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "Ваши ежедневные задания будут обнулены при первом же посещении сайта после <%= time %>. Убедитесь, что вы выполнили ежедневные задания до этого времени!", "customDayStartInfo1": "Habitica по умолчанию проверяет и сбрасывает ваши ежедневные задачи каждый день в полночь по вашему часовому поясу. Вы можете настроить это время здесь.", "misc": "Разное", @@ -61,12 +62,23 @@ "newUsername": "Новое имя пользователя", "dangerZone": "Опасная зона", "resetText1": "Осторожно! Это обнулит многое в вашем аккаунте. Использовать эту функцию крайне не рекомендуется, однако некоторым игрокам она может пригодится в начале — после того, как они попробуют приложение.", - "resetText2": "Вы потеряете уровень, всё свое золото и очки опыта. Все ваши задачи будут удалены навсегда и вы навсегда потеряете историю выполнения заданий. Вы также потеряете всё снаряжение, но сможете купить его снова, включая снаряжение ограниченного выпуска и таинственные предметы подписчиков, которые у вас уже есть (если снаряжение, которое вы хотите выкупить, предназначено для определенного класса, ваш класс должен соответствовать ему). Вы сохраните свой класс, питомцев и скакунов. Возможно, вам лучше воспользоваться шаром возрождения — он намного безопаснее и вы сохраните все свои задачи.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Вы уверены? Ваш аккаунт будет удален навсегда без возможности восстановления! Вам понадобится зарегистрировать новый аккаунт, если вы захотите пользоваться Habitica снова. Стоимость потраченных и находящихся в банке самоцветов не будет компенсирована. Если вы абсолютно уверены, напишите <%= deleteWord %> в текстовом поле ниже.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Скопируйте, чтобы использовать в сторонних приложениях. Однако, относитесь к токену API, как к паролю — не выкладывайте его в открытый доступ. Иногда у вас могут попросить ваш ID пользователя, но никогда не публикуйте токен API там, где его могут увидеть другие, включая Github.", "APIToken": "Токен API (это пароль — смотри предупреждение выше!)", + "thirdPartyApps": "Сторонние приложения", + "dataToolDesc": "Веб-страница, которая отображает определенную информацию из вашего аккаунта в Habitica, такую как статистика по задачам, снаряжение и умения.", + "beeminder": "Beeminder", + "beeminderDesc": "Позвольте Пчелиному Напоминателю автоматически отслеживать прогресс по списку задач в стране Habitica. Вы можете дать обещание выполнять определённое количество задач в день или в неделю, или же можно просто пообещать постепенно выполнять задачи из списка. (Под \"обещанием\" Пчелиный Напоминатель понимает угрозу денежного штрафа! Но может быть вам просто понравится, как он выглядит.)", + "chromeChatExtension": "Чат дополнение для Chrome", + "chromeChatExtensionDesc": "Чат дополнение для Chrome добавит область с чатом на все страницы habitica.com. Позволит общаться пользователям где бы они ни были: в таверне, команде или в любой гильдии.", + "otherExtensions": "Другие расширения", + "otherDesc": "Ищите другие приложения, дополнения и инструменты на Habitica wiki.", "resetDo": "Да, сделать сброс учетной записи!", + "resetComplete": "Reset complete!", "fixValues": "Исправить данные", "fixValuesText1": "Если в результате программной ошибки или непреднамеренных действий изменились параметры персонажа (урон, который не должен был быть причинен; золото, которое вы на самом деле не заработали), вы можете вручную исправить значения. Да, таким образом возможно жульничать, поэтому мудро используйте эту функцию, если не хотите подорвать весь процесс выработки привычек!", "fixValuesText2": "Обратите внимание, что здесь невозможно восстановить серии выполненных подряд отдельных заданий. Для этого войдите в редактирование ежедневного задания и воспользуйтесь полем – «Восстановить серию» в разделе «Дополнительные параметры».", @@ -96,6 +108,7 @@ "emailNotifications": "Уведомления по электронной почте", "wonChallenge": "Вы выиграли испытание", "newPM": "Получено личное сообщение", + "sentGems": "Sent gems!", "giftedGems": "Подаренные самоцветы", "giftedGemsInfo": "<%= amount %> самоцветов от <%= name %>", "giftedSubscription": "Подписка в подарок", @@ -135,6 +148,11 @@ "webhooks": "Веб-хуки", "enabled": "Включено", "webhookURL": "Ссылка на веб-хук", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Добавить", "buyGemsGoldCap": "Предел повышен до <%= amount %>", "mysticHourglass": "Кол-во мистических песочных часов: <%= amount %>", @@ -149,5 +167,5 @@ "amazonPayments": "Платеж с помощью Amazon", "timezone": "Часовой пояс", "timezoneUTC": "Habitica использует часовой пояс, установленный на вашем компьютере. В данный момент это: <%= utc %>", - "timezoneInfo": "Если часовой пояс определен неверно, сначала следует перезагрузить страницу, нажав на кнопку \"обновить\" в вашем браузере, чтобы убедиться, что используется текущее время. Если время по-прежнему определено неверно, поправьте установки времени на вашем компьютере и снова перезагрузите эту страницу.
Если вы используете Habitica на нескольких компьютерах или мобильных устройствах, необходимо установить одинаковый часовой пояс на всех используемых устройствах. Если ваши Ежедневные задачи сбрасываются в неправильное время, повторите эту проверку на всех остальных компьютерах и в браузерах на мобильных устройствах." + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/ru/spells.json b/common/locales/ru/spells.json index de7809cd94..9a6ec57186 100644 --- a/common/locales/ru/spells.json +++ b/common/locales/ru/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Бросьте снежок в товарища по команде! Что может пойти не так? Эффект длится до наступления нового дня компаньона.", "spellSpecialSaltText": "Соль", "spellSpecialSaltNotes": "Кто-то кинул в вас снежок. Ха-ха, очень смешно. А теперь стряхните с меня снег!", - "spellSpecialSpookDustText": "Зловещие искры", - "spellSpecialSpookDustNotes": "Превратите друга в парящую простыню с глазами!", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Зелье Непроницаемости", "spellSpecialOpaquePotionNotes": "Отменить эффект Зловещих искр", "spellSpecialShinySeedText": "Солнечное семя", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Морская пена", "spellSpecialSeafoamNotes": "Превратите друга в морское создание!", "spellSpecialSandText": "Песок", - "spellSpecialSandNotes": "Отменить эффект морской пены." + "spellSpecialSandNotes": "Отменить эффект морской пены.", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/ru/subscriber.json b/common/locales/ru/subscriber.json index ad3a8fcbd3..d961c5e74d 100644 --- a/common/locales/ru/subscriber.json +++ b/common/locales/ru/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Покупайте самоцветы за золото, получайте таинственные предметы каждый месяц, сохраняйте историю своего прогресса, удвойте ежедневный предел выпадения трофеев, поддерживайте разработчиков. Нажмите, чтобы узнать больше.", "buyGemsGold": "Возможность покупки самоцветов за золото", "buyGemsGoldText": "Торговец Александр будет продавать вам Самоцветы по цене <%= gemCost %> золота за каждый. Его ежемесячные поставки изначально ограничены до <%= gemLimit %> Самоцветов в месяц. Но это ограничение увеличивается на 5 Самоцветов каждые три месяца последовательной подписки вплоть до максимума в 50 Самоцветов в месяц!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Увеличенный список выполненных задач", "retainHistoryText": "Завершенные задачи дольше дольше не архивируются и доступны для просмотра.", "doubleDrops": "Увеличение дневного предела выпадения предметов в 2 раза", @@ -29,6 +31,7 @@ "manageSub": "Нажмите для управления подпиской", "cancelSub": "Отмена подписки", "canceledSubscription": "Подписка отменена", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Подписки администратора", "morePlans": "Больше тарифов
Скоро", "organizationSub": "Частная организация", @@ -73,6 +76,9 @@ "timeTravelersPopover": "Видно, что вы с Мистическими песочными часами, так что мы с радостью отправимся для вас в прошлое! Пожалуйста, выберите себе питомца, скакуна, или Комплект Таинственных предметов. Вы можете увидеть список прошлых комплектов здесь! Если они вам не подходят, возможно, вы будете заинтересованы в одном из наших модных футуристических Комплектов в стиле Стимпанк?", "timeTravelersAlreadyOwned": "Поздравляем! У вас уже есть все предметы, которые могут предложить путешественники во времени. Благодарим за поддержку сайта!", "mysticHourglassPopover": "Загадочные песочные часы позволят вам приобрести определённые предметы, которые были лишь временно доступны когда-то. Например, наборы таинственных предметов и награды за мировых боссов. Прямо из прошлого!", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Набор Крылатого посланника", "mysterySet201403": "Набор Лесничего", "mysterySet201404": "Набор Сумеречной бабочки", @@ -99,6 +105,8 @@ "mysterySet201601": "Набор Чемпиона Решительности", "mysterySet201602": "Набор Сердцееда", "mysterySet201603": "Набор Счастливого Клевера", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Стандартный Стимпанковый набор", "mysterySet301405": "Набор аксессуаров в стиле Стимпанка", "mysterySetwondercon": "Вандер-Кон", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Купить этот предмет за 1 мистические песочные часы?", "petsAlreadyOwned": "У вас уже есть этот питомец.", "mountsAlreadyOwned": "У вас уже есть этот скакун.", - "typeNotAllowedHourglass": "Покупка предметов этого типа с помощью мистических песочных часов не поддерживается. Допустимые типы:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Этого питомца нельзя купить за мистические песочные часы.", "mountsNotAllowedHourglass": "Этого скакуна нельзя купить за мистические песочные часы.", "hourglassPurchase": "Приобретён предмет за мистические песочные часы!", - "hourglassPurchaseSet": "Приобретён набор предметов за мистические песочные часы!" + "hourglassPurchaseSet": "Приобретён набор предметов за мистические песочные часы!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/ru/tasks.json b/common/locales/ru/tasks.json index 3d23c20de7..01d64edd52 100644 --- a/common/locales/ru/tasks.json +++ b/common/locales/ru/tasks.json @@ -32,7 +32,7 @@ "mental": "Умственное", "otherExamples": "Например, профессиональные цели, хобби, финансы и т. д.", "progress": "Прогресс", - "daily": "Ежедневное задание", + "daily": "Ежедневные задания", "dailies": "Ежедневное", "newDaily": "Новое ежедневное задание", "newDailyBulk": "Новые ежедневные задания (по одному на строку)", @@ -73,6 +73,7 @@ "clearTags": "Очистить", "hideTags": "Скрыть", "showTags": "Показать", + "toRequired": "You must supply a to value", "startDate": "Дата начала", "startDateHelpTitle": "Когда это задание должно начаться?", "startDateHelp": "Задайте дату, в этот день задание вступит в силу. До этого оно будет необязательным.", @@ -88,8 +89,9 @@ "fortifyName": "Эликсир укрепления", "fortifyPop": "Вернуть все задания в нейтральное состояние (желтый цвет) и восстановить всё здоровье.", "fortify": "Укрепление", - "fortifyText": "Укрепление вернёт все ваши задания в нейтральный (жёлтый) цвет, как будто бы вы их только что добавили, и восстановит всё здоровье до максимума. Это пригодится, если все ваши красные задания слишком усложняют, а синие — слишком упрощают игру. Если новое, свежее начало даст вам больше сил и мотивации, не пожалейте самоцветов и получите временное облегчение!", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "Вы уверены?", + "fortifyComplete": "Fortify complete!", "sureDelete": "Вы уверены, что хотите удалить <%= taskType %> с текстом \"<%= taskText %>\"?", "streakCoins": "Бонус за серию!", "pushTaskToTop": "Нажмите, чтобы переместить в начало списка. Удерживайте ctrl или cmd при нажатии, чтобы переместить в конец.", @@ -112,5 +114,18 @@ "rewardHelp2": "Снаряжение влияет на ваши характеристики (<%= linkStart %>Пользователь > Характеристики<%= linkEnd %>).", "rewardHelp3": "Здесь появится особое снаряжение во время Мировых Событий.", "rewardHelp4": "Не бойтесь назначать себе персональные награды! Посмотрите примеры наград здесь.", - "clickForHelp": "Помощь" + "clickForHelp": "Помощь", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/sk/backgrounds.json b/common/locales/sk/backgrounds.json index a87d08ee0a..8bfd63bfac 100644 --- a/common/locales/sk/backgrounds.json +++ b/common/locales/sk/backgrounds.json @@ -98,67 +98,74 @@ "backgroundGiantWaveNotes": "Surfuj na obrovskej vlne!", "backgroundSunkenShipText": "Potopená loď", "backgroundSunkenShipNotes": "Preskúmaj potopenú loď.", - "backgrounds082015": "SET 15: Released August 2015", - "backgroundPyramidsText": "Pyramids", - "backgroundPyramidsNotes": "Admire the Pyramids.", - "backgroundSunsetSavannahText": "Sunset Savannah", - "backgroundSunsetSavannahNotes": "Stalk across the Sunset Savannah.", - "backgroundTwinklyPartyLightsText": "Twinkly Party Lights", - "backgroundTwinklyPartyLightsNotes": "Dance under Twinkly Party Lights!", - "backgrounds092015": "SET 16: Released September 2015", - "backgroundMarketText": "Habitica Market", - "backgroundMarketNotes": "Shop in the Habitica Market.", - "backgroundStableText": "Habitica Stable", - "backgroundStableNotes": "Tend mounts in the Habitica Stable.", - "backgroundTavernText": "Habitica Tavern", - "backgroundTavernNotes": "Visit the Habitica Tavern.", - "backgrounds102015": "SET 17: Released October 2015", - "backgroundHarvestMoonText": "Harvest Moon", - "backgroundHarvestMoonNotes": "Cackle under the Harvest Moon.", - "backgroundSlimySwampText": "Slimy Swamp", - "backgroundSlimySwampNotes": "Slog through a Slimy Swamp.", - "backgroundSwarmingDarknessText": "Swarming Darkness", - "backgroundSwarmingDarknessNotes": "Shiver in the Swarming Darkness.", - "backgrounds112015": "SET 18: Released November 2015", - "backgroundFloatingIslandsText": "Floating Islands", - "backgroundFloatingIslandsNotes": "Hop across the Floating Islands.", - "backgroundNightDunesText": "Night Dunes", - "backgroundNightDunesNotes": "Walk peacefully through the Night Dunes.", - "backgroundSunsetOasisText": "Sunset Oasis", - "backgroundSunsetOasisNotes": "Bask in the Sunset Oasis.", - "backgrounds122015": "SET 19: Released December 2015", - "backgroundAlpineSlopesText": "Alpine Slopes", - "backgroundAlpineSlopesNotes": "Ski on the Alpine Slopes.", - "backgroundSnowySunriseText": "Snowy Sunrise", - "backgroundSnowySunriseNotes": "Gaze at the Snowy Sunrise.", - "backgroundWinterTownText": "Winter Town", - "backgroundWinterTownNotes": "Bustle through a Winter Town.", - "backgrounds012016": "SET 20: Released January 2016", - "backgroundFrozenLakeText": "Frozen Lake", - "backgroundFrozenLakeNotes": "Skate on a Frozen Lake.", - "backgroundSnowmanArmyText": "Snowman Army", - "backgroundSnowmanArmyNotes": "Lead a Snowman Army.", - "backgroundWinterNightText": "Winter Night", - "backgroundWinterNightNotes": "Look at the stars of a Winter Night.", - "backgrounds022016": "SET 21: Released February 2016", - "backgroundBambooForestText": "Bamboo Forest", - "backgroundBambooForestNotes": "Stroll through the Bamboo Forest.", - "backgroundCozyLibraryText": "Cozy Library", - "backgroundCozyLibraryNotes": "Read in the Cozy Library.", - "backgroundGrandStaircaseText": "Grand Staircase", - "backgroundGrandStaircaseNotes": "Stride down the Grand Staircase.", - "backgrounds032016": "SET 22: Released March 2016", - "backgroundDeepMineText": "Deep Mine", - "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.", - "backgroundRainforestText": "Rainforest", - "backgroundRainforestNotes": "Venture into a Rainforest.", - "backgroundStoneCircleText": "Circle of Stones", - "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones.", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", - "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgrounds082015": "15. sada: Vydaná v auguste 2015", + "backgroundPyramidsText": "Pyramídy", + "backgroundPyramidsNotes": "Obdivuj pyramídy. ", + "backgroundSunsetSavannahText": "Západ slnka v Savane", + "backgroundSunsetSavannahNotes": "Kráčaj oproti Západu slnka v Savane.", + "backgroundTwinklyPartyLightsText": "Žiariace Párty Svetlá", + "backgroundTwinklyPartyLightsNotes": "Tancuj pod Žiariacimi Párty Svetlami!", + "backgrounds092015": "16. sada: Vydaná v septembri 2015", + "backgroundMarketText": "Trh Habitiky", + "backgroundMarketNotes": "Obchoduj v Trhu Habitiky.", + "backgroundStableText": "Stajňa Habitiky", + "backgroundStableNotes": "Staraj sa o svoje tátoše v Stajni Habitiky.", + "backgroundTavernText": "Hostinec Habitiky", + "backgroundTavernNotes": "Navštív Hostinec Habitiky.", + "backgrounds102015": "17. sada: Vydaná v októbri 2015", + "backgroundHarvestMoonText": "Jesenná rovnodennosť", + "backgroundHarvestMoonNotes": "Prechádzka počas jesennej rovnodennosti.", + "backgroundSlimySwampText": "Slizký močiar", + "backgroundSlimySwampNotes": "Prebroď sa slizkým močiarom.", + "backgroundSwarmingDarknessText": "Roj temnoty", + "backgroundSwarmingDarknessNotes": "Chvej sa v roji temnoty.", + "backgrounds112015": "18. sada: Vydaná v novembri 2015", + "backgroundFloatingIslandsText": "Plávajúce ostrovy", + "backgroundFloatingIslandsNotes": "Preskakuj naprieč plávajúcimi ostrovmi.", + "backgroundNightDunesText": "Nočné duny", + "backgroundNightDunesNotes": "Mierumilovne sa prechádzaj nočnými dunami.", + "backgroundSunsetOasisText": "Oáza zapadajúceho slnka", + "backgroundSunsetOasisNotes": "Vyhrievaj sa pri oáze zapadajúceho slnka.", + "backgrounds122015": "19. sada: vydaná v decembri 2015", + "backgroundAlpineSlopesText": "Alpské svahy", + "backgroundAlpineSlopesNotes": "Lyžuj sa na alpských svahoch", + "backgroundSnowySunriseText": "Zasnežený východ slnka", + "backgroundSnowySunriseNotes": "Zadívaj sa na zasnežený východ slnka.", + "backgroundWinterTownText": "Zimné mestečko", + "backgroundWinterTownNotes": "Pobehuj zasneženým mestečkom.", + "backgrounds012016": "20. sada: Vydaná v Januári 2016", + "backgroundFrozenLakeText": "Zmrznuté jazero", + "backgroundFrozenLakeNotes": "Korčuľuj sa na zmrznutom jazere.", + "backgroundSnowmanArmyText": "Armáda snehuliakov", + "backgroundSnowmanArmyNotes": "Veď armádu snehuliakov.", + "backgroundWinterNightText": "Zimná noc", + "backgroundWinterNightNotes": "Pozoruj hviezdy zimnej noci.", + "backgrounds022016": "21. sada: Vydaná vo februári 2016", + "backgroundBambooForestText": "Bambusový les", + "backgroundBambooForestNotes": "Prechádzaj sa bambusovým lesom.", + "backgroundCozyLibraryText": "Útulná knižnica", + "backgroundCozyLibraryNotes": "Čítaj si v útulnej knižnici.", + "backgroundGrandStaircaseText": "Veľké schodisko", + "backgroundGrandStaircaseNotes": "Kráčaj dolu veľkým schodiskom.", + "backgrounds032016": "22. sada: Vydaná v marci 2016", + "backgroundDeepMineText": "Hlboká baňa", + "backgroundDeepMineNotes": "Nájdi vzácne kovy v hlbokej bani.", + "backgroundRainforestText": "Dažďový prales", + "backgroundRainforestNotes": "Odváž sa vstúpiť do dažďového pralesa.", + "backgroundStoneCircleText": "Kamenný kruh", + "backgroundStoneCircleNotes": "Čaruj v kamennom kruhu.", + "backgrounds042016": "23. sada: Vydaná v apríli 2016", + "backgroundArcheryRangeText": "Lukostrelnica", + "backgroundArcheryRangeNotes": "Trénuj v lukostrelnici.", + "backgroundGiantFlowersText": "Obrovské kvety", + "backgroundGiantFlowersNotes": "Šanti navrchu obrovských kvetov.", + "backgroundRainbowsEndText": "Koniec dúhy", + "backgroundRainbowsEndNotes": "Nájdi zlato na konci dúhy", + "backgrounds052016": "24. sada: Vydaná v máji 2016", + "backgroundBeehiveText": "Včelí úľ", + "backgroundBeehiveNotes": "Bzuč a tancuj vo včeľom úli. ", + "backgroundGazeboText": "Terasa", + "backgroundGazeboNotes": "Bojuj na terase.", + "backgroundTreeRootsText": "Korene stromov", + "backgroundTreeRootsNotes": "Preskúmaj korene stromov." } \ No newline at end of file diff --git a/common/locales/sk/challenge.json b/common/locales/sk/challenge.json index b499fd1143..72fe392b39 100644 --- a/common/locales/sk/challenge.json +++ b/common/locales/sk/challenge.json @@ -33,7 +33,7 @@ "challengeTagPop": "Výzvy sa zobrazujú v zozname štítkov a v popise úlohy. Takže oficiálny názov výzvy môže byť dlhší a výstižný, no potrebuješ aj krátku verziu. Napr výzva s názvom \"Schudnúť 10 kíl za 3 mesiace\" môže používať štítok \"-10kg\" (Pre viac informácií klikni na \"?\").", "challengeDescr": "Popis", "prize": "Odmena", - "prizePop": "If someone can 'win' your challenge, you can optionally award that winner a Gem prize. The maximum number you can award is the number of gems you own (plus the number of guild gems, if you created this challenge's guild). Note: This prize can't be changed later.", + "prizePop": "Ak niekto \"vyhrá\" tvoju výzvu, môžeš odmeniť víťaza drahokamami. Maximálny počet drahokamov, ktorými môžeš odmeniť je počet drahokamov ktoré vlastníš (+ počet drahokamov cechu, ak si vytvoril výzvu v rámci cechu). Poznámka: Túto odmenu už nemôžeš neskôr zmeniť.", "prizePopTavern": "Ak niekto môže 'vyhrať' tvoju výzvu, môžeš toho víťaza odmeniť drahokamami. Maximum = počet tvojich drahokamov. Poznámka: Túto odmenu neskôr už nemôžeš zmeniť a drahokamy sa ti nevrátia ak výzvu zrušíš.", "publicChallenges": "Minimum je 1 drahokam pre verejné výzvy (pomáha predísť spamu, naozaj).", "officialChallenge": "Oficiálna výzva Habiticy", @@ -43,8 +43,8 @@ "exportChallengeCSV": "Exportovať do CSV", "selectGroup": "Prosím, vyber skupinu", "challengeCreated": "Výzva bola úspešne vytvorená", - "sureDelCha": "Are you sure you want to delete this challenge?", - "sureDelChaTavern": "Are you sure you want to delete this challenge? Your gems will not be refunded.", + "sureDelCha": "Si si istý, že chceš zmazať túto výzvu?", + "sureDelChaTavern": "Si si istý, že chceš zmazať túto výzvu? Drahokamy sa ti nevrátia.", "removeTasks": "Odstrániť úlohy", "keepTasks": "Ponechať úlohy", "closeCha": "Uzavrieť výzvu a...", @@ -57,11 +57,26 @@ "prizeValue": "<%= gemcount %> <%= gemicon %> výhra", "clone": "Klonovať", "challengeNotEnoughGems": "Na vytvorenie výzvy nemáš dosť drahokamov.", - "noPermissionEditChallenge": "You don't have permissions to edit this challenge", - "noPermissionDeleteChallenge": "You don't have permissions to delete this challenge", - "noPermissionCloseChallenge": "You don't have permissions to close this challenge", - "congratulations": "Congratulations!", - "hurray": "Hurray!", - "noChallengeOwner": "no owner", - "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account." + "noPermissionEditChallenge": "Nemáš povolenie upravovať túto výzvu ", + "noPermissionDeleteChallenge": "Nemáš povolenie zmazať túto výzvu", + "noPermissionCloseChallenge": "Nemáš povolenie uzavrieť túto výzvu", + "congratulations": "Gratulujeme!", + "hurray": "Hurá!", + "noChallengeOwner": "žiadny vlastník", + "noChallengeOwnerPopover": "Táto výzva nemá vlastníka, pretože osoba, ktorá túto výzvu vytvorila, zmazala svoj účet.", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/sk/character.json b/common/locales/sk/character.json index 90a65df1e9..c00fecd300 100644 --- a/common/locales/sk/character.json +++ b/common/locales/sk/character.json @@ -1,7 +1,8 @@ { + "communityGuidelinesWarning": "Maj na pamäti, že tvoja zobrazované meno, profilová fotka a informácie o tebe musia vyhovovať Komunitných pravidiel (napr. žiadne vulgarizmy, témy len pre dospelých, urážky a pod.). Ak máš nejaké otázky ohľadom toho, či je niečo vhodné alebo nevhodné, napíš na leslie@habitica.com!", "statsAch": "Štatistiky a odznaky", "profile": "Profil", - "avatar": "Customize Avatar", + "avatar": "Prispôsobiť avatara", "other": "Ostatné", "fullName": "Celé meno", "displayName": "Zobrazené meno", @@ -34,7 +35,7 @@ "beard": "Brada", "mustache": "Fúzy", "flower": "Kvet", - "wheelchair": "Wheelchair", + "wheelchair": "Stolička", "basicSkins": "Základné pokožky", "rainbowSkins": "Dúhové pokožky", "pastelSkins": "Pastelové pokožky", @@ -53,22 +54,22 @@ "classEquipBonus": "Bonus za povolanie", "battleGear": "Bojová výzbroj", "battleGearText": "Toto je výzbroj, ktorú nosíš do boja; ovplyvňuje čísla pri interakcii s úlohami.", - "autoEquipBattleGear": "Auto-equip new gear", + "autoEquipBattleGear": "Automaticky sa vybaviť novým výstrojom", "costume": "Kostým", "costumeText": "Ak chceš radšej vyzerať inak, než vyzeráš so svojou aktuálnou bojovou výzbrojou, zaškrtni \"použiť kostým\", aby si si mohol zvoliť oblečenie, ktoré sa ti páči, no zároveň získavať bonusy za svoju najlepšiu bojovú výzbroj.", "useCostume": "Použiť kostým", "useCostumeInfo1": "Klikni na \"použiť kostým\" ak si chceš obliecť výstroj bez toho, aby ovplyvnila tvoje štatistiky bojového výstroja! To znamená, že si môžeš vybrať predmety pre získanie najlepších bonusov vľavo a obliecť svoj avatar vpravo.", - "useCostumeInfo2": "Once you click \"Use Costume\" your avatar will look pretty basic... but don't worry! If you look on the left, you'll see that your Battle Gear is still equipped. Next, you can make things fancy! Anything you equip on the right won't affect your stats, but can make you look super awesome. Try out different combos, mixing sets, and coordinating your Costume with your pets, mounts, and backgrounds.
Got more questions? Check out the Costume page on the wiki. Find the perfect ensemble? Show it off in the Costume Carnival guild or brag in the Tavern!", - "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:", - "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!", - "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.", + "useCostumeInfo2": "Keď klikneš na voľbu \"Použiť kostým\", tvoj avatar bude vyzerať veľmi jednoducho ... ale neboj sa! Ak sa pozrieš naľavo, uvidíš, že tvoj bojový výstroj sa stále používa. Teraz môžeš spraviť veci podľa svojho vkusu! Hocaké vybavenie, ktoré teraz použiješ napravo, nebude mať žiadny efekt na tvoje štatistiky, ale môžeš vďaka nemu vyzerať super úžasne. Vyskúšaj rozdielne kombinácie, miešanie sád, tátošov a pozadí. .
Stále máš otázky? Prečítaj si stránku kostýmov na wiki. Našiel si perfektný celok? Ukáž ho na kostýmovom karnevale alebo sa bež pochváliť do Hostinca!", + "gearAchievement": "Získal si odznak \"Najúžasnejší výstroj\" za maximálne vylepšenie sady výstroja pre svoje povolanie! Získal si nasledovné kompletné sady:", + "moreGearAchievements": "Na získanie viacerých odznakov najúžasnejšieho výstroja, zmeň si svoje povolanie na tvojej stránke štatistík a nakúp výstroj pre svoje nové povolanie!", + "armoireUnlocked": "Tiež si odomkol Kúzelnú skrinku! Klikni na Odmenu kúzelnej skrinky pre možnosť náhodného získania špeciálnej výbavy! Môže ti tiež dať ľubovoľne veľa XP alebo jedla.", "ultimGearName": "Najúžasnejší výstroj", - "ultimGearText": "Has upgraded to the maximum weapon and armor set for the following classes:", + "ultimGearText": "Vylepšil na maximum zbraň a brnenie pre nasledujúce povolania:", "level": "Level", "levelUp": "Získal si nový level!", - "gainedLevel": "You gained a level!", - "leveledUp": "By accomplishing your real-life goals, you've grown to Level <%= level %>!", - "fullyHealed": "You have been fully healed!", + "gainedLevel": "Získal si level!", + "leveledUp": "Plnením cieľov v reálnom živote si získal Level <%= level %>!", + "fullyHealed": "Bol si plne uzdravený!", "huzzah": "Huzzah!", "mana": "Mana", "hp": "HP", @@ -83,8 +84,8 @@ "allocatePerPop": "Pridať bod do postrehu", "allocateInt": "Body pridelené do Inteligencie:", "allocateIntPop": "Pridať bod do inteligencie", - "noMoreAllocate": "Now that you've hit level 100, you won't gain any more Attribute Points. You can continue leveling up, or start a new adventure at level 1 by using the Orb of Rebirth, now available for free in the Market.", - "stats": "Avatar Stats", + "noMoreAllocate": "Teraz, keď si dosiahol level 100, nezískaš žiadne ďaľšie body atribútov. Môžeš pokračovať v levelovaní, alebo začať nové dobrodružstvo na úrovni 1 pomocou použitia Orbu znovuzrodenia, ktorý je teraz dostupný zdarma na trhu.", + "stats": "Štatistiky avatara", "strength": "Sila", "strengthText": "Sila zvyšuje šancu náhodných \"kritických zásahov\" a tým aj možnosť získať z nich viac zlata, skúseností a predmetov. Taktiež pomáha zasadiť silnejšiu ranu boss monštrám.", "constitution": "Odolnosť", @@ -109,6 +110,7 @@ "mage": "Mág", "mystery": "Záhada", "changeClass": "Zmeniť povolanie, vrátiť pridelené body atribútov", + "lvl10ChangeClass": "Aby si mohol zmeniť povolanie, musíš byť aspoň level 10.", "levelPopover": "S každým levelom získaš jeden bod, ktorý môžeš priradiť do atribútu. Môžeš tak robiť ručne alebo nechať hru, aby rozhodla za teba, použitím možnosti \"automatické pridelenie\".", "unallocated": "Nepridelené body atribútov", "haveUnallocated": "Máš <%= points %> nepriradených bodov atribútov", @@ -126,9 +128,9 @@ "mageText": "Mágovia sa rýchlo učia, získavajú skúsenosti a levely rýchlejšie ako iné triedy. Taktiež majú veľké množstvo many na používanie svojich schopností. Hraj za mága, ak ťa baví taktické hranie Habitu, alebo ak ťa silne motivuje levelovanie a odomykanie rôznych funkcií.", "rogueText": "Zlodeji milujú hromadenie bohatstva, získavajú viac zlata ako ktokoľvek iný a sú odborníci na získavanie náhodných predmetov. Ich výborná schopnosť zakrádania im dáva možnosť vyhnúť sa následkom nesplnených denných úloh. Hraj za zlodeja, ak ťa silne motivujú odmeny a odznaky a chceš nahromadiť lup!", "healerText": "Liečitelia sú chránení pred zraneniami a svoju ochranu rozširujú aj na ostatných. Z nestihnutých denných úloh a zlých návykov si veľa nerobia a majú prostriedky ako si obnoviť zdravie v prípade zlyhania. Hraj za liečiteľa, ak ťa baví pomáhať ostatným v družine, alebo ak rád utekáš zubatej z lopaty!", - "optOutOfClasses": "Opt Out", - "optOutOfPMs": "Opt Out", - "optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User -> Stats.", + "optOutOfClasses": "Zrušiť výber povolania", + "optOutOfPMs": "Zrušiť", + "optOutOfClassesText": "Nezaujímajú ťa povolania? Chceš si vybrať neskôr? Zruš ich - budeš bojovník bez špeciálnych vlastností. O systéme povolaní si môžeš prečítať neskôr na wiki môžeš ich povoliť aj neskôr v položke Užívateľ -> Štatistiky.", "select": "Vybrať", "stealth": "Zakrádanie", "stealthNewDay": "Na začiatku nového dňa sa vyhneš zraneniam z nesplnených denných úloh.", @@ -137,7 +139,7 @@ "respawn": "Znovuzrodenie!", "youDied": "Si mŕtvy!", "dieText": "Stratil si level, všetko zlato a náhodný kus výstroja. Povstaň, Habitier, a skús to znovu! Drž na uzde svoje zlé návyky, buď dôsledný v plnení svojich denných úloh a, ak ochabneš, drž sa od smrti ďaleko pomocou elixíru zdravia.", - "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.", + "sureReset": "Si si istý? Tento krok zruší povolanie tvojej postavy a získané body (získaš ich naspäť na opätovné pridelenie). Tiež to bude stáť 3 drahokamy.", "purchaseFor": "Kúpiť za <%= cost %> drahokamov?", "notEnoughMana": "Nedostatok many.", "invalidTarget": "Neplatný cieľ", @@ -162,7 +164,9 @@ "con": "ODO", "per": "POS", "int": "INT", - "showQuickAllocation": "Show stat allocation", - "hideQuickAllocation": "Hide stat allocation", - "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats." + "showQuickAllocation": "Zobraziť rozdelenie štatistík", + "hideQuickAllocation": "Skryť rozdelenie štatistík", + "quickAllocationLevelPopover": "S každým levelom získaš jeden bod, ktorý môžeš priradiť do atribútu podľa svojho výberu. Môžeš tak robiť ručne alebo nechať hru, aby rozhodla za teba, použitím možnosti \"automatické pridelenie\", ktorú môžeš nájsť v časti Užívateľ -> Štatistiky.", + "invalidAttribute": "\"<%= attr %>\" nie je platný atribút.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/sk/communityguidelines.json b/common/locales/sk/communityguidelines.json index ab05eeb950..87fa5b9d57 100644 --- a/common/locales/sk/communityguidelines.json +++ b/common/locales/sk/communityguidelines.json @@ -7,11 +7,11 @@ "commGuidePara003": "Tieto pravidlá sa týkajú všetkých spoločenských priestorov, ktoré používame, v rátane (no nie nutne len) Trello, GitHub, Transifex a Wikia (tiež známa ako wiki). Občas nastane nepredvídateľná udalosť, napríklad nový zdroj konfliktu alebo zlotrilý nekromancer. Keď sa toto stane, modovia môžu zareagovať upravením týchto pravidiel aby ochránili Komunitu pred novými hrozbami. Ale neboj sa: Dáme ti vedieť pomocou oznámenia od Baileyho, ak sa pravidlá zmenia. ", "commGuidePara004": "Teraz si priprav svoje brká a zvitky na písanie poznámok a začnime! ", "commGuideHeadingBeing": "Byť Habitičanom", - "commGuidePara005": "Habitica is first and foremost a website devoted to improvement. As a result, we've been lucky to attract one of the warmest, kindest, most courteous and supportive communities on the internet. There are many traits that make up Habiticans. Some of the most common and most notable are:", - "commGuideList01A": "A Helpful Spirit. Many people devote time and energy helping out new members of the community and guiding them. The Newbies Guild, for example, is a guild devoted just to answering people's questions. If you think you can help, don't be shy!", - "commGuideList01B": "A Diligent Attitude. Habiticans work hard to improve their lives, but also help build the site and improve it constantly. We're an open-source project, so we are all constantly working to make the site the best place it can be.", - "commGuideList01C": "A Supportive Demeanor. Habiticans cheer for each other's victories, and comfort each other during hard times. We lend strength to each other and lean on each other and learn from each other. In parties, we do this with our spells; in chat rooms, we do this with kind and supportive words.", - "commGuideList01D": "A Respectful Manner. We all have different backgrounds, different skill sets, and different opinions. That's part of what makes our community so wonderful! Habiticans respect these differences and celebrate them. Stick around, and soon you will have friends from all walks of life.", + "commGuidePara005": "Habitica je prvá a hlavná web stránka, ktorá sa aktívne zlepšuje. Ako výsledok máme šťastie na jednu z najvrelejších, najmilších, najzdvorilejších a podporujúcich komunít na internete. Existuje veľa rýs, ktoré robia Habiticanov Habiticanmi. Niektoré z najbežnejších a najpozoruhodnejších sú:", + "commGuideList01A": "Pomocný duch Veľa ľudí venuje čas a energiu pomáhaniu novým členom komunity a ich vedeniu. The Newbies Guild, napríklad, je cech zameraný na odpovedanie otázok. Ak si myslíš, že môžeš pomôcť, nehanbi sa!", + "commGuideList01B": "Usilovný postoj. Habiticania usilovne pracujú, aby zlepšili svoje životy, ale tiež pomáhajú budovať stránku a stále ju zlepšujú. Sme projekt s otvoreným zdrojom, takže všetci neustále pracujeme na tom, aby sme zo stránky urobili to najlepšie miesto, akým môže byť.", + "commGuideList01C": "Podporujúce správanie. Habiticania oslavujú víťazstvá ostatných a pomáhajú si počas ťažkých chvíľ. Dodávajú si navzájom silu, spoliehajú sa na seba a učia sa od seba navzájom. V skupinách to dosiahneme s našimi kúzlami; v chatovacích miestnostiach s milými a podporujúcimi slovami. ", + "commGuideList01D": "Zdvorilé spôsoby. Všetci máme rozdielne pôvody, rôzne balíčky schopností, a rôzne názory. To je súčasť toho, čo robí našu komunitu takú úžasnú! Habiticania rešpektujú tieto rozdiely a oslavujú ich. Zostaň a čoskoro budeš mať priateľov z každého kúta spoločnosti. ", "commGuideHeadingMeet": "Zoznám sa s Modmi!", "commGuidePara006": "Habitica has some tireless knight-errants who join forces with the staff members to keep the community calm, contented, and free of trolls. Each has a specific domain, but will sometimes be called to serve in other social spheres. Staff and Mods will often precede official statements with the words \"Mod Talk\" or \"Mod Hat On\".", "commGuidePara007": "Staff have purple tags marked with crowns. Their title is \"Heroic\".", @@ -19,19 +19,19 @@ "commGuidePara009": "Súčasní zamestnanci sú (zľava doprava):", "commGuidePara009a": "v Trelle", "commGuidePara009b": "na GitHube", - "commGuidePara010": "There are also several Moderators who assist the staff members. They were selected carefully, so please give them your respect and listen to their suggestions.", - "commGuidePara011": "The current Moderators are (from left to right):", + "commGuidePara010": "Je tu tiež niekoľko Moderátorov, ktorý pomáhajú personálu. Sú starostlivo vybraný, tak im, prosím, prejavte svoj rešpekt a vypočujte si ich návrhy. ", + "commGuidePara011": "Súčasní moderátori sú (zľava doprava): ", "commGuidePara011a": "v Hostincovom chate", "commGuidePara011b": "na GitHub/Wikia", "commGuidePara011c": "na Wikia", "commGuidePara011d": "na GitHub", "commGuidePara012": "If you have an issue or concern about a particular Mod, please send an email to Lemoness (leslie@habitica.com).", - "commGuidePara013": "In a community as big as Habitica, users come and go, and sometimes a moderator needs to lay down their noble mantle and relax. The following are Moderators Emeritus. They no longer act with the power of a Moderator, but we would still like to honor their work!", - "commGuidePara014": "Moderators Emeritus:", + "commGuidePara013": "V komunite tak veľkej, ako je Habitica, užívatelia prichádzajú a odchádzajú, a niekedy aj moderátor potrebuje odložiť svoj vznešený plášť a oddýchnuť si. Tu sú vyslúžilí moderátori. Už nemajú moc moderátora, ale aj tak by sme radi poctili ich prácu!", + "commGuidePara014": "Vyslúžilí moderátori", "commGuideHeadingPublicSpaces": "Verejné priestory v Habitica", - "commGuidePara015": "Habitica has two kinds of social spaces: public, and private. Public spaces include the Tavern, Public Guilds, GitHub, Trello, and the Wiki. Private spaces are Private Guilds, party chat, and Private Messages. All Display Names must comply with the public space guidelines. To change your Display Name, go on the website to User > Profile and click on the \"Edit\" button.", - "commGuidePara016": "When navigating the public spaces in Habitica, there are some general rules to keep everyone safe and happy. These should be easy for adventurers like you!", - "commGuidePara017": "Respect each other. Be courteous, kind, friendly, and helpful. Remember: Habiticans come from all backgrounds and have had wildly divergent experiences. This is part of what makes Habitica so cool! Building a community means respecting and celebrating our differences as well as our similarities. Here are some easy ways to respect each other:", + "commGuidePara015": "Habitica má dva druhy sociálnych priestorov: verejné a súkromné. Verejné priestory zahrňujú hostinec, verejné cechy, GitHub, Trello a Wiki. Súkromné priestory sú súkromné cechy, chat družiny a súkromné správy. Všetky viditeľné názvy sa musia prispôsobiť pravidlám o verejných priestoroch. Ak chceš zmeniť názov, navštív web stránku Užívateľ > Profil a klikni na \"Upraviť\".", + "commGuidePara016": "Ak vedieš verejné priestory v Habitice, mal by si vedieť, že existujú nejaké všeobecné pravidlá, ktoré udržujú ostatných v bezpečí a šťastných. Mali by byť ľahké pre dobrodruha ako si ty!", + "commGuidePara017": "Rešpektovanie sa navzájom. Buď zdvorilý, milý, priateľský a nápomocný. Pamätaj: Habiticania majú rôzny pôvod a divoko rozdielne skúsenosti. Toto je časť toho, čo robí Habiticu tak úžasnú! Budovanie komunity znamená rešpektovať a oslavovať naše rozdiely rovnako ako naše podobnosti. Tu je pár jednoduchých spôsobov ako rešpektovať jeden druhého. ", "commGuideList02A": "Riaď sa všetkými Podmienkami a Pravidlami Užívania.", "commGuideList02B": "Do not post images or text that are violent, threatening, or sexually explicit/suggestive, or that promote discrimination, bigotry, racism, sexism, hatred, harassment or harm against any individual or group. Not even as a joke. This includes slurs as well as statements. Not everyone has the same sense of humor, and so something that you consider a joke may be hurtful to another. Attack your Dailies, not each other.", "commGuideList02C": "Keep discussions appropriate for all ages. We have many young Habiticans who use the site! Let's not tarnish any innocents or hinder any Habiticans in their goals.", @@ -75,8 +75,8 @@ "commGuidePara046": "The Habitica wiki can be considered to be a database of all things Habitica. It provides information about site features, guides to play the game, tips on how you can contribute to Habitica and also provides a place for you to advertise your guild or party and vote on topics.", "commGuidePara047": "Keďže wiki je hostená Wikia, pravidlá a podmienky Wikia platia dodatočne k pravidlám stanoveným Habiticou a Habitčanskou wiki stránkou. ", "commGuidePara048": "The wiki is solely a collaboration between all of its editors so some additional guidelines include:", - "commGuideList04A": "Requesting new pages or major changes on the Wiki Trello board", - "commGuideList04B": "Being open to other peoples' suggestion about your edit", + "commGuideList04A": "Žiadanie nových stránok alebo hlavné zmeny na Wiki Trello paneli", + "commGuideList04B": "Byť otvorený návrhom ostatných ľudí k tvojej úprave textu", "commGuideList04C": "Discussing any conflict of edits within the page's talk page", "commGuideList04D": "Bringing any unresolved conflict to the attention of wiki admins", "commGuideList04E": "Not spamming or sabotaging pages for personal gain", diff --git a/common/locales/sk/content.json b/common/locales/sk/content.json index 29d9b0353f..f1eec3a594 100644 --- a/common/locales/sk/content.json +++ b/common/locales/sk/content.json @@ -1,119 +1,125 @@ { "potionText": "Elixír zdravia", "potionNotes": "Vylieči 15 bodov zdravia (okamžité použitie)", - "armoireText": "Enchanted Armoire", - "armoireNotesFull": "Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining:", - "armoireLastItem": "You've found the last piece of rare Equipment in the Enchanted Armoire.", - "armoireNotesEmpty": "The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!", + "armoireText": "Kúzelná skrinka", + "armoireNotesFull": "Otvor skrinku aby si získal ľubovoľnú špeciálnu výbavu, skúsenosti alebo jedlo! Zostávajúce časti výbavy:", + "armoireLastItem": "Našiel si poslednú časť vzácnej výbavy v Kúzelnej skrinke.", + "armoireNotesEmpty": "Skrinka bude mat novú výbavu vždy v prvom týždni každého mesiaca. Dovtedy môžeš klikať na skúsenosti a jedlo!", "dropEggWolfText": "Vlk", - "dropEggWolfMountText": "Wolf", - "dropEggWolfAdjective": "a loyal", + "dropEggWolfMountText": "Vlk", + "dropEggWolfAdjective": "verný", "dropEggTigerCubText": "Tigríček", "dropEggTigerCubMountText": "Tiger", - "dropEggTigerCubAdjective": "a fierce", + "dropEggTigerCubAdjective": "divoký", "dropEggPandaCubText": "Pandiačik", "dropEggPandaCubMountText": "Pandiak", - "dropEggPandaCubAdjective": "a gentle", + "dropEggPandaCubAdjective": "krotký", "dropEggLionCubText": "Levík", "dropEggLionCubMountText": "Lev", - "dropEggLionCubAdjective": "a regal", + "dropEggLionCubAdjective": "veľkolepý", "dropEggFoxText": "Lišiak", - "dropEggFoxMountText": "Fox", - "dropEggFoxAdjective": "a wily", + "dropEggFoxMountText": "Lišiak", + "dropEggFoxAdjective": "prefíkaný", "dropEggFlyingPigText": "Lietajúci brav", - "dropEggFlyingPigMountText": "Flying Pig", - "dropEggFlyingPigAdjective": "a whimsical", + "dropEggFlyingPigMountText": "Lietajúci brav", + "dropEggFlyingPigAdjective": "vrtošivý", "dropEggDragonText": "Drak", - "dropEggDragonMountText": "Dragon", - "dropEggDragonAdjective": "a mighty", + "dropEggDragonMountText": "Drak", + "dropEggDragonAdjective": "mocný", "dropEggCactusText": "Kaktus", - "dropEggCactusMountText": "Cactus", - "dropEggCactusAdjective": "a prickly", + "dropEggCactusMountText": "Kaktus", + "dropEggCactusAdjective": "pichľavý", "dropEggBearCubText": "Medvedík", "dropEggBearCubMountText": "Medveď", - "dropEggBearCubAdjective": "a brave", + "dropEggBearCubAdjective": "odvážny", "questEggGryphonText": "Gryf", - "questEggGryphonMountText": "Gryphon", - "questEggGryphonAdjective": "a proud", + "questEggGryphonMountText": "Gryf", + "questEggGryphonAdjective": "hrdý", "questEggHedgehogText": "Ježko", - "questEggHedgehogMountText": "Hedgehog", - "questEggHedgehogAdjective": "a spiky", + "questEggHedgehogMountText": "Ježko", + "questEggHedgehogAdjective": "ostnatý", "questEggDeerText": "Jeleň", - "questEggDeerMountText": "Deer", - "questEggDeerAdjective": "an elegant", + "questEggDeerMountText": "Jeleň", + "questEggDeerAdjective": "elegantný", "questEggEggText": "Vajco", - "questEggEggMountText": "Egg Basket", - "questEggEggAdjective": "a colorful", + "questEggEggMountText": "Košík s vajíčkami", + "questEggEggAdjective": "pestrofarebné", "questEggRatText": "Potkan", - "questEggRatMountText": "Rat", - "questEggRatAdjective": "a sociable", + "questEggRatMountText": "Potkan", + "questEggRatAdjective": "kamarátsky", "questEggOctopusText": "Chobotnica", - "questEggOctopusMountText": "Octopus", - "questEggOctopusAdjective": "a slippery", + "questEggOctopusMountText": "Chobotnica", + "questEggOctopusAdjective": "klzká", "questEggSeahorseText": "Morský koník", - "questEggSeahorseMountText": "Seahorse", - "questEggSeahorseAdjective": "a prize", + "questEggSeahorseMountText": "Morský koník", + "questEggSeahorseAdjective": "prvotriedny", "questEggParrotText": "Papagáj", - "questEggParrotMountText": "Parrot", - "questEggParrotAdjective": "a vibrant", + "questEggParrotMountText": "Papagáj", + "questEggParrotAdjective": "kmitajúci", "questEggRoosterText": "Kohút", - "questEggRoosterMountText": "Rooster", - "questEggRoosterAdjective": "a strutting", + "questEggRoosterMountText": "Kohút", + "questEggRoosterAdjective": "pyšný", "questEggSpiderText": "Pavúk", - "questEggSpiderMountText": "Spider", - "questEggSpiderAdjective": "a creepy", + "questEggSpiderMountText": "Pavúk", + "questEggSpiderAdjective": "strašidelný", "questEggOwlText": "Sova", - "questEggOwlMountText": "Owl", - "questEggOwlAdjective": "a wise", + "questEggOwlMountText": "Sova", + "questEggOwlAdjective": "múdra", "questEggPenguinText": "Tučniak", - "questEggPenguinMountText": "Penguin", - "questEggPenguinAdjective": "a perspicacious", + "questEggPenguinMountText": "Tučniak", + "questEggPenguinAdjective": "bystrý", "questEggTRexText": "Tyrannosaurus", - "questEggTRexMountText": "Tyrannosaur", - "questEggTRexAdjective": "a tiny-armed", - "questEggRockText": "Rock", - "questEggRockMountText": "Rock", - "questEggRockAdjective": "a lively", - "questEggBunnyText": "Bunny", - "questEggBunnyMountText": "Bunny", - "questEggBunnyAdjective": "a snuggly", - "questEggSlimeText": "Marshmallow Slime", - "questEggSlimeMountText": "Marshmallow Slime", - "questEggSlimeAdjective": "a sweet", - "questEggSheepText": "Sheep", - "questEggSheepMountText": "Sheep", - "questEggSheepAdjective": "a woolly", - "questEggCuttlefishText": "Cuttlefish", - "questEggCuttlefishMountText": "Cuttlefish", - "questEggCuttlefishAdjective": "a cuddly", - "questEggWhaleText": "Whale", - "questEggWhaleMountText": "Whale", - "questEggWhaleAdjective": "a splashy", - "questEggCheetahText": "Cheetah", - "questEggCheetahMountText": "Cheetah", - "questEggCheetahAdjective": "an honest", - "questEggHorseText": "Horse", - "questEggHorseMountText": "Horse", - "questEggHorseAdjective": "a galloping", - "questEggFrogText": "Frog", - "questEggFrogMountText": "Frog", - "questEggFrogAdjective": "a princely", - "questEggSnakeText": "Snake", - "questEggSnakeMountText": "Snake", - "questEggSnakeAdjective": "a slithering", - "questEggUnicornText": "Unicorn", - "questEggUnicornMountText": "Winged Unicorn", - "questEggUnicornAdjective": "a magical", - "questEggSabretoothText": "Sabretooth Tiger", - "questEggSabretoothMountText": "Sabretooth Tiger", - "questEggSabretoothAdjective": "a ferocious", - "questEggMonkeyText": "Monkey", - "questEggMonkeyMountText": "Monkey", - "questEggMonkeyAdjective": "a mischievous", - "questEggSnailText": "Snail", - "questEggSnailMountText": "Snail", - "questEggSnailAdjective": "a slow but steady", - "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", + "questEggTRexMountText": "Tyrannosaurus", + "questEggTRexAdjective": "drobnoruký", + "questEggRockText": "Kameň", + "questEggRockMountText": "Kameň", + "questEggRockAdjective": "živý", + "questEggBunnyText": "Králik", + "questEggBunnyMountText": "Králik", + "questEggBunnyAdjective": "prítulný", + "questEggSlimeText": "Sladký sliz", + "questEggSlimeMountText": "Sladký sliz", + "questEggSlimeAdjective": "sladký", + "questEggSheepText": "Ovca", + "questEggSheepMountText": "Ovca", + "questEggSheepAdjective": "huňatý", + "questEggCuttlefishText": "Sépia", + "questEggCuttlefishMountText": "Sépia", + "questEggCuttlefishAdjective": "maznavá", + "questEggWhaleText": "Veľryba", + "questEggWhaleMountText": "Veľryba", + "questEggWhaleAdjective": "špliechajúca", + "questEggCheetahText": "Gepard", + "questEggCheetahMountText": "Gepard", + "questEggCheetahAdjective": "čestný", + "questEggHorseText": "Kôň", + "questEggHorseMountText": "Kôň", + "questEggHorseAdjective": "cválajúci", + "questEggFrogText": "Žaba", + "questEggFrogMountText": "Žaba", + "questEggFrogAdjective": "kniežací", + "questEggSnakeText": "Had", + "questEggSnakeMountText": "Had", + "questEggSnakeAdjective": "plazí", + "questEggUnicornText": "Jednorožec", + "questEggUnicornMountText": "Okrídlený jednorožec", + "questEggUnicornAdjective": "čarovné", + "questEggSabretoothText": "Šablozubý tiger", + "questEggSabretoothMountText": "Šablozubý tiger", + "questEggSabretoothAdjective": "zúrivý", + "questEggMonkeyText": "Opica", + "questEggMonkeyMountText": "Opica", + "questEggMonkeyAdjective": "roztopašná", + "questEggSnailText": "Slimák", + "questEggSnailMountText": "Slimák", + "questEggSnailAdjective": "pomalý ale nezlomný", + "questEggFalconText": "Sokol", + "questEggFalconMountText": "Sokol", + "questEggFalconAdjective": "rýchly", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", + "eggNotes": "Nájdi liahoxír a vylej ho na toto vajíčko, aby sa z neho vyliahlo zvieratko: <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Základný", "hatchingPotionWhite": "Biely", "hatchingPotionDesert": "Púštny", @@ -124,10 +130,11 @@ "hatchingPotionCottonCandyPink": "Cukrovo ružový", "hatchingPotionCottonCandyBlue": "Cukrovomodrý", "hatchingPotionGolden": "Zlatý", - "hatchingPotionSpooky": "Spooky", - "hatchingPotionPeppermint": "Peppermint", + "hatchingPotionSpooky": "Strašidelný", + "hatchingPotionPeppermint": "Mätový", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Vylej tento elixír na vajíčko a vyliahne sa z neho <%= potText(locale) %> zvieratko.", - "premiumPotionAddlNotes": "Not usable on quest pet eggs.", + "premiumPotionAddlNotes": "Nedá sa použiť na vajíčka zvieratiek z výprav.", "foodMeat": "Mäso", "foodMilk": "Mlieko", "foodPotatoe": "Zemiak", diff --git a/common/locales/sk/contrib.json b/common/locales/sk/contrib.json index 29591238be..1dd10c6382 100644 --- a/common/locales/sk/contrib.json +++ b/common/locales/sk/contrib.json @@ -1,24 +1,24 @@ { "friend": "Priateľ", - "friendFirst": "When your first set of submissions is deployed, you will receive the Habitica Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor. As a bounty for your work, you will also receive 3 Gems.", - "friendSecond": "When your second set of submissions is deployed, the Crystal Armor will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive 3 Gems.", + "friendFirst": "Po nasadení tvojej prvej sady príspevkov získaš odznak prispievateľa HabitRPG . V diskusii v hostinci bude tvoje meno hrdo zobrazovať, že si prispievateľ. Ako odmenu za svoju prácu dostaneš ešte 3 drahokamy.", + "friendSecond": "Po nasadení tvojej druhej sady príspevkov si budeš môcť v obchode s odmenami kúpiť kryštálové brnenie. Ako odmenu za tvoju neprestajnú prácu dostaneš 3 drahokamy.", "elite": "Elitný", - "eliteThird": "When your third set of submissions is deployed, the Crystal Helmet will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive 3 Gems.", - "eliteFourth": "When your fourth set of submissions is deployed, the Crystal Sword will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive 4 Gems.", + "eliteThird": "Po nasadení tvojej tretej sady príspevkov si budeš môcť v obchode s odmenami kúpiť kryštálovú helmu. Ako odmenu za tvoju neprestajnú prácu dostaneš 3 drahokamy.", + "eliteFourth": "Po nasadení tvojej štvrtej sady príspevkov si budeš môcť v obchode s odmenami kúpiť kryštálový meč. Ako odmenu za tvoju neprestajnú prácu dostaneš 4 drahokamy.", "champion": "Šampión", - "championFifth": "When your fifth set of submissions is deployed, the Crystal Shield will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive 4 Gems.", - "championSixth": "When your sixth set of submissions is deployed, you will receive a Hydra Pet. You will also receive 4 Gems.", + "championFifth": "Po nasadení tvojej piatej sady príspevkov, si budeš môcť v obchode s odmenami kúpiť kryštálový štít. Ako odmenu za tvoju neprestajnú prácu dostaneš 4 drahokamy.", + "championSixth": "Po nasadení tvojej šiestej sady príspevkov dostaneš domáce zvieratko - hydru. Dostaneš aj 4 drahokamy.", "legendary": "Legenda", - "legSeventh": "When your seventh set of submissions is deployed, you will receive 4 Gems and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of Habitica! Further contributions do not increase your tier, but you may continue to earn Gem bounties and titles.", + "legSeventh": "Pri nasadení tvojej siedmej sady príspevkov, dostaneš 4 drahokamy, staneš sa členom cteného spolku prispievateľov a budeš zasvätený do zákulisných detailov Habitiky! Ďalšie príspevky ti už nezvýšia hodnosť, ale môžeš pokračovať a naďalej získavať drahokamy a tituly.", "moderator": "Moderátor", "guardian": "Strážca", - "guardianText": "Moderators were selected carefully from high tier contributors, so please give them your respect and listen to their suggestions.", + "guardianText": "Moderátori sú starostlivo zvolení z prispievateľov vysokého levelu, tak pred nimi, prosím, majte rešpekt a počúvajte ich rady.", "staff": "Personál", "heroic": "Hrdina", - "heroicText": "The Heroic tier contains Habitica staff and staff-level contributors. If you have this title, you were appointed to it (or hired!).", + "heroicText": "Hodnosť hrdinu majú zamestnanci Habitiky a prispievatelia na úrovni zamestnancov. Ak máš tento titul, znamená to, že ti bol udelený (alebo si u nás zamestnaný!).", "npcText": "NPC sú ľudia, ktorí podporili Habitica na Kickstarteri na najvyššej úrovni. Ich avatary dohliadajú na funkcie stránky!", "modalContribAchievement": "Odznak prispievateľa!", - "contribModal": "<%= name %>, you awesome person! You're now a tier <%= level %> contributor for helping Habitica. See", + "contribModal": "<%= name %>, si úžasný! Za pomoc Habitce si na <%= level %>. leveli prispievateľa. Pozri si", "contribLink": "aké ceny si získal za svoj prínos.", "contribName": "Prispievateľ", "contribText": "Prispel do Habitica (kód, dizajn, pixelová grafika, právna rada, dokumenty, atď.). Chceš tento odznak?", @@ -28,21 +28,25 @@ "helped": "Milovník ankiet", "helpedText1": "Pomohol k zlepšeniu Habitica vyplnením", "helpedText2": "tejto ankety.", - "hall": "Hall of Heroes", + "hall": "Sieň hrdinov", "contribTitle": "Titul prispievateľa (napr. \"kováč\")", "contribLevel": "Úroveň prispievateľa", "contribHallText": "1-7 sú bežní prispievatelia, 8 sú moderátori, 9 je personál. Toto určuje, ktoré predmety, zvieratká a tátoše sú dostupné. Taktiež určuje farbu štítku s menom. Úrovni 8 a 9 je automaticky priradený status admina.", - "hallContributors": "Hall of Contributors", + "hallContributors": "Sieň prispievateľov", "hallPatrons": "Sieň patrónov", "rewardUser": "Odmeniť používateľa", - "UUID": "UUID", + "UUID": "User ID", "loadUser": "Nahrať používateľa", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "Titul", "moreDetails": "Viac podrobností (1-7)", "moreDetails2": "viac podrobností (8-9)", "contributions": "Príspevky", "admin": "Administrátor", - "notGems": "is in USD, not in Gems. Aka, if this number is 1, it means 4 gems. Only use this option when manually granting gems to players, don't use it when granting contributor tiers. Contrib tiers will automatically add gems.", + "notGems": "je v USD, nie v drahokamoch. Teda, ak je číslo 1, znamená 4 drahokamy. Použi túto možnosť len vtedy, ak hráčom manuálne pridávaš drahokamy, nepoužívaj ho pri schvaľovaní prispievateľských hodností. Prispievateľské hodnosti automaticky pridajú drahokamy.", "gamemaster": "Pán jaskyne (personál/moderátor)", "backerTier": "Úroveň podporovateľa", "balance": "Stav", @@ -52,13 +56,13 @@ "visitHeroes": "Navštív Sieň hrdinov (prispievatelia a podporovatelia)", "conLearn": "Zisti viac o prispievateľských odmenách", "conLearnHow": "Zisti ako prispieť do Habitica", - "surveysSingle": "Helped Habitica grow by filling out a survey. There are no active surveys.", - "surveysMultiple": "Helped Habitica grow by filling out <%= surveys %> surveys. There are no active surveys.", - "currentSurvey": "Current Survey", - "surveyWhen": "The badge will be awarded to all participants when surveys have been processed, in late March.", - "blurbInbox": "This is where your private messages are stored! You can send someone a message by clicking on the envelope icon next to their name in Tavern, Party, or Guild Chat. If you've received an inappropriate PM, you should email a screenshot of it to Lemoness (leslie@habitica.com)", - "blurbGuildsPage": "Guilds are common-interest chat groups created by the players, for players. Browse through the list and join the Guilds that interest you!", - "blurbChallenges": "Challenges are created by your fellow players. Joining a Challenge will add its tasks to your task dashboard, and winning a Challenge will give you an achievement and often a gem prize!", - "blurbHallPatrons": "This is the Hall of Patrons, where we honor the noble adventurers who backed Habitica's original Kickstarter. We thank them for helping us bring Habitica to life!", - "blurbHallContributors": "This is the Hall of Contributors, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned gems, exclusive equipment, and prestigious titles. You can contribute to Habitica, too! Find out more here. " + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", + "currentSurvey": "Aktuálny dotazník", + "surveyWhen": "Odznak dostanú všetci účastníci najneskôr v marci po spracovaní dotazníkov.", + "blurbInbox": "Tu sú uchované tvoje súkromné správy! Môžeš niekomu poslať správu kliknutím na ikonu obálky pri jeho mene v chate v hostinci, družine alebo cechu. Ak si dostal nevhodnú súkromnú správu, mal by si mailom odoslať screenshot tejto správy hráčovi Lemoness (leslie@habitica.com)", + "blurbGuildsPage": "Cechy sú chatovacie skupiny so spoločnými záujmami vytvorené hráčmi pre hráčov. Preštuduj si ich zoznam a pripoj sa k tým, ktoré ťa zaujímajú.", + "blurbChallenges": "Výzvy vytvárajú tvoji spoluhráči. Keď sa pripojíš k výzve, úlohy z nej sa objavia na tvojom paneli a ak výzvu vyhráš, dostaneš odznak a často aj nejaké drahokamy. ", + "blurbHallPatrons": "Toto je Sieň Patrónov, kde si uctievame ušľachtilých dobrodruhov, ktorí podporili pôvodnú Habitiku na Kickstarteri. Ďakujeme im za to, že nám pomohli priviesť Habitiku k životu!", + "blurbHallContributors": "Toto je Sieň Prispievateľov, kde sú uctievaní open-source prispievatelia Habitiky. Či už kódom, ilustráciami, hudbou, písaním alebo len pomáhaním, získali drahokamy, exkluzívne vybavenie, a prestížne tituly. Aj ty môžeš prispieť do Habitiky! Tu zistíš viac. " } \ No newline at end of file diff --git a/common/locales/sk/death.json b/common/locales/sk/death.json index 600c6164d5..cb71a616d6 100644 --- a/common/locales/sk/death.json +++ b/common/locales/sk/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Strácaš život rýchlo?", "lowHealthTips3": "Nedokončené denné úlohy ťa ublížia cez noc, takže buď opatrní, aby si ich nepridal príliš veľa na začiatku.", "lowHealthTips4": "Ak denná úloha nieje splatná na určitý deň, môžete to vypnúť kliknutím na ikonu ceruzky.", - "goodLuck": "Veľa šťastia!" + "goodLuck": "Veľa šťastia!", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/sk/defaulttasks.json b/common/locales/sk/defaulttasks.json index b7ffa68d11..61b198380a 100644 --- a/common/locales/sk/defaulttasks.json +++ b/common/locales/sk/defaulttasks.json @@ -1,5 +1,5 @@ { - "defaultHabit1Text": "Productive Work (Click the pencil to edit)", + "defaultHabit1Text": "Produktívna práca (Pre úpravu klikni na ceruzku)", "defaultHabit1Notes": "Sample Good Habits: + Eat a vegetable + 15 minutes productive work", "defaultHabit2Text": "Eat Junk Food (Click the pencil to edit)", "defaultHabit2Notes": "Sample Bad Habits: - Smoke - Procrastinate", @@ -7,7 +7,7 @@ "defaultHabit3Notes": "Sample Good or Bad Habits: +/- Took Stairs/Elevator ; +/- Drank Water/Soda", "defaultTodoNotes": "You can either complete this To-Do, edit it, or remove it.", "defaultTodo1Text": "Join Habitica (Check me off!)", - "defaultReward1Text": "15 minute break", + "defaultReward1Text": "15 minútová prestávka", "defaultReward1Notes": "Vlastné odmeny môžu mať rôzne formy. Niektorí ľudia odkladajú sledovanie svojho obľúbeného seriálu, kým nemajú dosť zlata, aby si to mohli dovoliť.", "defaultTag1": "ráno", "defaultTag2": "poobede", diff --git a/common/locales/sk/faq.json b/common/locales/sk/faq.json index 000a91cab8..0bb604e345 100644 --- a/common/locales/sk/faq.json +++ b/common/locales/sk/faq.json @@ -1,39 +1,39 @@ { - "frequentlyAskedQuestions": "Frequently Asked Questions", - "faqQuestion0": "I'm confused. Where do I get an overview?", + "frequentlyAskedQuestions": "Časté otázky", + "faqQuestion0": "Som zmätený/á. Kde nájdem súhrn?", "iosFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > Customize Avatar.\n\n Some basic ways to interact: click the (+) in the upper-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-left-hand corner, and expand and contract checklists by clicking on the checklist bubble.", "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", - "faqQuestion1": "How do I set up my tasks?", + "faqQuestion1": "Ako si vytvorím moje úlohy?", "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.", "webFaqAnswer1": "Good Habits (the ones with a ) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a ) are tasks that you should avoid, like biting nails. Habits with a and a have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n
\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n
\n To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.", - "faqQuestion2": "What are some sample tasks?", + "faqQuestion2": "Čo sú to ukážkové úlohy?", "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n
\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", - "faqQuestion3": "Why do my tasks change color?", + "faqQuestion3": "Prečo moje úlohy menia farbu?", "iosFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it's a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.", "webFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it’s a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.", - "faqQuestion4": "Why did my avatar lose health, and how do I regain it?", + "faqQuestion4": "Prečo môj avatar stráca zdravie a ako ho získam späť?", "iosFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight, they will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.", "webFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight, they will damage you. Second, if you click a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your party and one of your party mates did not complete all their Dailies, the Boss will attack you.\n
\n The main way to heal is to gain a level, which restores all your Health. You can also buy a Health Potion with Gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a party (under Social > Party) with a Healer, they can heal you as well.", "faqQuestion5": "How do I play Habitica with my friends?", "iosFaqAnswer5": "The best way is to invite them to a Party with you! Parties can go on quests, battle monsters, and cast skills to support each other. Go to Menu > Party and click \"Create New Party\" if you don't already have a Party. Then tap on the Members list, and tap Invite in the upper right-hand corner to invite your friends by entering their User ID (a string of numbers and letters that they can find under Settings > Account Details on the app, and Settings > API on the website). On the website, you can also invite friends via email, which we will add to the app in a future update.\n\nOn the website, you and your friends can also join Guilds, which are public chat rooms. Guilds will be added to the app in a future update!", "webFaqAnswer5": "The best way is to invite them to a party with you, under Social > Party! Parties can go on quests, battle monsters, and cast skills to support each other. You can also join guilds together (Social > Guilds). Guilds are chat rooms focusing on a shared interest or the pursuit of a common goal, and can be public or private. You can join as many guilds as you'd like, but only one party.\n
\n For more detailed info, check out the wiki pages on [Parties](http://habitrpg.wikia.com/wiki/Party) and [Guilds](http://habitrpg.wikia.com/wiki/Guilds).", - "faqQuestion6": "How do I get a Pet or Mount?", + "faqQuestion6": "Ako získam zvieratko alebo tátoša?", "iosFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Menu > Items.\n\n To hatch a Pet, you'll need an egg and a hatching potion. Tap on the egg to determine the species you want to hatch, and select \"Hatch Egg.\" Then choose a hatching potion to determine its color! Go to Menu > Pets to equip your new Pet to your avatar by clicking on it. \n\n You can also grow your Pets into Mounts by feeding them under Menu > Pets. Tap on a Pet, and then select \"Feed Pet\"! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Menu > Mounts and tap on it to equip it to your avatar.\n\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)", "webFaqAnswer6": "At level 3, you will unlock the Drop System. Every time you complete a task, you'll have a random chance at receiving an egg, a hatching potion, or a piece of food. They will be stored in Inventory > Market.\n
\n To hatch a Pet, you'll need an egg and a hatching potion. Click on the egg to determine the species you want to hatch, and then click on the hatching potion to determine its color! Go to Inventory > Pets to equip it to your avatar by clicking on it.\n
\n You can also grow your Pets into Mounts by feeding them under Inventory > Pets. Click on a Pet, and then click on a piece of food from the right-hand menu to feed it! You'll have to feed a pet many times before it becomes a Mount, but if you can figure out its favorite food, it will grow more quickly. Use trial and error, or [see the spoilers here](http://habitica.wikia.com/wiki/Food#Food_Preferences). Once you have a Mount, go to Inventory > Mounts and click on it to equip it to your avatar.\n
\n You can also get eggs for Quest Pets by completing certain Quests. (See below to learn more about Quests.)", - "faqQuestion7": "How do I become a Warrior, Mage, Rogue, or Healer?", + "faqQuestion7": "Ako sa stanem bojovníkom, mágom, zlodejom alebo liečiteľom?", "iosFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Decide Later” and choose later under Menu > Choose Class.", "webFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most Gold and find the most item drops, and they can help their party do the same. Finally, Healers can heal themselves and their party members.\n
\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click \"Opt Out\" and re-enable it later under User > Stats.", "faqQuestion8": "What is the blue stat bar that appears in the Header after level 10?", "iosFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Use Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.", "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in a special section in the Rewards Column. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You’ll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.", - "faqQuestion9": "How do I fight monsters and go on Quests?", + "faqQuestion9": "Ako môžem bojovať s príšerami a ísť na výpravy?", "iosFaqAnswer9": "First, you need to join or start a Party (see above). Although you can battle monsters alone, we recommend playing in a group, because this will make Quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n\n Next, you need a Quest Scroll, which are stored under Menu > Items. There are three ways to get a scroll:\n\n - At level 15, you get a Quest-line, aka three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively. \n - When you invite people to your Party, you'll be rewarded with the Basi-List Scroll!\n - You can buy Quests from the Quests Page on the [website](https://habitica.com/#/options/inventory/quests) for Gold and Gems. (We will add this feature to the app in a future update.)\n\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading by pulling down on the screen may be required to see the Boss's health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your Party at the same time that you damage the Boss. \n\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.", "webFaqAnswer9": "First, you need to join or start a party (under Social > Party). Although you can battle monsters alone, we recommend playing in a group, because this will make quests much easier. Plus, having a friend to cheer you on as you accomplish your tasks is very motivating!\n
\n Next, you need a Quest Scroll, which are stored under Inventory > Quests. There are three ways to get a scroll:\n
\n * When you invite people to your party, you’ll be rewarded with the Basi-List Scroll!\n * At level 15, you get a Quest-line, i.e., three linked quests. More Quest-lines unlock at levels 30, 40, and 60 respectively.\n * You can buy Quests from the Quests Page (Inventory > Quests) for Gold and Gems.\n
\n To battle the Boss or collect items for a Collection Quest, simply complete your tasks normally, and they will be tallied into damage overnight. (Reloading may be required to see the Boss's Health bar go down.) If you are fighting a Boss and you missed any Dailies, the Boss will damage your party at the same time that you damage the Boss.\n
\n After level 11 Mages and Warriors will gain Skills that allow them to deal additional damage to the Boss, so these are excellent classes to choose at level 10 if you want to be a heavy hitter.", - "faqQuestion10": "What are Gems, and how do I get them?", + "faqQuestion10": "Čo sú to drahokamy a ako ich získam?", "iosFaqAnswer10": "Gems are purchased with real money by tapping on the gem icon in the header. When people buy gems, they are helping us to keep the site running. We're very grateful for their support!\n\n In addition to buying gems directly, there are three other ways players can gain gems:\n\n * Win a Challenge on the [website](https://habitica.com) that has been set up by another player under Social > Challenges. (We will be adding Challenges to the app in a future update!)\n * Subscribe on the [website](https://habitica.com/#/options/settings/subscription) and unlock the ability to buy a certain number of gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with gems do not offer any statistical advantages, so players can still make use of the app without them!", "webFaqAnswer10": "Gems are [purchased with real money](https://habitica.com/#/options/settings/subscription), although [subscribers](https://habitica.com/#/options/settings/subscription) can purchase them with Gold. When people subscribe or buy Gems, they are helping us to keep the site running. We're very grateful for their support!\n
\n In addition to buying Gems directly or becoming a subscriber, there are two other ways players can gain Gems:\n
\n * Win a Challenge that has been set up by another player under Social > Challenges.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](http://habitica.wikia.com/wiki/Contributing_to_Habitica)\n
\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the site without them!", - "faqQuestion11": "How do I report a bug or request a feature?", + "faqQuestion11": "Ako nahlásim chybu alebo požiadam o novú funkciu?", "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > Report a Bug and Menu > Send Feedback! We'll do everything we can to assist you.", "webFaqAnswer11": "Bug reports are collected on GitHub. Go to [Help > Report a Bug](https://github.com/HabitRPG/habitrpg/issues/2760) and follow the instructions. Don't worry, we'll get you fixed up soon!\n
\n Feature requests are collected on Trello. Go to [Help > Request a Feature](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) and follow the instructions. Ta-da!", "faqQuestion12": "How do I battle a World Boss?", diff --git a/common/locales/sk/front.json b/common/locales/sk/front.json index 75e7cf4f04..7a571e82b4 100644 --- a/common/locales/sk/front.json +++ b/common/locales/sk/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "Ako to funguje", "companyBlog": "Blog", + "devBlog": "Developer Blog", "companyDonate": "Darovať", "companyExtensions": "Rozšírenia", "companyPrivacy": "Súkromie", @@ -51,6 +52,7 @@ "featureSocialHeading": "Social play", "featuredIn": "Featured in", "featuresHeading": "We also feature...", + "footerDevs": "Developers", "footerCommunity": "Komunita", "footerCompany": "Naša spoločnosť", "footerMobile": "Mobilné", @@ -84,7 +86,7 @@ "landingend4": ", ktoré sú ideálne pre rodiny, učiteľov, podporné skupiny, a firmy.", "landingfeatureslink": "našich funkcií", "landingp1": "The problem with most productivity apps on the market is that they provide no incentive to continue using them. Habitica fixes this by making habit building fun! By rewarding you for your successes and penalizing you for slip-ups, Habitica provides external motivation for completing your day-to-day activities.", - "landingp2": "Kedykoľvek posilníš svoj dobrý návyk, dokončíš dennú úlohu, alebo sa postaráš o staré to-do, Habitica ťa ihneď odmení bodmi skúseností a zlatom. Ako získavaš skúsenosti, zvyšuje sa ti level, zlepšuješ si štatistky a odomykáš nové funkcie, ako tnapríklad povolania a zvieratká. Zlato môžeš míňať na herné predmety, ktoré zmenia tvoj zážitok z hry, alebo za také odmeny, ktoré si vytvoríš v reálnom svete tak, aby ťa motivovali. Aj ten najmenší úspech ťa ihneď odmení a teda znižuje náchylnosť k prokrastinácii.", + "landingp2": "Kedykoľvek posilníš svoj dobrý návyk, dokončíš dennú úlohu, alebo sa postaráš o staré plánované úlohy, Habitica ťa ihneď odmení bodmi skúseností a zlatom. Ako získavaš skúsenosti, zvyšuje sa ti level, zlepšuješ si štatistky a odomykáš nové funkcie, ako tnapríklad povolania a zvieratká. Zlato môžeš míňať na herné predmety, ktoré zmenia tvoj zážitok z hry, alebo za také odmeny, ktoré si vytvoríš v reálnom svete tak, aby ťa motivovali. Aj ten najmenší úspech ťa ihneď odmení a teda znižuje náchylnosť k prokrastinácii.", "landingp2header": "Okamžitá odmena", "landingp3": "Whenever you indulge in a bad habit or fail to complete one of your daily tasks, you lose health. If your health drops too low, you lose some of the progress you've made. By providing immediate consequences, Habitica can help break bad habits and procrastination cycles before they cause real-world problems.", "landingp3header": "Dôsledky", @@ -96,7 +98,7 @@ "loginFacebookAlt": "Prihlásiť / Registrovať pomocou Facebook účtu", "logout": "Odhlásiť", "marketing1Header": "Hraním hry si zlepši návyky", - "marketing1Lead1": "Habitica je počítačová hra, ktorá ti pomôže zlepšiť sa v skutočných návykoch. Gamifikuje tvoj život, tým že úlohy (návyky, denné úlohy a úlohy) pretvára na príšerky, ktoré potrebuješ poraziť. Čím lepšie ti to ide, tým lepšie v hre postupuješ. Ak pochybíš v reálnom živote, negatívne to ovplyvní aj tvoju postavu v hre.", + "marketing1Lead1": "Habitica je počítačová hra, ktorá ti pomôže zlepšiť sa v skutočných návykoch. Gamifikuje tvoj život, tým že úlohy (návyky, denné úlohy a plánované úlohy) pretvára na príšerky, ktoré potrebuješ poraziť. Čím lepšie ti to ide, tým lepšie v hre postupuješ. Ak pochybíš v reálnom živote, negatívne to ovplyvní aj tvoju postavu v hre.", "marketing1Lead2": "Získaj hustú výzbroj. Zlepšuj si návyky a vylepši si postavu. Ukáž akú drsnú výzbroj máš.", "marketing1Lead2Title": "Získaj hustú výzbroj", "marketing1Lead3": "Hľadaj náhodné odmeny. Niektorých motivuje hazard, systém nazývaný \"stochastické odmeňovanie\". Habitica poskytuje všetky typy podpory: pozitívna, negatívna, predvídateľná aj náhodná.", @@ -146,7 +148,7 @@ "rewardHeading": "Complete a task to earn gold!", "sampleDailies": "Vzorové denné úlohy", "sampleHabits": "Vzorové návyky", - "sampleToDo": "Vzorové To-Dos", + "sampleToDo": "Vzorové plánované úlohy", "school": "Škola", "schoolSample1": "Finish 1 Assignment", "schoolSample2": "Study 1 hour", @@ -182,6 +184,7 @@ "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", "reportAccountProblems": "Report Account Problems", "reportCommunityIssues": "Report Community Issues", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "General Questions about the Site", "businessInquiries": "Business Inquiries", "merchandiseInquiries": "Merchandise Inquiries", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/sk/gear.json b/common/locales/sk/gear.json index 0c397d6d71..9a00998023 100644 --- a/common/locales/sk/gear.json +++ b/common/locales/sk/gear.json @@ -1,5 +1,5 @@ { - "set": "Set", + "set": "Séria", "weapon": "zbraň", "weaponBase0Text": "Bez zbrane", "weaponBase0Notes": "Bez zbrane.", @@ -58,7 +58,7 @@ "weaponHealer5Text": "Kráľovské žezlo", "weaponHealer5Notes": "Hodná monarchovej ruky alebo pre niekoho, kto je monarchovou pravou rukou. Zvyšuje inteligenciu o <%= int %>.", "weaponHealer6Text": "Zlaté žezlo", - "weaponHealer6Notes": "Utišuje bolesť všetkých, čo na ňupozrú. Zvyšuje inteligenciu o <%= int %>.", + "weaponHealer6Notes": "Utišuje bolesť všetkých, ktorý na ňu pozrú. Zvyšuje inteligenciu o <%= int %>.", "weaponSpecial0Text": "Meč temných duší", "weaponSpecial0Notes": "Vysáva z nepriateľa život, čím dodáva silu svojim nehoráznym úderom. Zvyšuje silu o <%= str %>.", "weaponSpecial1Text": "Kryštálový meč", @@ -66,11 +66,11 @@ "weaponSpecial2Text": "Dračia palica Stephena Webera", "weaponSpecial2Notes": "Pocíť dračiu silu prúdiacu z vnútra! Zvyšuje oboje silu a postreh o <%= attrs %>.", "weaponSpecial3Text": "Drtiaci kropáč Mustaina Milstonea", - "weaponSpecial3Notes": "Potýčky, príšery, pochyby: poriešené! Pogniaviť! Zvyšuje všetky silu, inteligenciu a odolnosť o <%= attrs %>.", + "weaponSpecial3Notes": "Potýčky, príšery, pochyby: poriešené! Pogniaviť! Zvyšuje silu, inteligenciu aj odolnosť o <%= attrs %>.", "weaponSpecialCriticalText": "Kritické kladivo Bugobijec", "weaponSpecialCriticalNotes": "Tam kde mnoho bojovníkov padlo, tento šampión skolil problematického zloducha z Githubu. Vyrobené z kostí Bugov, toto kladivo udeľuje mocné kritické zásahy. Zvyšuje silu aj postreh o <%= attrs %>.", - "weaponSpecialTridentOfCrashingTidesText": "Trident of Crashing Tides", - "weaponSpecialTridentOfCrashingTidesNotes": "Gives you the ability to command fish, and also deliver some mighty stabs to your tasks. Increases Intelligence by <%= int %>.", + "weaponSpecialTridentOfCrashingTidesText": "Trojzubec lámajúci príliv", + "weaponSpecialTridentOfCrashingTidesNotes": "Dáva ti schopnosť veliť rybám a tiež zoslať pár mocných úderov na tvoje úlohy. Zvyšuje inteligenciu o <%= int %>.", "weaponSpecialYetiText": "Kopija krotiteľa yetiov", "weaponSpecialYetiNotes": "Táto kopija umožňuje rozkazovať hocijakému yetimu. Zvyšuje silu o <%= str %>. Limitovaná Edícia 2013-2014 Zimná Výbava.", "weaponSpecialSkiText": "Lyžossassinská palica", @@ -93,29 +93,29 @@ "weaponSpecialSummerWarriorNotes": "There isn't a task in any To-Do list willing to tangle with this gnarly knife! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.", "weaponSpecialSummerMageText": "Kelp Catcher", "weaponSpecialSummerMageNotes": "This trident is used to spear seaweed effectively, for extra-productive kelp harvesting! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Summer Gear.", - "weaponSpecialSummerHealerText": "Wand of the Shallows", + "weaponSpecialSummerHealerText": "Prútik z plytčín", "weaponSpecialSummerHealerNotes": "This wand, made of aquamarine and live coral, is very attractive to schools of fish. Increases Intelligence by <%= int %>. Limited Edition 2014 Summer Gear.", - "weaponSpecialFallRogueText": "Silver Stake", + "weaponSpecialFallRogueText": "Strieborný kolík", "weaponSpecialFallRogueNotes": "Dispatches undead. Also grants a bonus against werewolves, because you can never be too careful. Increases Strength by <%= str %>. Limited Edition 2014 Autumn Gear.", "weaponSpecialFallWarriorText": "Grabby Claw of Science", "weaponSpecialFallWarriorNotes": "This grabby claw is at the very cutting edge of technology. Increases Strength by <%= str %>. Limited Edition 2014 Autumn Gear.", - "weaponSpecialFallMageText": "Magic Broom", + "weaponSpecialFallMageText": "Čarovná metla", "weaponSpecialFallMageNotes": "This enchanted broom flies faster than a dragon! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Autumn Gear.", - "weaponSpecialFallHealerText": "Scarab Wand", + "weaponSpecialFallHealerText": "Skarabeový prútik", "weaponSpecialFallHealerNotes": "The scarab on this wand protects and heals its wielder. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.", - "weaponSpecialWinter2015RogueText": "Ice Spike", + "weaponSpecialWinter2015RogueText": "Ľadový osteň", "weaponSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.", "weaponSpecialWinter2015WarriorText": "Gumdrop Sword", "weaponSpecialWinter2015WarriorNotes": "This delicious sword probably attracts monsters... but you're up for the challenge! Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.", "weaponSpecialWinter2015MageText": "Winter-lit Staff", "weaponSpecialWinter2015MageNotes": "The light of this crystal staff fills hearts with cheer. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.", - "weaponSpecialWinter2015HealerText": "Soothing Scepter", + "weaponSpecialWinter2015HealerText": "Chlácholivé žezlo", "weaponSpecialWinter2015HealerNotes": "This scepter warms sore muscles and soothes away stress. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.", "weaponSpecialSpring2015RogueText": "Exploding Squeak", "weaponSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "weaponSpecialSpring2015WarriorText": "Bone Club", "weaponSpecialSpring2015WarriorNotes": "It is a real bone club for real fierce doggies and is definitely not a chew toy that the Seasonal Sorceress gave you because who's a good doggy? Whoooo's a good doggy?? It's you!!! You're a good doggy!!! Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", - "weaponSpecialSpring2015MageText": "Magician's Wand", + "weaponSpecialSpring2015MageText": "Čarodejníkov prútik", "weaponSpecialSpring2015MageNotes": "Conjure up a carrot for yourself with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.", "weaponSpecialSpring2015HealerText": "Cat Rattle", "weaponSpecialSpring2015HealerNotes": "When you wave it, it makes a fascinating clickety noise that would keep ANYONE entertained for hours. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.", @@ -125,7 +125,7 @@ "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.", "weaponSpecialSummer2015MageText": "Soothsayer Staff", "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.", - "weaponSpecialSummer2015HealerText": "Wand of the Waves", + "weaponSpecialSummer2015HealerText": "Prútik vĺn", "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.", "weaponSpecialFall2015RogueText": "Bat-tle Ax", "weaponSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.", @@ -165,21 +165,21 @@ "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).", "weaponArmoireRancherLassoText": "Rancher Lasso", "weaponArmoireRancherLassoNotes": "Lassos: the ideal tool for rounding up and wrangling. Increases Strength by <%= str %>, Perception by <%= per %>, and Intelligence by <%= int %>. Enchanted Armoire: Rancher Set (Item 3 of 3).", - "weaponArmoireMythmakerSwordText": "Mythmaker Sword", + "weaponArmoireMythmakerSwordText": "Meč Mýtotvorcu", "weaponArmoireMythmakerSwordNotes": "Though it may seem humble, this sword has made many mythic heroes. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 3 of 3).", - "weaponArmoireIronCrookText": "Iron Crook", + "weaponArmoireIronCrookText": "Železný Hák", "weaponArmoireIronCrookNotes": "Fiercely hammered from iron, this iron crook is good at herding sheep. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Horned Iron Set (Item 3 of 3).", - "weaponArmoireGoldWingStaffText": "Gold Wing Staff", + "weaponArmoireGoldWingStaffText": "Zlatá Okrídlená Palica", "weaponArmoireGoldWingStaffNotes": "The wings on this staff constantly flutter and twist. Increases all attributes by <%= attrs %> each. Enchanted Armoire: Independent Item.", - "weaponArmoireBatWandText": "Bat Wand", + "weaponArmoireBatWandText": "Netopierí Prútik", "weaponArmoireBatWandNotes": "This wand can turn any task into a bat! Wave it about and watch them fly away. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.", - "weaponArmoireShepherdsCrookText": "Shepherd's Crook", + "weaponArmoireShepherdsCrookText": "Pastierova Palica", "weaponArmoireShepherdsCrookNotes": "Useful for herding gryphons. Increases Constitution by <%= con %>. Enchanted Armoire: Shepherd Set (Item 1 of 3).", - "weaponArmoireCrystalCrescentStaffText": "Crystal Crescent Staff", + "weaponArmoireCrystalCrescentStaffText": "Kryštálová Polmesiacová Palica", "weaponArmoireCrystalCrescentStaffNotes": "Summon the power of the crescent moon with this shining staff! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 3 of 3).", - "weaponArmoireBlueLongbowText": "Blue Longbow", + "weaponArmoireBlueLongbowText": "Modrý Luk", "weaponArmoireBlueLongbowNotes": "Ready... Aim... Fire! This bow has great range. Increases Perception by <%= per %>, Constitution by <%= con %>, and Strength by <%= str %>. Enchanted Armoire: Independent Item.", - "weaponArmoireGlowingSpearText": "Glowing Spear", + "weaponArmoireGlowingSpearText": "Žiarivý Oštep", "weaponArmoireGlowingSpearNotes": "This spear hypnotizes wild tasks so you can attack them. Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.", "weaponArmoireBarristerGavelText": "Barrister Gavel", "weaponArmoireBarristerGavelNotes": "Order! Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Barrister Set (Item 3 of 3).", @@ -187,9 +187,11 @@ "weaponArmoireJesterBatonNotes": "With a wave of your baton and some witty repartee, even the most complicated situations become clear. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Jester Set (Item 3 of 3).", "weaponArmoireMiningPickaxText": "Mining Pickax", "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).", - "weaponArmoireBasicLongbowText": "Basic Longbow", + "weaponArmoireBasicLongbowText": "Základný Luk", "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", - "armor": "armor", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", + "armor": "zbroj", "armorBase0Text": "Prosté ošatenie", "armorBase0Notes": "Bežné ošatenie. Neposkytuje žiadne výhody.", "armorWarrior1Text": "Kožená zbroj", @@ -254,7 +256,7 @@ "armorSpecialBirthday2015Notes": "Happy Birthday, Habitica! Wear these Silly Party Robes to celebrate this wonderful day. Confers no benefit.", "armorSpecialBirthday2016Text": "Ridiculous Party Robes", "armorSpecialBirthday2016Notes": "Happy Birthday, Habitica! Wear these Ridiculous Party Robes to celebrate this wonderful day. Confers no benefit.", - "armorSpecialGaymerxText": "Rainbow Warrior Armor", + "armorSpecialGaymerxText": "Dúhová Bojová Zbroj", "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", "armorSpecialSpringRogueText": "Priliehavý mačací oblek", "armorSpecialSpringRogueNotes": "Impeccably groomed. Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery201603Text": "Lucky Suit", "armorMystery201603Notes": "This suit is sewn from thousands of four-leafed clovers! Confers no benefit. March 2016 Subscriber Item.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorArmoireLunarArmorText": "Soothing Lunar Armor", @@ -394,6 +400,8 @@ "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).", "armorArmoireBasicArcherArmorText": "Basic Archer Armor", "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "headgear", "headBase0Text": "Bez helmy", "headBase0Notes": "Bez pokrývky hlavy.", @@ -442,7 +450,7 @@ "headSpecial1Text": "Kryštálová helma", "headSpecial1Notes": "Helma, ktorú obľubujú tí, čo sú radi pre iných vzorom. Zvyšuje všetky vlastnosti o <%= attrs %>.", "headSpecial2Text": "Bezmenná helma", - "headSpecial2Notes": "Svedectvo pre tých, čo sa obedovali bez toho, že by čosi žiadali na oplátku. Zvyšuje inteligenciu aj silu o <%= attrs %> .", + "headSpecial2Notes": "Svedectvo pre tých, čo sa obetovali bez toho, že by čosi žiadali na oplátku. Zvyšuje inteligenciu aj silu o <%= attrs %> .", "headSpecialFireCoralCircletText": "Fire Coral Circlet", "headSpecialFireCoralCircletNotes": "This circlet, designed by Habitica's greatest alchemists, allows you to breathe water and dive for treasure! Increases Perception by <%= per %>.", "headSpecialNyeText": "Absurdný párty klobúk", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.", "headMystery201603Text": "Lucky Hat", "headMystery201603Notes": "This top hat is a magical good-luck charm. Confers no benefit. March 2016 Subscriber Item.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -613,6 +625,8 @@ "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).", "headArmoireBasicArcherCapText": "Basic Archer Cap", "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "shield-hand item", "shieldBase0Text": "No Shield-Hand Equipment", "shieldBase0Notes": "Bez štítu alebo druhej zbrane.", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Soothing Shield", "shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.", "shieldSpecialSpring2015RogueText": "Exploding Squeak", - "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength <%= str %>. Limited Edition 2015 Spring Gear.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Dish Discus", "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015HealerText": "Patterned Pillow", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).", "shieldArmoireMysticLampText": "Mystic Lamp", "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "Back Accessory", "backBase0Text": "No Back Accessory", "backBase0Notes": "No Back Accessory.", @@ -820,6 +836,20 @@ "eyewear": "Eyewear", "eyewearBase0Text": "No Eyewear", "eyewearBase0Notes": "No Eyewear.", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Roguish Eyepatch", "eyewearSpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.", "eyewearSpecialSummerWarriorText": "Dashing Eyepatch", diff --git a/common/locales/sk/generic.json b/common/locales/sk/generic.json index 469610cb4b..5d423bc44f 100644 --- a/common/locales/sk/generic.json +++ b/common/locales/sk/generic.json @@ -3,41 +3,41 @@ "stringNotFound": "Reťazec '<%= string %>' sa nenašiel.", "titleIndex": "Habitica | Tvoj Život - RPG", "habitica": "Habitika", - "titleTasks": "Tasks", + "titleTasks": "Úlohy", "titleAvatar": "Avatar", - "titleBackgrounds": "Backgrounds", - "titleStats": "Stats & Achievements", - "titleProfile": "Profile", - "titleInbox": "Inbox", - "titleTavern": "Tavern", - "titleParty": "Party", - "titleHeroes": "Hall of Heroes", - "titlePatrons": "Hall of Patrons", - "titleGuilds": "Guilds", - "titleChallenges": "Challenges", - "titleDrops": "Market", - "titleQuests": "Quests", - "titlePets": "Pets", - "titleMounts": "Mounts", - "titleEquipment": "Equipment", - "titleTimeTravelers": "Time Travelers", - "titleSeasonalShop": "Seasonal Shop", - "titleSettings": "Settings", + "titleBackgrounds": "Pozadie", + "titleStats": "Štatistiky a Odznaky", + "titleProfile": "Profil", + "titleInbox": "Poštová schránka", + "titleTavern": "Hostinec", + "titleParty": "Družina", + "titleHeroes": "Sieň hrdinov", + "titlePatrons": "Sieň patrónov", + "titleGuilds": "Cechy", + "titleChallenges": "Výzvy", + "titleDrops": "Trh", + "titleQuests": "Výpravy", + "titlePets": "Zvieratká", + "titleMounts": "Tátoše", + "titleEquipment": "Výstroj", + "titleTimeTravelers": "Cestovatelia časom", + "titleSeasonalShop": "Sezónny obchod", + "titleSettings": "Nastavenia", "expandToolbar": "Rozbaliť lištu", "collapseToolbar": "Zrolovať lištu", "markdownBlurb": "Habitika používa markdown na formátovanie správ. Pre viac info pozri na Markdown Cheat Sheet", "showFormattingHelp": "Zobraziť pomôcku pre formátovanie", "hideFormattingHelp": "Skryť pomôcku pre formátovanie", - "youType": "You type:", - "youSee": "You see:", - "italics": "*Italics*", - "bold": "**Bold**", - "strikethrough": "~~Strikethrough~~", + "youType": "Píšeš", + "youSee": "Vidíš", + "italics": "*Šikmé*", + "bold": "**Hrubé**", + "strikethrough": "~~Prečiarknuté~~", "emojiExample": ":smile:", - "markdownLinkEx": "[Habitica is great!](https://habitica.com)", - "markdownImageEx": "![mandatory alt text](https://habitica.com/cake.png \"optional mouseover title\")", - "unorderedListHTML": "+ First item
+ Second item
+ Third item", - "unorderedListMarkdown": "+ First item\n+ Second item\n+ Third item", + "markdownLinkEx": "[Habitika je skvelá!](https://habitica.com)", + "markdownImageEx": "![povinný alternatívny text](https://habitica.com/cake.png \"voliteľný titulok pri prejdutí myšou\")", + "unorderedListHTML": "+ Prvá vec
+ Druhá vec
+ Tretia vec", + "unorderedListMarkdown": "+ Prvá vec\n+ Druhá vec\n+ Tretia vec", "code": "`code`", "achievements": "Odznaky", "modalAchievement": "Odznak!", @@ -48,7 +48,7 @@ "market": "Trh", "subscriberItem": "Záhadný predmet", "newSubscriberItem": "Nový tajomný predmet", - "subscriberItemText": "Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month. See the wiki's 'Mystery Item' page for more information.", + "subscriberItemText": "Predplatitelia dostanú každý mesiac záhadný predmet. Obvykle sa dostáva vždy týždeň pred koncom mesiaca. Pozri článok na wiki s názvom ,,Mystery item\" pre viac informácii.", "all": "Všetko", "none": "Nič", "or": "Alebo", @@ -68,7 +68,7 @@ "neverMind": "Radšej nie", "buyMoreGems": "Kúpiť viac drahokamov", "notEnoughGems": "Nedostatok drahokamov", - "alreadyHave": "Whoops! You already have this item. No need to buy it again!", + "alreadyHave": "Ups! Tento predmet už máš. Nepotrebuješ ho kupovať znovu!", "delete": "Zmazať", "gemsPopoverTitle": "Drahokamy", "gems": "Drahokamy", @@ -76,22 +76,22 @@ "moreInfo": "Viac informácií", "showMoreMore": "(ukázať viac)", "showMoreLess": "(ukázať menej)", - "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.", + "gemsWhatFor": "Klinki a kúpiš drahokamy! Za drahokamy môžeš kúpiť špeciálne veci ako zvitky s výpravami, úpravy avatara a sezónnu výbavu.", "veteran": "Veterán", "veteranText": "Je ošľahaný Habitom Šedým (naša stránka pred Angularom), a utŕžil veľa jaziev z boja s krvilačnými bugmi.", "originalUser": "Pôvodný používateľ!", "originalUserText": "Jeden z prapôvodných používateľov. Nebojácny alfa tester!", - "habitBirthday": "Habitica Birthday Bash", - "habitBirthdayText": "Celebrated the Habitica Birthday Bash!", - "habitBirthdayPluralText": "Celebrated <%= number %> Habitica Birthday Bashes!", - "habiticaDay": "Habitica Naming Day", - "habiticaDaySingularText": "Celebrated Habitica's Naming Day! Thanks for being a fantastic user.", - "habiticaDayPluralText": "Celebrated <%= number %> Naming Days! Thanks for being a fantastic user.", - "achievementDilatory": "Savior of Dilatory", - "achievementDilatoryText": "Helped defeat the Dread Drag'on of Dilatory during the 2014 Summer Splash Event!", - "costumeContest": "Costume Contestant", - "costumeContestText": "Participated in the Habitoween Costume Contest. See some of the entries on the Habitica blog!", - "costumeContestTextPlural": "Participated in <%= number %> Habitoween Costume Contests. See some of the entries on the Habitica blog!", + "habitBirthday": "Narodeninová oslava Habitiky", + "habitBirthdayText": "Slávil na Narodeninovej oslave Habitiky!", + "habitBirthdayPluralText": "Slávil na <%= number %> Narodeninových oslavách Habitiky!", + "habiticaDay": "Menovací deň Habitiky", + "habiticaDaySingularText": "Oslavoval Menovací deň Habitiky! Ďakujeme za to, že je fantastický užívateľ.", + "habiticaDayPluralText": "Oslavoval <%= number %> Menovacích dní Habitiky! Ďakujeme za to, že je fantastický užívateľ.", + "achievementDilatory": "Záchranca váhavosti", + "achievementDilatoryText": "Pomohol poraziť Desivého Dra'ka váhavosti počas Udalosti letného špliechania 2014!", + "costumeContest": "Súťaž kostýmov", + "costumeContestText": "Zúčastnil sa Habitoweenskej súťaže kostýmov. O vstupe do súťaže sa viac dozvieš na blogu Habitiky!", + "costumeContestTextPlural": "Zúčastnil sa <%= number %> Habitoweenskych súťaží kostýmov. O vstupe do súťaže sa viac dozvieš na blogu Habitiky!", "memberSince": "- Členom od", "lastLoggedIn": "- Posledné prihlásenie", "notPorted": "Táto funkcia ešte nie je prenesená z pôvodnej stránky.", @@ -100,26 +100,26 @@ "errorUpCase": "CHYBA:", "newPassSent": "Nové heslo odoslané.", "serverUnreach": "Server je dočasne nedostupný.", - "requestError": "Yikes, an error occurred! Please reload the page, your last action may not have been saved correctly.", - "seeConsole": "If the error persists, please report it at Help > Report a Bug. If you're familiar with your browser's console, please include any error messages.", + "requestError": "Och, nastala chyba! Prosím, znova načítaj stránku, tvoja posledná činnosť nemusela byť správne uložená.", + "seeConsole": "Ak chyba pretrváva, prosím nahláste ju v sekcií Pomoc > Nahlásiť chybu. Ak si rozumieš s konzolou prehliadača, prosím pripoj aj chybové správy.", "error": "Chyba", "menu": "Menu", "notifications": "Notifikácie", "noNotifications": "Žiadne nové správy", "clear": "Čisté", "endTour": "Ukončiť prehliadku", - "audioTheme": "Audio Theme", + "audioTheme": "Zvuková téma", "audioTheme_off": "Vypnuté", - "audioTheme_danielTheBard": "Daniel The Bard", - "audioTheme_wattsTheme": "Watts' Theme", - "audioTheme_gokulTheme": "Gokul Theme", - "audioTheme_luneFoxTheme": "LuneFox's Theme", + "audioTheme_danielTheBard": "Daniel, bard", + "audioTheme_wattsTheme": "Wattsova téma", + "audioTheme_gokulTheme": "Téma Gokul", + "audioTheme_luneFoxTheme": "Téma od LuneFox", "askQuestion": "Spýtaj sa otázku", "reportBug": "Nahlás problém", - "HabiticaWiki": "The Habitica Wiki", + "HabiticaWiki": "Wiki Habitiky", "HabiticaWikiFrontPage": "http://habitica.wikia.com/wiki/Habitica_Wiki", - "contributeToHRPG": "Contribute to Habitica", - "overview": "Overview for New Users", + "contributeToHRPG": "Prispej Habitice", + "overview": "Súhrn pre nových užívateľov", "January": "Január", "February": "Február", "March": "Marec", @@ -132,51 +132,51 @@ "October": "Október", "November": "November", "December": "December", - "dateFormat": "Date Format", - "achievementStressbeast": "Savior of Stoïkalm", - "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2014 Winter Wonderland Event!", - "achievementBurnout": "Savior of the Flourishing Fields", - "achievementBurnoutText": "Helped defeat Burnout and restore the Exhaust Spirits during the 2015 Fall Festival Event!", - "achievementBewilder": "Savior of Mistiflying", - "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!", - "checkOutProgress": "Check out my progress in Habitica!", - "cardReceived": "Received a card!", - "cardReceivedFrom": "<%= cardType %> from <%= userName %>", - "greetingCard": "Greeting Card", - "greetingCardExplanation": "You both receive the Cheery Chum achievement!", - "greetingCardNotes": "Send a greeting card to a party member.", - "greeting0": "Hi there!", - "greeting1": "Just saying hello :)", - "greeting2": "`waves frantically`", - "greeting3": "Hey you!", - "greetingCardAchievementTitle": "Cheery Chum", - "greetingCardAchievementText": "Hey! Hi! Hello! Sent or received <%= cards %> greeting cards.", - "thankyouCard": "Thank-You Card", - "thankyouCardExplanation": "You both receive the Greatly Grateful achievement!", - "thankyouCardNotes": "Send a Thank-You card to a party member.", - "thankyou0": "Thank you very much!", - "thankyou1": "Thank you, thank you, thank you!", - "thankyou2": "Sending you a thousand thanks.", - "thankyou3": "I'm very grateful - thank you!", - "thankyouCardAchievementTitle": "Greatly Grateful", - "thankyouCardAchievementText": "Thanks for being thankful! Sent or received <%= cards %> Thank-You cards.", - "birthdayCard": "Birthday Card", - "birthdayCardExplanation": "You both receive the Birthday Bonanza achievement!", - "birthdayCardNotes": "Send a birthday card to a party member.", - "birthday0": "Happy birthday to you!", - "birthdayCardAchievementTitle": "Birthday Bonanza", - "birthdayCardAchievementText": "Many happy returns! Sent or received <%= cards %> birthday cards.", - "streakAchievement": "You earned a streak achievement!", - "firstStreakAchievement": "21-Day Streak", - "streakAchievementCount": "<%= streaks %> 21-Day Streaks", - "twentyOneDays": "You've completed your Daily for 21 days in a row!", - "dontBreakStreak": "Amazing job. Don't break the streak!", - "dontStop": "Don't Stop Now!", - "levelUpShare": "I leveled up in Habitica by improving my real-life habits!", - "questUnlockShare": "I unlocked a new quest in Habitica!", - "hatchPetShare": "I hatched a new pet by completing my real-life tasks!", - "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!", - "wonChallengeShare": "I won a challenge in Habitica!", - "achievementShare": "I earned a new achievement in Habitica!", - "orderBy": "Order By <%= item %>" + "dateFormat": "Formát dátumu", + "achievementStressbeast": "Záchranca Stoïkalmu", + "achievementStressbeastText": "Pomohol poraziť Odporného stresozvera počas Udalosti zimnej krajiny zázrakov 2014!", + "achievementBurnout": "Záchranca kvitnúcich polí", + "achievementBurnoutText": "Pomohol poraziť Vypaľača a zachránil Vyčerpané duše počas Jesenného festivalu 2015!", + "achievementBewilder": "Záchranca zakliatych v hmle", + "achievementBewilderText": "Pomohol poraziť Be-Wildera počas Udalosti jarnej rozcvičky 2016!", + "checkOutProgress": "Pozrieť si môj postup v Habitike!", + "cardReceived": "Získal si kartu!", + "cardReceivedFrom": "<%= cardType %> od <%= userName %>", + "greetingCard": "Pozdrav", + "greetingCardExplanation": "Obaja získavate odznak Čerešňový kamarát!", + "greetingCardNotes": "Pošli pozdrav členovi družiny.", + "greeting0": "Ahoj!", + "greeting1": "Len som ťa prišiel pozdraviť :)", + "greeting2": "´horúčkovito máva´", + "greeting3": "Hej ty!", + "greetingCardAchievementTitle": "Veselý kamarát", + "greetingCardAchievementText": "Hej! Ahoj! Nazdar! Poslal si alebo získal <%= cards %> pozdravov.", + "thankyouCard": "Ďakovná pohľadnica", + "thankyouCardExplanation": "Obaja získavate odznak Veľmi vďačný!", + "thankyouCardNotes": "Pošli ďakovnú pohľadnicu členovi družiny.", + "thankyou0": "Ďakujem ti veľmi pekne!", + "thankyou1": "Ďakujem, ďakujem, ďakujem!", + "thankyou2": "Tisíceré díky!", + "thankyou3": "Som veľmi vďačný - ďakujem ti!", + "thankyouCardAchievementTitle": "Veľmi vďačný", + "thankyouCardAchievementText": "Ďakujeme za to, že si vďačný! Odoslaných a prijatých <%= cards %> ďakovných pohľadníc.", + "birthdayCard": "Narodeninové prianie", + "birthdayCardExplanation": "Obaja získavate odznak Narodeninový zisk!", + "birthdayCardNotes": "Pošli narodeninové prianie členovi družiny.", + "birthday0": "Všetko najlepšie!", + "birthdayCardAchievementTitle": "Narodeninový zisk", + "birthdayCardAchievementText": "Veľa šťastných návratov! Poslal alebo prijal <%= cards %> narodeninových oznámení.", + "streakAchievement": "Získal si odznak série!", + "firstStreakAchievement": "21-dňová séria", + "streakAchievementCount": "<%= streaks %> 21-dňových sérii", + "twentyOneDays": "Splnil si svoju dennú úlohu 21 dní za sebou!", + "dontBreakStreak": "Výborná práca. Neporuš reťazec!", + "dontStop": "Neprestávaj!", + "levelUpShare": "V Habitike som zvýšil svoju úroveň zlepšovaním mojich návykov v reálnom živote!", + "questUnlockShare": "Odomkol som novú výpravu v Habitike!", + "hatchPetShare": "Vďaka plneniu úloh v reálnom živote sa mi vyliahlo nové zvieratko!", + "raisePetShare": "Moje zvieratko vyrástlo v tátoše vďaka plneniu úloh v reálnom živote!", + "wonChallengeShare": "Vyhral som výzvu v Habitike!", + "achievementShare": "Získal som nový odznak v Habitike!", + "orderBy": "Zoradiť podľa <%= item %>" } \ No newline at end of file diff --git a/common/locales/sk/groups.json b/common/locales/sk/groups.json index f7e80c3182..c9815caa36 100644 --- a/common/locales/sk/groups.json +++ b/common/locales/sk/groups.json @@ -1,9 +1,9 @@ { - "tavern": "Tavern Chat", + "tavern": "Hostinec", "innCheckOut": "Odíď z hostinca", "innCheckIn": "Odpočiň si v hostinci", - "innText": "You're resting in the Inn! While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day. Be warned: If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies unless they are also in the Inn! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.", - "innTextBroken": "You're resting in the Inn, I guess... While checked-in, your Dailies won't hurt you at the day's end, but they will still refresh every day... If you are participating in a Boss Quest, the Boss will still damage you for your party mates' missed Dailies... unless they are also in the Inn... Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn... so tired...", + "innText": "Odpočívaš v hostinci! Zatiaľ, čo odpočívaš, tvoje denné úlohy ťa nezrania na konci dňa, ale stále sa budú obnovovať každý deň. Daj si pozor: ak sa účastníš lovu na bossa, boss ťa aj tak bude zraňovať za nesplnené úlohy ostatných členov tvojej družiny okrem prípadov, keď aj oni odpočívajú v hostinci! Taktiež tvoje vlastné poškodenie bossa (alebo zozberané veci) nebudú potvrdené, až pokým sa neodhlásiš z krčmy.", + "innTextBroken": "Odpočívaš v hostinci, pokiaľ sa nemýlim... Zatiaľ, čo odpočívaš, tvoje denné úlohy ťa nezrania na konci dňa, ale stále sa budú obnovovať každý deň... Ak sa účastníš lovu na bossa, boss ťa aj tak bude zraňovať za nesplnené úlohy ostatných členov tvojej družiny... okrem prípadov, keď aj oni odpočívajú v hostinci... Taktiež tvoje vlastné poškodenie bossa (alebo zozberané veci) nebudú potvrdené, až pokým sa neodhlásiš z krčmy... taký unavený...", "lfgPosts": "Príspevky ľudí hľadajúcich skupiny (\"Zháňam družinu\")", "tutorial": "Návod", "glossary": "Glosár", @@ -13,30 +13,30 @@ "community": "Komunitné fórum", "dataTool": "Nástroj na zobrazenie dát", "resources": "Zdroje", - "askQuestionNewbiesGuild": "Ask a Question (Newbies Guild)", + "askQuestionNewbiesGuild": "Spýtaj sa otázku (Newbies Guild)", "tavernTalk": "Pokec v hostinci", "tavernAlert1": "Poznámka: ak nahlasuješ bug, tu si ho vývojári nevšimnú. Prosím", - "tavernAlert2": "use GitHub instead", + "tavernAlert2": "miesto toho použi GitHub", "moderatorIntro1": "Moderátori hostinca a cechu sú:", - "communityGuidelines": "Community Guidelines", - "communityGuidelinesRead1": "Please read our", - "communityGuidelinesRead2": "before chatting.", + "communityGuidelines": "Komunitné Pravidlá", + "communityGuidelinesRead1": "Prosím, prečítaj si naše", + "communityGuidelinesRead2": "pred chatovaním.", "party": "Družina", "createAParty": "Vytvoriť družinu", - "updatedParty": "Party settings updated.", - "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:", - "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.", - "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:", - "joinExistingParty": "Join Someone Else's Party", + "updatedParty": "Nastavenia družiny boli aktualizované.", + "noPartyText": "Buď nie si v družine, alebo tvojej družine chvíľu trvá, dokedy sa načíta. Môžeš si vytvoriť družinu a pozvať priateľov, alebo ak sa chceš pripojiť k existujúcej družine, nechaj jej členov, aby napísali tvoje unikátne ID užívateľa nižšie a neskôr sa vráť aby si skontroloval pozvánku:", + "LFG": "Na prezentáciu svojej družiny alebo na hľadanie nejakej, ku ktorej sa môžeš pripojiť, navštív cech <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %>.", + "wantExistingParty": "Chceš sa pripojiť k existujúcej družine? Navštív cech <%= linkStart %>Party Wanted<%= linkEnd %> a napíš svoje užívateľské ID:", + "joinExistingParty": "Pripoj sa k družine", "create": "Vytvoriť", "userId": "ID používateľa", "invite": "Pozvať", "leave": "Opustiť", "invitedTo": "Pozvaný do <%= name %>", - "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?", - "joinNewParty": "Join New Party", - "declineInvitation": "Decline Invitation", - "loadingNewParty": "Your new party is loading. Please wait...", + "invitedToNewParty": "Bol si pozvaný do družiny! Chceš opustiť túto družinu a pridať sa k <%= partyName %>?", + "joinNewParty": "Pridať sa k novej družine", + "declineInvitation": "Odmietnuť pozvánku", + "loadingNewParty": "Tvoja nová družina sa načítava. Prosím počkaj...", "newMsg": "Nová správa v \"<%= name %>\"", "chat": "Chat", "sendChat": "Odoslať", @@ -48,12 +48,12 @@ "newGroupName": "<%= groupType %> meno", "groupName": "Názov družiny", "groupLeader": "Vodca družiny", - "groupID": "Group ID", + "groupID": "Skupinové ID", "groupDescr": "Popis zobrazujúci sa vo verejnom zozname cechov (Markdown je OK)", "logoUrl": "URL loga", "assignLeader": "Vodca družiny", - "members": "Members", - "partyList": "Order for party members in header", + "members": "Členovia", + "partyList": "Zoradenie členov družiny v hlavičke stránky", "banTip": "Vykopnúť člena", "moreMembers": "viac členov", "invited": "Pozvaný", @@ -68,22 +68,22 @@ "createGuild": "Vytvoriť cech", "guild": "Cech", "guilds": "Cechy", - "sureKick": "Do you really want to remove this member from the party/guild?", + "sureKick": "Naozaj chceš odstrániť tohto člena z družiny/cechu?", "optionalMessage": "Voliteľná správa", - "yesRemove": "Yes, remove them", + "yesRemove": "Áno, odstráň ho", "foreverAlone": "Nemôžeš si lajkovať vlastnú správu. Nechceš hádam byť jeden z tých ľudí.", "sortLevel": "Zoradiť podľa levelu", "sortRandom": "Zoradiť náhodne", "sortPets": "Zoradiť podľa počtu zvieratiek", - "sortJoined": "Sort by date joined the party", - "sortName": "Sort by avatar name", + "sortJoined": "Zoradiť podľa dátumu prijatia do družiny", + "sortName": "Zoradiť podľa mien avatarov", "sortBackgrounds": "Zoradiť podľa pozadia", - "sortHabitrpgJoined": "Sort by Habitica date joined", - "sortHabitrpgLastLoggedIn": "Sort by last time user logged in", + "sortHabitrpgJoined": "Zoradiť podľa dátumu pridania sa k Habitice", + "sortHabitrpgLastLoggedIn": "Zoradiť podľa posledného prihlásenia užívateľa", "ascendingSort": "Zoradiť vzostupne", "descendingSort": "Zoradiť zostupne", "confirmGuild": "Vytvoriť cech za 4 drahokamy?", - "leaveGroupCha": "Leave Guild challenges and...", + "leaveGroupCha": "Opustiť cechové výzvy a...", "confirm": "Potvrdiť", "leaveGroup": "Opustiť cech?", "leavePartyCha": "Opustiť výzvy družiny a...", @@ -92,64 +92,98 @@ "send": "Odoslať", "messageSentAlert": "Správa bola odoslaná", "pmHeading": "Súkromná správa pre <%= name %>", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "Vymazať všetky správy", - "confirmDeleteAllMessages": "Are you sure you want to delete all messages in your inbox? Other users will still see messages you have sent to them.", - "optOutPopover": "Don't like private messages? Click to completely opt out", + "confirmDeleteAllMessages": "Si si istý, že chceš vymazať všetky svoje správy v poštovej schránke? Ostatní užívatelia uvidia správy, ktoré si im poslal.", + "optOutPopover": "Nemáš rád súkromné správy? Klikni sem aby si sa kompletne odhlásil z ich prijímania", "block": "Zablokovať", "unblock": "Odblokovať", "pm-reply": "Odpovedať", - "inbox": "Inbox", - "abuseFlag": "Report violation of Community Guidelines", + "inbox": "Poštová schránka", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", + "abuseFlag": "Nahlás porušenie Komunitných Pravidiel", "abuseFlagModalHeading": "Nahlásiť <%= name %> za priestupok?", - "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction. Appropriate reasons to flag a post include but are not limited to:
- swearing, religous oaths
- bigotry, slurs
- adult topics
- violence, including as a joke
- spam, nonsensical messages
- náboženské prísahy, sľuby
- bigotnosť, urážky
- témy pre dospelých
- násilie, aj keď je myslené ako vtip
- spam, nezmyselné správy
They say there lies a terrible evil in the caverns of Mt. Habitica. A monster whose presence twists the wills of the strong heroes of the land, turning them towards bad habits and laziness! The beast is a grand dragon of immense power and comprised of the shadows themselves: Vice, the treacherous Shadow Wyrm. Brave Habiteers, stand up and defeat this foul beast once and for all, but only if you believe you can stand against its immense power.
Vice Part 1:
How can you expect to fight the beast if it already has control over you? Don't fall victim to laziness and vice! Work hard to fight against the dragon's dark influence and dispel his hold on you!
", "questVice1Boss": "Tieň neresti", "questVice1DropVice2Quest": "Neresť, časť 2 (zvitok)", - "questVice2Text": "Vice, Part 2: Find the Lair of the Wyrm", + "questVice2Text": "Neresť, časť 2: Nájdi dračí brloh", "questVice2Notes": "With Vice's influence over you dispelled, you feel a surge of strength you didn't know you had return to you. Confident in yourselves and your ability to withstand the wyrm's influence, your party makes its way to Mt. Habitica. You approach the entrance to the mountain's caverns and pause. Swells of shadows, almost like fog, wisp out from the opening. It is near impossible to see anything in front of you. The light from your lanterns seem to end abruptly where the shadows begin. It is said that only magical light can pierce the dragon's infernal haze. If you can find enough light crystals, you could make your way to the dragon.", "questVice2CollectLightCrystal": "Svetelné kryštály", "questVice2DropVice3Quest": "Neresť, časť 3 (zvitok)", - "questVice3Text": "Vice, Part 3: Vice Awakens", + "questVice3Text": "Neresť, časť 3: Neresť sa prebúdza", "questVice3Notes": "Po dlhých snahách sa tvojej družine podarilo nájsť brloh Neresti. Mohutné oči monštra si prezerajú tvoju družinu s opovrhnutím. Ako jej tieň zakrúži okolo teba, v hlave ti šepká hlas: \"Ďalší pobláznení občania Habitiky, čo ma prišli zastaviť? Aké milé. Bolo by rozumnejšie nechodiť sem.\" Šupinatý titán cúvne a pripraví sa na útok. Teraz je tvoja šanca! Daj do toho všetko a poraz Neresť raz a navždy!", "questVice3Completion": "The shadows dissipate from the cavern and a steely silence falls. My word, you've done it! You have defeated Vice! You and your party may finally breath a sigh of relief. Enjoy your victory, brave Habiteers, but take the lessons you've learned from battling Vice and move forward. There are still Habits to be done and potentially worse evils to conquer!", "questVice3Boss": "Neresť, Tieňová saňa", @@ -86,21 +86,21 @@ "questMoonstone3Completion": "Your breath comes hard and sweat stings your eyes as the undead Wyrm collapses. The remains of Recidivate dissipate into a thin grey mist that clears quickly under the onslaught of a refreshing breeze, and you hear the distant, rallying cries of Habiticans defeating their Bad Habits for once and for all.@Baconsaur the beast master swoops down on a gryphon. \"I saw the end of your battle from the sky, and I was greatly moved. Please, take this enchanted tunic – your bravery speaks of a noble heart, and I believe you were meant to have it.\"", "questMoonstone3Boss": "Necro-Vice", "questMoonstone3DropRottenMeat": "Zhnité mäso (Jedlo)", - "questMoonstone3DropZombiePotion": "Zombie Hatching Potion", + "questMoonstone3DropZombiePotion": "Zombie liahoxír", "questGoldenknight1Text": "The Golden Knight, Part 1: A Stern Talking-To", "questGoldenknight1Notes": "The Golden Knight has been getting on poor Habiticans' cases. Didn't do all of your Dailies? Checked off a negative Habit? She will use this as a reason to harass you about how you should follow her example. She is the shining example of a perfect Habitican, and you are naught but a failure. Well, that is not nice at all! Everyone makes mistakes. They should not have to be met with such negativity for it. Perhaps it is time you gather some testimonies from hurt Habiticans and give the Golden Knight a stern talking-to!", "questGoldenknight1CollectTestimony": "Testimonies", "questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Chain Part 2: Gold Knight (Scroll)", "questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight", "questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!", - "questGoldenknight2Boss": "Gold Knight", + "questGoldenknight2Boss": "Zlatá rytierka", "questGoldenknight2DropGoldenknight3Quest": "The Golden Knight Chain Part 3: The Iron Knight (Scroll)", "questGoldenknight3Text": "The Golden Knight, Part 3: The Iron Knight", "questGoldenknight3Notes": "@Jon Arinbjorn cries out to you to get your attention. In the aftermath of your battle, a new figure has appeared. A knight coated in stained-black iron slowly approaches you with sword in hand. The Golden Knight shouts to the figure, \"Father, no!\" but the knight shows no signs of stopping. She turns to you and says, \"I am sorry. I have been a fool, with a head too big to see how cruel I have been. But my father is crueler than I could ever be. If he isn't stopped he'll destroy us all. Here, use my morningstar and halt the Iron Knight!\"", "questGoldenknight3Completion": "With a satisfying clang, the Iron Knight falls to his knees and slumps over. \"You are quite strong,\" he pants. \"I have been humbled, today.\" The Golden Knight approaches you and says, \"Thank you. I believe we have gained some humility from our encounter with you. I will speak with my father and explain the complaints against us. Perhaps, we should begin apologizing to the other Habiticans.\" She mulls over in thought before turning back to you. \"Here: as our gift to you, I want you to keep my morningstar. It is yours now.\"", - "questGoldenknight3Boss": "The Iron Knight", - "questGoldenknight3DropHoney": "Honey (Food)", - "questGoldenknight3DropGoldenPotion": "Golden Hatching Potion", + "questGoldenknight3Boss": "Železný rytier", + "questGoldenknight3DropHoney": "Med (Jedlo)", + "questGoldenknight3DropGoldenPotion": "Zlatý liahoxír", "questGoldenknight3DropWeapon": "Mustaine's Milestone Mashing Morning Star (Shield-hand Weapon)", "questBasilistText": "The Basi-List", "questBasilistNotes": "There's a commotion in the marketplace--the kind that should make you run away. Being a courageous adventurer, you run towards it instead, and discover a Basi-list, coalescing from a clump of incomplete To-Dos! Nearby Habiticans are paralyzed with fear at the length of the Basi-list, unable to start working. From somewhere in the vicinity, you hear @Arcosine shout: \"Quick! Complete your To-Dos and Dailies to defang the monster, before someone gets a paper cut!\" Strike fast, adventurer, and check something off - but beware! If you leave any Dailies undone, the Basi-list will attack you and your party!", @@ -125,9 +125,9 @@ "questSeahorseText": "The Dilatory Derby", "questSeahorseNotes": "It's Derby Day, and Habiticans from all over the continent have traveled to Dilatory to race their pet seahorses! Suddenly, a great splashing and snarling breaks out at the racetrack, and you hear Seahorse Keeper @Kiwibot shouting above the roar of the waves. \"The gathering of seahorses has attracted a fierce Sea Stallion!\" she cries. \"He's smashing through the stables and destroying the ancient track! Can anyone calm him down?\"", "questSeahorseCompletion": "The now-tame Sea Stallion swims docilely to your side. \"Oh, look!\" Kiwibot says. \"He wants us to take care of his children.\" She gives you three eggs. \"Raise them well,\" she says. \"You're welcome at the Dilatory Derby any day!\"", - "questSeahorseBoss": "Sea Stallion", + "questSeahorseBoss": "Morský žrebec", "questSeahorseDropSeahorseEgg": "Morský koník (vajce)", - "questSeahorseUnlockText": "Unlocks purchasable seahorse eggs in the Market", + "questSeahorseUnlockText": "Odomkne predajné vajíčka morských koníkov na trhu", "questAtom1Text": "Attack of the Mundane, Part 1: Dish Disaster!", "questAtom1Notes": "You reach the shores of Washed-Up Lake for some well-earned relaxation... But the lake is polluted with unwashed dishes! How did this happen? Well, you simply cannot allow the lake to be in this state. There is only one thing you can do: clean the dishes and save your vacation spot! Better find some soap to clean up this mess. A lot of soap...", "questAtom1CollectSoapBars": "Bars of Soap", @@ -140,33 +140,33 @@ "questAtom3Notes": "With a deafening cry, and five delicious types of cheese bursting from its mouth, the SnackLess Monster falls to pieces. \"HOW DARE YOU!\" booms a voice from beneath the water's surface. A robed, blue figure emerges from the water, wielding a magic toilet brush. Filthy laundry begins to bubble up to the surface of the lake. \"I am the Laundromancer!\" he angrily announces. \"You have some nerve - washing my delightfully dirty dishes, destroying my pet, and entering my domain with such clean clothes. Prepare to feel the soggy wrath of my anti-laundry magic!\"", "questAtom3Completion": "The wicked Laundromancer has been defeated! Clean laundry falls in piles all around you. Things are looking much better around here. As you begin to wade through the freshly pressed armor, a glint of metal catches your eye, and your gaze falls upon a gleaming helm. The original owner of this shining item may be unknown, but as you put it on, you feel the warming presence of a generous spirit. Too bad they didn't sew on a nametag.", "questAtom3Boss": "The Laundromancer", - "questAtom3DropPotion": "Base Hatching Potion", - "questOwlText": "The Night-Owl", + "questAtom3DropPotion": "Základný liahoxír", + "questOwlText": "Nočná sova", "questOwlNotes": "The Tavern light is lit 'til dawn
Until one eve the glow is gone!
How can we see for our all-nighters?
@Twitching cries, \"I need some fighters!
See that Night-Owl, starry foe?
Fight with haste and do not slow!
We'll drive its shadow from our door,
And make the night shine bright once more!\"", "questOwlCompletion": "The Night-Owl fades before the dawn,
But even so, you feel a yawn.
Perhaps it's time to get some rest?
Then on your bed, you see a nest!
A Night-Owl knows it can be great
To finish work and stay up late,
But your new pets will softly peep
To tell you when it's time to sleep.", - "questOwlBoss": "The Night-Owl", - "questOwlDropOwlEgg": "Owl (Egg)", - "questOwlUnlockText": "Unlocks purchasable owl eggs in the Market", - "questPenguinText": "The Fowl Frost", + "questOwlBoss": "Nočná sova", + "questOwlDropOwlEgg": "Sova (Vajíčko)", + "questOwlUnlockText": "Odomkne predajné sovie vajíčka na trhu", + "questPenguinText": "Vtáčí mráz", "questPenguinNotes": "Although it's a hot summer day in the southernmost tip of Habitica, an unnatural chill has fallen upon Lively Lake. Strong, frigid winds rush around as the shore begins to freeze over. Ice spikes jut up from the ground, pushing grass and dirt away. @Melynnrose and @Breadstrings run up to you.
\"Help!\" says @Melynnrose. \"We brought a giant penguin in to freeze the lake so we could all go ice skating, but we ran out of fish to feed him!\"
\"He got angry and is using his freeze breath on everything he sees!\" says @Breadstrings. \"Please, you have to subdue him before all of us are covered in ice!\" Looks like you need this penguin to... cool down.", "questPenguinCompletion": "Upon the penguin's defeat, the ice melts away. The giant penguin settles down in the sunshine, slurping up an extra bucket of fish you found. He skates off across the lake, blowing gently downwards to create smooth, sparkling ice. What an odd bird! \"It appears he left behind a few eggs, as well,\" says @Painter de Cluster.
@Rattify laughs. \"Maybe these penguins will be a little more... chill?\"", - "questPenguinBoss": "Frost Penguin", - "questPenguinDropPenguinEgg": "Penguin (Egg)", - "questPenguinUnlockText": "Unlocks purchasable penguin eggs in the Market", + "questPenguinBoss": "Zamrznutý tučniak", + "questPenguinDropPenguinEgg": "Tučniak (Vajíčko)", + "questPenguinUnlockText": "Odomkne predajné vajíčka tučniakov na trhu", "questStressbeastText": "The Abominable Stressbeast of the Stoïkalm Steppes", "questStressbeastNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Stress Strike Bar. When the Stress Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts who are not resting in the inn will have their incomplete Dailies tallied.
~*~
The first thing we hear are the footsteps, slower and more thundering than the stampede. One by one, Habiticans look outside their doors, and words fail us.
We've all seen Stressbeasts before, of course - tiny vicious creatures that attack during difficult times. But this? This towers taller than the buildings, with paws that could crush a dragon with ease. Frost swings from its stinking fur, and as it roars, the icy blast rips the roofs off our houses. A monster of this magnitude has never been mentioned outside of distant legend.
\"Beware, Habiticans!\" SabreCat cries. \"Barricade yourselves indoors - this is the Abominable Stressbeast itself!\"
\"That thing must be made of centuries of stress!\" Kiwibot says, locking the Tavern door tightly and shuttering the windows.
\"The Stoïkalm Steppes,\" Lemoness says, face grim. \"All this time, we thought they were placid and untroubled, but they must have been secretly hiding their stress somewhere. Over generations, it grew into this, and now it's broken free and attacked them - and us!\"
There's only one way to drive away a Stressbeast, Abominable or otherwise, and that's to attack it with completed Dailies and To-Dos! Let's all band together and fight off this fearsome foe - but be sure not to slack on your tasks, or our undone Dailies may enrage it so much that it lashes out...", "questStressbeastBoss": "The Abominable Stressbeast", "questStressbeastBossRageTitle": "Stress Strike", "questStressbeastBossRageDescription": "When this gauge fills, the Abominable Stressbeast will unleash its Stress Strike on Habitica!", - "questStressbeastDropMammothPet": "Mammoth (Pet)", - "questStressbeastDropMammothMount": "Mammoth (Mount)", + "questStressbeastDropMammothPet": "Mamut (Zvieratko)", + "questStressbeastDropMammothMount": "Mamut (Tátoš)", "questStressbeastBossRageStables": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and their dark-red color has infuriated the Abominable Stressbeast and caused it to regain some of its health! The horrible creature lunges for the Stables, but Matt the Beast Master heroically leaps into the fray to protect the pets and mounts. The Stressbeast has seized Matt in its vicious grip, but at least it's distracted for the moment. Hurry! Let's keep our Dailies in check and defeat this monster before it attacks again!", "questStressbeastBossRageBailey": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nAhh!!! Our incomplete Dailies caused the Abominable Stressbeast to become madder than ever and regain some of its health! Bailey the Town Crier was shouting for citizens to get to safety, and now it has seized her in its other hand! Look at her, valiantly reporting on the news as the Stressbeast swings her around viciously... Let's be worthy of her bravery by being as productive as we can to save our NPCs!", "questStressbeastBossRageGuide": "`Abominable Stressbeast uses STRESS STRIKE!`\n\nThe surge of stress heals Abominable Stressbeast!\n\nLook out! Justin the Guide is trying to distract the Stressbeast by running around its ankles, yelling productivity tips! The Abominable Stressbeast is stomping madly, but it seems like we're really wearing this beast down. I doubt it has enough energy for another strike. Don't give up... we're so close to finishing it off!", "questStressbeastDesperation": "`Abominable Stressbeast reaches 500K health! Abominable Stressbeast uses Desperate Defense!`\n\nWe're almost there, Habiticans! With diligence and Dailies, we've whittled the Stressbeast's health down to only 500K! The creature roars and flails in desperation, rage building faster than ever. Bailey and Matt yell in terror as it begins to swing them around at a terrifying pace, raising a blinding snowstorm that makes it harder to hit.\n\nWe'll have to redouble our efforts, but take heart - this is a sign that the Stressbeast knows it is about to be defeated. Don't give up now!", "questStressbeastCompletion": "The Abominable Stressbeast is DEFEATED!
We've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!
Stoïkalm is Saved!
SabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.
\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"
She turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"", "questStressbeastCompletionChat": "`The Abominable Stressbeast is DEFEATED!`\n\nWe've done it! With a final bellow, the Abominable Stressbeast dissipates into a cloud of snow. The flakes twinkle down through the air as cheering Habiticans embrace their pets and mounts. Our animals and our NPCs are safe once more!\n\n`Stoïkalm is Saved!`\n\nSabreCat speaks gently to a small sabertooth. \"Please find the citizens of the Stoïkalm Steppes and bring them to us,\" he says. Several hours later, the sabertooth returns, with a herd of mammoth riders following slowly behind. You recognize the head rider as Lady Glaciate, the leader of Stoïkalm.\n\n\"Mighty Habiticans,\" she says, \"My citizens and I owe you the deepest thanks, and the deepest apologies. In an effort to protect our Steppes from turmoil, we began to secretly banish all of our stress into the icy mountains. We had no idea that it would build up over generations into the Stressbeast that you saw! When it broke loose, it trapped all of us in the mountains in its stead and went on a rampage against our beloved animals.\" Her sad gaze follows the falling snow. \"We put everyone at risk with our foolishness. Rest assured that in the future, we will come to you with our problems before our problems come to you.\"\n\nShe turns to where @Baconsaur is snuggling with some of the baby mammoths. \"We have brought your animals an offering of food to apologize for frightening them, and as a symbol of trust, we will leave some of our pets and mounts with you. We know that you will all take care good care of them.\"", - "questTRexText": "King of the Dinosaurs", + "questTRexText": "Kráľ dinosaurov", "questTRexNotes": "Now that ancient creatures from the Stoïkalm Steppes are roaming throughout all of Habitica, @Urse has decided to adopt a full-grown Tyrannosaur. What could go wrong?
Everything.", "questTRexCompletion": "The wild dinosaur finally stops its rampage and settles down to make friends with the giant roosters. @Urse beams down at it. \"They're not such terrible pets, after all! They just need a little discipline. Here, take some Tyrannosaur eggs for yourself.\"", "questTRexBoss": "Flesh Tyrannosaur", @@ -177,19 +177,19 @@ "questTRexUndeadRageTitle": "Skeleton Healing", "questTRexUndeadRageDescription": "This bar fills when you don't complete your Dailies. When it is full, the Skeletal Tyrannosaur will heal 30% of its remaining health!", "questTRexUndeadRageEffect": "`Skeletal Tyrannosaur uses SKELETON HEALING!`\n\nThe monster lets forth an unearthly roar, and some of its damaged bones knit back together!", - "questTRexDropTRexEgg": "Tyrannosaur (Egg)", + "questTRexDropTRexEgg": "Tyrannosaur (Vajičko)", "questTRexUnlockText": "Unlocks purchasable tyrannosaur eggs in the Market", - "questRockText": "Escape the Cave Creature", + "questRockText": "Uteč jaskynnej príšere ", "questRockNotes": "Crossing Habitica's Meandering Mountains with some friends, you make camp one night in a beautiful cave laced with shining minerals. But when you wake up the next morning, the entrance has disappeared, and the floor of the cave is shifting underneath you.
\"The mountain's alive!\" shouts your companion @pfeffernusse. \"These aren't crystals - these are teeth!\"
@Painter de Cluster grabs your hand. \"We'll have to find another way out - stay with me and don't get distracted, or we could be trapped in here forever!\"", "questRockBoss": "Crystal Colossus", "questRockCompletion": "Your diligence has allowed you to find a safe path through the living mountain. Standing in the sunshine, your friend @intune notices something glinting on the ground by the cave's exit. You stoop to pick it up, and see that it's a small rock with a vein of gold running through it. Beside it are a number of other rocks with rather peculiar shapes. They almost look like... eggs?", - "questRockDropRockEgg": "Rock (Egg)", - "questRockUnlockText": "Unlocks purchasable rock eggs in the Market", - "questBunnyText": "The Killer Bunny", + "questRockDropRockEgg": "Kameň (Vajíčko)", + "questRockUnlockText": "Odomkne predajné vajíčka kameňov na trhu", + "questBunnyText": "Zabijak králik", "questBunnyNotes": "After many difficult days, you reach the peak of Mount Procrastination and stand before the imposing doors of the Fortress of Neglect. You read the inscription in the stone. \"Inside resides the creature that embodies your greatest fears, the reason for your inaction. Knock and face your demon!\" You tremble, imagining the horror within and feel the urge to flee as you have done so many times before. @Draayder holds you back. \"Steady, my friend! The time has come at last. You must do this!\"
You knock and the doors swing inward. From within the gloom you hear a deafening roar, and you draw your weapon.", - "questBunnyBoss": "Killer Bunny", + "questBunnyBoss": "Zabijak králik", "questBunnyCompletion": "With one final blow the killer rabbit sinks to the ground. A sparkly mist rises from her body as she shrinks down into a tiny bunny... nothing like the cruel beast you faced a moment before. Her nose twitches adorably and she hops away, leaving some eggs behind. @Gully laughs. \"Mount Procrastination has a way of making even the smallest challenges seem insurmountable. Let's gather these eggs and head for home.\"", - "questBunnyDropBunnyEgg": "Bunny (Egg)", + "questBunnyDropBunnyEgg": "Králik (Vajíčko)", "questBunnyUnlockText": "Unlocks purchasable bunny eggs in the Market", "questSlimeText": "The Jelly Regent", "questSlimeNotes": "As you work on your tasks, you notice you are moving slower and slower. \"It's like walking through molasses,\" @Leephon grumbles. \"No, like walking through jelly!\" @starsystemic says. \"That slimy Jelly Regent has slathered his stuff all over Habitica. It's gumming up the works. Everybody is slowing down.\" You look around. The streets are slowly filling with clear, colorful ooze, and Habiticans are struggling to get anything done. As others flee the area, you grab a mop and prepare for battle!", @@ -201,7 +201,7 @@ "questSheepNotes": "As you wander the rural Taskan countryside with friends, taking a \"quick break\" from your obligations, you find a cozy yarn shop. You are so absorbed in your procrastination that you hardly notice the ominous clouds creep over the horizon. \"I've got a ba-a-a-ad feeling about this weather,\" mutters @Misceo, and you look up. The stormy clouds are swirling together, and they look a lot like a... \"We don't have time for cloud-gazing!\" @starsystemic shouts. \"It's attacking!\" The Thunder Ram hurtles forward, slinging bolts of lightning right at you!", "questSheepBoss": "Thunder Ram", "questSheepCompletion": "Impressed by your diligence, the Thunder Ram is drained of its fury. It launches three huge hailstones in your direction, and then fades away with a low rumble. Upon closer inspection, you discover that the hailstones are actually three fluffy eggs. You gather them up, and then stroll home under a blue sky.", - "questSheepDropSheepEgg": "Sheep (Egg)", + "questSheepDropSheepEgg": "Ovca (Vajíčko)", "questSheepUnlockText": "Unlocks purchasable sheep eggs in the Market", "questKrakenText": "The Kraken of Inkomplete", "questKrakenNotes": "It's a warm, sunny day as you sail across the Inkomplete Bay, but your thoughts are clouded with worries about everything that you still need to do. It seems that as soon as you finish one task, another crops up, and then another...
Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.
\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"", @@ -213,12 +213,12 @@ "questWhaleNotes": "You arrive at the Diligent Docks, hoping to take a submarine to watch the Dilatory Derby. Suddenly, a deafening bellow forces you to stop and cover your ears. \"Thar she blows!\" cries Captain @krazjega, pointing to a huge, wailing whale. \"It's not safe to send out the submarines while she's thrashing around!\"
\"Quick,\" calls @UncommonCriminal. \"Help me calm the poor creature so we can figure out why she's making all this noise!\"", "questWhaleBoss": "Wailing Whale", "questWhaleCompletion": "After much hard work, the whale finally ceases her thunderous cry. \"Looks like she was drowning in waves of negative habits,\" @zoebeagle explains. \"Thanks to your consistent effort, we were able to turn the tides!\" As you step into the submarine, several whale eggs bob towards you, and you scoop them up.", - "questWhaleDropWhaleEgg": "Whale (Egg)", - "questWhaleUnlockText": "Unlocks purchasable whale eggs in the Market", + "questWhaleDropWhaleEgg": "Veľryba (vajíčko)", + "questWhaleUnlockText": "Odomkne predajné vajíčka veľrýb na trhu", "questDilatoryDistress1Text": "Dilatory Distress, Part 1: Message in a Bottle", "questDilatoryDistress1Notes": "A message in a bottle arrived from the newly rebuilt city of Dilatory! It reads: \"Dear Habiticans, we need your help once again. Our princess has disappeared and the city is under siege by some unknown watery demons! The mantis shrimps are holding the attackers at bay. Please aid us!\" To make the long journey to the sunken city, one must be able to breathe water. Fortunately, the alchemists @Benga and @hazel can make it all possible! You only have to find the proper ingredients.", "questDilatoryDistress1Completion": "You don the the finned armor and swim to Dilatory as quickly as you can. The merfolk and their mantis shrimp allies have managed to keep the monsters outside the city for the moment, but they are losing. No sooner are you within the castle walls than the horrifying siege descends!", - "questDilatoryDistress1CollectFireCoral": "Fire Coral", + "questDilatoryDistress1CollectFireCoral": "Ohnivý korál", "questDilatoryDistress1CollectBlueFins": "Blue Fins", "questDilatoryDistress1DropArmor": "Finned Oceanic Armor (Armor)", "questDilatoryDistress2Text": "Dilatory Distress, Part 2: Creatures of the Crevasse", @@ -228,14 +228,14 @@ "questDilatoryDistress2RageTitle": "Swarm Respawn", "questDilatoryDistress2RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Water Skull Swarm will heal 30% of its remaining health!", "questDilatoryDistress2RageEffect": "`Water Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls pour forth from the crevasse, bolstering the swarm!", - "questDilatoryDistress2DropSkeletonPotion": "Skeleton Hatching Potion", - "questDilatoryDistress2DropCottonCandyBluePotion": "Cotton Candy Blue Hatching Potion", + "questDilatoryDistress2DropSkeletonPotion": "Kostlivý liahoxír", + "questDilatoryDistress2DropCottonCandyBluePotion": "Cukrovo modrý liahoxír", "questDilatoryDistress2DropHeadgear": "Fire Coral Circlet (Headgear)", "questDilatoryDistress3Text": "Dilatory Distress, Part 3: Not a Mere Maid", "questDilatoryDistress3Notes": "You follow the mantis shrimps deep into the Crevasse, and discover an underwater fortress. Princess Adva, escorted by more watery skulls, awaits you inside the main hall. \"My father has sent you, has he not? Tell him I refuse to return. I am content to stay here and practice my sorcery. Leave now, or you shall feel the wrath of the ocean's new queen!\" Adva seems very adamant, but as she speaks you notice a strange, ruby pendant on her neck glowing ominously... Perhaps her delusions would cease should you break it?", "questDilatoryDistress3Completion": "Finally, you manage to pull the bewitched pendant from Adva's neck and throw it away. Adva clutches her head. \"Where am I? What happened here?\" After hearing your story, she frowns. \"This necklace was given to me by a strange ambassador - a lady called 'Tzina'. I don't remember anything after that!\"
Back at Dilatory, Manta is overjoyed by your success. \"Allow me to reward you with this trident and shield! I ordered them from @aiseant and @starsystemic as a gift for Adva, but... I'd rather not put weapons in her hands any time soon.\"", "questDilatoryDistress3Boss": "Adva, the Usurping Mermaid", - "questDilatoryDistress3DropFish": "Fish (Food)", + "questDilatoryDistress3DropFish": "Ryba (Jedlo)", "questDilatoryDistress3DropWeapon": "Trident of Crashing Tides (Weapon)", "questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)", "questCheetahText": "Such a Cheetah", @@ -248,8 +248,8 @@ "questHorseNotes": "While relaxing in the Tavern with @beffymaroo and @JessicaChase, the talk turns to good-natured boasting about your adventuring accomplishments. Proud of your deeds, and perhaps getting a bit carried away, you brag that you can tame any task around. A nearby stranger turns toward you and smiles. One eye twinkles as he invites you to prove your claim by riding his horse.\nAs you all head for the stables, @UncommonCriminal whispers, \"You may have bitten off more than you can chew. That's no horse - that's a Night-Mare!\" Looking at its stamping hooves, you begin to regret your words...", "questHorseCompletion": "It takes all your skill, but finally the horse stamps a couple of hooves and nuzzles you in the shoulder before allowing you to mount. You ride briefly but proudly around the Tavern grounds while your friends cheer. The stranger breaks into a broad grin.\n\"I can see that was no idle boast! Your determination is truly impressive. Take these eggs to raise horses of your own, and perhaps we'll meet again one day.\" You take the eggs, the stranger tips his hat... and vanishes.", "questHorseBoss": "Night-Mare", - "questHorseDropHorseEgg": "Horse (Egg)", - "questHorseUnlockText": "Unlocks purchasable Horse eggs in the Market", + "questHorseDropHorseEgg": "Kôň (Vajíčko)", + "questHorseUnlockText": "Odomkne predajné vajíčka koní na trhu", "questBurnoutText": "Burnout and the Exhaust Spirits", "questBurnoutNotes": "It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. \"We need to evacuate all the wooden buildings!\" Redphoenix shouts. \"Hurry!\"
Kiwibot grips the wall as she catches her breath. \"It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!\"
\"'It'?'\" asks Lemoness.
And then the heat takes form.
It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle.
Kiwibot whispers a single word.
\"Burnout.\"", "questBurnoutCompletion": "Burnout is DEFEATED!
With a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.
Ian, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!
\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!
One of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"
Her tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"
She claps her hands. \"Now - let's celebrate!\"", @@ -266,20 +266,20 @@ "questFrogNotes": "As you and your friends are slogging through the Swamps of Stagnation, @starsystemic points at a large sign. \"Stay on the path -- if you can.\"
\"Surely that isn't hard!\" @RosemonkeyCT says. \"It's broad and clear.\"
But as you continue, you notice that path is gradually overtaken by the muck of the swamp, laced with bits of strange blue debris and clutter, until it's impossible to proceed.
As you look around, wondering how it got this messy, @Jon Arjinborn shouts, \"Look out!\" An angry frog leaps from the sludge, clad in dirty laundry and lit by blue fire. You will have to overcome this poisonous Clutter Frog to progress!", "questFrogCompletion": "The frog cowers back into the muck, defeated. As it slinks away, the blue slime fades, leaving the way ahead clear.
Sitting in the middle of the path are three pristine eggs. \"You can even see the tiny tadpoles and through the clear casing!\" @Breadstrings says. \"Here, you should take them.\"", "questFrogBoss": "Clutter Frog", - "questFrogDropFrogEgg": "Frog (Egg)", - "questFrogUnlockText": "Unlocks purchasable Frog eggs in the Market", + "questFrogDropFrogEgg": "Žaba (Vajíčko)", + "questFrogUnlockText": "Odomkne predajné žabie vajíčka na trhu", "questSnakeText": "The Serpent of Distraction", "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?", "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", - "questSnakeDropSnakeEgg": "Snake (Egg)", - "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", - "questUnicornText": "Convincing the Unicorn Queen", + "questSnakeDropSnakeEgg": "Had (Vajíčko)", + "questSnakeUnlockText": "Odomkne predajné hadie vajíčka na trhu", + "questUnicornText": "Presvedčivá kráľovná jednorožcov", "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", - "questUnicornBoss": "The Unicorn Queen", - "questUnicornDropUnicornEgg": "Unicorn (Egg)", - "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market", + "questUnicornBoss": "Kráľovná jednorožcov", + "questUnicornDropUnicornEgg": "Jednorožec (Vajíčko)", + "questUnicornUnlockText": "Odomkne predajné vajíčka jednorožcov na trhu", "questSabretoothText": "The Sabre Cat", "questSabretoothNotes": "A roaring monster is terrorizing Habitica! The creature stalks through the wilds and woods, then bursts forth to attack before vanishing again. It's been hunting innocent pandas and frightening the flying pigs into fleeing their pens to roost in the trees. @Inventrix and @icefelis explain that the Zombie Sabre Cat was set free while they were excavating in the ancient, untouched ice-fields of the Stoikalm Steppes. \"It was perfectly friendly at first – I don't know what happened. Please, you have to help us recapture it! Only a champion of Habitica can subdue this prehistoric beast!\"", "questSabretoothCompletion": "After a long and tiring battle, you wrestle the Zombie Sabre Cat to the ground. As you are finally able to approach, you notice a nasty cavity in one of its sabre teeth. Realising the true cause of the cat's wrath, you're able to get the cavity filled by @Fandekasp, and advise everyone to avoid feeding their friend sweets in future. The Sabre Cat flourishes, and in gratitude, its tamers send you a generous reward – a clutch of sabretooth eggs!", @@ -290,23 +290,35 @@ "questMonkeyNotes": "The Sloensteadi Savannah is being torn apart by the Monstrous Mandrill and his Mischief Monkeys! They shriek loudly enough to drown out the sound of approaching deadlines, encouraging everyone to avoid their duties and keep monkeying around. Alas, plenty of people ape this bad behavior. If no one stops these primates, soon everyone's tasks will be as red as the Monstrous Mandrill's face!
\"It will take a dedicated adventurer to resist them,\" says @yamato.
\"Quick, let's get this monkey off everyone's backs!\" @Oneironaut yells, and you charge into battle.", "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"
@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"", "questMonkeyBoss": "Monstrous Mandrill", - "questMonkeyDropMonkeyEgg": "Monkey (Egg)", - "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market", + "questMonkeyDropMonkeyEgg": "Opica (Vajíčko)", + "questMonkeyUnlockText": "Odomkne predajné vajíčka opíc na trhu", "questSnailText": "The Snail of Drudgery Sludge", "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"
\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"
Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.", "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"", "questSnailBoss": "Snail of Drudgery Sludge", - "questSnailDropSnailEgg": "Snail (Egg)", - "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market", + "questSnailDropSnailEgg": "Slimák (Vajíčko)", + "questSnailUnlockText": "Odomkne predajné vajíčka slimákov na trhu", "questBewilderText": "The Be-Wilder", "questBewilderNotes": "The party begins like any other.
The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
“Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
“As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
“Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
“My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
PainterProphet ducks as lightning bolts crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.", "questBewilderCompletion": "The Be-Wilder is DEFEATED!
We've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.
Mistiflying is saved!
The April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”
The crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.
“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”
Redphoenix coughs meaningfully.
“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”
Encouraged, the marching band starts up.
It isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.
As Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", "questBewilderCompletionChat": "`The Be-Wilder is DEFEATED!`\n\nWe've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.\n\n`Mistiflying is saved!`\n\nThe April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”\n\nThe crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.\n\n“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”\n\nRedphoenix coughs meaningfully.\n\n“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”\n\nEncouraged, the marching band starts up.\n\nIt isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.\n\nAs Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", "questBewilderBossRageTitle": "Beguilement Strike", "questBewilderBossRageDescription": "When this gauge fills, The Be-Wilder will unleash its Beguilement Strike on Habitica!", - "questBewilderDropBumblebeePet": "Bumblebee (Pet)", - "questBewilderDropBumblebeeMount": "Bumblebee (Mount)", + "questBewilderDropBumblebeePet": "Magical Bee (Pet)", + "questBewilderDropBumblebeeMount": "Magical Bee (Mount)", "questBewilderBossRageMarket": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nOh no! Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.\n\nHurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.", "questBewilderBossRageStables": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nAhh!!! Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!", - "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!" + "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!", + "questFalconText": "The Birds of Preycrastination", + "questFalconNotes": "Mt. Habitica is being overshadowed by a looming mountain of To-Dos. It used to be a place to picnic and enjoy a sense of accomplishment, until the neglected tasks grew out of control. Now it's home to fearsome Birds of Preycrastination, foul creatures which stop Habiticans from completing their tasks!
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Sokol (Vajíčko)", + "questFalconUnlockText": "Odomkne predajné sokolie vajíčka na trhu", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/sk/rebirth.json b/common/locales/sk/rebirth.json index 1636ea5dc5..2030547460 100644 --- a/common/locales/sk/rebirth.json +++ b/common/locales/sk/rebirth.json @@ -2,27 +2,28 @@ "rebirthNew": "Znovuzrodenie: Čas na nové dobrodružstvo!", "rebirthUnlock": "Odomkol si znovuzrodenie! Toto je špeciálna položka na trhu, ktorá ti umožňuje začať hru od 1. levelu, pričom ti zachová úlohy, odznaky, zvieratká, a ďalšie. Použi ho, ak máš pocit, že si už všetko dosiahol, a chceš do Habitica vdýchnuť nový život, alebo chceš zažiť nové funkcie očami nováčika.", "rebirthBegin": "Znovuzrodenie: Začni nové dobrodružstvo", - "rebirthStartOver": "Rebirth starts your character over from Level 1.", + "rebirthStartOver": "Znovuzrodením začneš znova hrať s postavou od 1. levelu.", "rebirthAdvList1": "Vráti sa ti plné zdravie.", - "rebirthAdvList2": "You have no Experience, Gold, or Equipment (with the exception of free items like Mystery items).", - "rebirthAdvList3": "Tvoje návyky, denné úlohy a úlohy zmenia farbu na žltú a série sa vynulujú.", + "rebirthAdvList2": "Nemáš žiadne skúsenosti, zlato či výstroj (s výnimkou vecí, ktoré sú zdarma, ako sú napríklad tajomné predmety)", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "Až kým nezískaš iné povolanie, budeš bojovník.", "rebirthInherit": "Tvoja nová postava získa zopár vecí od svojho predchodcu:", "rebirthInList1": "Úlohy, história a nastavenia sa nezmenia.", "rebirthInList2": "Členstvo vo výzvách, cechoch, a družine ostáva.", "rebirthInList3": "Drahokamy, úroveň podporovateľa na Kickstarteri a prispievateľské levely ostávajú.", "rebirthInList4": "Predmety, ktoré si si kúpil za drahokamy alebo ti padli (ako napríklad zvieratká a tátoši) ostávajú, ale nebudeš ich mať dostupné, kým ich neodomkneš.", - "rebirthInList5": "Limited edition equipment you've purchased can be repurchased, even if its event has ended. To repurchase class-specific equipment, you must first change to the correct class.", + "rebirthInList5": "Výstroj z limitovanej edície, ktorý si si kúpil, môže byť znova zakúpený, dokonca aj po skončení akcie. Pre opätovné zakúpenie špecifického výstroja pre dané povolanie si musíš najskôr zmeniť svoje povolanie.", "rebirthEarnAchievement": "Za začatie nového dobrodružstva získavaš aj špeciálny odznak!", "beReborn": "Znovu sa zrodiť", "rebirthAchievement": "Začal si nové dobrodružstvo! Toto je tvoje znovuzrodenie čislo <%= number %> a najvušší level, ktorý si dosiahol je <%= level %>. Ak chceš tento odznak vylepšiť, začni nové dobrodružstvo po dosiahnutí ešte vyššieho levelu!", - "rebirthAchievement100": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is 100 or higher. To stack this Achievement, begin your next new adventure when you've reached at least 100!", + "rebirthAchievement100": "Začal si nové dobrodružstvo! Toto je tvoje znovuzrodenie číslo <%= number %> a najvyšší level, ktorý si získal je 100 alebo vyšší. Ak chceš tento odznak vylepšiť, začni nové dobrodružstvo po dosiahnutí aspoň levelu 100!", "rebirthBegan": "Začal nové dobrodružstvo", "rebirthText": "Začal niekoľko nových dobrodružstiev: <%= rebirths %>", "rebirthOrb": "Použil Orb znovuzrodenia, aby začal odznovu, po dosiahnutí levelu", - "rebirthOrb100": "Used an Orb of Rebirth to start over after attaining Level 100 or higher", + "rebirthOrb100": "Použil Orb znovuzrodenia, aby začal odznovu, po dosiahnutí levelu 100 alebo vyššieho", "rebirthPop": "Začni s novou postavou na leveli 1, pričom ti ostanú odznaky, zberateľské predmety, a úlohy.", "rebirthName": "Orb znovuzrodenia", "reborn": "Znovuzrodený, najvyšší dosiahnutý level: <%= reLevel %>", - "confirmReborn": "Are you sure?" + "confirmReborn": "Si si istý?", + "rebirthComplete": "Bol si znovuzrodený!" } \ No newline at end of file diff --git a/common/locales/sk/settings.json b/common/locales/sk/settings.json index 5f25c5ba46..2436f3bd65 100644 --- a/common/locales/sk/settings.json +++ b/common/locales/sk/settings.json @@ -15,11 +15,11 @@ "startCollapsedPop": "Keď je zvolená táto možnosť, keď začneš upravovať úlohu, zoznam štítkov bude skrytý.", "startAdvCollapsed": "Zrolované pokročilé možnosti v úlohách", "startAdvCollapsedPop": "S nastavením tejto možnosti budú pokročilé možnosti v momente, keď prvý krát otvoríš úlohu na úpravy, skryté.", - "dontShowAgain": "Don't show this again", - "suppressLevelUpModal": "Don't show popup when gaining a level", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", + "dontShowAgain": "Už mi to nezobrazuj", + "suppressLevelUpModal": "Nezobrazuj popup, keď získam level", + "suppressHatchPetModal": "Nezobrazuj popup, keď vyliahnem zvieratko", + "suppressRaisePetModal": "Nezobrazuj popup, keď zo zvieratka vyrastie tátoš", + "suppressStreakModal": "Nezobrazuj popup, keď získam odznak za sériu", "showTour": "Zobraziť prehliadku", "restartTour": "Reštartovať úvodnú prehliadku prvej návštevy Habitica.", "showBailey": "Zobraziť Bailey", @@ -47,26 +47,38 @@ "customDayStart": "Vlastný začiatok dňa", "changeCustomDayStart": "Change Custom Day Start?", "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "Rôzne", "showHeader": "Zobraziť záhlavie", "changePass": "Zmeniť heslo", "changeUsername": "Zmeniť používateľské meno", - "changeEmail": "Change Email Address", - "newEmail": "New Email Address", + "changeEmail": "Zmeniť Emailovú adresu", + "newEmail": "Nová Emailová adresa", "oldPass": "Staré heslo", "newPass": "Nové heslo", "confirmPass": "Zopakuj nové heslo", "newUsername": "Nové používateľské meno", "dangerZone": "Nebezpečná zóna", "resetText1": "POZOR! Toto vynuluje veľa častí tvojho konta. Táto možnosť sa neodporúča, ale niektorí ľudia to považujú za užitočné po krátkom hraní sa so stránkou.", - "resetText2": "Stratíš svoju úroveň, zlato a body skúseností. Všetky tvoje úlohy sa nenávratne zmažú a prídeš aj o všetky historícké dáta. Prídeš o všetok výstroj, ale budeš si ho môcť kúpiť naspäť vrátane všetkých limitovaných alebo odberateľským záhadných predmetov, ktoré si už predtým vlastnil (budeš musieť ma správne povolanie, aby si mohol kúpiť výstroj špecifickú pre povolanie). Ostane ti súčasné povolanie a zvieratká a tátoše. Možno budeš viac preferovať Orb znovuzrodenia, ktorý je bezpečnejšou možnosťou a ktorý ti zachová úlohy.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Si si istý? Toto navždy zmaže tvoje konto a už sa nebude dať obnoviť! Ak budeš chcieť opäť používať Habitica, budeš sa musieť opäť registrovať s novým kontom. Odložené alebo použité drahokamy sa ti nepreplatia. Ak si si absolútne istý, napíš do textového poľa <%= deleteWord %>.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Zastarané", "APIText": "Na použitie aplikácií tretích strán použi tento kľúč. API token považuj za niečo ako heslo, nezdieľaj ho verejne. Občas ťa môže niekto požiadať o User ID, ale nikomu nedávaj API Token, ani na Github.", "APIToken": "API Token (toto je heslo - prečítaj si varovanie vyššie!)", + "thirdPartyApps": "Third Party Apps", + "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Chrome Chat Extension", + "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.", + "otherExtensions": "Other Extensions", + "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.", "resetDo": "Sprav to, zresetuj mi konto!", + "resetComplete": "Reset complete!", "fixValues": "Upraviť hodnoty", "fixValuesText1": "Ak si narazil na bug alebo spravil chybu, ktorá ti neprávom zmenila postavu (zranenie, ktoré si nemal dostať, zlato, ktoré si v skutočnosti nezískal, atď.), môžeš si manuálne upraviť hodnoty. Áno, dá sa pomocou toho podvádzať - používaj túto funkciu s rozmyslom, inak by mohla sabotovať budovanie tvojich vlastných návykov!", "fixValuesText2": "Všimni si, že na jednotlivých úlohách si nemôžeš obnoviť série. To môžeš spraviť pri editácii denných úloh, keď si otvoríš pokročilé možnosti, kde nájdeš pole na obnovenie série.", @@ -96,6 +108,7 @@ "emailNotifications": "Email notifikácie", "wonChallenge": "You won a Challenge!", "newPM": "Received Private Message", + "sentGems": "Poslať drahokamy!", "giftedGems": "Gifted Gems", "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>", "giftedSubscription": "Gifted Subscription", @@ -127,15 +140,20 @@ "promoPlaceholder": "Enter Promotion Code", "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member.", "saveCustomDayStart": "Save Custom Day Start", - "registration": "Registration", + "registration": "Registrácia", "addLocalAuth": "Add local authentication:", "generateCodes": "Generate Codes", "generate": "Generate", "getCodes": "Get Codes", "webhooks": "Webhooks", - "enabled": "Enabled", + "enabled": "Povolené", "webhookURL": "Webhook URL", - "add": "Add", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", + "add": "Pridať", "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", @@ -147,7 +165,7 @@ "mysticHourglasses": "Mystic Hourglasses:", "paypal": "PayPal", "amazonPayments": "Amazon Payments", - "timezone": "Time Zone", + "timezone": "Časová zóna", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been reseting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/sk/spells.json b/common/locales/sk/spells.json index 7ee448f806..4071f7b165 100644 --- a/common/locales/sk/spells.json +++ b/common/locales/sk/spells.json @@ -1,50 +1,56 @@ { "spellWizardFireballText": "Výbuch ohňa", - "spellWizardFireballNotes": "Flames burst from your hands. You gain XP, and you deal extra damage to Bosses! Click on a task to cast. (Based on: INT)", + "spellWizardFireballNotes": "Plamene šľahajú z tvojich rúk. Získavaš skúsenosti a spôsobuješ extra poškodenie bossom! Klikni na úlohu aby si začal čarovať. (Založené na: INT)", "spellWizardMPHealText": "Éterická vlna", - "spellWizardMPHealNotes": "You sacrifice mana to help your friends. The rest of your party gains MP! (Based on: INT)", + "spellWizardMPHealNotes": "Obetuješ manu aby si pomohol svojim kamarátom. Zbytok tvojej družiny získava MP! (Založené na: INT)", "spellWizardEarthText": "Zemetrasenie", - "spellWizardEarthNotes": "Your mental power shakes the earth. Your whole party gains a buff to Intelligence! (Based on: Unbuffed INT)", + "spellWizardEarthNotes": "Tvoja mentálna sila trasie so zemou. Celá tvoja družina získava magický bonus k intelektu! (Založené na: INT bez bonusu)", "spellWizardFrostText": "Mrazivá inovať", - "spellWizardFrostNotes": "Ice covers your tasks. None of your streaks will reset to zero tomorrow! (One cast affects all streaks.)", + "spellWizardFrostNotes": "Ľad prekrýva tvoje úlohy. Žiadna z tvojich sérii sa do zajtra nezníži na nulu! (Jedno zakúzlenie platí pre všetky série.)", "spellWarriorSmashText": "Brutálna rana", - "spellWarriorSmashNotes": "You hit a task with all of your might. It gets more blue/less red, and you deal extra damage to Bosses! Click on a task to cast. (Based on: STR)", + "spellWarriorSmashNotes": "Vrazil si celou silou jednej úlohe. Získava modrejšiu / menej červenú farbu a tiež spôsobuješ väčšie poškodenie bossom! Klikni na úlohu na zakúzlenie. (Založené na: SIL)", "spellWarriorDefensiveStanceText": "Obranný postoj", - "spellWarriorDefensiveStanceNotes": "You prepare yourself for the onslaught of your tasks. You gain a buff to Constitution! (Based on: Unbuffed CON)", + "spellWarriorDefensiveStanceNotes": "Pripravíš sa na útok svojich úloh. Získavaš bonus k odolnosti! (Založené na: ODO bez bonusu)", "spellWarriorValorousPresenceText": "Chrabrý výraz", - "spellWarriorValorousPresenceNotes": "Your presence emboldens your party. Your whole party gains a buff to Strength! (Based on: Unbuffed STR)", + "spellWarriorValorousPresenceNotes": "Tvoja prítomnosť povzbudzuje družinu. Celá tvoja družina získava bonus k sile! (Založené na: SIL bez bonusu)", "spellWarriorIntimidateText": "Zastrašujúci pohľad", - "spellWarriorIntimidateNotes": "Your gaze strikes fear into your enemies. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)", + "spellWarriorIntimidateNotes": "Tvoj pohľad zosiela strach na tvojich nepriateľov. Celá tvoja družina získava bonus k odolnosti! (Založené na: ODO bez bonusu)", "spellRoguePickPocketText": "Vreckárčiť", - "spellRoguePickPocketNotes": "You rob a nearby task. You gain gold! Click on a task to cast. (Based on: PER)", + "spellRoguePickPocketNotes": "Okrádaš blízku úlohu a získavaš zlato! Klikni na úlohu pre zakúzlenie. (Založené na: POS)", "spellRogueBackStabText": "Nôž do chrbta", - "spellRogueBackStabNotes": "You betray a foolish task. You gain gold and XP! Click on a task to cast. (Based on: STR)", + "spellRogueBackStabNotes": "Podvádzaš bláznivú úlohu. Získavaš zlato a XP! Klikni na úlohu pre zakúzlenie. (Založené na: SIL)", "spellRogueToolsOfTradeText": "Zlodejská výstroj", - "spellRogueToolsOfTradeNotes": "You share your talents with friends. Your whole party gains a buff to Perception! (Based on: Unbuffed PER)", + "spellRogueToolsOfTradeNotes": "Zdieľaš svoj talent s kamarátmi. Celá tvoja družina získava bonus k postrehu! (Založené na: POS bez bonusu)", "spellRogueStealthText": "Zakrádanie", - "spellRogueStealthNotes": "You are too sneaky to spot. Some of your undone Dailies will not cause damage tonight, and their streaks/color will not change. (Cast multiple times to affect more Dailies)", + "spellRogueStealthNotes": "Si príliš prefíkaný, aby ťa bolo možné spozorovať. Niektoré tvoje nesplnené denné úlohy dnes v noci nespôsobia poškodenie a ich postup / farba sa nezmení. (Vyčaruj viackrát aby si ovplyvnil viac denných úloh)", "spellHealerHealText": "Liečivá žiara", - "spellHealerHealNotes": "Light covers your body, healing your wounds. You regain health! (Based on: CON and INT)", + "spellHealerHealNotes": "Svetlo pokrýva tvoje telo a lieči rany. Obnovuješ si svoje zdravie! (Založené na: ODO a INT)", "spellHealerBrightnessText": "Spaľujúci jas", - "spellHealerBrightnessNotes": "A burst of light dazzles your tasks. They become more blue and less red! (Based on: INT)", + "spellHealerBrightnessNotes": "Slnečný lúč oslňuje tvoje úlohy. Začínajú byť modrejšie a menej červené! (Založené na: INT)", "spellHealerProtectAuraText": "Ochranná aura", - "spellHealerProtectAuraNotes": "You shield your party from damage. Your whole party gains a buff to Constitution! (Based on: Unbuffed CON)", + "spellHealerProtectAuraNotes": "Ochraňuješ svoju družinu pred poškodením. Celá tvoja družina získava bonus k odolnosti! (Založené na: ODO bez bonusu)", "spellHealerHealAllText": "Požehnanie", - "spellHealerHealAllNotes": "A soothing aura surrounds you. Your whole party regains health! (Based on: CON and INT)", + "spellHealerHealAllNotes": "Obklopuje ťa upokojujúca aura. Celá tvoja družina si obnovuje zdravie! (Založené na: ODO a INT)", "spellSpecialSnowballAuraText": "Snehová guľa", "spellSpecialSnowballAuraNotes": "Hoď snehovou guľou po členovi svojej družiny! Čo zlé by sa mohlo stať? Trvá do konca jeho dňa.", "spellSpecialSaltText": "Soľ", "spellSpecialSaltNotes": "Niekto do teba hodil snehovú guľu. Ha ha, veľmi vtipné. Teraz zo mňa dostaň ten sneh!", - "spellSpecialSpookDustText": "Strašidelné iskričky", - "spellSpecialSpookDustNotes": "Turn a friend into a floating blanket with eyes!", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Elixír nepriehľadnosti", "spellSpecialOpaquePotionNotes": "Zruší účinky strašidelných iskričiek.", - "spellSpecialShinySeedText": "Shiny Seed", - "spellSpecialShinySeedNotes": "Turn a friend into a joyous flower!", - "spellSpecialPetalFreePotionText": "Petal-Free Potion", - "spellSpecialPetalFreePotionNotes": "Cancel the effects of a Shiny Seed.", - "spellSpecialSeafoamText": "Seafoam", - "spellSpecialSeafoamNotes": "Turn a friend into a sea creature!", + "spellSpecialShinySeedText": "Lesklé semienko", + "spellSpecialShinySeedNotes": "Premení tvojho priateľa na veselý kvet!", + "spellSpecialPetalFreePotionText": "Bezlístkový elixír", + "spellSpecialPetalFreePotionNotes": "Ruší efekt lesklého semienka.", + "spellSpecialSeafoamText": "Morská pena", + "spellSpecialSeafoamNotes": "Premení tvojho priateľa na morského tvora!", "spellSpecialSandText": "Piesok", - "spellSpecialSandNotes": "Cancel the effects of Seafoam." + "spellSpecialSandNotes": "Ruší efekt morskej peny.", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/sk/subscriber.json b/common/locales/sk/subscriber.json index bf3d16c38f..6411d937ea 100644 --- a/common/locales/sk/subscriber.json +++ b/common/locales/sk/subscriber.json @@ -1,14 +1,16 @@ { "subscription": "Predplatné", "subscriptions": "Predplatné", - "subDescription": "Buy Gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.", + "subDescription": "Nakupuj drahokamy za peniaze, získaj záhadný predmet každý mesiac, uchovaj si históriu svojho pokroku, zdvojnásob denné padanie predmetov, podpor vývojárov. Klikni pre viac informácií. ", "buyGemsGold": "Kúp si za zlato drahokamy.", "buyGemsGoldText": "Alexander the Merchant will sell you Gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> Gems per month, but this cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Retain additional history entries", "retainHistoryText": "Makes completed To-Dos and task history available for longer.", "doubleDrops": "Zdvojnásob počet získateľných predmetov na deň", "doubleDropsText": "Zaplň svoju stajňu rýchlejšie!", - "mysteryItem": "Exclusive monthly items", + "mysteryItem": "Jedinečné predmety každý mesiac", "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.", "supportDevs": "Podporuj vývojárov", "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!", @@ -29,6 +31,7 @@ "manageSub": "Klikni pre zmenu predplatného", "cancelSub": "Zrušiť predplatné", "canceledSubscription": "Canceled Subscription", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Administrátorské predplatné", "morePlans": "More Plans
Coming Soon", "organizationSub": "Súkromá organizácia", @@ -73,6 +76,9 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Winged Messenger Set", "mysterySet201403": "Forest Walker Set", "mysterySet201404": "Twilight Butterfly Set", @@ -99,6 +105,8 @@ "mysterySet201601": "Champion of Resolution Set", "mysterySet201602": "Heartbreaker Set", "mysterySet201603": "Lucky Clover Set", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySetwondercon": "Wondercon", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Buy this item for 1 Mystic Hourglass?", "petsAlreadyOwned": "Pet already owned.", "mountsAlreadyOwned": "Mount already owned.", - "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Pet not available for purchase with Mystic Hourglass.", "mountsNotAllowedHourglass": "Mount not available for purchase with Mystic Hourglass.", "hourglassPurchase": "Purchased an item using a Mystic Hourglass!", - "hourglassPurchaseSet": "Purchased an item set using a Mystic Hourglass!" + "hourglassPurchaseSet": "Purchased an item set using a Mystic Hourglass!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/sk/tasks.json b/common/locales/sk/tasks.json index 71729b7f3a..cf8c89b8c8 100644 --- a/common/locales/sk/tasks.json +++ b/common/locales/sk/tasks.json @@ -2,19 +2,19 @@ "clearCompleted": "Zmaž hotové", "lotOfToDos": "Splnené úlohy sa po 3 dňoch automaticky archivujú. Ostanú prístupné cez Nastavenia > Export", "deleteToDosExplanation": "Ak klikneš na tlačítko nižšie, všetky tvoje dokončené ToDo a archivované ToDo sa nenávratne zmažú. Ak si chceš uchovať históriu, najskôr použi export.", - "addmultiple": "Add Multiple", - "addsingle": "Add Single", - "habit": "Habit", + "addmultiple": "Pridať viaceré", + "addsingle": "Pridať jeden", + "habit": "Návyk", "habits": "Návyky", "newHabit": "Nový návyk", - "newHabitBulk": "New Habits (one per line)", + "newHabitBulk": "Nový návyk (jeden na riadok)", "yellowred": "Slabé", "greenblue": "Silné", "edit": "Upraviť", "save": "Uložiť", "addChecklist": "Pridať kontrolný zoznam", "checklist": "Kontrolný zoznam", - "checklistText": "Break a task into smaller pieces! Checklists increase the Experience and Gold gained from a To-Do, and reduce the damage caused by a Daily.", + "checklistText": "Rozdeľ si úlohy na menšie časti! Kontrolný zoznam zvýši dosiahnuté skúsenosti a zlato získané z úlohy a zároveň zníži poškodenie spôsobené dennými úlohami. ", "expandCollapse": "Rozbaliť/zbaliť", "text": "Názov", "extraNotes": "Poznámky", @@ -22,7 +22,7 @@ "advancedOptions": "Pokročilé možnosti", "difficulty": "Obtiažnosť", "difficultyHelpTitle": "Ako náročná je úloha?", - "difficultyHelpContent": "The harder a task, the more Experience and Gold it awards you when you check it off... but the more it damages you if it is a Daily or Bad Habit!", + "difficultyHelpContent": "Čím ťažšiu úlohu splníš, tým viac skúseností a zlata dostaneš... ale zároveň si spôsobíš viac poškodenia, ak nesplníš dennú úlohu alebo urobíš zlý návyk!", "trivial": "Triviálne", "easy": "Ľahké", "medium": "Stredné", @@ -32,40 +32,40 @@ "mental": "Mentálne", "otherExamples": "Napr. profesné ciele, koníčky, finančné, atď.", "progress": "Postup", - "daily": "Daily", + "daily": "Denná úloha", "dailies": "Denné úlohy", "newDaily": "Nová denná úloha", - "newDailyBulk": "New Dailies (one per line)", + "newDailyBulk": "Nové denné úlohy (jedna na riadok)", "streakCounter": "Počítadlo série", "repeat": "Opakovať", "repeatEvery": "Opakovať každý", "repeatHelpTitle": "Ako často by sa mala táto úloha opakovať?", - "dailyRepeatHelpContent": "This task will be due every X days. You can set that value below.", - "weeklyRepeatHelpContent": "This task will be due on the highlighted days below. Click on a day to activate/deactivate it.", + "dailyRepeatHelpContent": "Táto úloha bude povinná každých X dní. Hodnotu môžeš nastaviť nižšie.", + "weeklyRepeatHelpContent": "Táto úloha bude povinná počas vyznačených dní. Klikni na deň aby si ho aktivoval/deaktivoval.", "repeatDays": "Každých X dní", - "repeatWeek": "On Certain Days of the Week", - "day": "Day", - "days": "Days", + "repeatWeek": "Určité dni v týždni", + "day": "Deň", + "days": "Dni", "restoreStreak": "Obnoviť sériu", - "todo": "To-Do", + "todo": "Úloha", "todos": "Úlohy", "newTodo": "Nová úloha", - "newTodoBulk": "New To-Dos (one per line)", + "newTodoBulk": "Nové úlohy (jedna na riadok)", "dueDate": "Dokončiť do", "remaining": "Aktívne", "complete": "Hotové", "dated": "S dátumom", "due": "V pláne", - "notDue": "Not Due", + "notDue": "Nie je presne určený čas", "grey": "Šedé", "score": "Skóre", - "reward": "Reward", + "reward": "Odmena", "rewards": "Odmeny", "ingamerewards": "Výstroj a zručnosti", "gold": "Zlato", "silver": "Grajciar (100 grajciarov = 1 zlatka)", "newReward": "Nová odmena", - "newRewardBulk": "New Rewards (one per line)", + "newRewardBulk": "Nové odmeny (jedna na riadok)", "price": "Cena", "tags": "Štítky", "editTags": "Upraviť", @@ -73,44 +73,59 @@ "clearTags": "Vyčistiť", "hideTags": "Skryť", "showTags": "Zobraziť", - "startDate": "Start Date", + "toRequired": "You must supply a to value", + "startDate": "Počiatočný dátum", "startDateHelpTitle": "Kedy by mala táto úloha začať?", - "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.", + "startDateHelp": "Nastav dátum, kedy bude táto úloha platná. Jej plnenie nebude povinné počas predchádzajúcich dní.", "streakName": "- počet sérií", "streakText": "Má na konte <%= streaks %> 21-dňové série na denných úlohách.", "streakSingular": "Sériovač", "streakSingularText": "Má na konte 21-dňovú sériu na denných úlohách.", "perfectName": "x perfektný deň", - "perfectText": "Completed all active Dailies on <%= perfects %> days. With this achievement you get a +level/2 buff to all attributes for the next day. Levels greater than 100 don't have any additional effects on buffs.", + "perfectText": "Zvládol všetky aktívne denné úlohy počas <%= perfects %> dní. S týmto odznakom získavaš bonus +level/2 pre všetky štatistiky na ďalší deň. Levely vyššie ako 100 nemajú žiadne ďalšie efekty bonusu.", "perfectSingular": "Bezchybný deň", - "perfectSingularText": "Completed all active Dailies in one day. With this achievement you get a +level/2 buff to all attributes for the next day. Levels greater than 100 don't have any additional effects on buffs.", + "perfectSingularText": "Zvládol všetky aktívne denné úlohy počas jedného dňa. S týmto odznakom získaš bonus +level/2 pre všetky štatistiky na ďalší deň. Levely vyššie ako 100 nemajú žiadne ďalšie efekty bonusu.", "streakerAchievement": "Získal si odznak \"Sériovač\"! 21 dní je hranica na vytvorenie návyku. Môžeš pokračovať a získavať ďalšie odznaky za každých 21 dní na tejto alebo inej dennej úlohe!", "fortifyName": "Siloxír", "fortifyPop": "Vráť všetky úlohy do neutrálneho stavu (žltá farba) a navráť všetko stratené zdravie.", "fortify": "Posilniť", - "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", - "confirmFortify": "Are you sure?", - "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", + "confirmFortify": "Si si istý?", + "fortifyComplete": "Fortify complete!", + "sureDelete": "Si si istý, že chceš zmazať <%= taskType %> \"<%= taskText %>\"?", "streakCoins": "Bonus za sériu!", - "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", - "emptyTask": "Enter the task's title first.", - "dailiesRestingInInn": "You're Resting in the Inn! Your Dailies will NOT hurt you tonight, but they WILL still refresh every day. If you're in a quest, you won't deal damage/collect items until you check out of the Inn, but you can still be injured by a Boss if your Party mates skip their own Dailies.", - "habitHelp1": "Good Habits are things that you do often. They award Gold and Experience every time you click the <%= plusIcon %>.", - "habitHelp2": "Bad Habits are things you want to avoid doing. They remove Health every time you click the <%= minusIcon %>.", - "habitHelp3": "For inspiration, check out these sample Habits!", - "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!", - "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.", - "dailyHelp2": "If you don't complete active Dailies, you lose Health when your day rolls over.", - "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.", - "dailyHelp4": "To change when your day rolls over, go to <%= linkStart %> Settings > Site<%= linkEnd %> > Custom Day Start.", - "dailyHelp5": "For inspiration, check out these sample Dailies!", - "toDoHelp1": "To-Dos start yellow, and get redder (more valuable) the longer it takes to complete them.", - "toDoHelp2": "To-Dos never hurt you! They only award Gold and Experience.", - "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!", - "toDoHelp4": "For inspiration, check out these sample To-Dos!", - "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.", - "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).", - "rewardHelp3": "Special equipment will appear here during World Events.", - "rewardHelp4": "Don't be afraid to set custom Rewards! Check out some samples here.", - "clickForHelp": "Klikni pre pomoc" + "pushTaskToTop": "Presuň úlohu navrch. Drž ctrl alebo cmd aby si ju presunul naspodok.", + "emptyTask": "Najskôr vlož názov úlohy.", + "dailiesRestingInInn": "Odpočívaš v hostinci! Tvoje denné úlohy ťa túto noc nezrania, ale napriek tomu sa OBNOVIA ďalší deň. Ak si na výprave, nebudeš spôsobovať poškodenie/zberať predmety dokedy sa neodhlásiš z hostinca, ale stále môžeš byť zranený Bossom, ak člen tvojej družiny preskočí jeho dennú úlohu.", + "habitHelp1": "Dobré návyky sú veci, ktoré robíš často. Získaš za ne Zlato a Skúsenosti vždy, keď klikneš na <%= plusIcon %>.", + "habitHelp2": "Zlozvyky sú veci, ktorým sa chceš vyvarovať. Uberú ti Zdravie vždy, keď klikneš na <%= minusIcon %>.", + "habitHelp3": "Pre inšpiráciu pozri vzory úloh!", + "newbieGuild": "Máš ďalšie otázky? Spýtaj sa v <%= linkStart %>Newbies Guild<%= linkEnd %>!", + "dailyHelp1": "Denné úlohy sa opakujú <%= emphasisStart %>každý deň<%= emphasisEnd %>, počas ktorého sú aktívne. Klikni na <%= pencilIcon %>, aby si zmenil dni, kedy bude denná úloha aktívna.", + "dailyHelp2": "Ak nesplníš aktívne denné úlohy, stratíš zdravie na konci dňa.", + "dailyHelp3": "Denné úlohy <%= emphasisStart %>sčervenajú<%= emphasisEnd %>, keď ich nesplníš a <%= emphasisStart %>zmodrejú<%= emphasisEnd %>, keď ich splníš. Čím je denná úloha červenejšia, tým vyššiu odmenu získaš... alebo tým viac ti ublíži. ", + "dailyHelp4": "Ak chceš zmeniť koniec svojho dňa, klikni na <%= linkStart %> Nastavenia > Stránka<%= linkEnd %> > Vlastný začiatok dňa.", + "dailyHelp5": "Pre inšpiráciu pozri pár príkladov na denné úlohy!", + "toDoHelp1": "Úlohy zožltnú a následne sčervenajú (sú cennejšie), čím dlhšie ti trvá ich splniť. ", + "toDoHelp2": "Úlohy ti nikdy neublížia! Za ich splnenie získaš zlato a skúsenosti. ", + "toDoHelp3": "Rozložením úlohy na menšie časti bude úloha vyzerať splniteľnejšie a zvýši tvoje body!", + "toDoHelp4": "Pre inšpiráciu pozri pár príkladov na úlohy!", + "rewardHelp1": "Výstroj, ktorú si kúpiš pre svojho avatara je uložený v <%= linkStart %>Inventár > Výstroj<%= linkEnd %>.", + "rewardHelp2": "Výstroj ovplyvní tvoje štatistiky (<%= linkStart %>Avatar > Štatistiky<%= linkEnd %>).", + "rewardHelp3": "Špeciálny výstroj sa objaví tu počas Podujatí.", + "rewardHelp4": "Neboj sa vlastných odmien! Pozri si zopár ich ukážok.", + "clickForHelp": "Klikni pre pomoc", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Úloha nebola nájdená.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "Úloha, ktorá je súčasťou výzvy, nemôže byť vymazaná.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "Žiadny zoznamový predmet nebol nájdený s daným id.", + "itemIdRequired": "\"itemId\" musí mať platné UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" musí mať platné UUID zhodujúce sa so štítkom, ktorý patrí užívateľovi. ", + "positionRequired": "\"position\" je vyžadovaná a musí to byť číslo.", + "cantMoveCompletedTodo": "Hotový to-do sa nedá presunúť.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "Úloha už má tento štítok." } \ No newline at end of file diff --git a/common/locales/sr/backgrounds.json b/common/locales/sr/backgrounds.json index 97e205a613..24a8edaac4 100644 --- a/common/locales/sr/backgrounds.json +++ b/common/locales/sr/backgrounds.json @@ -160,5 +160,12 @@ "backgroundGiantFlowersText": "Giant Flowers", "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow.", + "backgrounds052016": "SET 24: Released May 2016", + "backgroundBeehiveText": "Beehive", + "backgroundBeehiveNotes": "Buzz and dance in a Beehive.", + "backgroundGazeboText": "Gazebo", + "backgroundGazeboNotes": "Battle a Gazebo.", + "backgroundTreeRootsText": "Tree Roots", + "backgroundTreeRootsNotes": "Explore the Tree Roots." } \ No newline at end of file diff --git a/common/locales/sr/challenge.json b/common/locales/sr/challenge.json index 79500b1f12..ea0344c605 100644 --- a/common/locales/sr/challenge.json +++ b/common/locales/sr/challenge.json @@ -63,5 +63,20 @@ "congratulations": "Congratulations!", "hurray": "Hurray!", "noChallengeOwner": "no owner", - "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account." + "noChallengeOwnerPopover": "This challenge does not have an owner because the person who created the challenge deleted their account.", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/sr/character.json b/common/locales/sr/character.json index 398339103c..247aeb329e 100644 --- a/common/locales/sr/character.json +++ b/common/locales/sr/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the Community Guidelines (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email leslie@habitica.com!", "statsAch": "Karakteristike i odlikovanja", "profile": "Profil", "avatar": "Customize Avatar", @@ -109,6 +110,7 @@ "mage": "Čarobnjak", "mystery": "Tajna", "changeClass": "Zamena klase i ponovna raspodela poena za osobine", + "lvl10ChangeClass": "To change class you must be at least level 10.", "levelPopover": "Svaki nivo donosi Vam jedan poen koji možete dodeliti osobini kojoj želite. Možete to uraditi lično, ili možete prepustiti igri da to uradi umesto Vas.", "unallocated": "Neupotrebljeni poeni", "haveUnallocated": "Imate <%= points %> neupotrebljenih poena.", @@ -164,5 +166,7 @@ "int": "INT", "showQuickAllocation": "Show stat allocation", "hideQuickAllocation": "Hide stat allocation", - "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats." + "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats.", + "invalidAttribute": "\"<%= attr %>\" is not a valid attribute.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/sr/content.json b/common/locales/sr/content.json index 57075a2358..2690a74016 100644 --- a/common/locales/sr/content.json +++ b/common/locales/sr/content.json @@ -113,6 +113,12 @@ "questEggSnailText": "Snail", "questEggSnailMountText": "Snail", "questEggSnailAdjective": "a slow but steady", + "questEggFalconText": "Falcon", + "questEggFalconMountText": "Falcon", + "questEggFalconAdjective": "a swift", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Običan", "hatchingPotionWhite": "Beli", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "Zlatni", "hatchingPotionSpooky": "Spooky", "hatchingPotionPeppermint": "Peppermint", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Pospite ovo po jajetu, i iz njega će se izleći <%= potText(locale) %> ljubimac.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", "foodMeat": "Meso", diff --git a/common/locales/sr/contrib.json b/common/locales/sr/contrib.json index 955ba23ebf..c0b6059364 100644 --- a/common/locales/sr/contrib.json +++ b/common/locales/sr/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "Hall of Contributors", "hallPatrons": "Dvorana pokrovitelja", "rewardUser": "Dati nagradu korisniku", - "UUID": "UUID", + "UUID": "User ID", "loadUser": "Učitati korisnika", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "Titula", "moreDetails": "Još detalja (1-7)", "moreDetails2": "još detalja (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "Posetiti Dvoranu Heroja (saradnici i sponzori)", "conLearn": "Saznajte više o nagradima za saradnike", "conLearnHow": "Saznajte kako da date svoj doprinos Habitica-u", - "surveysSingle": "Pomogao Habitica-u popunjavanjem ankete. Trenutno nema anketa.", - "surveysMultiple": "Pomogao Habitica-u popunjavanjem <%= surveys %> ankete/a. Trenutno nema anketa.", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Nova anketa", "surveyWhen": "Odlikovanje se dodeljuje učesnicima nakon što se ankete obrade, krajem marta.", "blurbInbox": "This is where your private messages are stored! You can send someone a message by clicking on the envelope icon next to their name in Tavern, Party, or Guild Chat. If you've received an inappropriate PM, you should email a screenshot of it to Lemoness (leslie@habitica.com)", diff --git a/common/locales/sr/death.json b/common/locales/sr/death.json index 0868ff41fc..fc64cb8022 100644 --- a/common/locales/sr/death.json +++ b/common/locales/sr/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Gubite zdravlje prebrzo?", "lowHealthTips3": "Nezavršeni svakodnevni zadaci povređuju vas preko noći, budite pažljivi da ne dodate previše na početku.", "lowHealthTips4": "Ako svakodnevni zadatak nije zadat za određen dan, možete ga isključiti klikom na sličicu olovke.", - "goodLuck": "Srećno!" + "goodLuck": "Srećno!", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/sr/front.json b/common/locales/sr/front.json index c0e07d7c6c..85f87200f2 100644 --- a/common/locales/sr/front.json +++ b/common/locales/sr/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "Kako radi", "companyBlog": "blog", + "devBlog": "Developer Blog", "companyDonate": "Donacije", "companyExtensions": "Ekstenzije", "companyPrivacy": "Privatnost", @@ -51,6 +52,7 @@ "featureSocialHeading": "Društvena igra", "featuredIn": "O Habiticau pisali su", "featuresHeading": "Nudimo i...", + "footerDevs": "Developers", "footerCommunity": "Zajednica", "footerCompany": "Kompanija", "footerMobile": "Aplikacije za mobilne telefone", @@ -182,6 +184,7 @@ "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", "reportAccountProblems": "Prijavite problem sa nalogom", "reportCommunityIssues": "Prijavite problem u Zajednici", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "Pitanja o sajtu", "businessInquiries": "Business Inquiries", "merchandiseInquiries": "Merchandise Inquiries", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/sr/gear.json b/common/locales/sr/gear.json index 01912952d8..f9a420385f 100644 --- a/common/locales/sr/gear.json +++ b/common/locales/sr/gear.json @@ -189,6 +189,8 @@ "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).", "weaponArmoireBasicLongbowText": "Basic Longbow", "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "oklop", "armorBase0Text": "Obična odeća", "armorBase0Notes": "Potpuno obična odeća. Ne daje nikakav bonus.", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery201603Text": "Lucky Suit", "armorMystery201603Notes": "This suit is sewn from thousands of four-leafed clovers! Confers no benefit. March 2016 Subscriber Item.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Stimpank odelo", "armorMystery301404Notes": "Kicoško i zanosno! Ne daje nikakav bonus. Predmet za pretplatnike februar 3015..", "armorArmoireLunarArmorText": "Soothing Lunar Armor", @@ -394,6 +400,8 @@ "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).", "armorArmoireBasicArcherArmorText": "Basic Archer Armor", "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "šlemovi", "headBase0Text": "Bez šlema", "headBase0Notes": "Gola glava", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.", "headMystery201603Text": "Lucky Hat", "headMystery201603Notes": "This top hat is a magical good-luck charm. Confers no benefit. March 2016 Subscriber Item.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Otmeni cilindar", "headMystery301404Notes": "Otmeni cilindar za pripadnike visokog društva! Predmet za pretplatnike januar 3015. Ne daje nikakav bonus.", "headMystery301405Text": "Jednostavni cilindar", @@ -613,6 +625,8 @@ "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).", "headArmoireBasicArcherCapText": "Basic Archer Cap", "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "predmet za levu ruku", "shieldBase0Text": "Nema opreme za levu ruku", "shieldBase0Notes": "Nema štita ni drugog oružja", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Umirujući štit", "shieldSpecialWinter2015HealerNotes": "Ovaj štit odbija ledeni vetar. Povećava Vitalnost za <%= con %>. Oprema iz ograničene serije Zima 2014/15.", "shieldSpecialSpring2015RogueText": "Eksplozivni pisak", - "shieldSpecialSpring2015RogueNotes": "Ne dozvolite da Vas zvuk zavara - ovo je veoma moćan eksploziv. Povećava Snagu za <%= str %>. Oprema iz ograničene serije Proleće 2015.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Posuda za hranu", "shieldSpecialSpring2015WarriorNotes": "Bacite ga na neprijatelje... ili ga jednostavno zadržite, jer će se napuniti ukusnom hranom kad dođe vreme za večeru. Povećava Vitalnost za <%= con %>. Oprema iz ograničene serije Proleće 2015.", "shieldSpecialSpring2015HealerText": "Jastuk sa dezenom", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).", "shieldArmoireMysticLampText": "Mystic Lamp", "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "modni detalj za leđa", "backBase0Text": "Bez ukrasa na leđima", "backBase0Notes": "Bez ukrasa na leđima.", @@ -820,6 +836,20 @@ "eyewear": "naočare", "eyewearBase0Text": "Bez naočara", "eyewearBase0Notes": "Bez naočara.", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Odmetnička zakrpa za oko", "eyewearSpecialSummerRogueNotes": "Ne morate biti gusar da biste razumeli da je ovo vrhunac stila. Ne daje nikakav bonus. Oprema iz ograničene serije Leto 2014.", "eyewearSpecialSummerWarriorText": "Zanosna zakrpa za oko", diff --git a/common/locales/sr/groups.json b/common/locales/sr/groups.json index f2dfbe854d..682e2cc69f 100644 --- a/common/locales/sr/groups.json +++ b/common/locales/sr/groups.json @@ -92,6 +92,7 @@ "send": "Poslati", "messageSentAlert": "Poruka poslata", "pmHeading": "Privatna poruka za <%= name %>", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "Obrisati sve poruke", "confirmDeleteAllMessages": "Jeste li sigurni da želite da obrišete sve poruke u sandučetu? Drugi korisnici i dalje će moći da vide poruke koje ste im poslali.", "optOutPopover": "Ne želite da koristite privatne poruke? Kliknite ovde da ih onemogućite", @@ -99,6 +100,15 @@ "unblock": "Odblokirati", "pm-reply": "Odgovor", "inbox": "Sanduče", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "Prijavite kršenje Pravila ponašanja", "abuseFlagModalHeading": "Želite li da prijavite <%= name %> za kršenje pravila?", "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction. Appropriate reasons to flag a post include but are not limited to:
- swearing, religous oaths
- bigotry, slurs
- adult topics
- violence, including as a joke
- spam, nonsensical messages
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Falcon (Egg)", + "questFalconUnlockText": "Unlocks purchasable Falcon eggs in the Market", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/sr/rebirth.json b/common/locales/sr/rebirth.json index 4bb399f070..72cc75d133 100644 --- a/common/locales/sr/rebirth.json +++ b/common/locales/sr/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "Reinkarnacija vraća vašeg lika na nivo 1.", "rebirthAdvList1": "Zdravlje će Vam biti napunjeno.", "rebirthAdvList2": "Nemate iskustva,zlata ili opreme (sa izuzecima besplatnih predmeta kao što su Tajanstveni predmeti).", - "rebirthAdvList3": "Svi podešeni zadaci biće vraćeni na žuto, i serije će biti prekinute.", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "Bićete Ratnik dok ne otključate novu klasu.", "rebirthInherit": "Novi lik će naslediti neke stvari od svog prethodnika:", "rebirthInList1": "Zadaci, istorija, i postavke ostaće nepromenjeni.", @@ -24,5 +24,6 @@ "rebirthPop": "Počnite iz početka s nivoa 1, i zadržite odlikovanja, kolekcionarske predmete, i zadatke, zajedno sa istorijom.", "rebirthName": "Sfera za reinkarnaciju", "reborn": "Reinkarniran, najviši nivo <%= reLevel %>", - "confirmReborn": "Jeste li sigurni?" + "confirmReborn": "Jeste li sigurni?", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/sr/settings.json b/common/locales/sr/settings.json index 3f2e167be4..45e583a89f 100644 --- a/common/locales/sr/settings.json +++ b/common/locales/sr/settings.json @@ -47,6 +47,7 @@ "customDayStart": "Vreme početka dana", "changeCustomDayStart": "Change Custom Day Start?", "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "Ostalo", @@ -61,12 +62,23 @@ "newUsername": "Novo korisničko ime", "dangerZone": "Opasna zona", "resetText1": "PAŽNjA! Ova funkcija nulira delove Vašeg naloga. Njena upotreba se ne preporučuje, ali neki korisnici je koriste nakon igranja s postavkama i upoznavanja sa sajtom.", - "resetText2": "Izgubićete sve nivoe, zlato, i iskustvo. Svi Vaši zadaci biće izbrisani i izgubićete sve podatke o zadacima. Izgubićete svu opremu, ali moći ćete ponovo da je kupite, uključujući i opremu iz ograničenih serija i predmete za pretplatnike koje već posedujete (moraćete da imate odgovarajuću klasu da biste kupili određenu opremu). Zadržaćete svoju klasu, ljubimce, i životinje za jahanje. Ako upotebite sferu za reinkarnaciju, zadržaćete zadatke.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Jeste li sigurni? Ovim ćete zauvek obrisati svoj nalog, i nećete moći ponovo da ga aktivirate. Da biste ponovo igrali Habitica, moraćete da napravite novi nalog. Dragulji koje posedujete neće Vam biti vraćeni. Ako ste potpuno sigurni, ukucajte <%= deleteWord %> u polje za tekst.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Kopirajte ove kodove u aplikacije razvijene za Habitica. Vaš API ključ ima funkciju lozinke, pazite kome ga šaljete i kome je dostupan. Povremeno od Vas može biti zatražen Lični Broj Korisnika (User ID, UID), ali nikada ne objavljujte svoj API ključ tamo gde ga bilo ko može videti, uključujući i Github.", "APIToken": "API ključ (ovo je lozinka – pročitajte objašnjenje iznad)", + "thirdPartyApps": "Third Party Apps", + "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Chrome Chat Extension", + "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.", + "otherExtensions": "Other Extensions", + "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.", "resetDo": "Da, vrati nalog na početno stanje!", + "resetComplete": "Reset complete!", "fixValues": "Ispravljanje vrednosti", "fixValuesText1": "Ako ste naleteli na neku grešku u igri ili ste svojom greškom izmenili svoj nalog (šteta koja nije trebalo da Vam bude naneta, Zlato koje niste zaista zaradili, itd.), ovde možete da ispravite te vrednosti. Da, ovo Vam omogućava varanje: koristite ovu funkciju pažljivo, u protivnom, ometaćete samo svoju samodisciplinu.", "fixValuesText2": "Odavde ne možete da vratite izgubljene serije na pojedinačnim zadacima. Vraćanje izgubljenih serija možete izvršiti u Naprednim opcijama u prozoru za izmenu Svakodnevnih zadataka, funkcijom Podešavanje brojača.", @@ -96,6 +108,7 @@ "emailNotifications": "Obaveštenja imejlom", "wonChallenge": "You won a Challenge!", "newPM": "Primljena privatna poruka", + "sentGems": "Sent gems!", "giftedGems": "Poklonjeni dragulji", "giftedGemsInfo": "<%= amount %> Dragulja - od <%= name %>", "giftedSubscription": "Poklonjena pretplata", @@ -135,6 +148,11 @@ "webhooks": "Webhooks", "enabled": "Enabled", "webhookURL": "Webhook URL", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Dodaj", "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", @@ -149,5 +167,5 @@ "amazonPayments": "Amazon Payments", "timezone": "vremenska zona", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been reseting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/sr/spells.json b/common/locales/sr/spells.json index d9c4473d3f..f90094e76a 100644 --- a/common/locales/sr/spells.json +++ b/common/locales/sr/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Bacite grudvu na člana družine! Šta može poći naopako? Efekat traje do kraja dana.", "spellSpecialSaltText": "So", "spellSpecialSaltNotes": "Neko Vas je gađao grudvom. Ha ha, jako smešno. A sad skidaj ovaj sneg s mene.", - "spellSpecialSpookDustText": "Sablasne iskre", - "spellSpecialSpookDustNotes": "Pretvorite prijatelja u lebdeće ćebe s prorezima za oči!", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Neprozirni napitak", "spellSpecialOpaquePotionNotes": "Poništite efekat Sablasne iskre", "spellSpecialShinySeedText": "Svetlucava semenka", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Seafoam", "spellSpecialSeafoamNotes": "Turn a friend into a sea creature!", "spellSpecialSandText": "Sand", - "spellSpecialSandNotes": "Cancel the effects of Seafoam." + "spellSpecialSandNotes": "Cancel the effects of Seafoam.", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/sr/subscriber.json b/common/locales/sr/subscriber.json index 59656cb28d..c4f8acd3e4 100644 --- a/common/locales/sr/subscriber.json +++ b/common/locales/sr/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Buy Gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.", "buyGemsGold": "Kupovina dragulja zlatom", "buyGemsGoldText": "Alexander the Merchant will sell you Gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> Gems per month, but this cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Retain additional history entries", "retainHistoryText": "Makes completed To-Dos and task history available for longer.", "doubleDrops": "Udvostručenje maksimalnog dnevnog broja predmeta", @@ -29,6 +31,7 @@ "manageSub": "Kliknite da podesite opcije u vezi s pretplatom", "cancelSub": "Otkažite pretplatu", "canceledSubscription": "Otkazana pretplata", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Pretplate administratora", "morePlans": "More Plans
Coming Soon", "organizationSub": "Privatna organizacija", @@ -73,6 +76,9 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Winged Messenger Set", "mysterySet201403": "Forest Walker Set", "mysterySet201404": "Twilight Butterfly Set", @@ -99,6 +105,8 @@ "mysterySet201601": "Champion of Resolution Set", "mysterySet201602": "Heartbreaker Set", "mysterySet201603": "Lucky Clover Set", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySetwondercon": "Wondercon", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Buy this item for 1 Mystic Hourglass?", "petsAlreadyOwned": "Pet already owned.", "mountsAlreadyOwned": "Mount already owned.", - "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Pet not available for purchase with Mystic Hourglass.", "mountsNotAllowedHourglass": "Mount not available for purchase with Mystic Hourglass.", "hourglassPurchase": "Purchased an item using a Mystic Hourglass!", - "hourglassPurchaseSet": "Purchased an item set using a Mystic Hourglass!" + "hourglassPurchaseSet": "Purchased an item set using a Mystic Hourglass!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/sr/tasks.json b/common/locales/sr/tasks.json index 79468a4f28..03c3c51cac 100644 --- a/common/locales/sr/tasks.json +++ b/common/locales/sr/tasks.json @@ -73,6 +73,7 @@ "clearTags": "Očistiti", "hideTags": "Sakriti", "showTags": "Prikazati", + "toRequired": "You must supply a to value", "startDate": "Start Date", "startDateHelpTitle": "When should this task start?", "startDateHelp": "Set the date for which this task takes effect. Will not be due on earlier days.", @@ -88,8 +89,9 @@ "fortifyName": "Napitak okrepljenja", "fortifyPop": "Vraća sve zadatke na početnu vrednost (žuta boja), i obnavlja izgubljeno zdravlje.", "fortify": "Okrepljenje", - "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "Jeste li sigurni?", + "fortifyComplete": "Fortify complete!", "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", "streakCoins": "Bonus zbog redovnog izvršavanja zadataka!", "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", @@ -112,5 +114,18 @@ "rewardHelp2": "Equipment affects your stats (<%= linkStart %>Avatar > Stats<%= linkEnd %>).", "rewardHelp3": "Special equipment will appear here during World Events.", "rewardHelp4": "Don't be afraid to set custom Rewards! Check out some samples here.", - "clickForHelp": "Click for help" + "clickForHelp": "Click for help", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/sv/backgrounds.json b/common/locales/sv/backgrounds.json index 322a73d6a3..1ee282a699 100644 --- a/common/locales/sv/backgrounds.json +++ b/common/locales/sv/backgrounds.json @@ -10,7 +10,7 @@ "backgrounds072014": "SET 2: Släpptes Juli 2014", "backgroundCoralReefText": "Korallrev", "backgroundCoralReefNotes": "Simma i ett korallrev.", - "backgroundOpenWatersText": "Öppna Vatten", + "backgroundOpenWatersText": "Öppet Vatten", "backgroundOpenWatersNotes": "Njut av de öppna vattnen.", "backgroundSeafarerShipText": "Havsfartyg", "backgroundSeafarerShipNotes": "Segla ombord ett Havsfartyg.", @@ -140,25 +140,32 @@ "backgroundSnowmanArmyNotes": "Led en Snögubbearme.", "backgroundWinterNightText": "Vinternatt", "backgroundWinterNightNotes": "Se på stjärnorna en Vinternatt.", - "backgrounds022016": "UPPSÄTTNING 21: Utgiven februari 2016", + "backgrounds022016": "SET 21: Släpptes februari 2016", "backgroundBambooForestText": "Bambu Skog", "backgroundBambooForestNotes": "Promenera genom Bambu Skogen.", "backgroundCozyLibraryText": "Mysigt Bibliotek", "backgroundCozyLibraryNotes": "Läs i det Mysiga Biblioteket.", "backgroundGrandStaircaseText": "Storslagen Trappa", "backgroundGrandStaircaseNotes": "Kliv nedför den Storslagna Trappan.", - "backgrounds032016": "UPPSÄTTNING 22: Utgiven mars 2016", + "backgrounds032016": "SET 22: Släpptes mars 2016", "backgroundDeepMineText": "Djup Gruva", "backgroundDeepMineNotes": "Hitta dyrbara metaller i en Djup Gruva.", "backgroundRainforestText": "Regnskog", "backgroundRainforestNotes": "Bege in i en Regnskog.", "backgroundStoneCircleText": "Cirkel av Stenar", "backgroundStoneCircleNotes": "Kasta trollformler i en Cirkel av Stenar.", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", - "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgrounds042016": "SET 23: Släpptes april 2016", + "backgroundArcheryRangeText": "Bågskyttebana", + "backgroundArcheryRangeNotes": "Öva på bågskyttebanan", + "backgroundGiantFlowersText": "Jätteblommor", + "backgroundGiantFlowersNotes": "Roa dig ovan jätteblommor", + "backgroundRainbowsEndText": "Regnbågens slut", + "backgroundRainbowsEndNotes": "Upptäck guld vid regnbågens slut. ", + "backgrounds052016": "SET 24: Släpptes maj 2016", + "backgroundBeehiveText": "Bikupa", + "backgroundBeehiveNotes": "Sorl och dans i en bikupa.", + "backgroundGazeboText": "Lusthus", + "backgroundGazeboNotes": "Slåss mot ett lusthus.", + "backgroundTreeRootsText": "Trärötter", + "backgroundTreeRootsNotes": "Utforska trärötterna." } \ No newline at end of file diff --git a/common/locales/sv/challenge.json b/common/locales/sv/challenge.json index 78c3c72001..bd4ede5307 100644 --- a/common/locales/sv/challenge.json +++ b/common/locales/sv/challenge.json @@ -63,5 +63,20 @@ "congratulations": "Grattis!", "hurray": "Hurra!", "noChallengeOwner": "ingen ägare", - "noChallengeOwnerPopover": "Den här utmaningen ägs inte på grund av att skaparen har tagit bort sitt konto. " + "noChallengeOwnerPopover": "Den här utmaningen ägs inte på grund av att skaparen har tagit bort sitt konto. ", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/sv/character.json b/common/locales/sv/character.json index 71aaa1c918..ce76c97e50 100644 --- a/common/locales/sv/character.json +++ b/common/locales/sv/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Kom ihåg att ditt Användarnamn, Profilbild och dina ord om dig måste följa de Gemensamma Riktlinjerna (t.ex. inga hädelser, inga vuxna ämnen, inga förolämpningar, osv.) Om du har några frågor om huruvida något är lämpligt, var god maila leslie@habitica.com!", "statsAch": "Statistik & Prestationer", "profile": "Profil", "avatar": "Skräddarsy Avatar", @@ -34,7 +35,7 @@ "beard": "Skägg", "mustache": "Mustasch", "flower": "Blomma", - "wheelchair": "Wheelchair", + "wheelchair": "Rullstol", "basicSkins": "Grundläggande hudtyper", "rainbowSkins": "Regnbågshud", "pastelSkins": "Pastellfärgade hudtyper", @@ -109,6 +110,7 @@ "mage": "Magiker", "mystery": "Mysterium", "changeClass": "Byt Klass, Återbetala Egenskapspoäng", + "lvl10ChangeClass": "To change class you must be at least level 10.", "levelPopover": "Varje nivå ger dig en poäng att dela ut till valfri egenskap. Du kan antingen göra det manuellt eller låta spelet bestämma åt dig genom att använda ett av alternativen under automatisk utdelning.", "unallocated": "Outdelade Egenskapspoäng", "haveUnallocated": "Du har <%= points %> outdela(t/de) egenskapspoäng", @@ -159,10 +161,12 @@ "healerWiki": "Helare", "chooseClassLearn": "Lär dig mer om klasser", "str": "STY", - "con": "TÅL", - "per": "UPP", + "con": "FYS", + "per": "KAR", "int": "INT", - "showQuickAllocation": "Show stat allocation", - "hideQuickAllocation": "Hide stat allocation", - "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats." + "showQuickAllocation": "Visa poängfördelning", + "hideQuickAllocation": "Göm poängfördelning", + "quickAllocationLevelPopover": "Varje nivå ger dig en poäng att lägga ut på ett valfritt attribut. Du kan gör så själv eller låta spelet bestämma åt dig genom en av inställningarna under Användare -> Statistik & Prestationer", + "invalidAttribute": "\"<%= attr %>\" is not a valid attribute.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/sv/communityguidelines.json b/common/locales/sv/communityguidelines.json index 07ab6c0a29..810ea0eed0 100644 --- a/common/locales/sv/communityguidelines.json +++ b/common/locales/sv/communityguidelines.json @@ -103,12 +103,12 @@ "commGuidePara055": "Följande är ett par exempel på måttliga överträdelser. Detta är inte en omfattande lista.", "commGuideList06A": "Att ignorera eller vara respektlös mot en Moderator. Detta inkluderar att offentligt klaga på moderatorer eller andra användare/glorifiera eller försvara bannade användare. Om du är bekymrad över någon regel eller Moderator, vänligen kontakta Lemoness via e-post (leslie@habitica.com).", "commGuideList06B": "Backseat Modding. To quickly clarify a relevant point: A friendly mention of the rules is fine. Backseat modding consists of telling, demanding, and/or strongly implying that someone must take an action that you describe to correct a mistake. You can alert someone to the fact that they have committed a transgression, but please do not demand an action-for example, saying, \"Just so you know, profanity is discouraged in the Tavern, so you may want to delete that,\" would be better than saying, \"I'm going to have to ask you to delete that post.\"", - "commGuideList06C": "Repeated Violation of Public Space Guidelines", + "commGuideList06C": "Upprepade Överträdelser mot de Allmäna Riktlinjerna", "commGuideList06D": "Upprepande av smärre överträdelser", "commGuideHeadingMinorInfractions": "Smärre Överträdelser", "commGuidePara056": "Mindre överträdelser, trots att de inte uppmuntras, har ändå små konsekvenser. Om de fortsätter att inträffa kan de leda till allvarligare konsekvenser över tid.", "commGuidePara057": "Följande är några exempel på mindre regelbrott. Detta är inte en omfattande lista.", - "commGuideList07A": "First-time violation of Public Space Guidelines", + "commGuideList07A": "Förstagångsöverträdelser mot de Allmäna Riktlinjerna", "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please Don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Mod Talk: Please Don't keep arguing in favor of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.", "commGuideHeadingConsequences": "Konsekvenser", "commGuidePara058": "In Habitica -- as in real life -- every action has a consequence, whether it is getting fit because you've been running, getting cavities because you've been eating too much sugar, or passing a class because you've been studying.", @@ -148,7 +148,7 @@ "commGuideList12F": "Medarbetar-Husdjur, plus 4 Juveler", "commGuideList12G": "Inbjudan till Medarbetarnas Gille, plus 4 Juveler.", "commGuidePara065": "Mods are chosen from among Seventh Tier contributors by the Staff and preexisting Moderators. Note that while Seventh Tier Contributors have worked hard on behalf of the site, not all of them speak with the authority of a Mod.", - "commGuidePara066": "There are some important things to note about the Contributor Tiers:", + "commGuidePara066": "Här är några viktiga saker angående medarbetarbrickor:", "commGuideList13A": "Tiers are discretionary. They are assigned at the discretion of Moderators, based on many factors, including our perception of the work you are doing and its value in the community. We reserve the right to change the specific levels, titles and rewards at our discretion.", "commGuideList13B": "Tiers get harder as you progress. If you made one monster, or fixed a small bug, that may be enough to give you your first contributor level, but not enough to get you the next. Like in any good RPG, with increased level comes increased challenge!", "commGuideList13C": "Tiers don't \"start over\" in each field. When scaling the difficulty, we look at all your contributions, so that people who do a little bit of art, then fix a small bug, then dabble a bit in the wiki, do not proceed faster than people who are working hard at a single task. This helps keep things fair!", @@ -165,7 +165,7 @@ "commGuideLink03": "Wikin", "commGuideLink03description": "den största samlingen av information om Habitica.", "commGuideLink04": "Github", - "commGuideLink04description": "for bug reports or helping code programs!", + "commGuideLink04description": "för buggrapportering eller hjälp att koda program!", "commGuideLink05": "The Main Trello", "commGuideLink05description": "för förfrågningar av sidfunktioner.", "commGuideLink06": "Det mobila Trello", diff --git a/common/locales/sv/content.json b/common/locales/sv/content.json index 708d0d3a5e..fde8e916a6 100644 --- a/common/locales/sv/content.json +++ b/common/locales/sv/content.json @@ -113,6 +113,12 @@ "questEggSnailText": "Snigel", "questEggSnailMountText": "Snigel", "questEggSnailAdjective": "en långsam men stadig", + "questEggFalconText": "Falk", + "questEggFalconMountText": "Falk", + "questEggFalconAdjective": "snabbt", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", "eggNotes": "Hitta en kläckningsdryck och häll på det här ägget så kommer det kläckas till <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Standard", "hatchingPotionWhite": "Vit", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "Guld", "hatchingPotionSpooky": "läskig", "hatchingPotionPeppermint": "Pepparmint", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Häll den här på ett ägg, så kläcks det som ett <%= potText(locale) %> husdjur.", "premiumPotionAddlNotes": "Kan ej användas på ägg till uppdragshusdjur", "foodMeat": "Kött", diff --git a/common/locales/sv/contrib.json b/common/locales/sv/contrib.json index b3ca5bc796..f381542488 100644 --- a/common/locales/sv/contrib.json +++ b/common/locales/sv/contrib.json @@ -1,6 +1,6 @@ { "friend": "Vän", - "friendFirst": "When your first set of submissions is deployed, you will receive the Habitica Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor. As a bounty for your work, you will also receive 3 Gems.", + "friendFirst": "När ditt första bidrag är placerat kommer du få Habiticas Medarbetarmedalj. Ditt namn i Värdshuschatten kommer stolt visa att du är en medarbetare. Som en gåva för ditt arbete får du även ta emot 3 Juveler.", "friendSecond": "When your second set of submissions is deployed, the Crystal Armor will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive 3 Gems.", "elite": "Elit", "eliteThird": "When your third set of submissions is deployed, the Crystal Helmet will be available for purchase in the Rewards shop. As a bounty for your continued work, you will also receive 3 Gems.", @@ -28,15 +28,19 @@ "helped": "Hjälpte Habit Växa", "helpedText1": "Hjälpte Habitica växa genom att fylla i", "helpedText2": "denna undersökning.", - "hall": "Hall of Heroes", + "hall": "Hjältarnas sal ", "contribTitle": "Medarbetare-titel (t.ex. \"Smed\")", "contribLevel": "Medarbetarnivå", "contribHallText": "1-7 för normala medhjälpare, 8 för moderatorer, 9 för personal. Detta bestämmer även vilka föremål, husdjur samt riddjur som finns tillgängliga. Bestämmer även färg på namntagg. Nivåerna 8 och 9 blir automatiskt givna admin status.", "hallContributors": "Hall of Contributors", "hallPatrons": "Beskyddarnas Hall", "rewardUser": "Belöna Användare", - "UUID": "UUID", + "UUID": "User ID", "loadUser": "Ladda Användare", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "Titel", "moreDetails": "Fler detaljer (1-7)", "moreDetails2": "fler detaljer (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "Besök Hjältarnas Hall (medarbetare och hjälpare)", "conLearn": "Lär dig mer om belöningar för medarbetare", "conLearnHow": "Lär dig hur du kan bidra till Habitica", - "surveysSingle": "Hjälpte Habitica växa genom att delta i en undersökning. Det finns inga aktiva undersökningar just nu.", - "surveysMultiple": "Hjälpte Habitica växa genom att delta i <%= surveys %> undersökningar. Det finns inga aktiva undersökningar just nu.", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Nuvarande undersökning", "surveyWhen": "Detta emblem kommer delas ut till alla deltagare när undersökningarna har bearbetats, sent i Mars.", "blurbInbox": "This is where your private messages are stored! You can send someone a message by clicking on the envelope icon next to their name in Tavern, Party, or Guild Chat. If you've received an inappropriate PM, you should email a screenshot of it to Lemoness (leslie@habitica.com)", diff --git a/common/locales/sv/death.json b/common/locales/sv/death.json index b32bc97d1d..caba599286 100644 --- a/common/locales/sv/death.json +++ b/common/locales/sv/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Tappar du hälsa snabbt?", "lowHealthTips3": "Oavklarade Dagliga Uppgifter skadar dig under natten, så var försiktig och inte lägga till för många i början!", "lowHealthTips4": "Om en daglig uppgift inte behöver göras på en viss veckodag, så kan du avaktivera det genom att klicka på penn-symbolen.", - "goodLuck": "Lycka till!" + "goodLuck": "Lycka till!", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/sv/faq.json b/common/locales/sv/faq.json index ed41164fb2..902e6879d6 100644 --- a/common/locales/sv/faq.json +++ b/common/locales/sv/faq.json @@ -2,15 +2,15 @@ "frequentlyAskedQuestions": "Frekvent Ställda Frågor", "faqQuestion0": "Jag är förvirrad. Var kan jag få en överblick?", "iosFaqAnswer0": "Först börjar du med att göra i ordning uppgifter som du vill göra dagligen. När du klarat av uppgifterna i verkliga livet och prickat av dem kommer du att tjäna erfarenhet och guld. Guld används till att köpa utrustning, några artiklar, samt skräddarsydda belöningar. Med erfarenhet levlar din karaktär upp och låser upp innehåll såsom Husdjur, Färdigheter och Uppdrag! Du kan skräddarsy din karaktär genom att gå till Meny > Skräddarsy Avatar.\n\nNågra grundläggande sätt att interagera: klicka på (+) i övre högra hörnet för att lägga till en ny uppgift. Klicka på en befintlig uppgift för att ändra den, och dra till vänster på en uppgift för att radera den. Du kan sortera dina uppgifter genom att använda Taggar i övre vänstra hörnet, och expandera samt minska checklistor genom att klicka på checklistans ikon.", - "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", + "webFaqAnswer0": "Till att börja med ställer du in de uppgifter som du vill göra i din vardag. Eftersom du utför uppgifterna i verkliga livet och checkar av dem, så får du erfarenhet och guld. Gulf används för att köpa utrustning och en del saker, så väl som anpassade belöningar. Erfarenhet får din karaktär att höja sin level och låser upp innehåll som husdjur, förmågor och uppdrag! För mer detaljer, kolla in steg-för-steg översikten av spelet på [Help -> Overview for New Users](https://habitica.com/static/overview).", "faqQuestion1": "Hur ställer jag in mina uppgifter?", - "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.", + "iosFaqAnswer1": "Goda vanor (de som har ett +) är uppgifter du kan göra flera gånger om dagen, som att äta grönsaker. Dåliga vanor (de som har ett -) är vanor du borde undvika, som att bita på naglarna. Vanor med ett + och ett - är vanor med ett bra val och ett dåligt val, som att ta trapporna mot att ta hissen. Goda vanor belönas med erfarenhet och guld. Dåliga vanor straffar sig med förlorad hälsa. \n\nDagliga uppgifter är uppgifter som du bör göra varje dag, som att borsta tänderna eller kolla din email. Du kan anpassa vilken dag som din Dagliga uppgift ska göras genom att klicka för att anpassa den. Om du hoppar över en Daglig uppgift som skulle gjorts, kommer din avatar att ta skada under natten. Var försiktig och lägg inte till för många Dagliga uppgifter på en gång!\n\nAtt-göra är din att-göra-lista. Att fullfölja en Att-göra ger dig guld och erfarenhet. Du kan aldrig förlora hälsa från en Att-göra. Du kan lägga till ett datum då det ska vara färdigt genom att klicka för att anpassa den. ", "webFaqAnswer1": "Good Habits (the ones with a ) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a ) are tasks that you should avoid, like biting nails. Habits with a and a have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n
\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n
\n To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.", - "faqQuestion2": "Finns det några enkla uppgifter?", + "faqQuestion2": "Finns det några exempel uppgifter?", "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n
\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", "faqQuestion3": "Varför ändrar mina uppgifter färg?", - "iosFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it's a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.", + "iosFaqAnswer3": "Dina uppgifter ändrar färg beroende på hur väl du utför dem i nuläget! Varje ny uppgift börjar som neutral i gult. Utför Dagliga Uppgifter eller positiva Vanor mer ofta så kommer de flyttas över mot blått. Missa en Daglig Uppgift eller ge efter för en dålig Vana och uppgiften kommer fluttas över mot rött. Ju rödare en uppgift, desto mer belöning kommer den ge dig, men om det är en Daglig Uppgift eller en dålig Vana, desto mer kommer den också att skada dig! Detta hjälper till att motivera dig till att utföra uppgifter innan de börjar ge dig besvär.", "webFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it’s a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.", "faqQuestion4": "Varför förlorade min avatar hälsan och hur får jag tillbaka den?", "iosFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight, they will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.", @@ -24,7 +24,7 @@ "faqQuestion7": "Hur blir jag en Krigare, Magiker, Smygare eller Helare?", "iosFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their Party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most gold and find the most item drops, and they can help their Party do the same. Finally, Healers can heal themselves and their Party members.\n\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click “Decide Later” and choose later under Menu > Choose Class.", "webFaqAnswer7": "At level 10, you can choose to become a Warrior, Mage, Rogue, or Healer. (All players start as Warriors by default.) Each Class has different equipment options, different Skills that they can cast after level 11, and different advantages. Warriors can easily damage Bosses, withstand more damage from their tasks, and help make their party tougher. Mages can also easily damage Bosses, as well as level up quickly and restore Mana for their party. Rogues earn the most Gold and find the most item drops, and they can help their party do the same. Finally, Healers can heal themselves and their party members.\n
\n If you don't want to choose a Class immediately -- for example, if you are still working to buy all the gear of your current class -- you can click \"Opt Out\" and re-enable it later under User > Stats.", - "faqQuestion8": "What is the blue stat bar that appears in the Header after level 10?", + "faqQuestion8": "Vad är det för blå bar som finns i menyn vid nivå 10?", "iosFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 under Menu > Use Skills. Unlike your health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.", "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in a special section in the Rewards Column. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete Good Habits, Dailies, and To-Dos, and lost when you indulge bad Habits. You’ll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.", "faqQuestion9": "Hur strider jag mot monster och går på äventyr?", @@ -37,8 +37,8 @@ "iosFaqAnswer11": "You can report a bug, request a feature, or send feedback under Menu > Report a Bug and Menu > Send Feedback! We'll do everything we can to assist you.", "webFaqAnswer11": "Bug reports are collected on GitHub. Go to [Help > Report a Bug](https://github.com/HabitRPG/habitrpg/issues/2760) and follow the instructions. Don't worry, we'll get you fixed up soon!\n
\n Feature requests are collected on Trello. Go to [Help > Request a Feature](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents) and follow the instructions. Ta-da!", "faqQuestion12": "Hur gör jag för att strida mot en Världsboss?", - "iosFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and skills will damage the Boss as usual.\n\n You can also be in a normal Quest at the same time. Your tasks and skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.", + "iosFaqAnswer12": "Världsbossar är speciella monster som dyker upp i Värdshuset. Alla aktiva användare kommer automatiskt att hamna i strid med Bossen och deras uppgifter och förmågor kommer skada Bossen som vanligt.\n\nDu kan också vara på ett vanligt Äventyr samtidigt. Dina uppgifter ofh förmågor kommer röknas mot både Världsbossen och Bossen/Samlingsäventyrer i din grupp.\n\nEn Världsboss skadar aldrig dig eller ditt konto på något sätt. Istället har den en Raserimätare som fylls upp när en användare hoppar över sina Dagsuppdrag. Om Raserimätaren fulls helt kommer Världsbossen att attackera en Icke-spelare Person som finns på sidan och deras bild kommer då att ändras.", "webFaqAnswer12": "World Bosses are special monsters that appear in the Tavern. All active users are automatically battling the Boss, and their tasks and skills will damage the Boss as usual.\n
\n You can also be in a normal Quest at the same time. Your tasks and skills will count towards both the World Boss and the Boss/Collection Quest in your party.\n
\n A World Boss will never hurt you or your account in any way. Instead, it has a Rage Bar that fills when users skip Dailies. If its Rage bar fills, it will attack one of the Non-Player Characters around the site and their image will change.\n
\n You can read more about [past World Bosses](http://habitica.wikia.com/wiki/World_Bosses) on the wiki.", - "iosFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.", + "iosFaqStillNeedHelp": "Om du har en fråga som inte finns på denna listan eller på [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), så kan du ställa den i Värdshus-chatten under Meny > Värdshus! Vi hjälper gärna till.", "webFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](http://habitica.wikia.com/wiki/FAQ), come ask in the [Newbies Guild](https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a)! We're happy to help." } \ No newline at end of file diff --git a/common/locales/sv/front.json b/common/locales/sv/front.json index b4601f8f6f..00b8b011a8 100644 --- a/common/locales/sv/front.json +++ b/common/locales/sv/front.json @@ -3,7 +3,7 @@ "accept1Terms": "Genom att klicka på knappen nedan godkänner jag", "accept2Terms": "och", "alexandraQuote": "Kunde inte INTE prata om [Habitica] i mitt tal i Madrid. Ett måste för frilansare som fortfarande behöver en boss. ", - "althaireQuote": "Att alltid ha igång ett uppdrag motiverar mig verkligen att göra alla mina dagliga utmaningar och att-göra. Min största motivation är att inte göra mitt sällskap besviket.", + "althaireQuote": "Att alltid ha ett äventyr igång motiverar mig verkligen att göra alla mina dagliga utmaningar och att-göra. Min största motivation är att inte svika mitt sällskap.", "andeeliaoQuote": "Jättebra produkt, jag började bara för några dagar sedan och är redan mer medveten och produktiv med min tid!", "autumnesquirrelQuote": "Jag har slutat skjuta upp arbete och hushållssysslor och betalar mina räkningar i tid.", "businessSample1": "Bekräfta 1 sida av inventeringen", @@ -28,13 +28,14 @@ "communityReddit": "Reddit", "companyAbout": "Hur det fungerar", "companyBlog": "Blogg", + "devBlog": "Developer Blog", "companyDonate": "Donera", "companyExtensions": "Tillägg", "companyPrivacy": "Integritet", "companyTerms": "Villkor", "companyVideos": "Videor", "contribUse": "Habiticas medhjälpare använder", - "dragonsilverQuote": "I can't tell you how many time and task tracking systems I've tried over the decades... [Habitica] is the only thing I've used that actually helps me get things done rather than just list them.", + "dragonsilverQuote": "Jag kan inte ens berätta hur många tid- och planeringssystem jag har provat över årtionedena. [Habitica] är det enda jag provat som verkligen hjälpt mig få saker gjorda istället för att bara lägga in dem i listor.", "dreimQuote": "När jag upptäckte [Habitica] förra sommaren hade jag precis blivit underkänt i ungefär hälften av mina prov. Tack vare de Dagliga Utmaningarna... kunde jag organisera och disciplinera mig själv, och jag klarade faktiskt av alla mina prov med riktigt bra betyg en månad sen.", "elmiQuote": "Varje morgon ser jag fram emot att stiga upp så att jag kan tjäna lite guld!", "email": "E-post", @@ -42,21 +43,22 @@ "evagantzQuote": "Mitt första tandläkarbesök där tandhygienisten faktiskt var entusiastisk över tandtrådsvanor. Tack [Habitica]!", "examplesHeading": "Spelare använder Habitica för att ...", "featureAchievementByline": "Gjort någonting helt fantastiskt? Få ett märke och visa det upp!", - "featureAchievementHeading": "Achievement Badges", - "featureEquipByline": "Buy limited edition equipment, potions, and other virtual goodies in our Market with your task rewards!", + "featureAchievementHeading": "Bedrift-brickor", + "featureEquipByline": "Använd dina belöningar från uppgifter till att köpa trolldrycker, utrustning gjord i begränsad utgåva, och andra virtuella godsaker i vår Marknad.", "featureEquipHeading": "Utrustning och extra saker", - "featurePetByline": "Eggs and items drop when you complete your tasks. Be as productive as possible to collect pets and mounts!", + "featurePetByline": "Ägg och föremål hittas när du slutför uppgifter. Var så produktiv som möjligt och samla på dig Husdjur och Riddjur.", "featurePetHeading": "Husdjur och Riddjur", - "featureSocialByline": "Join common-interest groups with like-minded people. Create Challenges to compete against other users.", + "featureSocialByline": "Gå med i grupper med likasinnade människor med liknande intressen. Skapa utmaningar och tävla mot andra medlemmar.", "featureSocialHeading": "Socialt spel", "featuredIn": "Syns i", "featuresHeading": "Vi har även ...", + "footerDevs": "Developers", "footerCommunity": "Gemenskap", "footerCompany": "Företag", "footerMobile": "Mobil", "footerSocial": "Socialt", "forgotPass": "Glömt lösenord", - "frabjabulousQuote": "[Habitica] is the reason I got a killer, high-paying job... and even more miraculous, I'm now a daily flosser!", + "frabjabulousQuote": "[Habitica] är anledningen till att jag fick ett suveränt och välbetalt jobb... Vad som är ännu mer mirakulöst är att jag nu använder tandtråd varje dag!", "free": "Gå med gratis", "gamifyButton": "Gör ditt liv till ett spel idag!", "goalSample1": "Spela piano i 1 timme", @@ -72,25 +74,25 @@ "healthSample4": "Ät hälsosamt/Skräpmat", "healthSample5": "Svettas i 1 timme", "history": "Historik", - "infhQuote": "[Habitica] has really helped me impart structure to my life in graduate school.", + "infhQuote": "[Habitica] har verkligen hjälpt mig att få mer struktur i mitt liv gymnasieliv.", "invalidEmail": "En giltig e-postadress krävs för att kunna utföra en lösenordsåterställning.", - "irishfeet123Quote": "I've had horrible habits with clearing my place completely after meals and leaving cups all over the place. [Habitica] has cured that!", - "joinOthers": "Join <%= userCount %> people making it fun to achieve goals!", - "kazuiQuote": "Before [Habitica], I was stuck with my thesis, as well as dissatisfied with my personal discipline regarding housework and things like learning vocabulary and studying Go theory. It turns out breaking down these tasks into smaller manageable checklists is quite the thing to keep me motivated and constantly working.", + "irishfeet123Quote": "Jag har haft den hemska ovanan att alltid lämna koppar överallt när jag städar. [Habitica] har botat det!", + "joinOthers": "Anslut dig till de <%= userCount %> personer som gör det roligt att nå sina mål!", + "kazuiQuote": "Innan Habitica så hade jag fastnat på min avhandling och var missnöjd med min självdiciplin gällande hushållsarbete och saker i stil med att öka mittordförråd och studera Go-teori. Det visade sig att bryta ner dessa uppgifter till mindre, mer hanterbara checklistor var precis vad jag behövde för att hålla mig motiverad och i konstant arbete.", "landingadminlink": "adminpaket", "landingend": "Inte övertalad än?", "landingend2": "Se en mer detaljerad lista med", "landingend3": ". Letar du efter ett mer privat lösning? Ta en titt på våra", "landingend4": "som är perfekta för familjer, lärare, stödgrupper och företag.", "landingfeatureslink": "våra funktioner", - "landingp1": "The problem with most productivity apps on the market is that they provide no incentive to continue using them. Habitica fixes this by making habit building fun! By rewarding you for your successes and penalizing you for slip-ups, Habitica provides external motivation for completing your day-to-day activities.", + "landingp1": "Problemet med de flesta produktivitetsappar på marknaden är att de inte ger en något incitament för att fortsätta använda dem. Habitica fixar detta genom att göra det roligt att bygga vanor! Genom att belöna dig när du lyckas och straffa dig när du gör misstag, ger Habitica dig extern motivation för att klara av dina dagliga aktiviteter.", "landingp2": "Direkt när du förstärker en positiv vana, fullbordar en daglig uppgift eller tar itu med en gammal att-göra-uppgift så belönar Habitica dig med erfarenhetspoäng och guld. När du får erfarenhet kan du gå upp i level, vilket bygger upp dina egenskaper och låser upp fler funktioner som klasser och husdjur. Guld kan spenderas på föremål i spelet som kan ändra din upplevelse, eller personliga belöningar du har skapat för motivation. När även den minsta framgången ger dig omedelbar belöning är det mindre troligt att du skjuter upp det du behöver göra.", "landingp2header": "Omedelbar tillfredställelse", - "landingp3": "Whenever you indulge in a bad habit or fail to complete one of your daily tasks, you lose health. If your health drops too low, you lose some of the progress you've made. By providing immediate consequences, Habitica can help break bad habits and procrastination cycles before they cause real-world problems.", + "landingp3": "När du ger efter för en dålig vana eller misslyckas med att göra klart någon av dina dagliga uppgifter så förlorar du hälsa. Om din hälsa sjunker för lågt så förlorar du en del av de framsteg du gjort. Genom att ge omedelbara konsekvenser kan Habitica hjälpa till att bryta dåliga vanor och uppskjutningsmönster innan de blir till problem i verkligheten.", "landingp3header": "Konsekvenser", - "landingp4": "With an active community, Habitica provides the accountability you need to stay on task. With the party system, you can bring in a group of your closest friends to cheer you on. The guild system allows you to find people with similar interests or obstacles, so you can share your goals and swap tips on how to tackle your problems. In Habitica, the community means that you have both the support and the accountability you need to succeed.", + "landingp4": "Genom en aktiv gemenskap tillhandahåller Habitica den ansvarsskyldighet du behöver för att fortsätta med dina uppgifter. Med Sällskapssystemet kan du samla en grupp av dina närmaste vänner för att peppa dig. Gillen hjälper dig hitta människor med liknande intressen eller svårigheter, så att ni kan dela med er av era mål och tips på hur ni kan handskas med era problem. Hos Habitica så ger gemenskapen dig både det stöd och den ansvarsskyldighet du behöver för att lyckas.", "landingp4header": "Ansvarsskyldighet", - "leadText": "Habitica is a free habit building and productivity app that treats your real life like a game. With in-game rewards and punishments to motivate you and a strong social network to inspire you, Habitica can help you achieve your goals to become healthy, hard-working, and happy.", + "leadText": "Habitica är en gratis vane- och produktivitetsalp som behandlar ditt riktiga liv som ett spel. Med inbyggda belöningar och bestraffningar som motiverar dig och ett starkt socialt nätverk som inspirerar dig kan Habitica hjälpa dig att nå dina mål att bli hälsosam, hårt arbetande och lycklig.", "login": "Logga in", "loginAndReg": "Logga in / registrera", "loginFacebookAlt": "Logga in / registrera med Facebook", @@ -107,12 +109,12 @@ "marketing2Lead2Title": "Bossar", "marketing2Lead3": "Utmaningar gör det möjligt att tävla med vänner och främligar. Den som klarat sig bäst mot slutet av utmaningen vinner speciella priser.", "marketing3Header": "Appar", - "marketing3Lead1": "The iPhone & Android apps let you take care of business on the go. We realize that logging into the website to click buttons can be a drag.", - "marketing3Lead2": "Other 3rd Party Tools tie Habitica into various aspects of your life. Our API provides easy integration for things like the Chrome Extension, for which you lose points when browsing unproductive websites, and gain points when on productive ones. See more here", + "marketing3Lead1": "Våran iPhone & Android app gör det möjligt att ta hand om dina ärenden ''on the go''. Vi förstår att det kan vara jobbigt att ständigt logga in på hemsidan för att klicka på knappar.", + "marketing3Lead2": "Andra tredjeparts-verktyg knyter HabitRPG till olika delar av ditt liv. Vårat API ger enkel integrering till samer som Chrome Extensions där du tappar poäng varje gång du surfar till improduktiva hemsidor och får poäng när du besöker produktiva. Se mer här (på engelska)", "marketing4Header": "Organisationsanvändning", - "marketing4Lead1": "Education is one of the best sectors for gamification. We all know how glued to phones and games students are these days; harness that power! Pit your students against eachother in friendly competition. Reward good behavior with rare prizes. Watch their grades and behavior soar.", + "marketing4Lead1": "Utbildningssektorn är en av de bästa sektorerna för spelifiering. Vi vet alla hur elever idag sitter fastnaglade vid sina spel och telefoner; utnyttja det! Låt dem tävla mot varandra i vänskapliga tävlingar. Belöna gott uppförande med särskilda priser. Se sedan hur deras betyg och beteende skjuter i höjden.", "marketing4Lead1Title": "Spelifiering inom utbildning", - "marketing4Lead2": "Health care costs are on the rise, and something's gotta give. Hundreds of programs are built to reduce costs and improve wellness. We believe Habitica can pave a substantial path towards healthy lifestyles.", + "marketing4Lead2": "Kostnaden för sjukvården ökar och någonting måste göras. Det finns hundratals program vars mål är att minska ens utgifter och öka ens hälsa. Vi tror att Habitica kan leda en på vägen mot hälsosammare livsstilar.", "marketing4Lead2Title": "Spelifiering inom hälsa och välmående", "marketing4Lead3-1": "Vill du göra ditt liv till ett spel?", "marketing4Lead3-2": "Intresserad av att leda en grupp inom utbildning, hälsa och mer?", @@ -124,13 +126,13 @@ "motivate1": "Motivera dig själv till att göra vad som helst.", "motivate2": "Få organisation. Få motivation. Få guld.", "passConfirm": "Bekräfta lösenord", - "passMan": "In case you are using a password manager (like 1Password) and have problems logging in, try typing your username and password manually.", + "passMan": "Om du använder ett program som automatiskt fyller i ditt lösenord (som 1Password) och har problem att logga in, försök att skriva in ditt användarnamn och lösenord manuellt.", "password": "Lösenord", "playButton": "Spela", "playButtonFull": "Spela Habitica", "presskit": "Presskit", "presskitDownload": "Ladda ner alla bilder:", - "presskitText": "Thanks for your interest in Habitica! The following images can be used for articles or videos about Habitica. For more information, please contact Siena Leslie at leslie@habitica.com.", + "presskitText": "Tack för ditt intresse för Habitica! Följande bilder kan användas för artiklar eller videos om Habitica. För mer information, var vänlig att kontakta Siena Leslie på leslie@habitica.com.", "privacy": "integritetspolicy", "psst": "Psst", "punishByline": "Bryt dåliga vanor och uppskjutningscykler med omedelbara konsekvenser.", @@ -153,24 +155,24 @@ "schoolSample3": "Möt med studiecirkel", "schoolSample4": "Anteckningar för 1 kapitel", "schoolSample5": "Läs 1 kapitel", - "sixteenBitFilQuote": "I'm getting my jobs and tasks done in record time thanks to [Habitica]. I'm just always so eager to reach my next level-up!", + "sixteenBitFilQuote": "Jag blir klar med mina arbets- och dagliga uppgifter på rekordtid tack vare [Habitica]. Jag är alltid så sugen på att komma till nästa level!", "skysailorQuote": "Mitt sällskap och våra uppdrag håller mig engagerad i spelet, vilket håller mig motiverad till att få saker gjorda och göra positiva förändringar i mitt liv.", "socialTitle": "Habitica | Gör ditt liv till ett spel", "supermouse35Quote": "Jag tränar mer och jag har inte glömt att ta mina mediciner på en månad. Tack, Habit. :D", "sync": "Synkronisera", "tasks": "Uppgifter", "teamSample1": "Dagordning till tisdag", - "teamSample2": "Brainstorm Growth Hacking", - "teamSample3": "Discuss this week's KPIs", + "teamSample2": "''Brainstorm Growth Hacking''", + "teamSample3": "Diskutera den här veckans KPIs", "teams": "Lag", "terms": "allmänna villkor", "testimonialHeading": "Vad andra säger ...", - "localStorageTryFirst": "If you are experiencing problems with Habitica, click the button below to clear local storage for this website (other websites will not be affected). You will need to log in again after doing this, so first be sure that you know your log-in details, which can be found at Settings -> <%= linkStart %>Site<%= linkEnd %>.", - "localStorageTryNext": "If the problem persists, please <%= linkStart %>Report a Bug<%= linkEnd %> if you haven't already.", + "localStorageTryFirst": "Om du stöter på problem på Habitica, klicka på knappen nedan för att rensa lagringsutrymmet för den här webbplatsen (andra webbplatser kommer inte att påverkas). Du kommer behöva logga in på nytt efter detta, så se först till att du har koll på dina inloggningsuppgifter, som du hittar under Inställningar -> <%= linkStart %>Hemsidas<%= linkEnd %>.", + "localStorageTryNext": "Om problemet kvarstår, var snäll och <%= linkStart %>Rapportera en bugg<%= linkEnd %> om du inte redan gjort det.", "localStorageClearing": "Rensar Lokal Dataförvaring", - "localStorageClearingExplanation": "Your browser's local storage is being cleared. You will be logged out and redirected to the home page. Please wait.", + "localStorageClearingExplanation": "Din webläsares lokala datasparning kommer nu rensas. Du blir utloggad och omdirigeras till hemsidan. Vänligen vänta.", "localStorageClear": "Rensa Lokal Dataförvaring", - "localStorageClearExplanation": "This button will clear local storage and log you out", + "localStorageClearExplanation": "Den här knappen kommer rensa all lokal datasparning när du loggar ut.", "tutorials": "Handledningar", "unlockByline1": "Uppnå dina mål och gå upp i nivå.", "unlockByline2": "Lås upp nya motiveringsverktyg, som att samla husdjur, få slumpmässiga belöningar, kasta förtrollningar och mer!", @@ -179,9 +181,10 @@ "username": "Användarnamn", "watchVideos": "Se videor", "work": "Arbete", - "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", + "zelahQuote": "Med [Habitica] kan jag få mig själv i säng i tid tack vare motivationen att få poäng för en tidig natt och rädslan att förlora poäng för en sen!", "reportAccountProblems": "Anmäl kontoproblem", "reportCommunityIssues": "Anmäl gemenskapsproblem", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "Allmäna frågor om sidan", "businessInquiries": "Företagsfrågor", "merchandiseInquiries": "Varufrågor", @@ -190,9 +193,9 @@ "apps": "Appar", "checkOutMobileApps": "Ta en titt på våra appar!", "imagine1": "Föreställ dig att förbättrandet av ditt liv var lika roligt som att spela ett spel.", - "landingCopy1": "Advance in the game by completing your real-life tasks.", - "landingCopy2": "Battle monsters with friends to stay accountable to your goals.", - "landingCopy3": "Join over <%= userCount %> people having fun as they improve their lives.", + "landingCopy1": "Gör framsteg i spelet genom att slutföra uppgifter i ditt vanliga liv.", + "landingCopy2": "Slåss mot monster tillsammans med dina vänner för att hålla dig ansvarig för dina mål.", + "landingCopy3": "Gå med de <%= userCount %> andra spelare som redan har roligt medan de förbättrar sina liv.", "alreadyHaveAccount": "Jag har redan ett konto!", "getStartedNow": "Börja Direkt!", "altAttrNavLogo": "Habitica hem", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/sv/gear.json b/common/locales/sv/gear.json index 420e729d48..4c2a5a8338 100644 --- a/common/locales/sv/gear.json +++ b/common/locales/sv/gear.json @@ -24,7 +24,7 @@ "weaponRogue2Text": "Kroksabel", "weaponRogue2Notes": "Skarpt svärd, snabbt med ett dödande slag. Ökar Styrka med <%= str %>.", "weaponRogue3Text": "Kukri", - "weaponRogue3Notes": "Distinctive bush knife, both survival tool and weapon. Increases Strength by <%= str %>.", + "weaponRogue3Notes": "Typisk vildmarkskniv, både ett överlevnadsverktyg och ett vapen. Ökar styrka med <%= str %>.", "weaponRogue4Text": "Nunchaku", "weaponRogue4Notes": "Tunga batonger som svängs runt på en kedja. Ökar Styrka med <%= str %>.", "weaponRogue5Text": "Ninja-to", @@ -59,7 +59,7 @@ "weaponHealer5Notes": "Passar att pryda en monarks hand, eller handen på den som står på monarkens högra sida. Ökar Intelligens med <%= int %>.", "weaponHealer6Text": "Guldspira", "weaponHealer6Notes": "Stillar smärta hos alla som ser den. Ökar Intelligens med <%= int %>.", - "weaponSpecial0Text": "Dark Souls Blade", + "weaponSpecial0Text": "Mörka själars klinga", "weaponSpecial0Notes": "Konsumerar fiendens livsvilja för att förstärka sina slag. Ökar Styrka med <%= str %>.", "weaponSpecial1Text": "Kristallsvärd", "weaponSpecial1Notes": "Dess glittrande facetter förtäljer en hjältesaga. Ökar alla egenskaper med <%= attrs %>.", @@ -69,12 +69,12 @@ "weaponSpecial3Notes": "Möten, monster, missnöje: avklarat! Mos! Ökar Styrka, Intelligens och Tålighet med <%= attrs %> vardera.", "weaponSpecialCriticalText": "Kritisk Hammare för Kryp-Krossning", "weaponSpecialCriticalNotes": "This champion slew a critical Github foe where many warriors fell. Fashioned from the bones of Bug, this hammer deals a mighty critical hit. Increases Strength and Perception by <%= attrs %> each.", - "weaponSpecialTridentOfCrashingTidesText": "Trident of Crashing Tides", + "weaponSpecialTridentOfCrashingTidesText": "Tidvattenvågornas treudd", "weaponSpecialTridentOfCrashingTidesNotes": "Ger dig förmågan att beordra fiskar och dessutom utdela mäktiga hugg till dina uppgifter. Ökar intelligens med <%= int %>.", "weaponSpecialYetiText": "Yetitämjarspjut", "weaponSpecialYetiNotes": "Detta spjut tillåter dess användare att kontrollera valfri yeti. Ökar Styrka med <%= str %>. Begränsad utgåva 2013-2014 Vinterutrustning.", "weaponSpecialSkiText": "Ski-sassin Pole", - "weaponSpecialSkiNotes": "A weapon capable of destroying hordes of enemies! It also helps the user make very nice parallel turns. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.", + "weaponSpecialSkiNotes": "Ett vapen som är kapabelt till att förinta horder med fiender! Det hjälper också dess användare att göra väldigt schyssta parallella vändningar. Ökar styrka med <%= str %>. Begränsad utgåva 2013-2014 Vinterutrustning", "weaponSpecialCandycaneText": "Polkagrisstav", "weaponSpecialCandycaneNotes": "A powerful mage's staff. Powerfully DELICIOUS, we mean! Two-handed weapon. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.", "weaponSpecialSnowflakeText": "Snöflingsstav", @@ -82,9 +82,9 @@ "weaponSpecialSpringRogueText": "Krokklor", "weaponSpecialSpringRogueNotes": "Utmärkt för att klättra uppför höga byggnader och även för att strimla mattor. Ökar Styrka med <%= str %>. Begränsad utgåva 2014 Vårutrustning.", "weaponSpecialSpringWarriorText": "Morotssvärd", - "weaponSpecialSpringWarriorNotes": "This mighty sword can slice foes with ease! It also makes a delicious mid-battle snack. Increases Strength by <%= str %>. Limited Edition 2014 Spring Gear.", + "weaponSpecialSpringWarriorNotes": "Det här mäktiga svärdet skivar fiender med lätthet! Det är också ett läckert mellanmål i striden. Ökar styrka med <%= str %>. Begränsad utgåva Vårutrustning 2014.", "weaponSpecialSpringMageText": "Schweizerostsstav", - "weaponSpecialSpringMageNotes": "Only the most powerful rodents can brave their hunger to wield this potent staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Spring Gear.", + "weaponSpecialSpringMageNotes": "Endast de mäktigaste gnagarna kan stå emot sin hunger och svinga den här kraftfulla staven. Ökar Intelligens med <%= int %> och Uppmärksamhet med <%= per %>. Begränsad utgåva Vårutrustning 2014. ", "weaponSpecialSpringHealerText": "Underbart ben", "weaponSpecialSpringHealerNotes": "APPORT! Ökar intelligens med <%= int %>. Begränsad utgåva 2014 vårutrustning.", "weaponSpecialSummerRogueText": "Piratens kortsvärd", @@ -92,7 +92,7 @@ "weaponSpecialSummerWarriorText": "Sjöfarande förskärare", "weaponSpecialSummerWarriorNotes": "There isn't a task in any To-Do list willing to tangle with this gnarly knife! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.", "weaponSpecialSummerMageText": "Kelpfångare", - "weaponSpecialSummerMageNotes": "This trident is used to spear seaweed effectively, for extra-productive kelp harvesting! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014 Summer Gear.", + "weaponSpecialSummerMageNotes": "Den här treudden används för att spetsa sjögräs effektivt, för en extra produktiv tångskörd! Ökar Intelligens med <%= int %> och Uppmärksamhet med <%= per %>. Begränsad utgåva Vårutrustning. 2014.", "weaponSpecialSummerHealerText": "Skuggornas trollstav", "weaponSpecialSummerHealerNotes": "This wand, made of aquamarine and live coral, is very attractive to schools of fish. Increases Intelligence by <%= int %>. Limited Edition 2014 Summer Gear.", "weaponSpecialFallRogueText": "Silverpåle", @@ -104,7 +104,7 @@ "weaponSpecialFallHealerText": "Skarabéstav", "weaponSpecialFallHealerNotes": "Skarabén på denna stav skyddar och helar dess bärare. Ökar intelligens med <%= int %>. Begränsad utgåva 2014 höstutrustning.", "weaponSpecialWinter2015RogueText": "Ispik", - "weaponSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.", + "weaponSpecialWinter2015RogueNotes": "Do plockade verkligen, absolut precis upp dessa från marken. Ökar styrka med <%=str %> Begränsad utgåva 2014-2015 Vinterutrustning.", "weaponSpecialWinter2015WarriorText": "Geléhallonsvärd", "weaponSpecialWinter2015WarriorNotes": "This delicious sword probably attracts monsters... but you're up for the challenge! Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.", "weaponSpecialWinter2015MageText": "Vinterupplyst stav", @@ -112,34 +112,34 @@ "weaponSpecialWinter2015HealerText": "Lugnande spira", "weaponSpecialWinter2015HealerNotes": "Den här spiran värmer ömma muskler och minskar stress. Ökar intelligens med <%= int %>. Begränsad utgåva 2014-2015 Vinterutrustning.", "weaponSpecialSpring2015RogueText": "Exploderande pipleksak", - "weaponSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", + "weaponSpecialSpring2015RogueNotes": "Låt inte ljudet lura dig - dessa bomber är starkare än man tror. Ökar styrka med <%=str %>. Begränsad utgåva 2015 Vårutrustning", "weaponSpecialSpring2015WarriorText": "Benklubba", "weaponSpecialSpring2015WarriorNotes": "It is a real bone club for real fierce doggies and is definitely not a chew toy that the Seasonal Sorceress gave you because who's a good doggy? Whoooo's a good doggy?? It's you!!! You're a good doggy!!! Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "weaponSpecialSpring2015MageText": "Magikerns stav", "weaponSpecialSpring2015MageNotes": "Conjure up a carrot for yourself with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.", "weaponSpecialSpring2015HealerText": "Kattskallra", "weaponSpecialSpring2015HealerNotes": "Når du skakar den har den ett fascinerande clickande ljud som skulle kunna hålla VEM SOM HELST underhållen i timtal. Ökar intelligens med <%= int %>. Begränsad vår utgåva 2015 av vår utrustning.", - "weaponSpecialSummer2015RogueText": "Firing Coral", + "weaponSpecialSummer2015RogueText": "Brinnande Korall", "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.", - "weaponSpecialSummer2015WarriorText": "Sun Swordfish", + "weaponSpecialSummer2015WarriorText": "Solens Svärdfisk", "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.", "weaponSpecialSummer2015MageText": "Soothsayer Staff", "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.", - "weaponSpecialSummer2015HealerText": "Wand of the Waves", + "weaponSpecialSummer2015HealerText": "Vågornas trollstav", "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.", - "weaponSpecialFall2015RogueText": "Bat-tle Ax", + "weaponSpecialFall2015RogueText": "Fladdermyxa", "weaponSpecialFall2015RogueNotes": "Fearsome To-Dos cower before the flapping of this ax. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.", "weaponSpecialFall2015WarriorText": "Träplanka", "weaponSpecialFall2015WarriorNotes": "Great for elevating things in cornfields and/or smacking tasks. Increases Strength by <%= str %>. Limited Edition 2015 Autumn Gear.", "weaponSpecialFall2015MageText": "Förtrollad tråd", "weaponSpecialFall2015MageNotes": "A powerful Stitch Witch can control this enchanted thread without even touching it! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Autumn Gear.", - "weaponSpecialFall2015HealerText": "Swamp-Slime Potion", + "weaponSpecialFall2015HealerText": "Träskslems-dryck", "weaponSpecialFall2015HealerNotes": "Brewed to perfection! Now you just have to convince yourself to drink it. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", - "weaponSpecialWinter2016RogueText": "Cocoa Mug", + "weaponSpecialWinter2016RogueText": "En kopp varm choklad", "weaponSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", - "weaponSpecialWinter2016WarriorText": "Sturdy Shovel", + "weaponSpecialWinter2016WarriorText": "Stadig Spade", "weaponSpecialWinter2016WarriorNotes": "Shovel overdue tasks out of the way! Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", - "weaponSpecialWinter2016MageText": "Sorcerous Snowboard", + "weaponSpecialWinter2016MageText": "Magisk Snowboard", "weaponSpecialWinter2016MageNotes": "Your moves are so sick, they must be magic! Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", "weaponSpecialWinter2016HealerText": "Konfettikanon", "weaponSpecialWinter2016HealerNotes": "WHEEEEEEEEEE!!!!!!! HAPPY WINTER WONDERLAND!!!!!!!! Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", @@ -147,9 +147,9 @@ "weaponSpecialSpring2016RogueNotes": "You've mastered the ball, the club, and the knife. Now you advance to juggling fire! Awoo! Increases Strength by <%= str %>. Limited Edition 2016 Spring Gear.", "weaponSpecialSpring2016WarriorText": "Cheese Mallet", "weaponSpecialSpring2016WarriorNotes": "No one has as many friends as the mouse with tender cheeses. Increases Strength by <%= str %>. Limited Edition 2016 Spring Gear.", - "weaponSpecialSpring2016MageText": "Staff of Bells", + "weaponSpecialSpring2016MageText": "Klangerstav", "weaponSpecialSpring2016MageNotes": "Abra-cat-abra! So dazzling, you might mesmerize yourself! Ooh... it jingles... Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2016 Spring Gear.", - "weaponSpecialSpring2016HealerText": "Spring Flower Wand", + "weaponSpecialSpring2016HealerText": "Vårblommetrollstav ", "weaponSpecialSpring2016HealerNotes": "With a wave and a wink, you bring the fields and forests into bloom! Or bop troublesome mice on the head. Increases Intelligence by <%= int %>. Limited Edition 2016 Spring Gear.", "weaponMystery201411Text": "Måltidernas högaffel", "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.", @@ -159,7 +159,7 @@ "weaponMystery201505Notes": "This green and silver lance has unseated many opponents from their mounts. Confers no benefit. May 2015 Subscriber Item.", "weaponMystery301404Text": "Steampunk-käpp.", "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.", - "weaponArmoireBasicCrossbowText": "Basic Crossbow", + "weaponArmoireBasicCrossbowText": "Grundläggande armborst", "weaponArmoireBasicCrossbowNotes": "This crossbow can pierce a task's armor from very far away! Increases Strength by <%= str %>, Perception by <%= per %>, and Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "weaponArmoireLunarSceptreText": "Soothing Lunar Sceptre", "weaponArmoireLunarSceptreNotes": "The healing power of this wand waxes and wanes. Increases Constitution by <%= con %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 3 of 3).", @@ -171,15 +171,15 @@ "weaponArmoireIronCrookNotes": "Fiercely hammered from iron, this iron crook is good at herding sheep. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Horned Iron Set (Item 3 of 3).", "weaponArmoireGoldWingStaffText": "Gold Wing Staff", "weaponArmoireGoldWingStaffNotes": "The wings on this staff constantly flutter and twist. Increases all attributes by <%= attrs %> each. Enchanted Armoire: Independent Item.", - "weaponArmoireBatWandText": "Bat Wand", + "weaponArmoireBatWandText": "Fladdermus-spö", "weaponArmoireBatWandNotes": "This wand can turn any task into a bat! Wave it about and watch them fly away. Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Independent Item.", "weaponArmoireShepherdsCrookText": "Shepherd's Crook", "weaponArmoireShepherdsCrookNotes": "Useful for herding gryphons. Increases Constitution by <%= con %>. Enchanted Armoire: Shepherd Set (Item 1 of 3).", - "weaponArmoireCrystalCrescentStaffText": "Crystal Crescent Staff", + "weaponArmoireCrystalCrescentStaffText": "Kristallhalvmånens stav ", "weaponArmoireCrystalCrescentStaffNotes": "Summon the power of the crescent moon with this shining staff! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 3 of 3).", - "weaponArmoireBlueLongbowText": "Blue Longbow", + "weaponArmoireBlueLongbowText": "Blå långbåge", "weaponArmoireBlueLongbowNotes": "Ready... Aim... Fire! This bow has great range. Increases Perception by <%= per %>, Constitution by <%= con %>, and Strength by <%= str %>. Enchanted Armoire: Independent Item.", - "weaponArmoireGlowingSpearText": "Glowing Spear", + "weaponArmoireGlowingSpearText": "Lysande Spjut", "weaponArmoireGlowingSpearNotes": "This spear hypnotizes wild tasks so you can attack them. Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.", "weaponArmoireBarristerGavelText": "Barrister Gavel", "weaponArmoireBarristerGavelNotes": "Order! Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Barrister Set (Item 3 of 3).", @@ -187,8 +187,10 @@ "weaponArmoireJesterBatonNotes": "With a wave of your baton and some witty repartee, even the most complicated situations become clear. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Jester Set (Item 3 of 3).", "weaponArmoireMiningPickaxText": "Mining Pickax", "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).", - "weaponArmoireBasicLongbowText": "Basic Longbow", + "weaponArmoireBasicLongbowText": "Enkel långbåge ", "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "utrustning", "armorBase0Text": "Vanliga kläder", "armorBase0Notes": "Vanliga kläder. Har ingen effekt.", @@ -252,7 +254,7 @@ "armorSpecialBirthdayNotes": "Grattis på födelsedagen, Habitica! Bär dessa Absurda Festdräkter för att fira denna underbara dag. Ger ingen fördel.", "armorSpecialBirthday2015Text": "Löjliga partyrockar", "armorSpecialBirthday2015Notes": "Grattis på födelsedagen, Habitica! Bär dessa Fåniga Festdräkter för att fira denna underbara dag. Ger ingen fördel.", - "armorSpecialBirthday2016Text": "Ridiculous Party Robes", + "armorSpecialBirthday2016Text": "Fåniga Partydräkter", "armorSpecialBirthday2016Notes": "Happy Birthday, Habitica! Wear these Ridiculous Party Robes to celebrate this wonderful day. Confers no benefit.", "armorSpecialGaymerxText": "Regnbågsfärgad krigarutrustning", "armorSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special armor is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", @@ -312,9 +314,9 @@ "armorSpecialFall2015MageNotes": "Every stitch in this armor shimmers with enchantment. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "armorSpecialFall2015HealerText": "Potioner Robes", "armorSpecialFall2015HealerNotes": "What? Of course that was a potion of constitution. No, you are definitely not turning into a frog! Don't be ribbiticulous. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", - "armorSpecialWinter2016RogueText": "Cocoa Armor", + "armorSpecialWinter2016RogueText": "Kakaorustning", "armorSpecialWinter2016RogueNotes": "This leather armor keeps you nice and toasty. Is it actually made from cocoa? You'll never tell. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", - "armorSpecialWinter2016WarriorText": "Snowman Suit", + "armorSpecialWinter2016WarriorText": "Snögubbedräkt", "armorSpecialWinter2016WarriorNotes": "Brr! This padded armor is truly powerful... until it melts. Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "armorSpecialWinter2016MageText": "Snowboarder Parka", "armorSpecialWinter2016MageNotes": "The wisest wizard keeps well-bundled in the winter wind. Increases Intelligence by <%= int %>. Limited Edition 2015-2016 Winter Gear.", @@ -341,7 +343,7 @@ "armorMystery201408Text": "Solrock", "armorMystery201408Notes": "These robes are woven with sunlight and gold. Confers no benefit. August 2014 Subscriber Item.", "armorMystery201409Text": "Strider Vest", - "armorMystery201409Notes": "A leaf-covered vest that camouflages the wearer. Confers no benefit. September 2014 Subscriber Item.", + "armorMystery201409Notes": "En lövtäckt väst som kamouflerar sin bärare. Ger ingen fördel. September 2014 Prenumerantsartikel.", "armorMystery201410Text": "Trollutrustning", "armorMystery201410Notes": "Scaly, slimy, and strong! Confers no benefit. October 2014 Subscriber Item.", "armorMystery201412Text": "Pingvindräkt", @@ -352,7 +354,7 @@ "armorMystery201503Notes": "This blue mineral symbolizes good luck, happiness, and eternal productivity. Confers no benefit. March 2015 Subscriber Item.", "armorMystery201504Text": "Busy Bee Robe", "armorMystery201504Notes": "You'll be productive as a busy bee in this fetching robe! Confers no benefit. April 2015 Subscriber Item.", - "armorMystery201506Text": "Snorkel Suit", + "armorMystery201506Text": "Snorkeldräkt", "armorMystery201506Notes": "Snorkel through a coral reef in this brightly-colored swim suit! Confers no benefit. June 2015 Subscriber Item.", "armorMystery201508Text": "Cheetah Costume", "armorMystery201508Notes": "Run fast as a flash in the fluffy Cheetah Costume! Confers no benefit. August 2015 Subscriber Item.", @@ -360,10 +362,14 @@ "armorMystery201509Notes": "This IS a costume, right? Confers no benefit. September 2015 Subscriber Item.", "armorMystery201511Text": "Wooden Armor", "armorMystery201511Notes": "Considering this armor was carved directly from a magical log, it's surprisingly comfortable. Confers no benefit. November 2015 Subscriber Item.", - "armorMystery201512Text": "Cold Fire Armor", + "armorMystery201512Text": "Kall eld-rustning", "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", - "armorMystery201603Text": "Lucky Suit", + "armorMystery201603Text": "Turdräkt", "armorMystery201603Notes": "This suit is sewn from thousands of four-leafed clovers! Confers no benefit. March 2016 Subscriber Item.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Steampunk-dräkt", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorArmoireLunarArmorText": "Soothing Lunar Armor", @@ -394,6 +400,8 @@ "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).", "armorArmoireBasicArcherArmorText": "Basic Archer Armor", "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "huvudbonader", "headBase0Text": "Ingen hjälm", "headBase0Notes": "Ingen huvudbonad.", @@ -447,7 +455,7 @@ "headSpecialFireCoralCircletNotes": "This circlet, designed by Habitica's greatest alchemists, allows you to breathe water and dive for treasure! Increases Perception by <%= per %>.", "headSpecialNyeText": "Absurd partyhatt", "headSpecialNyeNotes": "You've received an Absurd Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.", - "headSpecialYetiText": "Yeti-Tamer Helm", + "headSpecialYetiText": "Yetitämjarens hjälm", "headSpecialYetiNotes": "An adorably fearsome hat. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.", "headSpecialSkiText": "Ski-sassin Helm", "headSpecialSkiNotes": "Keeps the wearer's identity secret... and their face toasty. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.", @@ -515,7 +523,7 @@ "headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.", "headSpecialNye2015Text": "Ridiculous Party Hat", "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.", - "headSpecialWinter2016RogueText": "Cocoa Helm", + "headSpecialWinter2016RogueText": "Kakaohjälm", "headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.", "headSpecialWinter2016WarriorText": "Snowman Cap", "headSpecialWinter2016WarriorNotes": "Brr! This mighty helm is truly powerful... until it melts. Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", @@ -546,7 +554,7 @@ "headMystery201411Text": "Steel Helm of Sporting", "headMystery201411Notes": "This is the traditional helmet worn in the beloved Habitican sport of Balance Ball, which consists of covering yourself with heavy protective gear and then committing to a healthy work-life balance..... WHILE PURSUED BY HIPPOGRIFFS. Confers no benefit. November 2014 Subscriber Item.", "headMystery201412Text": "Pingvinhatt", - "headMystery201412Notes": "Who's a penguin? Confers no benefit. December 2014 Subscriber Item.", + "headMystery201412Notes": "Vem är en pingvin? Ger ingen fördel. December 2014 prenumerantobjekt.", "headMystery201501Text": "Tindrande hjälm", "headMystery201501Notes": "The constellations flicker and swirl in this helm, guiding the wearer's thoughts towards focus. Confers no benefit. January 2015 Subscriber Item.", "headMystery201505Text": "Grön Riddar Hjälm", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.", "headMystery201603Text": "Lucky Hat", "headMystery201603Notes": "This top hat is a magical good-luck charm. Confers no benefit. March 2016 Subscriber Item.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Stilig cylinderhatt", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Vanlig cylinderhatt", @@ -585,13 +597,13 @@ "headArmoireRoyalCrownNotes": "Hooray for the ruler, mighty and strong! Increases Strength by <%= str %>. Enchanted Armoire: Royal Set (Item 1 of 3).", "headArmoireGoldenLaurelsText": "Golden Laurels", "headArmoireGoldenLaurelsNotes": "These golden laurels reward those who have conquered bad habits. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 2 of 3).", - "headArmoireHornedIronHelmText": "Horned Iron Helm", + "headArmoireHornedIronHelmText": "Hornklädd Järnhjälm", "headArmoireHornedIronHelmNotes": "Fiercely hammered from iron, this horned helmet is nearly impossible to break. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Horned Iron Set (Item 1 of 3).", "headArmoireYellowHairbowText": "Yellow Hairbow", "headArmoireYellowHairbowNotes": "Become perceptive, strong, and smart while wearing this beautiful Yellow Hairbow! Increases Perception, Strength, and Intelligence by <%= attrs %> each. Enchanted Armoire: Independent Item.", "headArmoireRedFloppyHatText": "Red Floppy Hat", "headArmoireRedFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a radiant red color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.", - "headArmoirePlagueDoctorHatText": "Plague Doctor Hat", + "headArmoirePlagueDoctorHatText": "Pestdoktorns Hatt", "headArmoirePlagueDoctorHatNotes": "An authentic hat worn by the doctors who battle the Plague of Procrastination! Increases Strength by <%= str %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Plague Doctor Set (Item 1 of 3).", "headArmoireBlackCatText": "Black Cat Hat", "headArmoireBlackCatNotes": "This black hat is... purring. And twitching its tail. And breathing? Yeah, you just have a sleeping cat on your head. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.", @@ -613,6 +625,8 @@ "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).", "headArmoireBasicArcherCapText": "Basic Archer Cap", "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "shield-hand item", "shieldBase0Text": "No Shield-Hand Equipment", "shieldBase0Notes": "Ingen sköld eller sekundärt vapen.", @@ -658,7 +672,7 @@ "shieldSpecialSummerRogueNotes": "Avast! You'll make those Dailies walk the plank! Increases Strength by <%= str %>. Limited Edition 2014 Summer Gear.", "shieldSpecialSummerWarriorText": "Drivvedssköld", "shieldSpecialSummerWarriorNotes": "This shield, made from the wood of wrecked ships, can deter even the stormiest Dailies. Increases Constitution by <%= con %>. Limited Edition 2014 Summer Gear.", - "shieldSpecialSummerHealerText": "Shield of the Shallows", + "shieldSpecialSummerHealerText": "Skuggornas Sköld", "shieldSpecialSummerHealerNotes": "No one will dare to attack the coral reef when faced with this shiny shield! Increases Constitution by <%= con %>. Limited Edition 2014 Summer Gear.", "shieldSpecialFallRogueText": "Silverpål", "shieldSpecialFallRogueNotes": "Dispatches undead. Also grants a bonus against werewolves, because you can never be too careful. Increases Strength by <%= str %>. Limited Edition 2014 Autumn Gear.", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Soothing Shield", "shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.", "shieldSpecialSpring2015RogueText": "Exploderande pipleksak", - "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength <%= str %>. Limited Edition 2015 Spring Gear.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Dish Discus", "shieldSpecialSpring2015WarriorNotes": "Kasta den mot dina fiender... eller håll bara i den, för den kommer att fyllas med mumsigt torrfoder vid middagstid. Ökar Tålighet med <%= con %>. Begränsad utgåva 2015 vårutrustning.", "shieldSpecialSpring2015HealerText": "Mönstrad kudde", @@ -690,7 +704,7 @@ "shieldSpecialFall2015WarriorNotes": "It's true that you're supposed to be SCARING the crows, but there's nothing wrong with making friends! Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", "shieldSpecialFall2015HealerText": "Stirring Stick", "shieldSpecialFall2015HealerNotes": "This stick can stir anything without melting, dissolving, or bursting into flame! It can also be used to fiercely poke enemy tasks. Increases Constitution by <%= con %>. Limited Edition 2015 Autumn Gear.", - "shieldSpecialWinter2016RogueText": "Cocoa Mug", + "shieldSpecialWinter2016RogueText": "Kakaomugg", "shieldSpecialWinter2016RogueNotes": "Warming drink, or boiling projectile? You decide... Increases Strength by <%= str %>. Limited Edition 2015-2016 Winter Gear.", "shieldSpecialWinter2016WarriorText": "Sled Shield", "shieldSpecialWinter2016WarriorNotes": "Use this sled to block attacks, or ride it triumphantly into battle! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", @@ -698,7 +712,7 @@ "shieldSpecialWinter2016HealerNotes": "Open it open it open it open it open it open it!!!!!!!!! Increases Constitution by <%= con %>. Limited Edition 2015-2016 Winter Gear.", "shieldSpecialSpring2016RogueText": "Fire Bolas", "shieldSpecialSpring2016RogueNotes": "You've mastered the ball, the club, and the knife. Now you advance to juggling fire! Awoo! Increases Strength <%= str %>. Limited Edition 2016 Spring Gear.", - "shieldSpecialSpring2016WarriorText": "Cheese Wheel", + "shieldSpecialSpring2016WarriorText": "Osthjul", "shieldSpecialSpring2016WarriorNotes": "You braved fiendish traps to procure this defense-boosting food. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.", "shieldSpecialSpring2016HealerText": "Floral Buckler", "shieldSpecialSpring2016HealerNotes": "The April Fool claims this little shield will block Shiny Seeds. Don't believe him. Increases Constitution by <%= con %>. Limited Edition 2016 Spring Gear.", @@ -706,16 +720,18 @@ "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.", "shieldMystery301405Text": "Klocksköld", "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.", - "shieldArmoireGladiatorShieldText": "Gladiator Shield", + "shieldArmoireGladiatorShieldText": "Gladiatorsköld", "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).", "shieldArmoireMidnightShieldText": "Midnight Shield", "shieldArmoireMidnightShieldNotes": "This shield is most powerful at the stroke of midnight! Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Independent Item.", "shieldArmoireRoyalCaneText": "Royal Cane", "shieldArmoireRoyalCaneNotes": "Hooray for the ruler, worthy of song! Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Royal Set (Item 2 of 3).", - "shieldArmoireDragonTamerShieldText": "Dragon Tamer Shield", + "shieldArmoireDragonTamerShieldText": "Draktämjarsköld", "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).", - "shieldArmoireMysticLampText": "Mystic Lamp", + "shieldArmoireMysticLampText": "Mystisk Lampa", "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "Back Accessory", "backBase0Text": "Inget ryggtillbehör", "backBase0Notes": "Inget ryggtillbehör.", @@ -725,9 +741,9 @@ "backMystery201404Notes": "Var en fjäril och fladdra förbi! Ger ingen fördel. April 2014 prenumerantobjekt.", "backMystery201410Text": "Trollvingar", "backMystery201410Notes": "Swoop through the night on these strong wings. Confers no benefit. October 2014 Subscriber Item.", - "backMystery201504Text": "Busy Bee Wings", + "backMystery201504Text": "Hektiska Bivingar", "backMystery201504Notes": "Buzz buzz buzz! Flit from task to task. Confers no benefit. April 2015 Subscriber Item.", - "backMystery201507Text": "Rad Surfboard", + "backMystery201507Text": "Tuff Surfbräda", "backMystery201507Notes": "Surf off the Diligent Docks and ride the waves in Inkomplete Bay! Confers no benefit. July 2015 Subscriber Item.", "backMystery201510Text": "Goblin Tail", "backMystery201510Notes": "Prehensile and powerful! Confers no benefit. October 2015 Subscriber Item.", @@ -737,9 +753,9 @@ "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.", "backSpecialWonderconBlackText": "Lömsk mantel", "backSpecialWonderconBlackNotes": "Spun of shadows and whispers. Confers no benefit. Special Edition Convention Item.", - "body": "Body Accessory", - "bodyBase0Text": "No Body Accessory", - "bodyBase0Notes": "No Body Accessory.", + "body": "Kroppstillbehör", + "bodyBase0Text": "Inget kroppstillbehör", + "bodyBase0Notes": "Inget kroppstillbehör.", "bodySpecialWonderconRedText": "Rubinkrage", "bodySpecialWonderconRedNotes": "An attractive ruby collar! Confers no benefit. Special Edition Convention Item.", "bodySpecialWonderconGoldText": "Guldkrage", @@ -779,16 +795,16 @@ "headAccessorySpecialSpring2015MageNotes": "De här öronen lyssnar ivrigt ifall någon magiker skulle avslöjar hemligheter någonstans. Ger ingen fördel. Begränsad utgåva 2015 vår utrustning.", "headAccessorySpecialSpring2015HealerText": "Gröna kattöron", "headAccessorySpecialSpring2015HealerNotes": "De här kattunge-öronen kommer göra andra gröna av avund! Ger ingen fördel. Begränsad utgåva 2015 vår utrustning.", - "headAccessorySpecialSpring2016RogueText": "Green Dog Ears", + "headAccessorySpecialSpring2016RogueText": "Gröna Hundöron", "headAccessorySpecialSpring2016RogueNotes": "With these, you can keep track of tricky Mages even if they turn invisible! Confers no benefit. Limited Edition 2016 Spring Gear.", - "headAccessorySpecialSpring2016WarriorText": "Red Mouse Ears", + "headAccessorySpecialSpring2016WarriorText": "Röda Musöron", "headAccessorySpecialSpring2016WarriorNotes": "To better hear your theme song across clamorous battlefields. Confers no benefit. Limited Edition 2016 Spring Gear.", - "headAccessorySpecialSpring2016MageText": "Yellow Cat Ears", + "headAccessorySpecialSpring2016MageText": "Gula Kattöron", "headAccessorySpecialSpring2016MageNotes": "These sharp ears can detect the minute hum of ambient Mana, or the muted footfalls of a Rogue. Confers no benefit. Limited Edition 2016 Spring Gear.", - "headAccessorySpecialSpring2016HealerText": "Purple Bunny Ears", + "headAccessorySpecialSpring2016HealerText": "Lila Kaninöron", "headAccessorySpecialSpring2016HealerNotes": "They stand like flags above the fray, letting others know where to run for help. Confers no benefit. Limited Edition 2016 Spring Gear.", "headAccessoryBearEarsText": "Björn öron", - "headAccessoryBearEarsNotes": "These ears make you look like a brave bear! Confers no benefit.", + "headAccessoryBearEarsNotes": "De här öronen får dig att se ut som en modig björn! Ger ingen fördel.", "headAccessoryCactusEarsText": "Kaktus öron", "headAccessoryCactusEarsNotes": "De här öronen får dig att se ut som en stickig kaktus! Ger ingen fördel.", "headAccessoryFoxEarsText": "Räv öron", @@ -815,14 +831,28 @@ "headAccessoryMystery201510Notes": "These fearsome horns are slightly slimy. Confers no benefit. October 2015 Subscriber Item.", "headAccessoryMystery301405Text": "Headwear Goggles", "headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.", - "headAccessoryArmoireComicalArrowText": "Comical Arrow", + "headAccessoryArmoireComicalArrowText": "Komisk Pil", "headAccessoryArmoireComicalArrowNotes": "This whimsical item doesn't provide a stat boost, but it sure is good for a laugh! Confers no benefit. Enchanted Armoire: Independent Item.", - "eyewear": "Eyewear", + "eyewear": "Ögonskydd", "eyewearBase0Text": "Inget ögonskydd", "eyewearBase0Notes": "Inget ögonskydd.", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Roguish Eyepatch", "eyewearSpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.", - "eyewearSpecialSummerWarriorText": "Dashing Eyepatch", + "eyewearSpecialSummerWarriorText": "Snitsig Ögonlapp", "eyewearSpecialSummerWarriorNotes": "It doesn't take a rapscallion to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.", "eyewearSpecialWonderconRedText": "Mäktig mask", "eyewearSpecialWonderconRedNotes": "Vilket kraftfullt ansikts tillbehör! Ger ingen fördel. ???", @@ -830,14 +860,14 @@ "eyewearSpecialWonderconBlackNotes": "Your motives are definitely legitimate. Confers no benefit. Special Edition Convention Item.", "eyewearMystery201503Text": "Aquamarine Eyewear", "eyewearMystery201503Notes": "Bli inte petad i ögat av de här shimrande juvelerna! Ger ingen fördel. Mars 2015 prenumerantobjekt.", - "eyewearMystery201506Text": "Neon Snorkel", - "eyewearMystery201506Notes": "This neon snorkel lets its wearer see underwater. Confers no benefit. June 2015 Subscriber Item.", - "eyewearMystery201507Text": "Rad Sunglasses", + "eyewearMystery201506Text": "Neonsnorkel", + "eyewearMystery201506Notes": "Neonsnorkeln låter sin bärare se under vatten. Ger ingen fördel. Juni 2015 prenumerantobjekt.", + "eyewearMystery201507Text": "Tuffa Solglasögon", "eyewearMystery201507Notes": "These sunglasses let you stay cool even when the weather is hot. Confers no benefit. July 2015 Subscriber Item.", "eyewearMystery301404Text": "Eyewear Goggles", "eyewearMystery301404Notes": "Inget ögonskydd skulle kunna vara stiligare än ett par glasögon - förutom, möjligtvis, en monokel. Ger inga fördelar. April 2015 prenumerationsföremål.", "eyewearMystery301405Text": "Monokel", "eyewearMystery301405Notes": "Inget ögonskydd skulle kunna vara stiligare än ett par glasögon - förutom, möjligtvis, en monokel. Ger inga fördelar. Juli 2015 prenumerationsföremål.", - "eyewearArmoirePlagueDoctorMaskText": "Plague Doctor Mask", + "eyewearArmoirePlagueDoctorMaskText": "Pestdoktorns Mask", "eyewearArmoirePlagueDoctorMaskNotes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Confers no benefit. Enchanted Armoire: Plague Doctor Set (Item 2 of 3)." } \ No newline at end of file diff --git a/common/locales/sv/generic.json b/common/locales/sv/generic.json index 35ddf94e2a..3020787216 100644 --- a/common/locales/sv/generic.json +++ b/common/locales/sv/generic.json @@ -10,10 +10,10 @@ "titleProfile": "Profil", "titleInbox": "Inkorg", "titleTavern": "Värdshus", - "titleParty": "Party", - "titleHeroes": "Hall of Heroes", - "titlePatrons": "Hall of Patrons", - "titleGuilds": "Guilds", + "titleParty": "Grupp", + "titleHeroes": "Hjältarnas Sal", + "titlePatrons": "Skyddsherrarnas Sal", + "titleGuilds": "Gille", "titleChallenges": "Utmaningar", "titleDrops": "Marknad", "titleQuests": "Uppdrag", @@ -25,15 +25,15 @@ "titleSettings": "Inställningar", "expandToolbar": "Expandera Verktygsfält", "collapseToolbar": "Fäll ihop Verktygsfält", - "markdownBlurb": "Habitica uses markdown for message formatting. See the Markdown Cheat Sheet for more info.", + "markdownBlurb": "HabitRPG har olika koder för att formatera meddelanden. För mer information (på engelska), se Markdown Cheat Sheet.", "showFormattingHelp": "Visa formateringshjälp", - "hideFormattingHelp": "Dölja formateringshjälp", - "youType": "Du skriva:", + "hideFormattingHelp": "Dölj formateringshjälp", + "youType": "Du skriver:", "youSee": "Du ser:", "italics": "*Kursivering*", "bold": "**Fetstilt**", "strikethrough": "~~Strykning~~", - "emojiExample": ":Leende:", + "emojiExample": ":smile:", "markdownLinkEx": "[Habitica är jättebra!](https://habitica.com)", "markdownImageEx": "![mandatory alt text](https://habitica.com/cake.png \"optional mouseover title\")", "unorderedListHTML": "+ Första artikeln
+ Andra artikeln
+ Tredje artikeln", @@ -84,14 +84,14 @@ "habitBirthday": "Habiticas födelsedagsparty", "habitBirthdayText": "Firade Habiticas födelsedagsparty!", "habitBirthdayPluralText": "Har firat <%= number %> HabitPRG födelsedagspartyn!", - "habiticaDay": "Habitica Naming Day", - "habiticaDaySingularText": "Celebrated Habitica's Naming Day! Thanks for being a fantastic user.", - "habiticaDayPluralText": "Celebrated <%= number %> Naming Days! Thanks for being a fantastic user.", + "habiticaDay": "HabitRPG Namnsdag", + "habiticaDaySingularText": "Firade HabitRPG:s namnsdag! Tack för att du är en så fantastisk användare.", + "habiticaDayPluralText": "Firade <%= number %> namnsdagar! Tack för att du är en så fantastisk användare.", "achievementDilatory": "Dilatorys Befriare", - "achievementDilatoryText": "Helped defeat the Dread Drag'on of Dilatory during the 2014 Summer Splash Event!", - "costumeContest": "Costume Contestant", - "costumeContestText": "Participated in the Habitoween Costume Contest. See some of the entries on the Habitica blog!", - "costumeContestTextPlural": "Participated in <%= number %> Habitoween Costume Contests. See some of the entries on the Habitica blog!", + "achievementDilatoryText": "Hjälpte till att besegra Dilatorys Fruktade Drake under Sommaren 2014. ", + "costumeContest": "Maskeraddeltagare", + "costumeContestText": "Deltog i Habitoweens Maskeradtävling. Se en del av bidragen på HabitRPG-bloggen!", + "costumeContestTextPlural": "Deltagit i <%= number %> maskeradtävlingar under Habitoween. Se en del av bidragen på HabitRPG-bloggen!", "memberSince": "- Medlem sedan", "lastLoggedIn": "- Senast inloggad", "notPorted": "Denna funktion är inte flyttad från orginalhemsidan ännu.", @@ -100,8 +100,8 @@ "errorUpCase": "FEL:", "newPassSent": "Nytt lösenord skickat.", "serverUnreach": "Servern är otillgänglig för tillfället.", - "requestError": "Yikes, an error occurred! Please reload the page, your last action may not have been saved correctly.", - "seeConsole": "If the error persists, please report it at Help > Report a Bug. If you're familiar with your browser's console, please include any error messages.", + "requestError": "Ojsan, ett fel har skett! Vänligen ladda om sidan, din senaste handling kanske inte sparats ordentligt.", + "seeConsole": "Om felet fortsätter, rapportera in det under Gemenskap > Rapportera bugg. Om du känner till din webläsare ordentligt, inkludera gärna felmeddelanden därifrån.", "error": "Fel", "menu": "Meny", "notifications": "Tillkännagivanden", @@ -113,7 +113,7 @@ "audioTheme_danielTheBard": "Barden Daniel", "audioTheme_wattsTheme": "Watts Tema", "audioTheme_gokulTheme": "Gokul Tema", - "audioTheme_luneFoxTheme": "LuneFox's Theme", + "audioTheme_luneFoxTheme": "LuneFoxs tema", "askQuestion": "Ställ en fråga", "reportBug": "Rapportera ett fel", "HabiticaWiki": "Habitica Wikin", @@ -134,49 +134,49 @@ "December": "December", "dateFormat": "Datumformat", "achievementStressbeast": "Stoïkalms Räddare", - "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2014 Winter Wonderland Event!", - "achievementBurnout": "Savior of the Flourishing Fields", - "achievementBurnoutText": "Helped defeat Burnout and restore the Exhaust Spirits during the 2015 Fall Festival Event!", - "achievementBewilder": "Savior of Mistiflying", - "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!", + "achievementStressbeastText": "Hjälpte till att besegra den Fruktansvärda Stressbesten under vintern 2014.", + "achievementBurnout": "Blomstrande Fältens Räddare", + "achievementBurnoutText": "Hjälpte till att besegra Utbrännaren och återställa Förbruknings-andarna under våren 2015.", + "achievementBewilder": "Mistiflyings Räddare", + "achievementBewilderText": "Hjälpte till att besegra Förvildaren under våren 2016.", "checkOutProgress": "Kolla mina framsteg i Habitica!", "cardReceived": "Tagit emot ett kort!", "cardReceivedFrom": "<%= cardType %> från <%= userName %>", "greetingCard": "Hälsningskort", - "greetingCardExplanation": "You both receive the Cheery Chum achievement!", - "greetingCardNotes": "Send a greeting card to a party member.", + "greetingCardExplanation": "Ni får båda en Lycklig Lirare-bedrift!", + "greetingCardNotes": "Skicka ett hälsningskort till en gruppmedlem.", "greeting0": "Hallå där!", - "greeting1": "Just saying hello :)", + "greeting1": "Bara hälsar. :)", "greeting2": "`vinkar intensivt`", "greeting3": "Hej du!", - "greetingCardAchievementTitle": "Cheery Chum", - "greetingCardAchievementText": "Hey! Hi! Hello! Sent or received <%= cards %> greeting cards.", - "thankyouCard": "Tack kort", - "thankyouCardExplanation": "You both receive the Greatly Grateful achievement!", - "thankyouCardNotes": "Send a Thank-You card to a party member.", + "greetingCardAchievementTitle": "Lycklig Lirare", + "greetingCardAchievementText": "Hej! Tjena! Hallå! Skickar eller tagit emot <%= cards %> hälsningskort.", + "thankyouCard": "Tack-kort", + "thankyouCardExplanation": "Ni får båda en Mycket Tacksam-bedrift!", + "thankyouCardNotes": "Skicka ett tack-kort till en Gruppmedlem.", "thankyou0": "Tack så mycket!", "thankyou1": "Tack, tack, tack!", - "thankyou2": "Sending you a thousand thanks.", + "thankyou2": "Skickar tusen tack till dig.", "thankyou3": "Jag är väldigt tacksam - tack!", "thankyouCardAchievementTitle": "Oerhört Tacksam", "thankyouCardAchievementText": "Tack för att du är tacksam! Skickat eller tagit emot <%= cards %> Tack kort.", "birthdayCard": "Födelsedagskort", - "birthdayCardExplanation": "You both receive the Birthday Bonanza achievement!", + "birthdayCardExplanation": "Ni får båda en Födelsedagstjolabalo-bedrift!", "birthdayCardNotes": "Sänd ett födelsedagskort ti", "birthday0": "Grattis på dagen!", - "birthdayCardAchievementTitle": "Birthday Bonanza", - "birthdayCardAchievementText": "Many happy returns! Sent or received <%= cards %> birthday cards.", - "streakAchievement": "You earned a streak achievement!", - "firstStreakAchievement": "21-Day Streak", - "streakAchievementCount": "<%= streaks %> 21-Day Streaks", - "twentyOneDays": "You've completed your Daily for 21 days in a row!", - "dontBreakStreak": "Amazing job. Don't break the streak!", + "birthdayCardAchievementTitle": "Födelsedagstjolabalo", + "birthdayCardAchievementText": "Hjärtliga gratulationer. Skickat eller tagit emot <%= cards %> födelsedagskort.", + "streakAchievement": "Du har tjänat in en Följd-bedrift!", + "firstStreakAchievement": "21-dagars följd", + "streakAchievementCount": "<%= streaks %> 21-dagars följder", + "twentyOneDays": "Du har slutfört dina Dagliga Uppgifter 21 dar i rad!", + "dontBreakStreak": "Fantastiskt jobb. Sluta inte när du har flytet uppe!", "dontStop": "Sluta inte nu!", - "levelUpShare": "I leveled up in Habitica by improving my real-life habits!", - "questUnlockShare": "I unlocked a new quest in Habitica!", - "hatchPetShare": "I hatched a new pet by completing my real-life tasks!", - "raisePetShare": "I raised a pet into a mount by completing my real-life tasks!", - "wonChallengeShare": "I won a challenge in Habitica!", - "achievementShare": "I earned a new achievement in Habitica!", - "orderBy": "Order By <%= item %>" + "levelUpShare": "Jag har gått upp i Level i HabitRPG genom att förbättra mina vanor!", + "questUnlockShare": "Jag låste upp ett nytt äventyr i HabitRPG!", + "hatchPetShare": "Jag har kläckt ett nytt husdjur genom att slutföra mina uppgifter!", + "raisePetShare": "Jag uppfostrade mitt husdjur till ett riddjur genom att slutföra mina uppgifter!", + "wonChallengeShare": "Jag van en utmaning i HabitRPG!", + "achievementShare": "Jag har klarat av en ny bedrift i HabitRPG!", + "orderBy": "Sortera enligt <%= item %>" } \ No newline at end of file diff --git a/common/locales/sv/groups.json b/common/locales/sv/groups.json index b4231a8dc9..3b41fe6501 100644 --- a/common/locales/sv/groups.json +++ b/common/locales/sv/groups.json @@ -13,7 +13,7 @@ "community": "Community-forum", "dataTool": "Datavisningsverktyg", "resources": "Resurser", - "askQuestionNewbiesGuild": "Ask a Question (Newbies Guild)", + "askQuestionNewbiesGuild": "Ställ en fråga (Nybörjaregille)", "tavernTalk": "Krogsnack", "tavernAlert1": "Notera: om du rapporterar en bugg här kommer inte utvecklarna se det. Var god", "tavernAlert2": "använd GitHub istället", @@ -27,16 +27,16 @@ "noPartyText": "You are either not in a party or your party is taking a while to load. You can either create one and invite friends, or if you want to join an existing party, have them enter your Unique User ID below and then come back here to look for the invitation:", "LFG": "To advertise your new party or find one to join, go to the <%= linkStart %>Party Wanted (Looking for Group)<%= linkEnd %> Guild.", "wantExistingParty": "Want to join an existing party? Go to the <%= linkStart %>Party Wanted Guild<%= linkEnd %> and post this User ID:", - "joinExistingParty": "Join Someone Else's Party", + "joinExistingParty": "Gå med i någon annans sällskap", "create": "Skapa", "userId": "Användar-ID", "invite": "Bjud in", "leave": "Lämna", "invitedTo": "Inbjuden till <%= name %>", "invitedToNewParty": "You were invited to join a party! Do you want to leave this party and join <%= partyName %>?", - "joinNewParty": "Join New Party", + "joinNewParty": "Gå med i ett nytt sällskap", "declineInvitation": "Avböj Inbjudan", - "loadingNewParty": "Your new party is loading. Please wait...", + "loadingNewParty": "Ditt nya sällskap laddar. Vänta...", "newMsg": "Nytt meddelande i \"<%= name %>\"", "chat": "Chatt", "sendChat": "Skicka Chatt", @@ -92,6 +92,7 @@ "send": "Skicka", "messageSentAlert": "Meddelande skickat", "pmHeading": "Privatmeddelande till <%= name %>", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "Radera alla meddelanden", "confirmDeleteAllMessages": "Är du säker på att du vill ta bort alla meddelanden i din inkorg? Andra användare kommer fortfarande se meddelanden som du har skickat till dem.", "optOutPopover": "Gillar du inte privatmeddelanden? Klicka för att stänga av funktionen", @@ -99,10 +100,19 @@ "unblock": "Avblockera", "pm-reply": "Skicka ett svar", "inbox": "Inkorgen", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "Anmäl brott mot gemenskapens riktlinjer.", "abuseFlagModalHeading": "Rapportera <%= name %> för överträdelse?", "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction. Appropriate reasons to flag a post include but are not limited to:
- swearing, religous oaths
- bigotry, slurs
- adult topics
- violence, including as a joke
- spam, nonsensical messages
- Check off To-Dos to earn Gold & Experience!
- To-Dos never make your avatar lose Health.
- Dailies repeat every day.
- You lose Health if you skip Dailies.
- Good Habits award Gold & Experience.
- Bad Habits make you lose Health.
- Spend your hard-earned Gold here!
- Purchase Equipment for your avatar, or set custom Rewards.
Suddenly, the boat gives a horrible jolt, and slimy tentacles burst out of the water on all sides! \"We're being attacked by the Kraken of Inkomplete!\" Wolvenhalo cries.
\"Quickly!\" Lemoness calls to you. \"Strike down as many tentacles and tasks as you can, before new ones can rise up to take their place!\"", @@ -218,9 +218,9 @@ "questDilatoryDistress1Text": "Dilatory Distress, Part 1: Message in a Bottle", "questDilatoryDistress1Notes": "A message in a bottle arrived from the newly rebuilt city of Dilatory! It reads: \"Dear Habiticans, we need your help once again. Our princess has disappeared and the city is under siege by some unknown watery demons! The mantis shrimps are holding the attackers at bay. Please aid us!\" To make the long journey to the sunken city, one must be able to breathe water. Fortunately, the alchemists @Benga and @hazel can make it all possible! You only have to find the proper ingredients.", "questDilatoryDistress1Completion": "You don the the finned armor and swim to Dilatory as quickly as you can. The merfolk and their mantis shrimp allies have managed to keep the monsters outside the city for the moment, but they are losing. No sooner are you within the castle walls than the horrifying siege descends!", - "questDilatoryDistress1CollectFireCoral": "Fire Coral", - "questDilatoryDistress1CollectBlueFins": "Blue Fins", - "questDilatoryDistress1DropArmor": "Finned Oceanic Armor (Armor)", + "questDilatoryDistress1CollectFireCoral": "Eldkorall", + "questDilatoryDistress1CollectBlueFins": "Blåa Fenor", + "questDilatoryDistress1DropArmor": "Fjällig Havsrustning (Rustning)", "questDilatoryDistress2Text": "Dilatory Distress, Part 2: Creatures of the Crevasse", "questDilatoryDistress2Notes": "The siege can be seen from miles away: thousands of disembodied skulls rushing through a portal in the crevasse walls and making their way towards Dilatory.
When you meet King Manta in his war room, his eyes seem sunken, and his face is worried. \"My daughter Adva disappeared into the Dark Crevasse just before this siege began. Please find her and bring her back home safely! I will lend you my Fire Coral Circlet to aid you. If you succeed, it is yours.\"", "questDilatoryDistress2Completion": "You vanquish the nightmarish horde of skulls, but you feel no closer to finding Adva. You speak to @Kiwibot, the royal tracker, to see if she has any ideas. \"The mantis shrimps that defend the city must have seen Adva escape,\" @Kiwibot says. \"Try following them into the Dark Crevasse.\"", @@ -228,26 +228,26 @@ "questDilatoryDistress2RageTitle": "Swarm Respawn", "questDilatoryDistress2RageDescription": "Swarm Respawn: This bar fills when you don't complete your Dailies. When it is full, the Water Skull Swarm will heal 30% of its remaining health!", "questDilatoryDistress2RageEffect": "`Water Skull Swarm uses SWARM RESPAWN!`\n\nEmboldened by their victories, more skulls pour forth from the crevasse, bolstering the swarm!", - "questDilatoryDistress2DropSkeletonPotion": "Skeleton Hatching Potion", - "questDilatoryDistress2DropCottonCandyBluePotion": "Cotton Candy Blue Hatching Potion", + "questDilatoryDistress2DropSkeletonPotion": "Skelett kläckningsdryck", + "questDilatoryDistress2DropCottonCandyBluePotion": "Blå sockervadd kläckningsdryck", "questDilatoryDistress2DropHeadgear": "Fire Coral Circlet (Headgear)", "questDilatoryDistress3Text": "Dilatory Distress, Part 3: Not a Mere Maid", "questDilatoryDistress3Notes": "You follow the mantis shrimps deep into the Crevasse, and discover an underwater fortress. Princess Adva, escorted by more watery skulls, awaits you inside the main hall. \"My father has sent you, has he not? Tell him I refuse to return. I am content to stay here and practice my sorcery. Leave now, or you shall feel the wrath of the ocean's new queen!\" Adva seems very adamant, but as she speaks you notice a strange, ruby pendant on her neck glowing ominously... Perhaps her delusions would cease should you break it?", "questDilatoryDistress3Completion": "Finally, you manage to pull the bewitched pendant from Adva's neck and throw it away. Adva clutches her head. \"Where am I? What happened here?\" After hearing your story, she frowns. \"This necklace was given to me by a strange ambassador - a lady called 'Tzina'. I don't remember anything after that!\"
Back at Dilatory, Manta is overjoyed by your success. \"Allow me to reward you with this trident and shield! I ordered them from @aiseant and @starsystemic as a gift for Adva, but... I'd rather not put weapons in her hands any time soon.\"", "questDilatoryDistress3Boss": "Adva, the Usurping Mermaid", - "questDilatoryDistress3DropFish": "Fish (Food)", + "questDilatoryDistress3DropFish": "Fisk (Mat)", "questDilatoryDistress3DropWeapon": "Trident of Crashing Tides (Weapon)", "questDilatoryDistress3DropShield": "Moonpearl Shield (Shield-Hand Item)", - "questCheetahText": "Such a Cheetah", + "questCheetahText": "En sån Puma", "questCheetahNotes": "As you hike across the Sloensteadi Savannah with your friends @PainterProphet, @tivaquinn, @Unruly Hyena, and @Crawford, you're startled to see a Cheetah screeching past with a new Habitican clamped in its jaws. Under the Cheetah's scorching paws, tasks burn away as though complete -- before anyone has the chance to actually finish them! The Habitican sees you and yells, \"Please help me! This Cheetah is making me level too quickly, but I'm not getting anything done. I want to slow down and enjoy the game. Make it stop!\" You fondly remember your own fledgling days, and know that you have to help the newbie by stopping the Cheetah!", "questCheetahCompletion": "The new Habitican is breathing heavily after the wild ride, but thanks you and your friends for your help. \"I'm glad that Cheetah won't be able to grab anyone else. It did leave some Cheetah eggs for us, so maybe we can raise them into more trustworthy pets!\"", "questCheetahBoss": "Gepard", "questCheetahDropCheetahEgg": "Gepard (Ägg)", - "questCheetahUnlockText": "Unlocks purchasable Cheetah eggs in the Market", + "questCheetahUnlockText": "Låser upp köpbara Puma-ägg i Marknaden", "questHorseText": "Rid på Mardrömmen", "questHorseNotes": "While relaxing in the Tavern with @beffymaroo and @JessicaChase, the talk turns to good-natured boasting about your adventuring accomplishments. Proud of your deeds, and perhaps getting a bit carried away, you brag that you can tame any task around. A nearby stranger turns toward you and smiles. One eye twinkles as he invites you to prove your claim by riding his horse.\nAs you all head for the stables, @UncommonCriminal whispers, \"You may have bitten off more than you can chew. That's no horse - that's a Night-Mare!\" Looking at its stamping hooves, you begin to regret your words...", "questHorseCompletion": "It takes all your skill, but finally the horse stamps a couple of hooves and nuzzles you in the shoulder before allowing you to mount. You ride briefly but proudly around the Tavern grounds while your friends cheer. The stranger breaks into a broad grin.\n\"I can see that was no idle boast! Your determination is truly impressive. Take these eggs to raise horses of your own, and perhaps we'll meet again one day.\" You take the eggs, the stranger tips his hat... and vanishes.", - "questHorseBoss": "Night-Mare", + "questHorseBoss": "Mardröm", "questHorseDropHorseEgg": "Häst (ägg)", "questHorseUnlockText": "Unlocks purchasable Horse eggs in the Market", "questBurnoutText": "Burnout and the Exhaust Spirits", @@ -257,7 +257,7 @@ "questBurnoutBoss": "Burnout", "questBurnoutBossRageTitle": "Exhaust Strike", "questBurnoutBossRageDescription": "When this gauge fills, Burnout will unleash its Exhaust Strike on Habitica!", - "questBurnoutDropPhoenixPet": "Phoenix (Pet)", + "questBurnoutDropPhoenixPet": "Phoenix (Husdjur)", "questBurnoutDropPhoenixMount": "Phoenix (Mount)", "questBurnoutBossRageQuests": "`Burnout uses EXHAUST STRIKE!`\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!\n\nOnly defeating Burnout can break the spell and restore our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!", "questBurnoutBossRageSeasonalShop": "`Burnout uses EXHAUST STRIKE!`\n\nAhh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a drooping Exhaust Spirit.\n\nWe have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!", @@ -272,41 +272,53 @@ "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?", "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.", "questSnakeBoss": "Serpent of Distraction", - "questSnakeDropSnakeEgg": "Snake (Egg)", + "questSnakeDropSnakeEgg": "Orm (Ägg)", "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market", - "questUnicornText": "Convincing the Unicorn Queen", + "questUnicornText": "Att övertyga Enhörningsdrottningen", "questUnicornNotes": "Conquest Creek has become muddied, destroying Habit City's fresh water supply! Luckily, @Lukreja knows an old legend that claims that a unicorn's horn can purify the foulest of waters. Together with your intrepid guide @UncommonCriminal, you hike through the frozen peaks of the Meandering Mountains. Finally, at the icy summit of Mount Habitica itself, you find the Unicorn Queen amid the glittering snows. \"Your pleas are compelling,\" she tells you. \"But first you must prove that you are worthy of my aid!\"", "questUnicornCompletion": "Impressed by your diligence and strength, the Unicorn Queen at last agrees that your cause is worthy. She allows you to ride on her back as she soars to the source of Conquest Creek. As she lowers her golden horn to the befouled waters, a brilliant blue light rises from the water’s surface. It is so blinding that you are forced to close your eyes. When you open them a moment later, the unicorn is gone. However, @rosiesully lets out a cry of delight: the water is now clear, and three shining eggs rest at the creek’s edge.", - "questUnicornBoss": "The Unicorn Queen", - "questUnicornDropUnicornEgg": "Unicorn (Egg)", + "questUnicornBoss": "Enhörningsdrottningen ", + "questUnicornDropUnicornEgg": "Enhörning (Ägg)", "questUnicornUnlockText": "Unlocks purchasable Unicorn eggs in the Market", - "questSabretoothText": "The Sabre Cat", + "questSabretoothText": "Den Sabeltandade Katt", "questSabretoothNotes": "A roaring monster is terrorizing Habitica! The creature stalks through the wilds and woods, then bursts forth to attack before vanishing again. It's been hunting innocent pandas and frightening the flying pigs into fleeing their pens to roost in the trees. @Inventrix and @icefelis explain that the Zombie Sabre Cat was set free while they were excavating in the ancient, untouched ice-fields of the Stoikalm Steppes. \"It was perfectly friendly at first – I don't know what happened. Please, you have to help us recapture it! Only a champion of Habitica can subdue this prehistoric beast!\"", "questSabretoothCompletion": "After a long and tiring battle, you wrestle the Zombie Sabre Cat to the ground. As you are finally able to approach, you notice a nasty cavity in one of its sabre teeth. Realising the true cause of the cat's wrath, you're able to get the cavity filled by @Fandekasp, and advise everyone to avoid feeding their friend sweets in future. The Sabre Cat flourishes, and in gratitude, its tamers send you a generous reward – a clutch of sabretooth eggs!", - "questSabretoothBoss": "Zombie Sabre Cat", + "questSabretoothBoss": "Zombie Sabelkatt ", "questSabretoothDropSabretoothEgg": "Sabretooth (Egg)", "questSabretoothUnlockText": "Unlocks purchasable Sabretooth eggs in the Market", "questMonkeyText": "Monstrous Mandrill and the Mischief Monkeys", "questMonkeyNotes": "The Sloensteadi Savannah is being torn apart by the Monstrous Mandrill and his Mischief Monkeys! They shriek loudly enough to drown out the sound of approaching deadlines, encouraging everyone to avoid their duties and keep monkeying around. Alas, plenty of people ape this bad behavior. If no one stops these primates, soon everyone's tasks will be as red as the Monstrous Mandrill's face!
\"It will take a dedicated adventurer to resist them,\" says @yamato.
\"Quick, let's get this monkey off everyone's backs!\" @Oneironaut yells, and you charge into battle.", "questMonkeyCompletion": "You did it! No bananas for those fiends today. Overwhelmed by your diligence, the monkeys flee in panic. \"Look,\" says @Misceo. \"They left a few eggs behind.\"
@Leephon grins. \"Maybe a well-trained pet monkey can help you as much as the wild ones hinder you!\"", "questMonkeyBoss": "Monstrous Mandrill", - "questMonkeyDropMonkeyEgg": "Monkey (Egg)", + "questMonkeyDropMonkeyEgg": "Apa (Ägg)", "questMonkeyUnlockText": "Unlocks purchasable Monkey eggs in the Market", "questSnailText": "The Snail of Drudgery Sludge", "questSnailNotes": "You're excited to begin questing in the abandoned Dungeons of Drudgery, but as soon as you enter, you feel the ground under your feet start to suck at your boots. You look up to the path ahead and see Habiticans mired in slime. @Overomega yells, \"They have too many unimportant tasks and dailies, and they're getting stuck on things that don't matter! Pull them out!\"
\"You need to find the source of the ooze,\" @Pfeffernusse agrees, \"or the tasks that they cannot accomplish will drag them down forever!\"
Pulling out your weapon, you wade through the gooey mud.... and encounter the fearsome Snail of Drudgery Sludge.", "questSnailCompletion": "You bring your weapon down on the great Snail's shell, cracking it in two, releasing a flood of water. The slime is washed away, and the Habiticans around you rejoice. \"Look!\" says @Misceo. \"There's a small group of snail eggs in the remnants of the muck.\"", "questSnailBoss": "Snail of Drudgery Sludge", - "questSnailDropSnailEgg": "Snail (Egg)", + "questSnailDropSnailEgg": "Snigel (Ägg)", "questSnailUnlockText": "Unlocks purchasable Snail eggs in the Market", - "questBewilderText": "The Be-Wilder", + "questBewilderText": "Förvildaren", "questBewilderNotes": "The party begins like any other.
The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
“Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
“As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
“Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
“My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
PainterProphet ducks as lightning bolts crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.", "questBewilderCompletion": "The Be-Wilder is DEFEATED!
We've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.
Mistiflying is saved!
The April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”
The crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.
“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”
Redphoenix coughs meaningfully.
“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”
Encouraged, the marching band starts up.
It isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.
As Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", "questBewilderCompletionChat": "`The Be-Wilder is DEFEATED!`\n\nWe've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.\n\n`Mistiflying is saved!`\n\nThe April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”\n\nThe crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.\n\n“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”\n\nRedphoenix coughs meaningfully.\n\n“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”\n\nEncouraged, the marching band starts up.\n\nIt isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.\n\nAs Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", "questBewilderBossRageTitle": "Beguilement Strike", "questBewilderBossRageDescription": "When this gauge fills, The Be-Wilder will unleash its Beguilement Strike on Habitica!", - "questBewilderDropBumblebeePet": "Bumblebee (Pet)", - "questBewilderDropBumblebeeMount": "Bumblebee (Mount)", + "questBewilderDropBumblebeePet": "Magiskt Bi (Husdjur)", + "questBewilderDropBumblebeeMount": "Magiskt Bi (Riddjur)", "questBewilderBossRageMarket": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nOh no! Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.\n\nHurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.", "questBewilderBossRageStables": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nAhh!!! Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!", - "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!" + "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!", + "questFalconText": "The Birds of Preycrastination", + "questFalconNotes": "Mt. Habitica is being overshadowed by a looming mountain of To-Dos. It used to be a place to picnic and enjoy a sense of accomplishment, until the neglected tasks grew out of control. Now it's home to fearsome Birds of Preycrastination, foul creatures which stop Habiticans from completing their tasks!
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Falk (Ägg)", + "questFalconUnlockText": "Låser upp köpbara Falk-ägg i marknaden", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/sv/rebirth.json b/common/locales/sv/rebirth.json index ba1fd047a5..e24f463085 100644 --- a/common/locales/sv/rebirth.json +++ b/common/locales/sv/rebirth.json @@ -5,14 +5,14 @@ "rebirthStartOver": "Återfödelse startar om din karaktär från nivå 1.", "rebirthAdvList1": "Du återvänder till full Hälsa.", "rebirthAdvList2": "Du har ingen erfarenhet, guld eller utrustning (utan gratis föremål t.ex mysterieföremål) ", - "rebirthAdvList3": "Dina Vanor, Dagliga- och Att-Göra-Uppgifter återställs till gult, och följder återställs.", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "Du har startklassen Krigare tills du låser upp klass-systemet.", "rebirthInherit": "Din nya karaktär ärver vissa saker från dess föregångare:", "rebirthInList1": "Uppgifter, historik och inställningar är kvar.", "rebirthInList2": "Utmaning-, Gille- och Sällskapsmedlemskap är kvar.", "rebirthInList3": "Juveler, Stödjarnivå och Medarbetarnivå är kvar.", "rebirthInList4": "Föremål erhållna från Juveler eller drops (såsom husdjur eller riddjur) är kvar, men du kan inte komma åt dem innan du låser upp dem igen.", - "rebirthInList5": "Limited edition equipment you've purchased can be repurchased, even if its event has ended. To repurchase class-specific equipment, you must first change to the correct class.", + "rebirthInList5": "Köpt utrustning som är av begränsad utgåva kan återköpas, även om dess event har slutat. För att köpa klass-specifik utrustning måste du först byta till den korrekta klassen. ", "rebirthEarnAchievement": "Du får även en Bedrift för att du börjar på ett nytt äventyr!", "beReborn": "Bli pånyttfödd", "rebirthAchievement": "Du har börjat på ett nytt äventyr! Det här är Pånyttfödelse nummer <%= number %> för dig, och den högsta Leveln du har nått är <%= level %>. För att stapla denna Bedrift, börja ditt nästa nya äventyr när du har nått en ännu högre Level!", @@ -24,5 +24,6 @@ "rebirthPop": "Starta en ny karaktär från Level 1 medan du behåller bedrifter, samlarobjekt och uppgifter med dess historik.", "rebirthName": "Pånyttfödelsesfär", "reborn": "Pånyttfödd, max level <%= reLevel %>", - "confirmReborn": "Är du säker?" + "confirmReborn": "Är du säker?", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/sv/settings.json b/common/locales/sv/settings.json index d89419444f..9cbca16b1c 100644 --- a/common/locales/sv/settings.json +++ b/common/locales/sv/settings.json @@ -1,7 +1,7 @@ { "settings": "Inställningar", "language": "Språk", - "americanEnglishGovern": "Ifall att det uppstår en oförenlighet i översättningarna kommer den amerikansk engelska versionen framstå.", + "americanEnglishGovern": "I den händelse att det uppstår en oförenlighet i översättningarna, så är den amerikansk engelska versionen styrande.", "helpWithTranslation": "Skulle du vilja hjälpa till med översättningen av Habitica? Toppen! Besök då detta Trello kort.", "showHeaderPop": "Visa din avatar, Hälsa-/Erfarenhetsmätare, och sällskap.", "stickyHeader": "Fastklistrat sidhuvud", @@ -17,9 +17,9 @@ "startAdvCollapsedPop": "Med den här inställningen är Avancerade Inställningar dolda när du öppnar en uppgift för redigering.", "dontShowAgain": "Visa inte det här igen", "suppressLevelUpModal": "Visa inte popup när jag levlar upp", - "suppressHatchPetModal": "Don't show popup when hatching a pet", - "suppressRaisePetModal": "Don't show popup when raising a pet into a mount", - "suppressStreakModal": "Don't show popup when attaining a Streak achievement", + "suppressHatchPetModal": "Visa inte en popup när ett husdjur kläcks", + "suppressRaisePetModal": "Visa inte en popup när ett husdjur blir ett riddjur", + "suppressStreakModal": "Visa inte en popup när jag når en följd av bedrifter", "showTour": "Visa Rundtur", "restartTour": "Starta om den introducerande rundturen från när du började med Habitica.", "showBailey": "Visa Bailey", @@ -47,8 +47,9 @@ "customDayStart": "Skräddarsydd Dagsstart", "changeCustomDayStart": "Ändra skräddarsydd dagsstarten?", "sureChangeCustomDayStart": "Är du säker på att du vill ändrar skräddarsydd dagsstarten?", - "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", - "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", + "customDayStartHasChanged": "Your custom day start has changed.", + "nextCron": "Dina dagliga utmaningar kommer återställas den första gången du använder Habitica efter <%= time %>. Se till att ha avslutat dina dagliga utmaningar innan det händer!", + "customDayStartInfo1": "Habitica återställer alltid dina dagliga utmaningar vid midnatt i din tidszon varje dag. Du kan ställa in den tiden här.", "misc": "Blandat", "showHeader": "Visa sidhuvud", "changePass": "Ändra lösenord", @@ -61,12 +62,23 @@ "newUsername": "Nytt Inloggningsnamn", "dangerZone": "Riskområde", "resetText1": "VARNING! Detta kommer återställa många delar av ditt konto. Vi rekommenderar det inte, men somliga anser det praktiskt i början efter att ha provat spelet en kort stund.", - "resetText2": "You will lose all your levels, gold, and experience points. All your tasks will be deleted permanently and you will lose all of your task's historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Are you sure? This will delete your account forever, and it can never be restored! You will need to register a new account to use Habitica again. Banked or spent Gems will not be refunded. If you're absolutely certain, type <%= deleteWord %> into the text box below.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Kopiera dessa för användning i tredjepartsapplikationer. Du bör behandla ditt API-token som ett lösenord och inte dela med dig av det publikt. Du kan få frågan att ange ditt User ID, men lägg inte ut ditt API-token där andra kan se det, inklusive på Github.", "APIToken": "API Token (detta är ett lösenord - se varningen ovanför)", + "thirdPartyApps": "Tredjehandsappar", + "dataToolDesc": "En hemsida som visar dig särskilt information från ditt Habitica-konto, så som statistik om dina uppgifter, din utrustning och dina färdigheter.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Google Chromes Chatt-Extension ", + "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.", + "otherExtensions": "Other Extensions", + "otherDesc": "Hitta andra appar, tillägg och verktyg på Habitica-wikin.", "resetDo": "Gör det, återställ mitt konto!", + "resetComplete": "Reset complete!", "fixValues": "Ändra Värden", "fixValuesText1": "Om du har stött på en bugg eller gjort ett misstag som orättvist ändrat din karaktär (skada du inte borde ha fått, Guld du inte egentligen förtjänat, osv.) så kan du manuellt rätta dina nummer här. Ja, det här gör det möjligt att fuska: använd denna funktion klokt, annars saboterar du din egen vanebildning!", "fixValuesText2": "Notera att du inte kan återställa Följder för individuella uppgifter här. För att göra det, redigera den specifika Dagliga Uppgiften och gå in under Avancerade Alternativ där du hittar fältet Återställ Följd.", @@ -80,7 +92,7 @@ "usernameSuccess": "Inloggningsnamn framgångsrikt ändrat", "emailSuccess": "E-postadress framgångsrikt ändrad", "detachFacebook": "Avregistrera Facebook", - "detachedFacebook": "Successfully removed Facebook from your account", + "detachedFacebook": "Facebook är no borttaget från ditt konto", "addedLocalAuth": "Successfully added local authentication", "data": "Data", "exportData": "Exportera data", @@ -96,6 +108,7 @@ "emailNotifications": "E-postnotiser", "wonChallenge": "Du vann en utmaning!", "newPM": "Mottagit privatmeddelande", + "sentGems": "Sent gems!", "giftedGems": "Skänkta juveler", "giftedGemsInfo": "<%= amount %> juveler - av <%= name %>", "giftedSubscription": "Skänkt prenumeration", @@ -107,7 +120,7 @@ "invitedQuest": "Inbjuden till uppdrag", "kickedGroup": "Avfärdad från grupp", "remindersToLogin": "Påminnelser att titta in i Habitica", - "subscribeUsing": "Subscribe using", + "subscribeUsing": "Prenumerera genom", "unsubscribedSuccessfully": "Avprenumerationen lyckades!", "unsubscribedTextUsers": "You have successfully unsubscribed from all Habitica emails. You can enable only the emails you want to receive from the settings (requires login).", "unsubscribedTextOthers": "Du kommer inte få fler e-post från Habitica.", @@ -121,9 +134,9 @@ "couponPlaceholder": "Skriv in kupongkod", "couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)", "apply": "Anmäl", - "resubscribe": "Resubscribe", + "resubscribe": "Återprenumerera", "promoCode": "Rabattkod", - "promoCodeApplied": "Promo Code Applied! Check your inventory", + "promoCodeApplied": "Promo-Koden lades till! Kolla ditt lager", "promoPlaceholder": "Lägg till rabbatkod", "displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member.", "saveCustomDayStart": "Spara skräddarsydd dagsstart", @@ -135,19 +148,24 @@ "webhooks": "Webhooks", "enabled": "Aktiverad", "webhookURL": "Webhook URL", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Lägg till", "buyGemsGoldCap": "Cap raised to <%= amount %>", - "mysticHourglass": "<%= amount %> Mystic Hourglass", - "mysticHourglassText": "Mystic Hourglasses allow purchasing a previous month's Mystery Item set.", + "mysticHourglass": "<%= amount %> Mystiskt timglas", + "mysticHourglassText": "Mystiskt timglas låter dig köpa föregående månadens uppsättning mystiska föremål.", "purchasedPlanId": "Recurring $<%= price %> USD each <%= months %> Month(s) (<%= plan %>)", - "purchasedPlanExtraMonths": "You have <%= months %> months of extra subscription credit.", - "consecutiveSubscription": "Consecutive Subscription", - "consecutiveMonths": "Consecutive Months:", + "purchasedPlanExtraMonths": "Du har <%= months %> månader kvar av din prenumerationskredit.", + "consecutiveSubscription": "Återkommande Prenumeration", + "consecutiveMonths": "På rad följande månader:", "gemCapExtra": "Juvel gräns extra:", "mysticHourglasses": "Mystiskt timglas:", "paypal": "PayPal", "amazonPayments": "Amazon Payments", "timezone": "Tidszon", - "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been reseting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." + "timezoneUTC": "Habitica använder den tidszon som är inställd på din dator, vilket är: <%= utc %>", + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/sv/spells.json b/common/locales/sv/spells.json index 06c4050127..613792045b 100644 --- a/common/locales/sv/spells.json +++ b/common/locales/sv/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Kasta en snöboll på en sällskapsdeltagare! Vad kan gå fel? Varar fram till deltagarens nästa dag.", "spellSpecialSaltText": "Salt", "spellSpecialSaltNotes": "Någon kastade en snöboll på dig. Ha ha, väldigt roligt. Se nu till att få bort den här snön från mig!", - "spellSpecialSpookDustText": "Spöklik hud", - "spellSpecialSpookDustNotes": "Transformera en vän till en flytande filt med ögon.", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Ogenomskinlig Dryck", "spellSpecialOpaquePotionNotes": "Avbryt effekterna av spöklik hud.", "spellSpecialShinySeedText": "Glänsande Frö", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Sjöskum", "spellSpecialSeafoamNotes": "Förvandla en vän till ett sjödjur!", "spellSpecialSandText": "Sand", - "spellSpecialSandNotes": "Avbryt effekten av Sjöskum." + "spellSpecialSandNotes": "Avbryt effekten av Sjöskum.", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/sv/subscriber.json b/common/locales/sv/subscriber.json index d37afb18d2..2658b0109b 100644 --- a/common/locales/sv/subscriber.json +++ b/common/locales/sv/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Köp Juveler med guld, få mystiska saker varje månad, behåll historiken över framsteg, begränsningen på fynd ökas till det dubbla och stöd utvecklarna. Klicka här för mer information.", "buyGemsGold": "Köp Juveler med Guld", "buyGemsGoldText": "Köpmannen Alexander säljer dig Juveler mot en kostnad av <%= gemCost %> guld per juvel. Hans månatliga transporter är från början begränsad till <%= gemLimit %> Juveler per månad, men begränsningen ökar med 5 Juveler för var tredje månad av konsekutiv prenumeration, upp till maximalt 50 Juveler per månad!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Behåll ytterligare historik över inlägg", "retainHistoryText": "Gör att färdiga uppgifter och historik över uppgifter är tillgängliga under en längre tid.", "doubleDrops": "Fördubblad daglig drop-gräns", @@ -11,7 +13,7 @@ "mysteryItem": "Exklusiva föremål varje månad", "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.", "supportDevs": "Stödjer utvecklarna", - "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!", + "supportDevsText": "Din prenumeration hjälper Habitica att växa och stödjer utvecklingen av nya tillägg. Tack för din generositet!", "monthUSD": "USD / Månad", "organization": "Organisation", "groupPlans": "Affärsplaner", @@ -29,8 +31,9 @@ "manageSub": "Klicka för att hantera abonnemang", "cancelSub": "Avbryt Abonnemang", "canceledSubscription": "Avbruten Prenumeration", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Administratör-abonnemang.", - "morePlans": "More Plans
Coming Soon", + "morePlans": "Mer Planer
Kommer Snart", "organizationSub": "Privat Organisation", "organizationSubText": "Medlemmar i organisaitonen deltar utanför det vanliga Habitica, och fokusen hålls kvar bland dina deltagare.", "hostingType": "Servertyp", @@ -47,7 +50,7 @@ "timeSupportText": "Vi kommer ge support för utbildning, buggar, installation och funktionsförfrågningar.", "gameFeatures": "Spelfunktioner", "gold2Gem": "Juveler kan köpas med Guld", - "gold2GemText": "Members will be able to purchase Gems with gold, meaning none of your participants need to buy anything with real money.", + "gold2GemText": "Medlemmar kan köpa Juveler med guld vilket innebär att tingen av dina deltagare behöver köpa någonting med riktiga pengar.", "infiniteGem": "Obegränsade juveler för ledaren", "infiniteGemText": "We will provide the organization leaders with as many Gems as they need, for things like challenge prizes, guild-creation, etc.", "notYetPlan": "Plan ej tillgänglig än, men klicka för att kontakta oss så håller vi dig uppdaterad.", @@ -57,7 +60,7 @@ "subCanceled": "Prenumerationen kommer bli inaktiv den", "buyGemsGoldTitle": "Att köpa Juveler med Guld", "becomeSubscriber": "Bli en Prenumerant", - "subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold. You can see how many Gems are available to buy at the corner of the Gem icon.", + "subGemPop": "Eftersom du prenumererar på Habitica kan du köpa ett antal Juveler varje månad med Guld. Du kan se hur många Juveler du kan köpa i hörnet av Juvelikonen.", "subGemName": "Prenumereringsjuveler", "freeGemsTitle": "Få Juveler gratis", "maxBuyGems": "Du har köpt alla de Juveler du kan för den här månaden. Mer går att köpa inom de tre första dagarna av nästa månad. Tack för att du prenumererar!", @@ -65,14 +68,17 @@ "buyGemsAllow2": "fler Juveler den här månaden", "purchaseGemsSeparately": "Köp ytterligare Juveler", "subFreeGemsHow": "Habitica players can earn Gems for free by winning challenges that award Gems as a prize, or as a contributor reward by helping the development of Habitica.", - "seeSubscriptionDetails": "Go to Settings > Subscription to see your subscription details!", + "seeSubscriptionDetails": "Gå till Settings > Subscription för att se detaljer om din prenumeration!", "timeTravelers": "Tidsresenärer", "timeTravelersTitleNoSub": "<%= linkStartTyler %>Tyler<%= linkEnd %> och <%= linkStartVicky %>Vicky<%= linkEnd %>", "timeTravelersTitle": "Mystiska Tidsresenärer", "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a rare pet, mount, or Subscriber Item Set from the past... or maybe even the future.", "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", - "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", + "timeTravelersAlreadyOwned": "Grattis! Du äger nu allting som Tidsresenärerna erbjuder för tillfället. Tack för att du stödjer hemsidan!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Winged Messenger Set", "mysterySet201403": "Forest Walker Set", "mysterySet201404": "Twilight Butterfly Set", @@ -99,6 +105,8 @@ "mysterySet201601": "Champion of Resolution Set", "mysterySet201602": "Heartbreaker Set", "mysterySet201603": "Lucky Clover Set", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySetwondercon": "Wondercon", @@ -106,13 +114,29 @@ "subUpdateTitle": "Uppdatera", "subUpdateDescription": "Uppdatera Ditt Kort att Bli Laddat", "notEnoughHourglasses": "Du har inte tillräckligt med Mystiska Timglas.", - "hourglassBuyEquipSetConfirm": "Buy this full set of items for 1 Mystic Hourglass?", + "hourglassBuyEquipSetConfirm": "Vill du köpa en full uppsättning av dessa föremål för 1 Mystiskt Timglas?", "hourglassBuyItemConfirm": "Köp den här artikeln för 1 Mystiskt Timglas?", "petsAlreadyOwned": "Du äger redan husdjuret.", "mountsAlreadyOwned": "Du äger redan riddjuret.", - "typeNotAllowedHourglass": "Föremålstypen är inte tillgänglig att köpas med Mystiskt Timglas. Tillåtna typer:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Husdjuret inte tillgängligt att köpas med Mystiskt Timglas.", "mountsNotAllowedHourglass": "Riddjuret är inte tillgängligt att köpas med Mystiskt Timglas.", "hourglassPurchase": "Köpte ett föremål med Mystiskt Timglas!", - "hourglassPurchaseSet": "Köpte ett föremålsset med Mystiskt Timglas!" + "hourglassPurchaseSet": "Köpte ett föremålsset med Mystiskt Timglas!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/sv/tasks.json b/common/locales/sv/tasks.json index 65c16b829c..c2e09bd715 100644 --- a/common/locales/sv/tasks.json +++ b/common/locales/sv/tasks.json @@ -73,6 +73,7 @@ "clearTags": "Återställ", "hideTags": "Förminska", "showTags": "Visa", + "toRequired": "You must supply a to value", "startDate": "Startdatum", "startDateHelpTitle": "När Borde Detta Uppdraget Börja?", "startDateHelp": "Ställ in det datum för vilket den här uppgiften börjar. Kommer inte infalla på föreliggande dagar.", @@ -81,36 +82,50 @@ "streakSingular": "Bedriftaren", "streakSingularText": "Har utfört en 21-dagars-följd på en daglig utmaning.", "perfectName": "Perfekta Dagar", - "perfectText": "Completed all active Dailies on <%= perfects %> days. With this achievement you get a +level/2 buff to all attributes for the next day. Levels greater than 100 don't have any additional effects on buffs.", + "perfectText": "Slutfört alla dagliga utmaningar under en <%= perfekt %> dag. Med denna bedrift får du en +level/2 buff till alla egenskaper för nästa dag. Nivåer över 100 får ingen effekt av buffs.", "perfectSingular": "Perfekt Dag", - "perfectSingularText": "Completed all active Dailies in one day. With this achievement you get a +level/2 buff to all attributes for the next day. Levels greater than 100 don't have any additional effects on buffs.", + "perfectSingularText": "Slutfört alla dagliga utmaningar under en dag. Med denna bedrift får du en +level/2 buff till alla egenskaper för nästa dag. Nivåer över 100 får ingen effekt av buffs.", "streakerAchievement": "Du har uppnått \"Bedriftaren\" bedriften! 21-dagars-gränsen är en milstolpe för att forma vanor. Du kan fortsätta att lagra denna bedrift för varje 21-dagars period, på denna dagliga utmaning eller någon annan!", "fortifyName": "Stärkande Dryck", "fortifyPop": "Återställ alla uppgifter till neutralt värde (gul färg) och återställ all förlorad Hälsa.", "fortify": "Stärk", - "fortifyText": "Fortify will return all your tasks to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "Är du säker?", + "fortifyComplete": "Fortify complete!", "sureDelete": "Är du säker på att du vill radera <%= taskType %> med texten \"<%= taskText %>\"?", "streakCoins": "Följdbonus!", - "pushTaskToTop": "Push task to top. Hold ctrl or cmd to push to bottom.", + "pushTaskToTop": "Flytta uppgifterna till toppen. Håll ned ctrl eller cmd för att flytta dem nedåt.", "emptyTask": "Skriv in uppgiftens titel först.", "dailiesRestingInInn": "Du vilar på värdshuset! Dina Dagliga Uppgifter kommer inte skada dig i natt, men de kommer återställas varje dag. Om du är i ett uppdrag kommer du inte utdela skada eller få föremål förrän du checkar ut från värdshuset, men du kan fortfarande bli skadad av en boss om ditt sällskapskamrater missar sina Dagliga Uppgifter.", "habitHelp1": "Goda vanor är saker du gör ofta. De belönar dig med Guld och Erfarenhet varje gång du klickar på <%= plusIcon %>.", "habitHelp2": "Dåliga vanor är saker du vill undvika att göra. De sänker din hälsa varje gång du klickar på <%= minusIcon %>.", - "habitHelp3": "For inspiration, check out these sample Habits!", - "newbieGuild": "More questions? Ask in the <%= linkStart %>Newbies Guild<%= linkEnd %>!", - "dailyHelp1": "Dailies repeat <%= emphasisStart %>every day<%= emphasisEnd %> that they are active. Click the <%= pencilIcon %> to change the days a Daily is active.", + "habitHelp3": "För inspiration, kolla på dessa href='http://habitica.wikia.com/wiki/Sample_Habits' target='_blank'>exempel Uppgifter!", + "newbieGuild": "Fler frågor? Ställ dom i <%= linkStart %>Newbies Guild<%= linkEnd %>!", + "dailyHelp1": "Dagliga utmaningar upprepas <%= emphasisStart %>varje dag<%= emphasisEnd %> som de är aktiva. Klicka på <%= pencilIcon %> För att välja vilka dagar en daglig uppgift skall vara aktiv.", "dailyHelp2": "Om du inte gör klart dina aktiva Dagliga Utmaningar förlorar du Hälsa när dagen är slut.", - "dailyHelp3": "Dailies turn <%= emphasisStart %>redder<%= emphasisEnd %> when you miss them, and <%= emphasisStart %>bluer<%= emphasisEnd %> when you complete them. The redder the Daily, the more it will reward you... or hurt you.", + "dailyHelp3": "Dagliga utmaningar blir <%= emphasisStart %>rödare<%= emphasisEnd %> när du missar dom och <%= emphasisStart %>blåare<%= emphasisEnd %> när du gör dem. Ju rödare en daglig utmaning är, desto mer kommer den belöna dig... eller skada dig.", "dailyHelp4": "För att ändra när dagen tar slut gå till <%= linkStart %> Inställningar > Webbsida<%= linkEnd %> > Skräddarsydd Dagsstart.", - "dailyHelp5": "For inspiration, check out these sample Dailies!", + "dailyHelp5": "För inspiration, spana in dessa förslag på dagliga utmaningar!", "toDoHelp1": "Uppgifter (att göra) börjar gula, sedan blir de mer röda (mer värdefulla) ju längre det tar att göra klart dem.", "toDoHelp2": "Att-Göra-Uppgifter skadar dig aldrig! De bara belönar dig med Guld och Erfarenhet.", - "toDoHelp3": "Breaking a To-Do down into a checklist of smaller items will make it less scary, and will increase your points!", - "toDoHelp4": "For inspiration, check out these sample To-Dos!", - "rewardHelp1": "The Equipment you buy for your avatar is stored in <%= linkStart %>Inventory > Equipment<%= linkEnd %>.", + "toDoHelp3": "Att bryta ned en Att-Göra lista till en checklista bestående av mindre föremål kommer göra det mindre läskigt, och kommer öka dina poäng!", + "toDoHelp4": "För inspiration, spana in dessa förslag på dagliga att-göra!", + "rewardHelp1": "Utrustningen du köper till din avatar förvaras i <%= linkStart %>Förråd > Utrustning<%= linkEnd %>.", "rewardHelp2": "Utrustning påverkar din statistik (<%= linkStart %>Avatar > Statistik<%= linkEnd %>).", "rewardHelp3": "Speciell utrustning kommer finnas här under globala evenemang.", - "rewardHelp4": "Don't be afraid to set custom Rewards! Check out some samples here.", - "clickForHelp": "Klicka För Hjälp" + "rewardHelp4": "Var inte rädd för att sätta personliga belöningar! Spana in några exempel här.", + "clickForHelp": "Klicka För Hjälp", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/uk/backgrounds.json b/common/locales/uk/backgrounds.json index 734a1668b1..cd3c54c603 100644 --- a/common/locales/uk/backgrounds.json +++ b/common/locales/uk/backgrounds.json @@ -133,32 +133,39 @@ "backgroundSnowySunriseNotes": "Споглядайте Зимовий Ранок.", "backgroundWinterTownText": "Зимове Місто", "backgroundWinterTownNotes": "Прошвирніться по Зимовому Місту.", - "backgrounds012016": "SET 20: Released January 2016", - "backgroundFrozenLakeText": "Frozen Lake", - "backgroundFrozenLakeNotes": "Skate on a Frozen Lake.", - "backgroundSnowmanArmyText": "Snowman Army", - "backgroundSnowmanArmyNotes": "Lead a Snowman Army.", - "backgroundWinterNightText": "Winter Night", - "backgroundWinterNightNotes": "Look at the stars of a Winter Night.", - "backgrounds022016": "SET 21: Released February 2016", - "backgroundBambooForestText": "Bamboo Forest", - "backgroundBambooForestNotes": "Stroll through the Bamboo Forest.", - "backgroundCozyLibraryText": "Cozy Library", - "backgroundCozyLibraryNotes": "Read in the Cozy Library.", - "backgroundGrandStaircaseText": "Grand Staircase", - "backgroundGrandStaircaseNotes": "Stride down the Grand Staircase.", - "backgrounds032016": "SET 22: Released March 2016", - "backgroundDeepMineText": "Deep Mine", - "backgroundDeepMineNotes": "Find precious metals in a Deep Mine.", - "backgroundRainforestText": "Rainforest", - "backgroundRainforestNotes": "Venture into a Rainforest.", - "backgroundStoneCircleText": "Circle of Stones", + "backgrounds012016": "Набір 20: випущений в січні 2016", + "backgroundFrozenLakeText": "Замерзле Озеро", + "backgroundFrozenLakeNotes": "Прокатайтесь по Замерзлому Озері.", + "backgroundSnowmanArmyText": "Армія Сніговиків", + "backgroundSnowmanArmyNotes": "Лідер Армії Сніговиків", + "backgroundWinterNightText": "Зимова Ніч", + "backgroundWinterNightNotes": "Дивитись на зорі Зимової Ночі.", + "backgrounds022016": "Набір 21: випущений в лютому 2016", + "backgroundBambooForestText": "Бамбуковий ліс", + "backgroundBambooForestNotes": "Прогуляйтеся по бамбуковому лісі", + "backgroundCozyLibraryText": "Затишна Бібліотека", + "backgroundCozyLibraryNotes": "Читати в Затишній Бібліотеці.", + "backgroundGrandStaircaseText": "Парадні Сходи.", + "backgroundGrandStaircaseNotes": "Спустіться Парадними Сходами.", + "backgrounds032016": "Набір 22: випущений в березні 2016", + "backgroundDeepMineText": "Глибока Шахта", + "backgroundDeepMineNotes": "Шукати дорогоцінні метали в Глибокій Шахті", + "backgroundRainforestText": "Дощовий Ліс", + "backgroundRainforestNotes": "Відправтесь в Тропічний Ліс.", + "backgroundStoneCircleText": "Коло з Каменів", "backgroundStoneCircleNotes": "Cast spells in a Circle of Stones.", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", - "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgrounds042016": "Набір 23: випущений в квітні 2016", + "backgroundArcheryRangeText": "Лучне Стрільбище", + "backgroundArcheryRangeNotes": "Попрактикуйтеся на Лучному Стрільбищі.", + "backgroundGiantFlowersText": "Гігантські Квіти", + "backgroundGiantFlowersNotes": "Повеселіться на Гігантських Квітках.", + "backgroundRainbowsEndText": "Кінець Радуги.", + "backgroundRainbowsEndNotes": "Знайдіть золото на Кінці Радуги.", + "backgrounds052016": "SET 24: Released May 2016", + "backgroundBeehiveText": "Beehive", + "backgroundBeehiveNotes": "Buzz and dance in a Beehive.", + "backgroundGazeboText": "Gazebo", + "backgroundGazeboNotes": "Battle a Gazebo.", + "backgroundTreeRootsText": "Tree Roots", + "backgroundTreeRootsNotes": "Explore the Tree Roots." } \ No newline at end of file diff --git a/common/locales/uk/challenge.json b/common/locales/uk/challenge.json index cdd6063b55..0b1ffe2242 100644 --- a/common/locales/uk/challenge.json +++ b/common/locales/uk/challenge.json @@ -63,5 +63,20 @@ "congratulations": "Вітаємо!", "hurray": "Ура!", "noChallengeOwner": "немає власника", - "noChallengeOwnerPopover": "У цього випробування немає власника, тому що людина, що створила його, вилучила свій акаунт." + "noChallengeOwnerPopover": "У цього випробування немає власника, тому що людина, що створила його, вилучила свій акаунт.", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/uk/character.json b/common/locales/uk/character.json index eaaa7ac5d3..35a5f1c779 100644 --- a/common/locales/uk/character.json +++ b/common/locales/uk/character.json @@ -1,7 +1,8 @@ { + "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the Community Guidelines (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email leslie@habitica.com!", "statsAch": "Герой і здобутки", "profile": "Профіль", - "avatar": "Customize Avatar", + "avatar": "Редагувати Аватар", "other": "Інше", "fullName": "Повне ім'я", "displayName": "Ім’я на показ", @@ -34,7 +35,7 @@ "beard": "Борода", "mustache": "Вуса", "flower": "Квітка", - "wheelchair": "Wheelchair", + "wheelchair": "Крісло на коліщатках", "basicSkins": "Прості кольори", "rainbowSkins": "Кольори веселки", "pastelSkins": "Пастельні кольори", @@ -84,7 +85,7 @@ "allocateInt": "Призначено очок інтелекту:", "allocateIntPop": "Додати очко інтелекту", "noMoreAllocate": "Ви досягли 100-го рівня, тому ви більше не будете отримувати Очки Характеристик. Ви можете продовжувати підвищувати свій рівень або почати ваші пригоди з першого рівня, скористувавшись Кулею Переродження, яку можно бескоштовно отримати на Ринку.", - "stats": "Avatar Stats", + "stats": "Cтатистика персонажа", "strength": "Сила", "strengthText": "Сила зменшує ступінь небезпеки завдань (почервоніння), збільшує приріст від випадкових \"критичних ударів\" та допомагає завдавати ушкодження монстрам-босам.", "constitution": "Комплекція", @@ -109,6 +110,7 @@ "mage": "Чародій", "mystery": "Таємниця", "changeClass": "Змінити клас, перерозподілити пункти характеристик", + "lvl10ChangeClass": "To change class you must be at least level 10.", "levelPopover": "Кожен рівень надає Вам одне очко, яке можна призначити на характеристику на Ваш вибір. Ви можете це зробити самотужки, а можна дозволити грі вирішувати за Вас, обравши один з варіянтів автоматичного розподілу.", "unallocated": "Нерозподілені очки характеристик", "haveUnallocated": "Ви маєте <%= points %> нерозподілених очок характеристик", @@ -126,9 +128,9 @@ "mageText": "Чародії швидко вчаться, отримуючи досвід та рівні швидше, аніж інші класи. Також вигідно використовують ману на особливі здібності. Грайте чародієм, якщо Вам подобаються тактичні особливості Habitica, або Вас сильно мотивує отримання нових рівнів та відкривання додаткових можливостей.", "rogueText": "Шибайголови обожнюють збагачуватися, отримуючи більше Золота, ніж інші класи. Також вони експерти зі знайдення випадкових предметів. Їхня неперевершена потайливість дозволяє їм ухилитися від наслідків невиконаних щоденних завдань. Грайте Шибайголовою, якщо Вас мотивують нагороди, досягнення та жага до награбованого та значків!", "healerText": "Цілителі невразливі до ушкоджень та поширюють захист на інших. Невиконані щоденні завдання та шкідливі звички ледь турбують їх, у них є шляхи підняти своє Здоров'я після поразки. Грайте цілителем, якщо Вам подобається допомагати іншим членам гурту, або Вас надихає ідея через старанну працю обманути Смерть!", - "optOutOfClasses": "Opt Out", - "optOutOfPMs": "Opt Out", - "optOutOfClassesText": "Can't be bothered with classes? Want to choose later? Opt out - you'll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time under User -> Stats.", + "optOutOfClasses": "Відмовитися від вибору класу", + "optOutOfPMs": "Відмовитися від вибору класу", + "optOutOfClassesText": "Не хочете займати себе вибором класу? Хочете обрати потім? Відмовтеся - ви залишитеся воїном без особливих класових навиків. Ви завжди можете прочитати про класову систему пізніше на вікі та ввімкнути класи коли завгодно в меню Користувач -> Характеристики.", "select": "Обрати", "stealth": "Потайливість", "stealthNewDay": "Коли почнеться новий день, ви ухилитеся від ушкоджень за невиконані щоденні завдання у такому числі.", @@ -137,7 +139,7 @@ "respawn": "Відродження!", "youDied": "Ви загинули!", "dieText": "Ви втратили один рівень, усе Ваше золото та випадковий предмет спорядження. Підводьтеся та спробуйте ще раз! Приборкайте шкідливі звички, будьте старанними у виконанні щоденних завдань і тримайтеся від Смерті подалі, використовуючи еліксир здоров'я, якщо відчуваєте слабкість!", - "sureReset": "Are you sure? This will reset your character's class and allocated points (you'll get them all back to re-allocate), and costs 3 gems.", + "sureReset": "Ви впевнені? Це коштує 3 самцвіти і відмінить Ваш вибір класу та розподілення очків характеристик (Ви зможете розподілити їх по-новому).", "purchaseFor": "Придбати за <%= cost %> самоцвітів?", "notEnoughMana": "Недостатньо мани.", "invalidTarget": "Хибна ціль", @@ -162,7 +164,9 @@ "con": "КОМ", "per": "СПР", "int": "ІНТ", - "showQuickAllocation": "Show stat allocation", - "hideQuickAllocation": "Hide stat allocation", - "quickAllocationLevelPopover": "Each level earns you one point to assign to an attribute of your choice. You can do so manually, or let the game decide for you using one of the Automatic Allocation options found in User -> Stats." + "showQuickAllocation": "Показати розподілення характеристик", + "hideQuickAllocation": "Сховати розподілення характеристик", + "quickAllocationLevelPopover": "Кожного рівню Ви отримуєте одне очко, яке можна призначити на характеристику на Ваш вибір. Ви можете зробити це самотужки, або ж дозволити грі зробити вибір за Вас, обравши один з варіантів автоматичного розподілу.", + "invalidAttribute": "\"<%= attr %>\" is not a valid attribute.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/uk/communityguidelines.json b/common/locales/uk/communityguidelines.json index 539bd45755..a82d33d247 100644 --- a/common/locales/uk/communityguidelines.json +++ b/common/locales/uk/communityguidelines.json @@ -25,7 +25,7 @@ "commGuidePara011b": "на GitHub/Wikia", "commGuidePara011c": "на Wikia", "commGuidePara011d": "на GitHub", - "commGuidePara012": "If you have an issue or concern about a particular Mod, please send an email to Lemoness (leslie@habitica.com).", + "commGuidePara012": "Якщо у Вас є якісь питання щодо певного Модератора, будь ласка відправте повідомлення на почту Lemoness (leslie@habitica.com).", "commGuidePara013": "У такій великій спільноті, як Habitica, користувачі прибувають і відбувають, але трапляється так, що модератори мають потребу скласти свої повноваження та відпочити. Пройти шляхом Модератора Емерітуса. Вони більше не мають влади Модератора, але ми поважаємо і шануємо їх особистий внесок!", "commGuidePara014": "Поважний Модератор:", "commGuideHeadingPublicSpaces": "Громадські місця у Habitica", @@ -103,12 +103,12 @@ "commGuidePara055": "The following are some examples of Moderate Infractions. This is not a comprehensive list.", "commGuideList06A": "Ignoring or Disrespecting a Mod. This includes publicly complaining about moderators or other users/publicly glorifying or defending banned users. If you are concerned about one of the rules or Mods, please contact Lemoness via email (leslie@habitica.com).", "commGuideList06B": "Backseat Modding. To quickly clarify a relevant point: A friendly mention of the rules is fine. Backseat modding consists of telling, demanding, and/or strongly implying that someone must take an action that you describe to correct a mistake. You can alert someone to the fact that they have committed a transgression, but please do not demand an action-for example, saying, \"Just so you know, profanity is discouraged in the Tavern, so you may want to delete that,\" would be better than saying, \"I'm going to have to ask you to delete that post.\"", - "commGuideList06C": "Repeated Violation of Public Space Guidelines", + "commGuideList06C": "Багатократне порушення Правил та Умов поведінки у Громадських місцях ", "commGuideList06D": "Repeated Minor Infractions", "commGuideHeadingMinorInfractions": "Незначні порушення", "commGuidePara056": "Minor Infractions, while discouraged, still have minor consequences. If they continue to occur, they can lead to more severe consequences over time.", "commGuidePara057": "The following are some examples of Minor Infractions. This is not a comprehensive list.", - "commGuideList07A": "First-time violation of Public Space Guidelines", + "commGuideList07A": "Перше порушення Правил та Умов поведінки у Громадських місцях ", "commGuideList07B": "Any statements or actions that trigger a \"Please Don't\". When a Mod has to say \"Please Don't do this\" to a user, it can count as a very minor infraction for that user. An example might be \"Mod Talk: Please Don't keep arguing in favor of this feature idea after we've told you several times that it isn't feasible.\" In many cases, the Please Don't will be the minor consequence as well, but if Mods have to say \"Please Don't\" to the same user enough times, the triggering Minor Infractions will start to count as Moderate Infractions.", "commGuideHeadingConsequences": "Наслідки", "commGuidePara058": "In Habitica -- as in real life -- every action has a consequence, whether it is getting fit because you've been running, getting cavities because you've been eating too much sugar, or passing a class because you've been studying.", @@ -130,11 +130,11 @@ "commGuideList10F": "Putting users on \"Probation\"", "commGuideHeadingMinorConsequences": "Examples of Minor Consequences", "commGuideList11A": "Reminders of Public Space Guidelines", - "commGuideList11B": "Warnings", + "commGuideList11B": "Застереження", "commGuideList11C": "Requests", "commGuideList11D": "Deletions (Mods/Staff may delete problematic content)", "commGuideList11E": "Edits (Mods/Staff may edit problematic content)", - "commGuideHeadingRestoration": "Restoration", + "commGuideHeadingRestoration": "Відновлення", "commGuidePara061": "Habitica is a land devoted to self-improvement, and we believe in second chances. If you commit an infraction and receive a consequence, view it as a chance to evaluate your actions and strive to be a better member of the community.", "commGuidePara062": "The email that you receive explaining the consequences of your actions (or, in the case of minor consequences, the Mod/Staff announcement) is a good source of information. Cooperate with any restrictions which have been imposed, and endeavor to meet the requirements to have any penalties lifted.", "commGuidePara063": "If you do not understand your consequences, or the nature of your infraction, ask the Staff/Moderators for help so you can avoid committing infractions in the future.", diff --git a/common/locales/uk/content.json b/common/locales/uk/content.json index 304553c04a..b036897507 100644 --- a/common/locales/uk/content.json +++ b/common/locales/uk/content.json @@ -113,6 +113,12 @@ "questEggSnailText": "Snail", "questEggSnailMountText": "Snail", "questEggSnailAdjective": "a slow but steady", + "questEggFalconText": "Falcon", + "questEggFalconMountText": "Falcon", + "questEggFalconAdjective": "a swift", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", "eggNotes": "Знайдіть зілля вилуплення, щоби вилити на це яйце і з нього вилупиться <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Простий", "hatchingPotionWhite": "Білий", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "Золотий", "hatchingPotionSpooky": "Моторошний", "hatchingPotionPeppermint": "Peppermint", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "Вилийте це на яйце і з нього вилупиться <%= potText(locale) %> улюбленець.", "premiumPotionAddlNotes": "Не можна використати на квестових яйцях улюбленців", "foodMeat": "М'ясо", diff --git a/common/locales/uk/contrib.json b/common/locales/uk/contrib.json index fb85944299..369a989a9c 100644 --- a/common/locales/uk/contrib.json +++ b/common/locales/uk/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "Hall of Contributors", "hallPatrons": "Зала Благодійників", "rewardUser": "Нагородити гравця", - "UUID": "UUID", + "UUID": "User ID", "loadUser": "Завантажити користувача", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "Титул", "moreDetails": "Детальніше (1-7)", "moreDetails2": "детальніше (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "Відвідати Залу Героїв (вкладники й меценати)", "conLearn": "Довідатися більше про нагороди вкладникам", "conLearnHow": "Довідатися, як стати співавтором Habitica", - "surveysSingle": "Helped Habitica grow by filling out a survey. There are no active surveys.", - "surveysMultiple": "Допомагає Habitica зростати, заповнивши <%= surveys %> опитувань. Наразі активних опитувань немає.", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "Поточне опитування", "surveyWhen": "Усіх учасників буде нагороджено відзнакою, коли опитування буде оброблено, наприкінці березня", "blurbInbox": "This is where your private messages are stored! You can send someone a message by clicking on the envelope icon next to their name in Tavern, Party, or Guild Chat. If you've received an inappropriate PM, you should email a screenshot of it to Lemoness (leslie@habitica.com)", diff --git a/common/locales/uk/death.json b/common/locales/uk/death.json index 3cc675b2c9..8476f5a2c1 100644 --- a/common/locales/uk/death.json +++ b/common/locales/uk/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "Швидко втрачаєте здоров'я?", "lowHealthTips3": "Невиконані щоденні задачі приносять вам шкоду уночі, тож не додавайте забагато спочатку!", "lowHealthTips4": "If a Daily isn't due on a certain day, you can disable it by clicking the pencil icon.", - "goodLuck": "Удачі!" + "goodLuck": "Удачі!", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/uk/faq.json b/common/locales/uk/faq.json index 000a91cab8..db716cec2c 100644 --- a/common/locales/uk/faq.json +++ b/common/locales/uk/faq.json @@ -1,17 +1,17 @@ { - "frequentlyAskedQuestions": "Frequently Asked Questions", - "faqQuestion0": "I'm confused. Where do I get an overview?", - "iosFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn experience and gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as Pets, Skills, and Quests! You can customize your character under Menu > Customize Avatar.\n\n Some basic ways to interact: click the (+) in the upper-right-hand corner to add a new task. Tap on an existing task to edit it, and swipe left on a task to delete it. You can sort tasks using Tags in the upper-left-hand corner, and expand and contract checklists by clicking on the checklist bubble.", - "webFaqAnswer0": "First, you'll set up tasks that you want to do in your everyday life. Then, as you complete the tasks in real life and check them off, you'll earn Experience and Gold. Gold is used to buy equipment and some items, as well as custom rewards. Experience causes your character to level up and unlock content such as pets, skills, and quests! For more detail, check out a step-by-step overview of the game at [Help -> Overview for New Users](https://habitica.com/static/overview).", - "faqQuestion1": "How do I set up my tasks?", - "iosFaqAnswer1": "Good Habits (the ones with a +) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a -) are tasks that you should avoid, like biting nails. Habits with a + and a - have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award experience and gold. Bad Habits subtract health.\n\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by tapping to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n\n To-Dos are your To-Do list. Completing a To-Do earns you gold and experience. You never lose health from To-Dos. You can add a due date to a To-Do by tapping to edit.", - "webFaqAnswer1": "Good Habits (the ones with a ) are tasks that you can do many times a day, such as eating vegetables. Bad Habits (the ones with a ) are tasks that you should avoid, like biting nails. Habits with a and a have a good choice and a bad choice, like taking the stairs vs. taking the elevator. Good Habits award Experience and Gold. Bad Habits subtract Health.\n
\n Dailies are tasks that you have to do every day, like brushing your teeth or checking your email. You can adjust the days that a Daily is due by clicking the pencil item to edit it. If you skip a Daily that is due, your avatar will take damage overnight. Be careful not to add too many Dailies at once!\n
\n To-Dos are your To-Do list. Completing a To-Do earns you Gold and Experience. You never lose Health from To-Dos. You can add a due date to a To-Do by clicking the pencil icon to edit.", - "faqQuestion2": "What are some sample tasks?", - "iosFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n
\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", - "webFaqAnswer2": "The wiki has four lists of sample tasks to use as inspiration:\n * [Sample Habits](http://habitica.wikia.com/wiki/Sample_Habits)\n * [Sample Dailies](http://habitica.wikia.com/wiki/Sample_Dailies)\n * [Sample To-Dos](http://habitica.wikia.com/wiki/Sample_To-Dos)\n * [Sample Custom Rewards](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", - "faqQuestion3": "Why do my tasks change color?", - "iosFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it's a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.", - "webFaqAnswer3": "Your tasks change color based on how well you are currently accomplishing them! Each new task starts out as a neutral yellow. Perform Dailies or positive Habits more frequently and they move toward blue. Miss a Daily or give in to a bad Habit and the task moves toward red. The redder a task, the more rewards it will give you, but if it’s a Daily or bad Habit, the more it will hurt you! This helps motivate you to complete the tasks that are giving you trouble.", + "frequentlyAskedQuestions": "Поширені запитання", + "faqQuestion0": "Я в розгубленості. Що робити?", + "iosFaqAnswer0": "Спочатку Ви ставите перед собою завдання, котрі Вам необхідно виконати в своєму повсякденному житті. По мірі виконання цих завдань в реальному житті, Ви відмічаєте їх галочками та заробляєте досвід і золото. Золото використовується для придбання спорядження та інших речей, а також нагород, що створюєте Ви самі. Завдяки досвіду, Ваш персонаж набирає рівні і відкриває новий контент, наприклад улюбленців, навички і квести! Ви можете налаштувати свій аватар в Меню->Налаштування аватару.\n\nДеякі основні способи взаємодії: натисніть (+) у верхньому правому куті, щоб додати нове завдання. Натисніть на на вже існуюче завдання, щоб його змінити; потягніть завдання вліво для видалення. Ви можете сортувати завдання, використовуючи Теги в лівому верхньому куті, розгортати та згортати списки підзавдань, натиснувши на позначку списку.", + "webFaqAnswer0": "Спочатку Ви ставите перед собою завдання, котрі Вам необхідно виконати в своєму повсякденному житті. По мірі виконання цих завдань в реальному житті, Ви відмічаєте їх галочками та заробляєте Досвід і Золото. Золото використовується для придбання спорядження та інших речей, а також нагород, що створюєте Ви самі. Завдяки Досвіду, Ваш персонаж набирає рівні і відкриває новий контент, наприклад улюбленців, навички і квести! Подробиці можна дізнатися в нашому покроковому гіді на сторінці [Допомога -> Інформація для новачків] (https://habitica.com/static/overview).", + "faqQuestion1": "Як я можу створити завдання?", + "iosFaqAnswer1": "Корисні звички (ті, що позначені знаком +) - це завдання, які Ви можете виконувати багато разів за день: наприклад, вживати овочі. Шкідиві звички (зі знаком -) - це ті дії, від яких Вам варто відмовитися: наприклад, гризти нігті. Звички, навпроти яких стоять і +, і -, припускають двоїстий вибір - або в хороший, або в поганий бік: наприклад підйом по сходах пішки проти користування ліфтом. Корисні звички винагороджуються досвідом та золотом. Погані звички віднімають здоров'я.\n\nЩоденні завдання - це завдання, котрі ви маєте виконувати кожен день, наприклад чистити зуби чи перевіряти електронну пошту. Ви можете вказати дні, в які щоденне завдання обов'язкове або необов'язкове до виконання; для цього варто лише натиснути на нього для редагування. Якщо ви пропустите обов'язкове завдання, ваш персонаж втратить здоров'я наступної ночі. Будьте уважні і не додавайте забагато щоденних завдань відразу!\n\nЗадачі - це список одноразових справ, котрі Вам необхідно виконати. Виконання задач приносить Вам золото та досвід. Ви не втрачатимете здоров'я, якщо не виконаєте задачу. Ви можете вказати обов'язковий термін виконання задачі, натиснувши на неї для редагування.", + "webFaqAnswer1": "Корисні звички (ті, що позначені знаком ) - це завдання, які Ви можете виконувати багато разів за день: наприклад, вживати овочі. Шкідиві звички (зі знаком ) - це ті дії, від яких Вам варто відмовитися: наприклад, гризти нігті. Звички, навпроти яких стоять і , і , припускають двоїстий вибір - або в хороший, або в поганий бік: наприклад підйом по сходах пішки проти користування ліфтом. Корисні звички винагороджуються досвідом та золотом. Погані звички віднімають здоров'я.\n
\nЩоденні завдання - це завдання, котрі ви маєте виконувати кожен день, наприклад чистити зуби чи перевіряти електронну пошту. Ви можете вказати дні, в які щоденне завдання обов'язкове або необов'язкове до виконання; для цього варто лише натиснути на піктограму олівця для редагування. Якщо ви пропустите обов'язкове завдання, ваш персонаж втратить здоров'я наступної ночі. Будьте уважні і не додавайте забагато щоденних завдань відразу!\n
\nЗадачі - це список одноразових справ, котрі Вам необхідно виконати. Виконання задач приносить Вам Золото та Досвід. Ви не втрачатимете здоров'я, якщо не виконаєте задачу. Ви можете вказати обов'язковий термін виконання задачі, натиснувши на піктограму олівця для редагування.", + "faqQuestion2": "Де можна подивитися приклади завдань?", + "iosFaqAnswer2": "На Вікі є чотири списки з прикладами завдань, які можна використати для натхнення:\n
\n* [Приклади звичок](http://habitica.wikia.com/wiki/Sample_Habits)\n* [Приклади щоденних завдань](http://habitica.wikia.com/wiki/Sample_Dailies)\n* [Приклади задач](http://habitica.wikia.com/wiki/Sample_To-Dos)\n* [Приклади нагород](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", + "webFaqAnswer2": "На Вікі є чотири списки з прикладами завдань, які можна використати для натхнення:\n\n* [Приклади звичок](http://habitica.wikia.com/wiki/Sample_Habits)\n* [Приклади щоденних завдань](http://habitica.wikia.com/wiki/Sample_Dailies)\n* [Приклади задач](http://habitica.wikia.com/wiki/Sample_To-Dos)\n* [Приклади нагород](http://habitica.wikia.com/wiki/Sample_Custom_Rewards)", + "faqQuestion3": "Чому завдання змінюють колір?", + "iosFaqAnswer3": "Ваші завдання змінюють колір в залежності від того, наскільки добре Ви в даний момент справляєтесь з їх виконаням! Кожне нове завдання забарвлене в нейтральний жовтий колір. Виконуйте щоденні завдання або корисні звички, і тоді вони почнуть змінювати колір у бік синього. Якщо Ви будете пропускати щоденні завдання або піддастеся шкідливим звичкам, завдання почнуть потроху червоніти. Чим більш червоне завдання, тим більшу винагороду Ви отримаєте за його виконання, та тим часом, червоні щоденні завдання і шкідливі звички нанесуть вам більше ушкодження за пропуск, ніж зазвичай! Це послужить для Вас мотивацією справлятися із завданнями, які доставляють Вам найбільше клопоту.", + "webFaqAnswer3": "Ваші завдання змінюють колір в залежності від того, наскільки добре Ви в даний момент справляєтесь з їх виконаням! Кожне нове завдання забарвлене в нейтральний жовтий колір. Виконуйте щоденні завдання або корисні звички, і тоді вони почнуть змінювати колір у бік синього. Якщо Ви будете пропускати щоденні завдання або піддастеся шкідливим звичкам, завдання почнуть потроху червоніти. Чим більш червоне завдання, тим більшу винагороду Ви отримаєте за його виконання, та тим часом, червоні щоденні завдання і шкідливі звички нанесуть вам більше ушкодження за пропуск, ніж зазвичай! Це послужить для Вас мотивацією справлятися із завданнями, які доставляють Вам найбільше клопоту.", "faqQuestion4": "Why did my avatar lose health, and how do I regain it?", "iosFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight, they will damage you. Second, if you tap a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your Party and one of your Party mates did not complete all their Dailies, the Boss will attack you.\n\n The main way to heal is to gain a level, which restores all your health. You can also buy a Health Potion with gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a Party with a Healer, they can heal you as well.", "webFaqAnswer4": "There are several things that can cause you to take damage. First, if you left Dailies incomplete overnight, they will damage you. Second, if you click a bad Habit, it will damage you. Finally, if you are in a Boss Battle with your party and one of your party mates did not complete all their Dailies, the Boss will attack you.\n
\n The main way to heal is to gain a level, which restores all your Health. You can also buy a Health Potion with Gold from the Rewards column. Plus, at level 10 or above, you can choose to become a Healer, and then you will learn healing skills. If you are in a party (under Social > Party) with a Healer, they can heal you as well.", diff --git a/common/locales/uk/front.json b/common/locales/uk/front.json index c192183b6e..8b651bdefa 100644 --- a/common/locales/uk/front.json +++ b/common/locales/uk/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "Як це працює", "companyBlog": "Блоґ", + "devBlog": "Developer Blog", "companyDonate": "Пожертвувати", "companyExtensions": "Розширення", "companyPrivacy": "Політика конфіденційности", @@ -51,6 +52,7 @@ "featureSocialHeading": "Social play", "featuredIn": "Featured in", "featuresHeading": "We also feature...", + "footerDevs": "Developers", "footerCommunity": "Спільнота", "footerCompany": "Компанія", "footerMobile": "Мобільник", @@ -182,6 +184,7 @@ "zelahQuote": "With [Habitica], I can be persuaded to go to bed on time by the thought of gaining points for an early night or losing health for a late one!", "reportAccountProblems": "Report Account Problems", "reportCommunityIssues": "Report Community Issues", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "General Questions about the Site", "businessInquiries": "Business Inquiries", "merchandiseInquiries": "Merchandise Inquiries", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/uk/gear.json b/common/locales/uk/gear.json index f7c0ef6e4c..3c81def29f 100644 --- a/common/locales/uk/gear.json +++ b/common/locales/uk/gear.json @@ -189,6 +189,8 @@ "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).", "weaponArmoireBasicLongbowText": "Basic Longbow", "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "броня", "armorBase0Text": "Звичайний одяг", "armorBase0Notes": "Звичайнісінький одяг. Так собі.", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery201603Text": "Lucky Suit", "armorMystery201603Notes": "This suit is sewn from thousands of four-leafed clovers! Confers no benefit. March 2016 Subscriber Item.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", "armorArmoireLunarArmorText": "Soothing Lunar Armor", @@ -394,6 +400,8 @@ "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).", "armorArmoireBasicArcherArmorText": "Basic Archer Armor", "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "headgear", "headBase0Text": "Без шолома", "headBase0Notes": "Без головного убору", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.", "headMystery201603Text": "Lucky Hat", "headMystery201603Notes": "This top hat is a magical good-luck charm. Confers no benefit. March 2016 Subscriber Item.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -613,6 +625,8 @@ "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).", "headArmoireBasicArcherCapText": "Basic Archer Cap", "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "shield-hand item", "shieldBase0Text": "No Shield-Hand Equipment", "shieldBase0Notes": "Без щита чи другої зброї", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "Soothing Shield", "shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.", "shieldSpecialSpring2015RogueText": "Exploding Squeak", - "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength <%= str %>. Limited Edition 2015 Spring Gear.", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "Dish Discus", "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015HealerText": "Patterned Pillow", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).", "shieldArmoireMysticLampText": "Mystic Lamp", "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "Back Accessory", "backBase0Text": "No Back Accessory", "backBase0Notes": "No Back Accessory.", @@ -820,6 +836,20 @@ "eyewear": "Eyewear", "eyewearBase0Text": "No Eyewear", "eyewearBase0Notes": "No Eyewear.", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "Roguish Eyepatch", "eyewearSpecialSummerRogueNotes": "It doesn't take a scallywag to see how stylish this is! Confers no benefit. Limited Edition 2014 Summer Gear.", "eyewearSpecialSummerWarriorText": "Dashing Eyepatch", diff --git a/common/locales/uk/generic.json b/common/locales/uk/generic.json index 24f8f21acd..0bea0a3c58 100644 --- a/common/locales/uk/generic.json +++ b/common/locales/uk/generic.json @@ -33,7 +33,7 @@ "italics": "*курсив*", "bold": "**Жирний**", "strikethrough": "~~Закреслено~~", - "emojiExample": ":смайлик:", + "emojiExample": ":smile:", "markdownLinkEx": "[Habitica - це круто!](https://habitica.com)", "markdownImageEx": "![mandatory alt text](https://habitica.com/cake.png \"optional mouseover title\")", "unorderedListHTML": "+ First item
+ Second item
+ Third item", diff --git a/common/locales/uk/groups.json b/common/locales/uk/groups.json index 0ca7617c99..50cbb2dc83 100644 --- a/common/locales/uk/groups.json +++ b/common/locales/uk/groups.json @@ -92,6 +92,7 @@ "send": "Надіслати", "messageSentAlert": "Повідомлення відправлено", "pmHeading": "Приватне повідомлення до <%= name %>", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "Delete All Messages", "confirmDeleteAllMessages": "Are you sure you want to delete all messages in your inbox? Other users will still see messages you have sent to them.", "optOutPopover": "Не подобається приватні повідомлення? Натисніть, щоб повністю відмовитися від них", @@ -99,6 +100,15 @@ "unblock": "Розблокувати", "pm-reply": "Надіслати відповідь", "inbox": "Inbox", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "Report violation of Community Guidelines", "abuseFlagModalHeading": "Report <%= name %> for violation?", "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction. Appropriate reasons to flag a post include but are not limited to:
- swearing, religous oaths
- bigotry, slurs
- adult topics
- violence, including as a joke
- spam, nonsensical messages
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Falcon (Egg)", + "questFalconUnlockText": "Unlocks purchasable Falcon eggs in the Market", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/uk/rebirth.json b/common/locales/uk/rebirth.json index 4dfdf32880..524d13ee08 100644 --- a/common/locales/uk/rebirth.json +++ b/common/locales/uk/rebirth.json @@ -5,14 +5,14 @@ "rebirthStartOver": "Переродження запускає вашого персонажа заново з 1го рівня.", "rebirthAdvList1": "Ви повністю оздоровилися.", "rebirthAdvList2": "У вас немає досвіду, золота, чи спорядження (крім безкоштовних предметів, наприклад, таємничих предметів).", - "rebirthAdvList3": "Ваші „Звички“, „Щоденні“ та „Зробити“ відкотилися до жовтого, серії також відкотилися.", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "Ви починаєте класом воїна, допоки не заслужите новий клас.", "rebirthInherit": "Ваш персонаж успадкує декілька речей від попередника:", "rebirthInList1": "Завдання, історія та налаштування збереглися.", "rebirthInList2": "Випробування, ґільдії та гурти, до яких Ви належали, збереглися.", "rebirthInList3": "Самоцвіти, рівень співавтора та мецената збереглися.", "rebirthInList4": "Предмети придбано, ті, що випали (улюбленці чи скакуни) збереглися, але Ви не можете їх використовувати, допоки не розблокуєте їх знову.", - "rebirthInList5": "Limited edition equipment you've purchased can be repurchased, even if its event has ended. To repurchase class-specific equipment, you must first change to the correct class.", + "rebirthInList5": "Спорядження обмеженого видання, яке Ви придбали, може бути придбане знову, незважаючи на те, що час того заходу вже вичерпався. Щоб знову придбати спорядження для конкретного класу, спершу Ви маєте змінити клас на потрібний.", "rebirthEarnAchievement": "Ви отримали досягнення за початок нової пригоди!", "beReborn": "Переродись-но!", "rebirthAchievement": "Ви почали нову пригоду! Це Ваше <%= number %> переродження, Ви досягали найбільше <%= level %> рівня. Аби збільшити це досягнення, почніть свою нову пригоду після того, як досягнете вищого рівня!", @@ -24,5 +24,6 @@ "rebirthPop": "Розпочніть заново з персонажем 1 рівня, зберігши досягнення, колекційні предмети та завдання з історією.", "rebirthName": "Куля переродження", "reborn": "Переродження, максимальний рівень <%= reLevel %>", - "confirmReborn": "Are you sure?" + "confirmReborn": "Ви впевнені?", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/uk/settings.json b/common/locales/uk/settings.json index f3d6bccc06..479b909644 100644 --- a/common/locales/uk/settings.json +++ b/common/locales/uk/settings.json @@ -47,6 +47,7 @@ "customDayStart": "Обрати початок доби", "changeCustomDayStart": "Change Custom Day Start?", "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "Усяке", @@ -61,12 +62,23 @@ "newUsername": "New Login Name", "dangerZone": "Небезпечна зона", "resetText1": "УВАГА! Це призведе до скидання багатьох частин вашого акаунта. Це вкрай небажано, але деякі люди вважають це корисним після гри з сайтом протягом короткого часу.", - "resetText2": "Ви втратите всі рівні, золото та очки досвіду. Всі ваші завдання будуть видалені і ви втратите всі історичні дані завдань. Ви втратите увесь ваш обладунок, але матимете можливість придбати їх знову, включаючи всі обмежені тиражем обладунки або Загадкові предмети за підписку, які у вас вже є (ви повинні бути в правильному класі, щоб докуповувати Класові обладунки). Ви збережете поточний клас, улюбленців і їздових тварин. Ви можете віддати перевагу Зіллю Переродження, яке набагато безпечніший варіант і який збереже ваші завдання.", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "Ви впевнені? Акаунт буде повністю вилучено назавжди, і його неможливо буде відновити! Вам треба буде знову реєструватися, аби грати у Habitica. Накопичені й витрачені самоцвіти не буде повернено. Якщо Ви цілковито впевнені, надрукуйте <%= deleteWord %> у текстовому полі нижче.", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "Скопіюйте це для використання в додатках сторонніх розробників. Але пам'ятайте, що API Token використовується як пароль, тож не поширюйте його публічно. Інколи вас питатимуть про ID користувача, але не публікуйте свій API Token там, де інші можуть побачити його, у тому числі на GitHub.", "APIToken": "Отримати API (це пароль - прочитайте застереження вище!)", + "thirdPartyApps": "Third Party Apps", + "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Chrome Chat Extension", + "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.", + "otherExtensions": "Other Extensions", + "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.", "resetDo": "Так, зробіть повне скидання акаунту!", + "resetComplete": "Reset complete!", "fixValues": "Виправити дані", "fixValuesText1": "Якщо проґрамна помилка, або ненавмисні дії спричинили зміну параметрів персонажа (ушкодження, яке Ви не мали отримати, золото, яке Ви не заробили тощо), Ви можете самотужки відредагувати числа тут. Так, авжеж цим можна шахраювати: користуйтеся цією функцією мудро, аби не підривати процес вироблення звички!", "fixValuesText2": "Зверніть увагу, що тут неможливо відновити лічильник низки завдань. Аби це зробити, зайдіть у редагування щоденного завдання до секції „Додатково“, там Ви знайдете поле „Відновити серію“.", @@ -96,6 +108,7 @@ "emailNotifications": "Сповіщення по електронній пошті ", "wonChallenge": "Ви виграли випробування! ", "newPM": "Received Private Message", + "sentGems": "Sent gems!", "giftedGems": "Gifted Gems", "giftedGemsInfo": "<%= amount %> Gems - by <%= name %>", "giftedSubscription": "Gifted Subscription", @@ -135,6 +148,11 @@ "webhooks": "Webhooks", "enabled": "Enabled", "webhookURL": "Webhook URL", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "Add", "buyGemsGoldCap": "Cap raised to <%= amount %>", "mysticHourglass": "<%= amount %> Mystic Hourglass", @@ -149,5 +167,5 @@ "amazonPayments": "Amazon Payments", "timezone": "Time Zone", "timezoneUTC": "Habitica uses the time zone set on your PC, which is: <%= utc %>", - "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been reseting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/uk/spells.json b/common/locales/uk/spells.json index 12a6a23237..75ed2d220e 100644 --- a/common/locales/uk/spells.json +++ b/common/locales/uk/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "Жбурніть сніжок в членів групи! Що може статися? Триває, до наступного ігрового дня.", "spellSpecialSaltText": "Сіль", "spellSpecialSaltNotes": "Хтось жбурнув у Вас сніжкою. Ха-ха, дуже смішно. Ану ж струсіть із мене цей сніг!", - "spellSpecialSpookDustText": "Моторошні Іскри", - "spellSpecialSpookDustNotes": "Перетворіть друга у літаючу ковдру з очима! ", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "Непрозоре Зілля", "spellSpecialOpaquePotionNotes": "Відмінити ефект Моторошних Іскор.", "spellSpecialShinySeedText": "Shiny Seed", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "Морська Піна", "spellSpecialSeafoamNotes": "Перетворіть друга на морське створіння! ", "spellSpecialSandText": "Пісок", - "spellSpecialSandNotes": "Відмінити ефект Морської Піни" + "spellSpecialSandNotes": "Відмінити ефект Морської Піни", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/uk/subscriber.json b/common/locales/uk/subscriber.json index 082edcc0ca..da10322f29 100644 --- a/common/locales/uk/subscriber.json +++ b/common/locales/uk/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "Buy Gems with gold, get monthly mystery items, retain progress history, double daily drop-caps, support the devs. Click for more info.", "buyGemsGold": "Придбати самоцвіти за золото", "buyGemsGoldText": "Alexander the Merchant will sell you Gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> Gems per month, but this cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "Retain additional history entries", "retainHistoryText": "Makes completed To-Dos and task history available for longer.", "doubleDrops": "Щоденне випадання предметів подвоїлося", @@ -29,6 +31,7 @@ "manageSub": "Клацніть, аби редагувати підписку", "cancelSub": "Скасувати підписку", "canceledSubscription": "Canceled Subscription", + "cancelingSubscription": "Canceling the subscription", "adminSub": "Підписка адміністратора", "morePlans": "More Plans
Coming Soon", "organizationSub": "Приватна орґанізація", @@ -73,6 +76,9 @@ "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets here! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "Winged Messenger Set", "mysterySet201403": "Forest Walker Set", "mysterySet201404": "Twilight Butterfly Set", @@ -99,6 +105,8 @@ "mysterySet201601": "Champion of Resolution Set", "mysterySet201602": "Heartbreaker Set", "mysterySet201603": "Lucky Clover Set", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySetwondercon": "Wondercon", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "Buy this item for 1 Mystic Hourglass?", "petsAlreadyOwned": "Pet already owned.", "mountsAlreadyOwned": "Mount already owned.", - "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types:", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "Pet not available for purchase with Mystic Hourglass.", "mountsNotAllowedHourglass": "Mount not available for purchase with Mystic Hourglass.", "hourglassPurchase": "Purchased an item using a Mystic Hourglass!", - "hourglassPurchaseSet": "Purchased an item set using a Mystic Hourglass!" + "hourglassPurchaseSet": "Purchased an item set using a Mystic Hourglass!", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/uk/tasks.json b/common/locales/uk/tasks.json index 0b5847cbe1..d1a49842e5 100644 --- a/common/locales/uk/tasks.json +++ b/common/locales/uk/tasks.json @@ -4,17 +4,17 @@ "deleteToDosExplanation": "Якщо натиснути на кнопку внизу, то всі з виконаних Зробити та архівних Зробити будуть остаточно вилучені. Якщо хочете зберегти запис про них, спершу експортуйте їх.", "addmultiple": "Додати декілька", "addsingle": "Додати одне", - "habit": "Habit", + "habit": "Звичка", "habits": "Звички", "newHabit": "Додати звичку", "newHabitBulk": "Нові звички (одна на рядок)", - "yellowred": "Шкідливі", - "greenblue": "Корисні", + "yellowred": "Слабкі", + "greenblue": "Сильні", "edit": "Редагувати", "save": "Зберегти", "addChecklist": "Додати перелік", "checklist": "Перелік", - "checklistText": "Розбийте задачі на меньші шматки! Переліки збільшують кількість досвіду та золота, які ви отримаєте за виконання задачі, та зменьшують ушкодження від щоденніх задач.", + "checklistText": "Розбивайте великі задачі на менші! Коли Ви розбиваете задачу на підзавдання, Ви збільшуєте досвід та золото, які отримаєте за його виконання, а також зменшуєте ушкодження від невиконання щоденних завдань.", "expandCollapse": "Показати/Приховати", "text": "Назва", "extraNotes": "Додаткові примітки", @@ -32,7 +32,7 @@ "mental": "Розумове", "otherExamples": "До прикладу, фахова мета, захоплення, фінанси тощо.", "progress": "Поступ", - "daily": "Daily", + "daily": "Щоденне завдання", "dailies": "Щоденні", "newDaily": "Нове щоденне", "newDailyBulk": "Нові щоденні (одне на рядок)", @@ -47,7 +47,7 @@ "day": "День", "days": "Днів", "restoreStreak": "Відновити серію", - "todo": "To-Do", + "todo": "Завдання ", "todos": "Зробити", "newTodo": "Додати завдання", "newTodoBulk": "Нові завдання (одна на рядок)", @@ -55,11 +55,11 @@ "remaining": "Активні", "complete": "Виконано", "dated": "З датою", - "due": "Повинен зробити", + "due": "Не виконані", "notDue": "Не обов'язково", "grey": "Сірі", "score": "Рахунок", - "reward": "Reward", + "reward": "Нагорода", "rewards": "Нагороди", "ingamerewards": "Обладунки та Уміння", "gold": "Золото", @@ -73,6 +73,7 @@ "clearTags": "Очистити", "hideTags": "Приховати", "showTags": "Показати", + "toRequired": "You must supply a to value", "startDate": "Дата початку", "startDateHelpTitle": "Коли має починатися це завдання?", "startDateHelp": "Вкажіть дату, коли це завдання набуде чинності. До цієї дати воно буде не обов'язковим.", @@ -88,9 +89,10 @@ "fortifyName": "Зілля підсилення", "fortifyPop": "Повернути завдання до нейтрального стану (жовтого кольору) та відновити все здоров'я.", "fortify": "Підсилитися", - "fortifyText": "Підсилення поверне всі ваші завдання у нейтральний (жовтий) колір, немов ви щойно їх додали, та відновить все ваше здоров’я. Це дуже корисно, якщо ваші червоні задачі роблять гру занадто складною, а сині — занадто простою. Якщо новий початок з чистої сторінки вас мотивує, не шкодуйте самоцвіти та отримайте тимчасове полегшення!", - "confirmFortify": "Are you sure?", - "sureDelete": "Are you sure you want to delete the <%= taskType %> with the text \"<%= taskText %>\"?", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", + "confirmFortify": "Ви впевнені?", + "fortifyComplete": "Fortify complete!", + "sureDelete": "Ви впевнені, що хочете видалити <%= taskType %> під назвою \"<%= taskText %>\"?", "streakCoins": "Бонус за серію!", "pushTaskToTop": "Перемістити завдання нагору. Натисніть CTRL або CMD, щоб перемістити його донизу", "emptyTask": "Спочатку введіть назву завдання", @@ -112,5 +114,18 @@ "rewardHelp2": "Спорядження впливає на ваші характеристики (<%= linkStart %>Персонаж > Характеристики<%= linkEnd %>).", "rewardHelp3": "Спеціальне спорядження з'являтиметься тут під час Світових подій", "rewardHelp4": "Не бійтеся встановлювати власні Нагороди! Огляньте кілька прикладів тут.", - "clickForHelp": "Клацніть для довідки" + "clickForHelp": "Клацніть для довідки", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/zh/backgrounds.json b/common/locales/zh/backgrounds.json index 70f62726ca..f29670cd3a 100644 --- a/common/locales/zh/backgrounds.json +++ b/common/locales/zh/backgrounds.json @@ -154,11 +154,18 @@ "backgroundRainforestNotes": "到雨林中冒险。", "backgroundStoneCircleText": "巨石阵", "backgroundStoneCircleNotes": "在巨石阵中释放魔法", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", - "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgrounds042016": "第23组：2016年4月推出", + "backgroundArcheryRangeText": "射箭场", + "backgroundArcheryRangeNotes": "在射箭场练习。", + "backgroundGiantFlowersText": "巨大的花", + "backgroundGiantFlowersNotes": "在巨大的花顶嬉戏。", + "backgroundRainbowsEndText": "彩虹的尽头", + "backgroundRainbowsEndNotes": "在彩虹的尽头发现金子。", + "backgrounds052016": "第24组：2016年5月推出", + "backgroundBeehiveText": "蜂窝", + "backgroundBeehiveNotes": "在蜂窝里嗡嗡嗡地跳舞", + "backgroundGazeboText": "亭子", + "backgroundGazeboNotes": "攻击一个亭子", + "backgroundTreeRootsText": "树根", + "backgroundTreeRootsNotes": "探索茂密的树根" } \ No newline at end of file diff --git a/common/locales/zh/challenge.json b/common/locales/zh/challenge.json index b407f9a0f8..b26a01f029 100644 --- a/common/locales/zh/challenge.json +++ b/common/locales/zh/challenge.json @@ -57,11 +57,27 @@ "prizeValue": "<%= gemcount %> <%= gemicon %> 奖励", "clone": "复制", "challengeNotEnoughGems": "你的宝石数不足以发起这一挑战。", - "noPermissionEditChallenge": "你没有权限修改这个挑战。", + "noPermissionEditChallenge": "你没有编辑这个挑战的权限", "noPermissionDeleteChallenge": "你没有权限删除这个挑战。", "noPermissionCloseChallenge": "你没有权限关闭这个挑战。", "congratulations": "恭喜！", "hurray": "万岁！", "noChallengeOwner": "没有主持人", - "noChallengeOwnerPopover": "这项挑战没有主持人，因为创建该挑战的用户已删除帐号" + "noChallengeOwnerPopover": "这项挑战没有主持人，因为创建该挑战的用户已删除帐号", + "challengeMemberNotFound": "挑战成员中找不到用户", + "onlyGroupLeaderChal": "仅有队长能创建挑战", + "tavChalsMinPrize": "酒馆挑战的奖励至少1颗宝石。", + "cantAfford": "你不能支付这个奖励。请购买更多宝石或减少奖励数量。", + "challengeIdRequired": "\"challengeId\"必须是一个有效的UUID。", + "winnerIdRequired": "\"winnerId\"必须是一个有效的UUID。", + "challengeNotFound": "找不到挑战。", + "onlyLeaderDeleteChal": "仅有挑战发起者能删除它。", + "onlyLeaderUpdateChal": "仅有挑战发起者能更新它。", + "winnerNotFound": "获胜者ID \"<%= userId %>\"找不到或者不是挑战的一部分。", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching challenge tasks.", + "userTasksNoChallengeId": "当\"tasksOwner\"是\"user\" \"challengeId\"，则不会通过。", + "onlyChalLeaderEditTasks": "属于一个挑战的任务仅能被发起者编辑。", + "userAlreadyInChallenge": "用户已经加入此挑战。", + "cantOnlyUnlinkChalTask": "仅有破碎的挑战任务能被拆开。", + "shortNameTooShort": "Tag Name must have at least 3 characters." } \ No newline at end of file diff --git a/common/locales/zh/character.json b/common/locales/zh/character.json index f22f558968..52ef6637dc 100644 --- a/common/locales/zh/character.json +++ b/common/locales/zh/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "请注意您的显示名称、照片和简介，它们必须遵从社区指南 (例如，没有亵渎言论，没有成人话题，没有侮辱言论)。如果您对是否适当有任何问题，欢迎发送电子邮件给leslie@habitica.com！", "statsAch": "角色属性及成就", "profile": "角色信息", "avatar": "角色形象", @@ -34,7 +35,7 @@ "beard": "落腮胡", "mustache": "八字胡", "flower": "花", - "wheelchair": "Wheelchair", + "wheelchair": " 轮椅", "basicSkins": "基本肤色", "rainbowSkins": "彩虹肤色", "pastelSkins": "柔和肤色", @@ -109,6 +110,7 @@ "mage": "法师", "mystery": "神秘", "changeClass": "更改职业，重新分配属性点", + "lvl10ChangeClass": "您必须达到等级10才可以更换职业。", "levelPopover": "每一级你可以获得一个可自由分配的属性点。你可以手动分配，或者让系统为你自动分配。", "unallocated": "未分配的属性点", "haveUnallocated": "你有 <%= points %> 点未分配的属性点", @@ -164,5 +166,7 @@ "int": "智力", "showQuickAllocation": "显示属性分配", "hideQuickAllocation": "隐藏属性分配", - "quickAllocationLevelPopover": "每个等级获得一点属性点供你分配。你可以手工分配或者用一种自动分配选项让游戏帮你决定，在 玩家 -> 角色属性及成就 中选择。" + "quickAllocationLevelPopover": "每个等级获得一点属性点供你分配。你可以手工分配或者用一种自动分配选项让游戏帮你决定，在 玩家 -> 角色属性及成就 中选择。", + "invalidAttribute": "\"<%= attr %>\" 不是一个有效的属性点分配数字。", + "notEnoughAttrPoints": "您没有足够的属性点点数。" } \ No newline at end of file diff --git a/common/locales/zh/content.json b/common/locales/zh/content.json index f126b8d003..637e98cd66 100644 --- a/common/locales/zh/content.json +++ b/common/locales/zh/content.json @@ -113,6 +113,12 @@ "questEggSnailText": "蜗牛", "questEggSnailMountText": "蜗牛", "questEggSnailAdjective": "一只缓慢但沉着的", + "questEggFalconText": "猎鹰", + "questEggFalconMountText": "猎鹰", + "questEggFalconAdjective": "一只迅捷的", + "questEggTreelingText": "小树芽", + "questEggTreelingMountText": "小树芽", + "questEggTreelingAdjective": "一只叶子般的", "eggNotes": "将一瓶孵化药水倒在这个宠物蛋上，你就能孵化出一只<%= eggAdjective(locale) %><%= eggText(locale) %>。", "hatchingPotionBase": "普通", "hatchingPotionWhite": "白色", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "金色", "hatchingPotionSpooky": "阴森森的", "hatchingPotionPeppermint": "薄荷", + "hatchingPotionFloral": "草花", "hatchingPotionNotes": "把它倒在宠物蛋上可以孵化出一只<%= potText(locale) %>宠物。", "premiumPotionAddlNotes": "无法在任务奖励宠物蛋上使用", "foodMeat": "肉", diff --git a/common/locales/zh/contrib.json b/common/locales/zh/contrib.json index 31bf4b6fd6..ea00e8056a 100644 --- a/common/locales/zh/contrib.json +++ b/common/locales/zh/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "贡献者殿堂", "hallPatrons": "赞助人殿堂", "rewardUser": "奖励玩家", - "UUID": "帐号", + "UUID": "用户ID", "loadUser": "载入玩家", + "noAdminAccess": "你没有管理员权限。", + "pageMustBeNumber": "req.query.page必须是一个数字", + "userNotFound": "找不到用户", + "invalidUUID": "UUID 必须有效", "title": "头衔", "moreDetails": "更多详情(1-7)", "moreDetails2": "更多详情(8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "前往英雄殿堂 (贡献者和支持者之殿)", "conLearn": "查看更多关于贡献奖励的信息", "conLearnHow": "如何为Habitica作出贡献", - "surveysSingle": "为了帮助Habitica成长而填写了一份问卷。现在没有任何可填的问卷", - "surveysMultiple": "为了帮助Habitica成长而填写了 <%= surveys %> 份问卷。现在没有任何可填的问卷", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "现在的问卷", "surveyWhen": "那个章将会在三约尾给所有参与过问卷的玩家", "blurbInbox": "这是你的私人邮件箱！你能在酒馆、队伍或者工会聊天中通过点击其他人名字边上的邮件图标给他们发送信息。如果你收到了一封不合适的私人消息，请截图发给柠檬小姐(leslie@habitica.com)。", diff --git a/common/locales/zh/death.json b/common/locales/zh/death.json index 1345337761..787da98b2f 100644 --- a/common/locales/zh/death.json +++ b/common/locales/zh/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "生命值丢失很快？", "lowHealthTips3": "前一晚仍未完成的每日任务会使你收到伤害，所以请小心，初期别添加太多每日任务！", "lowHealthTips4": "如果每日任务在某一天仍未到期，你可以点击铅笔图标来取消它。", - "goodLuck": "祝你好运！" + "goodLuck": "祝你好运！", + "cannotRevive": "如果没有死亡就不能复活" } \ No newline at end of file diff --git a/common/locales/zh/front.json b/common/locales/zh/front.json index a7c388bd05..fce8280728 100644 --- a/common/locales/zh/front.json +++ b/common/locales/zh/front.json @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "如何使用", "companyBlog": "博客", + "devBlog": "开发者部落格", "companyDonate": "捐款", "companyExtensions": "插件", "companyPrivacy": "隐私", @@ -51,6 +52,7 @@ "featureSocialHeading": "多人游戏", "featuredIn": "特别提供", "featuresHeading": "我们还有这些特别的……", + "footerDevs": "开发者", "footerCommunity": "社区", "footerCompany": "公司", "footerMobile": "手机版", @@ -182,6 +184,7 @@ "zelahQuote": "因为 [Habitica] 的帮助，我能够准时上床休息了，因为我老想着早睡能挣经验，晚睡会掉血！", "reportAccountProblems": "报告账户问题", "reportCommunityIssues": "报告社区问题", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "关于本站的常见问题", "businessInquiries": "业务咨询", "merchandiseInquiries": "商业咨询", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "缺少用户名或邮箱。", + "missingEmail": "缺少电子邮件地址。", + "missingUsername": "缺少用户名。", + "missingPassword": "缺少密码。", + "missingNewPassword": "缺少新密码。", + "wrongPassword": "密码错误。", + "notAnEmail": "无效的电子邮件地址。", + "emailTaken": "邮件地址已经在现有账号中存在", + "newEmailRequired": "缺少新的邮件地址", + "usernameTaken": "用户名已被使用", + "passwordConfirmationMatch": "密码不匹配", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/zh/gear.json b/common/locales/zh/gear.json index 3129c36ed0..d833f4512c 100644 --- a/common/locales/zh/gear.json +++ b/common/locales/zh/gear.json @@ -1,5 +1,5 @@ { - "set": "组", + "set": "套装", "weapon": "武器", "weaponBase0Text": "没有武器", "weaponBase0Notes": "没有武器。", @@ -66,7 +66,7 @@ "weaponSpecial2Text": "史蒂芬韦伯的巨龙长矛", "weaponSpecial2Notes": "感受喷薄而出的巨龙神力吧！增加力量和感知各<%= attrs %>点。", "weaponSpecial3Text": "马斯泰恩的碎石流星锤", - "weaponSpecial3Notes": "怪物统统捣烂！增加力量，智力，体质各<%= attrs %>点。", + "weaponSpecial3Notes": "怪物统统捣烂！增加体质和感知各<%= attrs %>点。", "weaponSpecialCriticalText": "碾碎臭虫的批判战锤", "weaponSpecialCriticalNotes": "这位勇士杀死了一个使无数战士陨落的吹毛求疵的 Github 敌人。这把战锤由臭虫的骨头打造，能造成强大的致命一击。增加力量和感知各<%= attrs %>点。", "weaponSpecialTridentOfCrashingTidesText": "怒潮三叉戟", @@ -187,8 +187,10 @@ "weaponArmoireJesterBatonNotes": "挥舞着手杖，妙语连珠，最复杂的情况都会变得清晰起来。增加智力和感知各 <%= attrs %> 点。魔法衣橱：小丑套装(3件中的第3件)", "weaponArmoireMiningPickaxText": "采矿鹤嘴锄", "weaponArmoireMiningPickaxNotes": "从你的任务中挖取最大量的金币！增加感知<%= per %>点。魔法衣橱：采矿者套装(3件中的第3件)。", - "weaponArmoireBasicLongbowText": "Basic Longbow", - "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireBasicLongbowText": "基础长弓", + "weaponArmoireBasicLongbowNotes": "一把有用的传下来的弓。增加<%= str %>点力量。魔法衣橱：基础射手套装(3件中的第1件)。", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "护甲", "armorBase0Text": "普通服装", "armorBase0Notes": "普通的衣服。 没有属性加成。", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "召唤冰冷的冬之焰！没有属性加成。2015年12月订阅者物品。", "armorMystery201603Text": "幸运衣", "armorMystery201603Notes": "这件衣服是成千上万的四叶草缝成的！没有属性加成。2016年3月捐赠者物品。", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "蒸汽朋克套装", "armorMystery301404Notes": "整洁又精神，真聪明！没有属性加成。3015年2月订阅者物品", "armorArmoireLunarArmorText": "静月护甲", @@ -377,7 +383,7 @@ "armorArmoireHornedIronArmorText": "铁角护甲", "armorArmoireHornedIronArmorNotes": "纯钢打造，坚不可摧。这件铁角护甲几乎无法被打破。增加<%= con %>点体质和<%= per %>点感知。魔法衣橱：铁角套装(3件套之2)。", "armorArmoirePlagueDoctorOvercoatText": "瘟疫医生外套", - "armorArmoirePlagueDoctorOvercoatNotes": "瘟疫拖延症主治医生穿的正式大褂。增加<%= int %>点智力, <%= str %>点力量，还有<%= con %>点体质。魔法衣橱: 瘟疫医生系列 (3件的第2件)。", + "armorArmoirePlagueDoctorOvercoatNotes": "瘟疫拖延症主治医生穿的正式大褂。增加<%= int %>点智力, <%= str %>点力量，还有<%= con %>点体质。魔法衣橱: 瘟疫医生系列 (3件的第3件)。", "armorArmoireShepherdRobesText": "牧羊人长袍", "armorArmoireShepherdRobesNotes": "轻薄凉爽透气，在沙漠中放牧狮鹫的时候穿上最完美了。增加力量和感知各<%= attrs %>点。魔法衣橱：牧羊人套装(3件中的第2件)", "armorArmoireRoyalRobesText": "皇家长袍", @@ -392,8 +398,10 @@ "armorArmoireJesterCostumeNotes": "的啦啦啦！尽管衣服看起来呵呵，你不是一个傻瓜。增加智力 <%= int %> 点。魔法衣橱：小丑套装(3件中的第2件)", "armorArmoireMinerOverallsText": "采矿者工作裤", "armorArmoireMinerOverallsNotes": "它们看起来破旧，但他们被施了魔法抵御灰尘。增加体质<%= con %>点。魔法衣橱：采矿者套装(3件中的第2件)。", - "armorArmoireBasicArcherArmorText": "Basic Archer Armor", - "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireBasicArcherArmorText": "基础射手皮甲", + "armorArmoireBasicArcherArmorNotes": "这件伪装的背心使你在通过森林式不被注意。增加<%= per %>点感知。魔法衣橱：基础射手套装(3件中的第2件)。", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "头饰", "headBase0Text": "没有头盔", "headBase0Notes": "没有头饰", @@ -565,6 +573,10 @@ "headMystery201602Notes": "对所有你的爱慕者隐藏你的身份。没有属性加成。2016年2月捐赠者物品。", "headMystery201603Text": "幸运帽", "headMystery201603Notes": "这顶大礼帽有着神奇的好运魔力。没有属性加成。2016年3月捐赠者物品。", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "华丽礼帽", "headMystery301404Notes": "上流社会佼佼者的华丽礼帽！3015年1月捐赠者物品。没有属性加成。", "headMystery301405Text": "基础礼帽", @@ -611,8 +623,10 @@ "headArmoireJesterCapNotes": "帽子上的铃铛让对手分心，它仅帮你集中注意力。增加感知 <%= per %> 点。魔法衣橱：小丑套装(3件中的第1件)", "headArmoireMinerHelmetText": "采矿者头盔", "headArmoireMinerHelmetNotes": "保护你的头不被掉下的任务砸伤！增加智力 <%= int %>点。魔法衣橱：采矿者套装(3件中的第1件)。", - "headArmoireBasicArcherCapText": "Basic Archer Cap", - "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireBasicArcherCapText": "基础射手帽", + "headArmoireBasicArcherCapNotes": "只有有了一个活泼的帽子，一个射手才是完整的！增加<%= per %>点感知。魔法衣橱：基础射手套装(3件中的第3件)。", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "副手物品", "shieldBase0Text": "没有副手装备", "shieldBase0Notes": "没有盾牌或副手武器。", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "抚慰之盾", "shieldSpecialWinter2015HealerNotes": "这块盾牌偏转了刺骨的寒风。增加<%= con %>点体质。2014-2015限定版装备。", "shieldSpecialSpring2015RogueText": "霹雳爆破管", - "shieldSpecialSpring2015RogueNotes": "别被它的噼里啪啦声糊弄了——爆炸起来简直厉害。提高 <%= str %>点力量。2015春季限定版装备。", + "shieldSpecialSpring2015RogueNotes": "别让这些声音愚弄你 - 这些炸药威力巨大。 增加力量 <%= str %> 点。2015年限量版弹簧装置套装。", "shieldSpecialSpring2015WarriorText": "菜盘子铁饼", "shieldSpecialSpring2015WarriorNotes": "向你的敌人掷去……或者只是单纯地拿着它，因为到了晚饭时间它就会装满好吃的粗磨粉狗粮啦。提高<%= con %>点体质。2015春季限定版装备。", "shieldSpecialSpring2015HealerText": "印花枕头", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "用这件龙形的盾牌扰乱敌人吧。增加<%= per %>点感知。魔法衣橱：驯龙套装(3件套之2)。", "shieldArmoireMysticLampText": "神秘的灯", "shieldArmoireMysticLampNotes": "用神秘的灯照亮黑暗的洞穴！增加感知<%= per %>点。魔法衣橱：独立装备。", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "在战斗中没有什么用处。但是它们很漂亮，不是吗？提升<%= con %>点体质。魔法衣橱：独立装备。", "back": "背部挂件", "backBase0Text": "没有背部挂件", "backBase0Notes": "没有背部挂件。", @@ -815,11 +831,25 @@ "headAccessoryMystery201510Notes": "这些吓人的角滑溜溜的。没有属性加成。2015年10月捐赠者物品。", "headAccessoryMystery301405Text": "头戴护目镜", "headAccessoryMystery301405Notes": "“护目镜是戴在眼睛上的，”人们说。“没有人会想要一副只能戴在头上的护目镜。”人们说。哈！你果然让他们长见识了！没有增益效果。3015年8月捐赠者物品。", - "headAccessoryArmoireComicalArrowText": "Comical Arrow", - "headAccessoryArmoireComicalArrowNotes": "This whimsical item doesn't provide a stat boost, but it sure is good for a laugh! Confers no benefit. Enchanted Armoire: Independent Item.", + "headAccessoryArmoireComicalArrowText": "滑稽的箭", + "headAccessoryArmoireComicalArrowNotes": "这个古怪的东西不会增加属性，但它保证好笑！没有属性加成。魔法衣橱：独立装备。", "eyewear": "眼镜", "eyewearBase0Text": "没有眼镜", "eyewearBase0Notes": "没有眼镜。", + "eyewearSpecialBlackTopFrameText": "黑色标准眼睛", + "eyewearSpecialBlackTopFrameNotes": "有着黑色眼镜框的眼睛。没有属性加成。", + "eyewearSpecialBlueTopFrameText": "蓝色标准眼睛", + "eyewearSpecialBlueTopFrameNotes": "有着蓝色眼镜框的眼睛。没有属性加成。", + "eyewearSpecialGreenTopFrameText": "绿色标准眼睛", + "eyewearSpecialGreenTopFrameNotes": "有着绿色眼镜框的眼睛。没有属性加成。", + "eyewearSpecialPinkTopFrameText": "粉色标准眼睛", + "eyewearSpecialPinkTopFrameNotes": "有着粉色眼镜框的眼睛。没有属性加成。", + "eyewearSpecialRedTopFrameText": "红色标准眼睛", + "eyewearSpecialRedTopFrameNotes": "有着红色眼镜框的眼睛。没有属性加成。", + "eyewearSpecialWhiteTopFrameText": "白色标准眼睛", + "eyewearSpecialWhiteTopFrameNotes": "有着白色眼镜框的眼睛。没有属性加成。", + "eyewearSpecialYellowTopFrameText": "黄色标准眼睛", + "eyewearSpecialYellowTopFrameNotes": "有着黄色眼镜框的眼睛。没有属性加成。", "eyewearSpecialSummerRogueText": "流氓眼罩", "eyewearSpecialSummerRogueNotes": "即使是无赖也能看出这个眼罩有多时髦！没有增益效果。限定版2014夏季装备。", "eyewearSpecialSummerWarriorText": "时髦眼罩", diff --git a/common/locales/zh/generic.json b/common/locales/zh/generic.json index 4a438815b8..c1e25a0901 100644 --- a/common/locales/zh/generic.json +++ b/common/locales/zh/generic.json @@ -27,18 +27,18 @@ "collapseToolbar": "隐藏列表", "markdownBlurb": "Habitica使用markdown标记语言作为信息传递格式。点击 Markdown Cheat Sheet 查看更多信息。", "showFormattingHelp": "查看格式相关帮助", - "hideFormattingHelp": "缩小格式相关帮助", + "hideFormattingHelp": "隐藏格式相关帮助", "youType": "你输入了：", "youSee": "你会看到：", - "italics": "斜体", - "bold": "粗体", - "strikethrough": "~~继续前进~~", - "emojiExample": ":笑:", + "italics": "*斜体*", + "bold": "**粗体**", + "strikethrough": "~~删除线~~", + "emojiExample": ":smile:", "markdownLinkEx": "[Habitica 真好！](https://habitica.com)", "markdownImageEx": "![mandatory alt text](https://habitica.com/cake.png \"optional mouseover title\")", "unorderedListHTML": "+ 第一个道具
+ 第二个道具
+ 第三个道具", "unorderedListMarkdown": "+ 第一个道具\n+ 第二个道具\n+ 第三个道具", - "code": "代码", + "code": "`代码`", "achievements": "成就", "modalAchievement": "获得成就！", "special": "特殊", @@ -137,8 +137,8 @@ "achievementStressbeastText": "在2014冬季仙境事件中协助战胜可恶的压力野兽！", "achievementBurnout": "全盛田野的救护者", "achievementBurnoutText": "在2015秋季节事件中打败了疲惫魔，复原了锻炼精魂！", - "achievementBewilder": "Savior of Mistiflying", - "achievementBewilderText": "Helped defeat the Be-Wilder during the 2016 Spring Fling Event!", + "achievementBewilder": "Mistiflying城的拯救者", + "achievementBewilderText": "在2016年春季嘉年华事件中协助战胜迷失怪！", "checkOutProgress": "看一下我在Habitica的进步！", "cardReceived": "收到一个卡片！", "cardReceivedFrom": "来自 <%= userName %> 的 <%= cardType %> ", diff --git a/common/locales/zh/groups.json b/common/locales/zh/groups.json index 2bcee8cb47..0f28f8abf2 100644 --- a/common/locales/zh/groups.json +++ b/common/locales/zh/groups.json @@ -92,6 +92,7 @@ "send": "发送", "messageSentAlert": "已发送消息", "pmHeading": "向<%= name %>发私信", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "删除所有消息", "confirmDeleteAllMessages": "确定要删除收件箱里的所有消息吗？其他用户依然会看到你已发送给他们的消息。", "optOutPopover": "不喜欢私信？点击不再接收", @@ -99,6 +100,15 @@ "unblock": "解锁", "pm-reply": "发送回复", "inbox": "收件箱", + "messageRequired": "请填写信息", + "toUserIDRequired": "需要用户ID", + "gemAmountRequired": "需要指明宝石数量", + "notAuthorizedToSendMessageToThisUser": "无法向该用户发送消息", + "privateMessageGiftIntro": "<%= receiverName %> 您好！<%= senderName %> 给了您", + "privateMessageGiftGemsMessage": "<%= gemAmount %> 宝石！", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> 个月的捐助！", + "cannotSendGemsToYourself": "无法向自己发送宝石。使用捐助功能试试看", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "举报违反社区准则的用户", "abuseFlagModalHeading": "举报 <%= name %> 违规", "abuseFlagModalBody": "你确定要举报这个帖子？你 只能 举报违反了<%= firstLinkStart %>社区准则<%= linkEnd %>或者 <%= secondLinkStart %>服务条款<%= linkEnd %> 的帖子。不当的举报是违反社区准则的，并且你会因此而违规。适当的举报理由包括但不限于：
- 咒骂 、宗教性的起誓
- 偏见、诋毁
- 成人话题
- 暴力内容，即便是玩笑性质的
- 垃圾邮件，荒谬的消息
The appetizers are excellent, the music is swinging, and even the dancing elephants have become routine. Habiticans laugh and frolic amid the overflowing floral centerpieces, happy to have a distraction from their least-favorite tasks, and the April Fool whirls among them, eagerly providing an amusing trick here and a witty twist there.
As the Mistiflying clock tower strikes midnight, the April Fool leaps onto the stage to give a speech.
“Friends! Enemies! Tolerant acquaintances! Lend me your ears.” The crowd chuckles as animal ears sprout from their heads, and they pose with their new accessories.
“As you know,” the Fool continues, “my confusing illusions usually only last a single day. But I’m pleased to announce that I’ve discovered a shortcut that will guarantee us non-stop fun, without having to deal with the pesky weight of our responsibilities. Charming Habiticans, meet my magical new friend... the Be-Wilder!”
Lemoness pales suddenly, dropping her hors d'oeuvres. “Wait! Don’t trust--”
But suddenly mists are pouring into the room, glittering and thick, and they swirl around the April Fool, coalescing into cloudy feathers and a stretching neck. The crowd is speechless as an monstrous bird unfolds before them, its wings shimmering with illusions. It lets out a horrible screeching laugh.
“Oh, it has been ages since a Habitican has been foolish enough to summon me! How wonderful it feels, to have a tangible form at last.”
Buzzing in terror, the magic bees of Mistiflying flee the floating city, which sags from the sky. One by one, the brilliant spring flowers wither up and wisp away.
“My dearest friends, why so alarmed?” crows the Be-Wilder, beating its wings. “There’s no need to toil for your rewards any more. I’ll just give you all the things that you desire!”
A rain of coins pours from the sky, hammering into the ground with brutal force, and the crowd screams and flees for cover. “Is this a joke?” Baconsaur shouts, as the gold smashes through windows and shatters roof shingles.
PainterProphet ducks as lightning bolts crackle overhead, and fog blots out the sun. “No! This time, I don’t think it is!”
Quickly, Habiticans, don’t let this World Boss distract us from our goals! Stay focused on the tasks that you need to complete so we can rescue Mistiflying -- and hopefully, ourselves.", - "questBewilderCompletion": "The Be-Wilder is DEFEATED!
We've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.
Mistiflying is saved!
The April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”
The crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.
“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”
Redphoenix coughs meaningfully.
“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”
Encouraged, the marching band starts up.
It isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.
As Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", - "questBewilderCompletionChat": "`The Be-Wilder is DEFEATED!`\n\nWe've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.\n\n`Mistiflying is saved!`\n\nThe April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”\n\nThe crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.\n\n“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”\n\nRedphoenix coughs meaningfully.\n\n“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”\n\nEncouraged, the marching band starts up.\n\nIt isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.\n\nAs Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", - "questBewilderBossRageTitle": "Beguilement Strike", - "questBewilderBossRageDescription": "When this gauge fills, The Be-Wilder will unleash its Beguilement Strike on Habitica!", - "questBewilderDropBumblebeePet": "Bumblebee (Pet)", - "questBewilderDropBumblebeeMount": "Bumblebee (Mount)", - "questBewilderBossRageMarket": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nOh no! Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.\n\nHurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.", - "questBewilderBossRageStables": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nAhh!!! Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!", - "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!" + "questBewilderText": "迷失怪", + "questBewilderNotes": "派对开始和其他一样。
开胃菜是极好的，音乐让人摇摆，甚至跳舞的大象都很常见。Habitica居民在中间的花海中大笑嬉闹，逍遥地开始分心不顾最不喜欢的任务，April Fool在他们中间回转，急切在各处展示着有趣的恶作剧和诙谐的动作。
随着Mistiflying城市的钟塔在午夜响起，April Fool跳上舞台开始演讲。
“朋友们！敌人们！心胸宽广熟悉的人们！听我说两句。”人们轻笑着，竖起了耳朵，用新的配饰装扮自己，摆起了姿势。
“如你们所知，”Fool 继续说着，“我混乱的幻觉仅仅存在一天。但是，我很开心的宣布，我已经发现一个捷径，可以保证我们的快乐不会停止，不用强迫去处理我们有着麻烦的重要性的责任。可爱的Habitica居民，见见我新的魔法朋友吧…迷失怪！”
Lemoness突然脸色苍白，丢下她的餐前甜点。“等等！不要相信--”
但是，突然迷雾灌进了房间，闪闪发光，逐渐变浓，它们绕着April Fool打着旋儿，凝聚成云的羽毛和伸展的脖子。人群说不出话来，一只巨大的怪鸟在他们面前显露出来，它的翅膀闪烁着幻觉。它发出恐怖刺耳的笑声。
“噢，已经很多很多年了，一个有够愚蠢的Habitica居民召唤了我！多么美妙啊，终于有一个实体了。”
Mistiflying城的魔法蜜蜂惊恐嗡嗡的逃离了浮空城，浮空城开始从天空下落。灿烂的春之花一个接一个枯萎了。
“我最亲爱的朋友，为何如此惊恐？”迷失怪啼叫着，扇动着它的翅膀，“没必要再幸苦赢得奖励了。我会给你们所有你们想要的东西！”
金币雨从空中倾泻下来，猛力地敲打在地面，人们尖叫奔跑找遮蔽物。“这是玩笑吗?”Baconsaur大叫，金币砸穿了窗户，打破了屋顶的瓦片。
PainterProphet闪避着，空中出现了闪电裂纹，雾遮挡了太阳。“不！这次我不想这样！”
快，Habitica居民们，不要让这个世界级怪物让我们注意力转移到金币上！保持注意力，关注你需要完成的任务，这样我们才能拯救Mistiflying城 -- 我们自己，有着希望。", + "questBewilderCompletion": "迷失怪被 打败了！
我们做到了！迷失怪在空中扭曲，悲恸大叫，羽毛飘下来就像是雨点。渐渐地，它被卷入一团闪亮的雾中。一缕缕阳光穿透了迷雾，驱散了它，显露出虚弱，仁慈的人们，其中有Bailey, Matt, Alex...和April Fool自己。
Mistiflying城市被拯救了！
April Fool看起来有点局促不安。“噢，嗯，”他说，“我可能有点....忘乎所以了。”
人们在喃喃低语，湿漉漉的花朵被冲上人行道，在远处还能看到坍塌的屋顶溅起的壮观水花。
“额，好”April Fool说，“也就是说…我想说的是，很抱歉。”他长长的叹息，“也许我还是会带头开始下一年的恶作剧，但这不会全是游戏与乐趣了，毕竟偶尔注意一下不会有坏处的。”
浴火凤凰有深意地咳了下。
“我的意思是，今年的春季大扫除赶在别人前面！”April Fool说，“我无所畏惧，我会很快将Habit城市还原的一模一样。幸运的是在双持扫把上没人比我的等级高。”
仪仗队开始演奏，鼓舞大家。
这是哈比城一切回归正常的不久之前的事了。此外，现在怀尔德已经消失了，魔法蜜蜂回到了Mistiflying开始了忙碌的工作，不久后，城市又一次淹没在了花海中。
Habitic居民拥抱了魔法绒绒蜜蜂，April Fool的眼睛瞬间点亮，“噢，我有了一个想法！为什么你们都不养一些绒绒蜜蜂当宠物和坐骑呢？如果我要将所有无聊的和有寓意的都给你，这将是一个很好礼物，它完美的代表了辛勤工作和甜蜜的回报的结合”他眨了眨眼，“另外，它们没有毒刺！傻瓜的荣耀。”", + "questBewilderCompletionChat": "`迷失怪被 打败了！`\n\n我们做到了！迷失怪在空中扭曲，悲恸大叫，羽毛飘下来就像是雨点。渐渐地，它被卷入一团闪亮的雾中。一缕缕阳光穿透了迷雾，驱散了它，显露出虚弱，仁慈的人们，其中有Bailey, Matt, Alex...和April Fool自己。\n\n`Mistiflying城市被拯救了！`\n\nApril Fool看起来有点局促不安。“噢，嗯，”他说，“我可能有点....忘乎所以了。”\n\n人们在喃喃低语，湿漉漉的花朵被冲上人行道，在远处还能看到坍塌的屋顶溅起的壮观水花。\n\n“额，好”April Fool说，“也就是说…我想说的是，很抱歉。”他长长的叹息，“也许我还是会带头开始下一年的恶作剧，但不会全是游戏与乐趣了，毕竟偶尔注意一下不会有坏处的。 ”\n\n浴火凤凰有深意地咳了下。\n\n“我的意思是，今年的春季大扫除赶在别人前面！”April Fool说，“我无所畏惧，我会很快将Habit城市还原的一模一样。幸运的是在双持扫把上没人比我的等级高。”\n\n仪仗队开始演奏，鼓舞大家。\n\n没多久，Habit城市中所有回到了正常。另外，现在迷失怪已经蒸发了，Mistiflying城的魔法蜜蜂喧闹的回到了工作岗位，很快，花盛开了，城市再一次起飞。\n\nHabitic居民拥抱了魔法绒绒蜜蜂，April Fool的眼睛瞬间点亮，“噢，我有了一个想法！为什么你们都不养一些绒绒蜜蜂当宠物和坐骑呢？如果我要将所有无聊的和有寓意的都给你，这将是一个很好礼物，它完美的代表了辛勤工作和甜蜜的回报的结合”他眨了眨眼，“另外，它们没有毒刺！傻瓜的荣耀。”", + "questBewilderBossRageTitle": "欺骗打击", + "questBewilderBossRageDescription": "当这个量槽被填满，迷失怪就会在Habitica释放他的欺骗攻击！", + "questBewilderDropBumblebeePet": "魔法蜜蜂(宠物)", + "questBewilderDropBumblebeeMount": "魔法蜜蜂(坐骑)", + "questBewilderBossRageMarket": "`迷失怪运用了 欺骗打击！`\n\n噢不！尽管我们努力了，我们迷失怪迷人的幻觉还是让我们分心，忘掉了一些每日任务！伴随着咯咯的叫喊声，华丽的鸟儿扇动着翅膀，扇起了一大团薄雾围绕着商人Alex。当雾消失，他已经着魔了！“有一些免费的样品！”他兴高采烈地喊着，开始丢出爆炸的蛋和药水朝向逃跑的Habitica村民。诚然，不是最优惠的销售。\n\n快！让我们保持关注我们的每日任务在它占据其他人之前打败这个怪物。", + "questBewilderBossRageStables": "`迷失怪运用了 欺骗打击！`\n\n啊！！！一旦迷失怪让我们目眩神迷忽视了我们的每日任务，现在它已经攻击了驯兽师马特！伴随着一阵雾盘旋在身边，马特变成了可怕的飞行怪兽，所有的宠物和坐骑在兽栏中悲哀地嚎叫。快！保持关注你的每日任务打败这个卑鄙的分心。", + "questBewilderBossRageBailey": "`迷失怪运用了 欺骗打击！`\n\n小心！在报导新闻中，公告员贝利已经被迷失怪占据了！她放出了一个恶魔，她随意的大叫声升上了天空。现在我们该怎么办？\n\n不要放弃...我们就快要击败这个讨厌的大鸟了，一劳永逸！", + "questFalconText": "掠食明天之鸟", + "questFalconNotes": "Habitica山正被正在逼近的待办事项之山蒙上了阴影。它在被忽视的任务增长失控前曾是野餐和享受完成的感觉的地方。现在，他变成了掠食明天之鸟的巢穴，掠食明天之鸟是一种邪恶的生物，阻止Habitica居民完成他们的任务！
“太难了！”它们朝着@JonArinbjorn和@Onheiron发出叫声，“现在完成花太多的时间了！等到明天做一点关系都没有！为什么现在不去做一些有趣的事情呢？”
你发誓再也不这样了。你将攀登你自己的待办事项山脉，打败掠食明天之鸟！", + "questFalconCompletion": "最后，你战胜了掠食明天之鸟，安下心来享受风景和你应得的休息时间。
“哇噢！”@Trogdorina说，“你赢了！”
@Squish接着说道，“.嘿，拿上这些我找到的蛋作为你的奖励。”", + "questFalconBoss": "掠食明天之鸟", + "questFalconDropFalconEgg": "猎鹰(宠物蛋)", + "questFalconUnlockText": "解锁猎鹰蛋购买功能", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/zh/rebirth.json b/common/locales/zh/rebirth.json index 816e48a6b7..5f853e107f 100644 --- a/common/locales/zh/rebirth.json +++ b/common/locales/zh/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "复活后你的角色从1级开始。", "rebirthAdvList1": "生命值完全复原", "rebirthAdvList2": "你没有经验，金币，装备(免费物品例外如神秘物品)。", - "rebirthAdvList3": "你的习惯，每日任务，待办事项会被重置为黄色，连击数也会被重置。", + "rebirthAdvList3": "你的习惯，每日任务，和待办事项重置到黄色，并且连击数也重置，除了挑战任务。", "rebirthAdvList4": "你的初始职业是战士，但你以后可以解锁新的职业。", "rebirthInherit": "你的新角色继承了一些前身的东西：", "rebirthInList1": "任务，历史记录和设置保留了下来。", @@ -24,5 +24,6 @@ "rebirthPop": "开始一个1级的新角色并保留成就，物品和任务历史。", "rebirthName": "重生球", "reborn": "重生, 最高级别 <%= reLevel %>", - "confirmReborn": "你确定吗？" + "confirmReborn": "你确定吗？", + "rebirthComplete": "你已经重生了！" } \ No newline at end of file diff --git a/common/locales/zh/settings.json b/common/locales/zh/settings.json index fd7becbb80..d8c734165c 100644 --- a/common/locales/zh/settings.json +++ b/common/locales/zh/settings.json @@ -47,6 +47,7 @@ "customDayStart": "自定义起始日期", "changeCustomDayStart": "变更自定义起始日期？", "sureChangeCustomDayStart": "你确定要变更自定义起始日期吗？", + "customDayStartHasChanged": "你自定义的每日开始时间已经改变。", "nextCron": "从你第一次使用Habitica<%= time %>之后，你的每日任务将会重置。请确保你在这之前已经完成了所有每日任务！", "customDayStartInfo1": "在你所处地区时间每天凌晨12点，Habitica默认核对并重置你的每日任务。你可以在此变更任务重置时间。", "misc": "其他", @@ -61,12 +62,23 @@ "newUsername": "新的登录名", "dangerZone": "危险区域", "resetText1": "警告！这会重置你角色的许多数值。强烈不建议你这样做。不过，在短暂的试玩一段时间后，进行重置或许会有所帮助。", - "resetText2": "你会失去你所有的等级，金币和经验。你所有的任务会被永久删除，你会失去你所有的任务历史数据。你会失去所有的装备，但是你能够把他们买回来。包括你曾经拥有过的所有限量版装备和订阅者的神秘物品(你需要编程合适的职业才能重新购买职业限定的装备)。你会保留你的当前职业和你的宠物与坐骑。相比之下，用道具重生球会更安全，你的任务会被保留下来。", + "resetText2": "你将会失去你所有等级，金币和经验。你的所有任务(除了那些来自挑战的任务)将会被永久删除并且你将失去所有它们的历史数据。你将会丢失所有的装备但你能够再次购买回来，包括所有你已拥有的限定版装备或捐赠者神秘物品(你将需要是恰当的职业才能重新购买职业限定装备)。你将会保留你当前职业和你的宠物和坐骑。你可能更愿意去使用 重生球 来替代，这是一个更安全的选择，它能保存你所有的任务。", "deleteText": "你确定吗？这会永久地删除你的帐号，并且永远也无法恢复！如果希望再次使用Habitica需要注册一个新的帐号。已有的金钱和花掉的宝石无法被退费。如果你非常确定，在下面的文本框中输入<%= deleteWord %>。", "API": "API / 应用程序接口", + "APIv3": "API v3", + "APIv2": "API v2 - 弃用", "APIText": "这个是用来复制到第三方应用的。但是，你的API令牌相当于密码，不要公开它。有时候别人会问你要用户ID，但是永远不要把你的API令牌分享给其他人，包括Github。", "APIToken": "API 令牌 (这相当于密码——看上面的警告！)", + "thirdPartyApps": "第三方应用", + "dataToolDesc": "一个网页，这个网页展示你的Habitica账户的特定信息，例如你的任务、装备和技能的统计信息。", + "beeminder": "蜜蜂看守", + "beeminderDesc": "让蜜蜂看守自动地监视你的Habitica待办事项。你能交付来维持一个目标数量的待办事项每周或每天被完成，或者你能交付来渐渐减少维持的未完成待办事项数量。(通过“交付”蜜蜂看守意味着有支付真实金钱的风险！但你也可能仅喜欢蜜蜂看守的华丽的图形)。", + "chromeChatExtension": "Chrome聊天扩展", + "chromeChatExtensionDesc": "Habitica的Chrome聊天扩展增加了一个直观的聊天窗口。它让用户能在它们所属的旅馆、队伍和工会中闲聊。", + "otherExtensions": "其他扩展", + "otherDesc": "其他应用、扩展和工具请关注Habitica维基。", "resetDo": "去吧，重置我的账号吧！", + "resetComplete": "重置完成！", "fixValues": "修复数值", "fixValuesText1": "如果你遇到了一个bug或者错误地改变了你的角色 (不应该受到的伤害，获得了不属于你的金币等等)，你可以手动的改正你的数值。是的，这使得用户有能力作弊：请正确地使用这个功能，否则你会破坏你自己的习惯养成系统！", "fixValuesText2": "注意你不可以在这里重置单个任务的连击数。如果希望那样做，编辑日常标签，进入高级选项，在那里你可以修复连击数。", @@ -96,6 +108,7 @@ "emailNotifications": "电子邮件通知", "wonChallenge": "你赢得了一项挑战！", "newPM": "收到悄悄话", + "sentGems": "发送宝石！", "giftedGems": "自然宝石", "giftedGemsInfo": "<%= amount %> 宝石 - 来自 <%= name %>", "giftedSubscription": "捐助有礼", @@ -135,6 +148,11 @@ "webhooks": "Webhooks", "enabled": "已启用", "webhookURL": "Webhook链接", + "invalidUrl": "无效的url", + "invalidEnabled": "\"enabled\"参数应该为一个布尔值", + "regIdRequired": "需要RegId", + "pushDeviceAdded": "成功添加推送设备", + "pushDeviceAlreadyAdded": "用户已经有推送设备了", "add": "添加", "buyGemsGoldCap": "上限提升至 <%= amount %>", "mysticHourglass": "<%= amount %> 个神秘沙漏", @@ -149,5 +167,5 @@ "amazonPayments": "亚马逊支付", "timezone": "时区", "timezoneUTC": "Habitica直接引用你电脑上的时区设置：<%= utc %>", - "timezoneInfo": "如果这个时区显示错误，首先让你的网页浏览器刷新页面，保证Habitica有最新的信息。如果依旧错误，在你的电脑上调节时区设置，并再次刷新页面。
如果你在其他电脑或移动设备上使用Habitica，所有时区必须保持一致。如果你的每日任务在错误的时间重置，请在所有的电脑或移动设备上检查这项设置。" + "timezoneInfo": "如果那个时区是错误的，首先用你浏览器的重载或刷新按钮重载这个页面以确保Habitica有最新的信息。如果还是不行，调整你电脑上的时区然后再次重载页面。
如果你在其他电脑或移动设备上使用Habitica，它们上的时区必须是一样的才行。如果你的每日任务已经在错误的时间被重置，在你所有其他的电脑和你移动设备的一个浏览器上重复这个检查。" } \ No newline at end of file diff --git a/common/locales/zh/spells.json b/common/locales/zh/spells.json index e9cd79fc86..cd9382e948 100644 --- a/common/locales/zh/spells.json +++ b/common/locales/zh/spells.json @@ -1,50 +1,56 @@ { "spellWizardFireballText": "火焰爆轰", - "spellWizardFireballNotes": "你的手中释放出强大的烈焰。你得到经验值，并且对怪物造成额外伤害！点击一个目标以使用 (法术强度与智力值有关)", + "spellWizardFireballNotes": "火焰在你手中迸发。你将获得经验值，并且对怪物们造成额外伤害！点击一项任务来释放(法术强度与智力值有关)", "spellWizardMPHealText": "澎湃灵泉", "spellWizardMPHealNotes": "你消耗魔法值来帮助你的队友。你队伍中的其他成员获得魔法值！(法术强度与智力值有关)", "spellWizardEarthText": "地震", - "spellWizardEarthNotes": "你的精神力量晃动着大地。你的整个队伍获得智力上的增益！(法术强度与未增益的智力有关)", + "spellWizardEarthNotes": "你的精神力量撼动了大地。所有队员获得智力上的增益！(法术强度与未增益的智力值有关)", "spellWizardFrostText": "极寒霜冻", - "spellWizardFrostNotes": "冰霜冻结了你的任务。你的任务连击数在明天不会重置！(一次施放影响所有连击数)", + "spellWizardFrostNotes": "冰霜冻结了你的任务。你所有任务的连击数不会在今天之后归零！(释放一次即对所有任务生效)", "spellWarriorSmashText": "致命一击", - "spellWarriorSmashNotes": "你全部力量都集中于一个任务。该任务获得更多蓝色值、更少红色值，而且你能对王造成额外伤害！点击一个任务来施放法术。(法术强度与力量值有关)", + "spellWarriorSmashNotes": "你全力击中了一项任务。该任务的蓝色值将更深/红色值将更浅，与此同时你对怪物们造成额外伤害！点击一项任务来释放法术。(法术强度与力量值有关)", "spellWarriorDefensiveStanceText": "防御姿态", - "spellWarriorDefensiveStanceNotes": "你准备对你的任务发起一次猛攻。你获得体质上的增益！(法术强度与未增益的体质值有关)", + "spellWarriorDefensiveStanceNotes": "你准备好接受来自自己任务的猛攻了。你获得体质上的增益！(法术强度与未增益的体质值有关)", "spellWarriorValorousPresenceText": "悍勇现身", - "spellWarriorValorousPresenceNotes": "你的出现鼓舞了你的队伍。你的整个队伍获得了力量上的增益！(法术强度与未增益的力量值有关)", + "spellWarriorValorousPresenceNotes": "你的出现鼓舞了你的队伍。所有队员获得了力量上的增益！(法术强度与未增益的力量值有关)", "spellWarriorIntimidateText": "威慑凝视", - "spellWarriorIntimidateNotes": "你的凝视将恐惧钉入敌人内心。你的整个队伍获得体质上的增益！(法术强度与未增益的体质值有关)", + "spellWarriorIntimidateNotes": "你的凝视使敌人吓破了胆。你的整个队伍获得体质上的增益！(法术强度与未增益的体质值有关)", "spellRoguePickPocketText": "飞龙探云手", - "spellRoguePickPocketNotes": "你窃取了一个附近的任务的财富。你获得了一些金币！点击一个任务来施放法术。(法术强度与感知值有关)", + "spellRoguePickPocketNotes": "你偷走了附近一个任务的财富。你获得了一些金币！点击一项任务来释放。(法术强度与感知值有关)", "spellRogueBackStabText": "背刺", - "spellRogueBackStabNotes": "你背叛了一个愚蠢的任务。你获得了一些金币与经验！点击一个任务来施放法术。(法术强度与力量值有关)", - "spellRogueToolsOfTradeText": "职业用具", - "spellRogueToolsOfTradeNotes": "你与你的队友分享了你的天赋。你的整个队伍获得了感知上的增益！(法术强度与未增益的感知值有关)", + "spellRogueBackStabNotes": "你背叛了一个愚蠢的任务。你获得了一些金币与经验值！点击一项任务来释放。(法术强度与力量值有关)", + "spellRogueToolsOfTradeText": "行业工具", + "spellRogueToolsOfTradeNotes": "你与朋友们分享了你的天赋。所有队员获得了感知上的增益！(法术强度与未增益的感知值有关)", "spellRogueStealthText": "潜行", - "spellRogueStealthNotes": "你是如此鬼祟以至于难以被找出。一些你的未完成的日常任务在今晚不会对你造成伤害，而且它们的连击数和颜色不会发生改变。(需要多次施放以对多个日常任务生效)", - "spellHealerHealText": "圣光术", - "spellHealerHealNotes": "圣光笼罩着你，治愈了你的伤口。你获得了生命值！(法术强度与体质值以及智力值有关)", - "spellHealerBrightnessText": "灼热光矢", - "spellHealerBrightnessNotes": "你爆发出一道光闪瞎了你的任务。你的任务的蓝色值增加、红色值降低了。(法术强度与智力值有关)", - "spellHealerProtectAuraText": "守护光环", + "spellRogueStealthNotes": "你隐秘地在黑夜中行进。今晚，你未完成的一些日常任务将不会对你造成伤害，它们的连击数和颜色也保持不变。(需要多次施放以对多个日常任务生效)", + "spellHealerHealText": "治愈之光", + "spellHealerHealNotes": "圣光笼罩着你，治愈了你的伤口。你的生命值恢复了！(法术强度与体质值以及智力值有关)", + "spellHealerBrightnessText": "目眩神迷", + "spellHealerBrightnessNotes": "你爆发出一道光闪瞎了你的任务。所有任务的蓝色值增加、红色值降低。(法术强度与智力值有关)", + "spellHealerProtectAuraText": "灵光护佑", "spellHealerProtectAuraNotes": "你保护你的队伍免受伤害。你的整个队伍获得体质上的增益！(法术强度与未增益的体质值有关)", "spellHealerHealAllText": "祝福", - "spellHealerHealAllNotes": "抚慰之光围绕着你。你的整个队伍恢复生命值！(法术强度与体质值以及智力值有关)", + "spellHealerHealAllNotes": "治愈的光环围绕着你。所有队员恢复生命值！(法术强度与体质值以及智力值有关)", "spellSpecialSnowballAuraText": "雪球", "spellSpecialSnowballAuraNotes": "向队友丢了一个雪球!会发生什么事情呢?所产生的效果会持续到第二天早上.", "spellSpecialSaltText": "盐", "spellSpecialSaltNotes": "有人向你扔了雪球。哈哈，很好玩。现在把这些雪从我身上弄下来！", - "spellSpecialSpookDustText": "鬼火", - "spellSpecialSpookDustNotes": "把一个好友变成长眼睛的魔毯。", + "spellSpecialSpookySparklesText": "幽灵般的闪光", + "spellSpecialSpookySparklesNotes": "把一个好友变成长眼睛的魔毯！", "spellSpecialOpaquePotionText": "晦暗的药水", "spellSpecialOpaquePotionNotes": "取消鬼火的效果", "spellSpecialShinySeedText": "闪光种子", "spellSpecialShinySeedNotes": "把一个好友变成一朵笑笑花。", "spellSpecialPetalFreePotionText": "除花剂", "spellSpecialPetalFreePotionNotes": "解除闪光种子效果。", - "spellSpecialSeafoamText": "浪花", - "spellSpecialSeafoamNotes": "把好友变成海洋生物", + "spellSpecialSeafoamText": "海泡石", + "spellSpecialSeafoamNotes": "把一位好友变成海洋生物", "spellSpecialSandText": "沙子", - "spellSpecialSandNotes": "取消浪花效果" + "spellSpecialSandNotes": "抵消海泡石的效果", + "spellNotFound": "找不到技能\"<%= spellId %>\"。", + "partyNotFound": "找不到队伍", + "targetIdUUID": "\"targetId\" 必须是有效ID。", + "challengeTasksNoCast": "不允许在挑战任务上使用技能。", + "spellNotOwned": "你没有拥有这个技能。", + "spellLevelTooHigh": "你必须达到等级<%= level %>来运用这个技能。" } \ No newline at end of file diff --git a/common/locales/zh/subscriber.json b/common/locales/zh/subscriber.json index e1f3aa5cfa..736a16e65e 100644 --- a/common/locales/zh/subscriber.json +++ b/common/locales/zh/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "可以使用金币购买宝石，获得每月神秘装备，保留已完成项目的历史，双倍日常掉落率，支持开发者。点击获取更多信息。", "buyGemsGold": "用金币购买宝石", "buyGemsGoldText": "商人亚历山大可以按每个宝石 <%= gemCost %>金币的价格向你出售宝石，他每个月的初始进货量是 <%= gemLimit %> 个宝石，如果可以在接下来的时间里坚持捐助，每三个月宝石上限就会增加5，直到最大值1个月50颗宝石！", + "mustSubscribeToPurchaseGems": "必须捐赠来用GP购买宝石", + "reachedGoldToGemCap": "你已经达到了本月的 金币=>宝石 上限<%= convCap %>。我们用这个来阻止 滥用/买卖。这个上限将在每个月前三天重置。", "retainHistory": "保留额外的历史条目", "retainHistoryText": "使完成的待办事项和任务的历史纪录更长时间保留。", "doubleDrops": "日常掉率上限翻倍", @@ -29,6 +31,7 @@ "manageSub": "按这里管理捐助", "cancelSub": "取消捐助", "canceledSubscription": "取消捐助", + "cancelingSubscription": "取消捐助", "adminSub": "管理员捐助", "morePlans": "更多计划
即将推出", "organizationSub": "私人组织", @@ -73,6 +76,9 @@ "timeTravelersPopover": "我们看到你有1个神秘的沙漏，所以我们愉快地决定穿梭回来找你！请选择你喜欢的宠物，坐骑或是神秘物品。你还可以看到一系列已不再开放的物品列表在 这里！如果这些都不能满足你，也许你会对我们富有时尚未来感的蒸汽朋克物品套装感兴趣？", "timeTravelersAlreadyOwned": "恭喜！你已经拥有了时光穿梭者目前能够提供的所有道具，感谢支持本站！", "mysticHourglassPopover": "神秘沙漏可以让你购买一些特别的限定道具，比如每月神秘道具组合，世界BOSS甚至过去已经发布完的奖励！", + "mysterySetNotFound": "神秘套装找不到，或者已经拥有套装。", + "mysteryItemIsEmpty": "神秘物品是空的", + "mysteryItemOpened": "神秘物品打开。", "mysterySet201402": "有翼使者长袍套装", "mysterySet201403": "森林行者套装", "mysterySet201404": "薄暮蝴蝶套装", @@ -99,6 +105,8 @@ "mysterySet201601": "决心组冠军", "mysterySet201602": "负心人套装", "mysterySet201603": "幸运草套装", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "蒸汽朋克标准套装", "mysterySet301405": "蒸汽朋克配饰套装", "mysterySetwondercon": "Wondercon漫展", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "花费1个神秘沙漏购买这个道具?", "petsAlreadyOwned": "你已经拥有这只宠物", "mountsAlreadyOwned": "你已经拥有这只坐骑", - "typeNotAllowedHourglass": "本道具无法使用神秘沙漏购买，可购买种类有：", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "本宠物无法使用神秘沙漏购买，可购买种类有：", "mountsNotAllowedHourglass": "本坐骑无法使用神秘沙漏购买，可购买种类有：", "hourglassPurchase": "你使用了一个神秘沙漏购买了一件道具！", - "hourglassPurchaseSet": "你使用了一个神秘沙漏购买了一套道具组合！" + "hourglassPurchaseSet": "你使用了一个神秘沙漏购买了一套道具组合！", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "支付失败", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "无效的优惠劵代码", + "couponUsed": "优惠劵已被使用", + "noSudoAccess": "您没有sudo权限", + "couponCodeRequired": "请填写优惠劵代码", + "eventRequired": "需要 \"req.params.event\"", + "countRequired": "需要 \"req.query.count\"" } \ No newline at end of file diff --git a/common/locales/zh/tasks.json b/common/locales/zh/tasks.json index 8f08b0ce84..25fda3751f 100644 --- a/common/locales/zh/tasks.json +++ b/common/locales/zh/tasks.json @@ -73,6 +73,7 @@ "clearTags": "清除", "hideTags": "隐藏", "showTags": "显示", + "toRequired": "You must supply a to value", "startDate": "开始日期", "startDateHelpTitle": "这个 任务 什么时候开始", "startDateHelp": "设置任务生效的日期。在这之前将不会到期。", @@ -88,8 +89,9 @@ "fortifyName": "稳固药剂", "fortifyPop": "将所有任务恢复至中性状态(黄色)，并补充所有损失的生命值。", "fortify": "稳固", - "fortifyText": "稳固作用会将所有的任务重置到初始(黄色)状态，就像刚刚添加时一样，还会回满你的生命值。如果你变红的任务太多，让你感到游戏太难进行，而蓝色的任务又太容易，这会非常有帮助。如果觉得重获新生非常激励人，那就花几块宝石来给自己缓解一下吧！", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "你确定吗？", + "fortifyComplete": "Fortify complete!", "sureDelete": "你确定要删除这些 <%= taskType %>文本\"<%= taskText %>\"吗？", "streakCoins": "连击奖励！", "pushTaskToTop": "将任务置于顶部.按住ctrl或者cmd可拖至底部。", @@ -112,5 +114,18 @@ "rewardHelp2": "装备能够影响你的属性点数 (<%= linkStart %>头像 > 属性点<%= linkEnd %>)。", "rewardHelp3": "特殊装备会在世界性事件中出现。", "rewardHelp4": "别害怕，大胆地为自己设置自定义奖励！来这里看看 一些简单例子。", - "clickForHelp": "点击获取帮助" + "clickForHelp": "点击获取帮助", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "找不到任务。", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/locales/zh_TW/backgrounds.json b/common/locales/zh_TW/backgrounds.json index 4c4b09de6d..45f6ea4cb1 100644 --- a/common/locales/zh_TW/backgrounds.json +++ b/common/locales/zh_TW/backgrounds.json @@ -154,11 +154,18 @@ "backgroundRainforestNotes": "冒險進入一個熱帶雨林。", "backgroundStoneCircleText": "石圈", "backgroundStoneCircleNotes": "在石圈裡施法。", - "backgrounds042016": "SET 23: Released April 2016", - "backgroundArcheryRangeText": "Archery Range", - "backgroundArcheryRangeNotes": "Practice on the Archery Range.", - "backgroundGiantFlowersText": "Giant Flowers", + "backgrounds042016": "第 23 組：2016 年 4 月推出", + "backgroundArcheryRangeText": "弓箭射程", + "backgroundArcheryRangeNotes": "練習弓箭射程", + "backgroundGiantFlowersText": "巨花", "backgroundGiantFlowersNotes": "Frolic atop Giant Flowers.", - "backgroundRainbowsEndText": "End of the Rainbow", - "backgroundRainbowsEndNotes": "Discover gold at the End of the Rainbow." + "backgroundRainbowsEndText": "彩虹的盡頭", + "backgroundRainbowsEndNotes": "在彩虹的盡頭尋找金幣", + "backgrounds052016": "SET 24: Released May 2016", + "backgroundBeehiveText": "Beehive", + "backgroundBeehiveNotes": "Buzz and dance in a Beehive.", + "backgroundGazeboText": "Gazebo", + "backgroundGazeboNotes": "Battle a Gazebo.", + "backgroundTreeRootsText": "Tree Roots", + "backgroundTreeRootsNotes": "Explore the Tree Roots." } \ No newline at end of file diff --git a/common/locales/zh_TW/challenge.json b/common/locales/zh_TW/challenge.json index c463153958..a1c3da1d91 100644 --- a/common/locales/zh_TW/challenge.json +++ b/common/locales/zh_TW/challenge.json @@ -63,5 +63,20 @@ "congratulations": "恭喜！", "hurray": "太好了！", "noChallengeOwner": "無人擁有", - "noChallengeOwnerPopover": "由於開創這個挑戰的人已經刪除他們的帳號，所以這個挑戰無人擁有。" + "noChallengeOwnerPopover": "由於開創這個挑戰的人已經刪除他們的帳號，所以這個挑戰無人擁有。", + "challengeMemberNotFound": "User not found among challenge's members", + "onlyGroupLeaderChal": "Only the group leader can create challenges", + "tavChalsMinPrize": "Prize must be at least 1 Gem for Tavern challenges.", + "cantAfford": "You can't afford this prize. Purchase more gems or lower the prize amount.", + "challengeIdRequired": "\"challengeId\" must be a valid UUID.", + "winnerIdRequired": "\"winnerId\" must be a valid UUID.", + "challengeNotFound": "Challenge not found.", + "onlyLeaderDeleteChal": "Only the challenge leader can delete it.", + "onlyLeaderUpdateChal": "Only the challenge leader can update it.", + "winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.", + "noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.", + "userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.", + "onlyChalLeaderEditTasks": "Tasks belonging to a challenge can only be edited by the leader.", + "userAlreadyInChallenge": "User is already participating in this challenge.", + "cantOnlyUnlinkChalTask": "Only broken challenges tasks can be unlinked." } \ No newline at end of file diff --git a/common/locales/zh_TW/character.json b/common/locales/zh_TW/character.json index 5cab47dd36..ea16eac7ac 100644 --- a/common/locales/zh_TW/character.json +++ b/common/locales/zh_TW/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the Community Guidelines (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email leslie@habitica.com!", "statsAch": "屬性及成就", "profile": "基本資料", "avatar": "客制化角色圖像", @@ -34,7 +35,7 @@ "beard": "落腮鬍", "mustache": "八字鬍", "flower": "花朵", - "wheelchair": "Wheelchair", + "wheelchair": "輪椅", "basicSkins": "基本膚色", "rainbowSkins": "彩色膚色", "pastelSkins": "柔和膚色", @@ -109,6 +110,7 @@ "mage": "法師", "mystery": "神秘", "changeClass": "變更職業並重新分配屬性點", + "lvl10ChangeClass": "To change class you must be at least level 10.", "levelPopover": "每升一級你都能得到一點並分配到你想要的屬性。你可以手動分配，或讓系統幫你自動完成。", "unallocated": "未分配的屬性點", "haveUnallocated": "你有( <%= points %> )點未分配的屬性點", @@ -164,5 +166,7 @@ "int": "智力", "showQuickAllocation": "開啟分配狀態", "hideQuickAllocation": "關閉分配狀態", - "quickAllocationLevelPopover": "每升一級你都能得到一點並分配到你想要的屬性。你可以手動分配，或讓系統在使用者->屬性下幫你自動完成。" + "quickAllocationLevelPopover": "每升一級你都能得到一點並分配到你想要的屬性。你可以手動分配，或讓系統在使用者->屬性下幫你自動完成。", + "invalidAttribute": "\"<%= attr %>\" is not a valid attribute.", + "notEnoughAttrPoints": "You don't have enough attribute points." } \ No newline at end of file diff --git a/common/locales/zh_TW/content.json b/common/locales/zh_TW/content.json index add68c446a..b06c3007c3 100644 --- a/common/locales/zh_TW/content.json +++ b/common/locales/zh_TW/content.json @@ -113,6 +113,12 @@ "questEggSnailText": "蛇", "questEggSnailMountText": "蛇", "questEggSnailAdjective": "緩慢但穩定的", + "questEggFalconText": "Falcon", + "questEggFalconMountText": "Falcon", + "questEggFalconAdjective": "a swift", + "questEggTreelingText": "Treeling", + "questEggTreelingMountText": "Treeling", + "questEggTreelingAdjective": "a leafy", "eggNotes": "把孵化藥水倒在寵物蛋上會把它孵化成一隻<%= eggAdjective(locale) %> <%= eggText(locale) %>。", "hatchingPotionBase": "普通", "hatchingPotionWhite": "白色", @@ -126,6 +132,7 @@ "hatchingPotionGolden": "金色", "hatchingPotionSpooky": "怪異", "hatchingPotionPeppermint": "薄荷", + "hatchingPotionFloral": "Floral", "hatchingPotionNotes": "把它倒在寵物蛋上可以孵化出一隻<%= potText(locale) %>寵物。", "premiumPotionAddlNotes": "不能夠在任務寵物蛋上使用。", "foodMeat": "肉", diff --git a/common/locales/zh_TW/contrib.json b/common/locales/zh_TW/contrib.json index ad68845c75..2037c395a6 100644 --- a/common/locales/zh_TW/contrib.json +++ b/common/locales/zh_TW/contrib.json @@ -35,8 +35,12 @@ "hallContributors": "贊助人殿堂", "hallPatrons": "贊助人殿堂", "rewardUser": "獎勵玩家", - "UUID": "帳號", + "UUID": "User ID", "loadUser": "載入玩家", + "noAdminAccess": "You don't have admin access.", + "pageMustBeNumber": "req.query.page must be a number", + "userNotFound": "User not found.", + "invalidUUID": "UUID must be valid", "title": "頭銜", "moreDetails": "更多細節 (1-7)", "moreDetails2": "更多細節 (8-9)", @@ -52,8 +56,8 @@ "visitHeroes": "前往英雄殿堂(貢獻者和支持者之殿)", "conLearn": "查看更多關於貢獻獎勵的信息", "conLearnHow": "如何為Habitica作出貢獻", - "surveysSingle": "填寫調查表來幫助Habitica成長。沒有進行中的調查表。", - "surveysMultiple": "填寫<%= surveys %>調查表來幫助Habitica成長。沒有進行中的調查表。", + "surveysSingle": "Helped Habitica grow, either by filling out a survey or helping with a major testing effort. Thank you!", + "surveysMultiple": "Helped Habitica grow on <%= surveys %> occasions, either by filling out a survey or helping with a major testing effort. Thank you!", "currentSurvey": "目前的調查表", "surveyWhen": "在三月下旬調查表將處理完畢，徽章將被授予給的所有參與者。", "blurbInbox": "這裡放著你的私人訊息，你可以透過在公會、酒館、隊伍裡發聲的使用者後面的信件圖示來送私人訊息給那個人。如收到不雅文字請截圖寄給Lemoness (leslie@habitica.com)。", diff --git a/common/locales/zh_TW/death.json b/common/locales/zh_TW/death.json index e12f2941ab..3650bcb84e 100644 --- a/common/locales/zh_TW/death.json +++ b/common/locales/zh_TW/death.json @@ -12,5 +12,6 @@ "losingHealthQuickly": "太容易失去生命值嗎？", "lowHealthTips3": "未完成的每日任務會在隔天造成損害，所以要小心，不要一開始就增加太多每日任務！", "lowHealthTips4": "如果你的每日任務在某些日子不用完成的話，你可以點選鉛筆按鈕去更改它。", - "goodLuck": "祝你好運！" + "goodLuck": "祝你好運！", + "cannotRevive": "Cannot revive if not dead" } \ No newline at end of file diff --git a/common/locales/zh_TW/front.json b/common/locales/zh_TW/front.json index 7b9adedb62..611aee7f7d 100644 --- a/common/locales/zh_TW/front.json +++ b/common/locales/zh_TW/front.json @@ -18,7 +18,7 @@ "choreSample4": "整理一間房間", "choreSample5": "清洗並晾乾成堆的衣服", "chores": "家務事", - "clearBrowserData": "Clear Browser Data", + "clearBrowserData": "清除瀏覽器資料", "communityBug": "錯誤 (Bug) 回報", "communityExtensions": "附加元件及擴充套件", "communityFacebook": "Facebook", @@ -28,6 +28,7 @@ "communityReddit": "Reddit", "companyAbout": "如何執行", "companyBlog": "部落格", + "devBlog": "Developer Blog", "companyDonate": "贊助", "companyExtensions": "擴充套件", "companyPrivacy": "隱私權政策", @@ -51,6 +52,7 @@ "featureSocialHeading": "社交遊戲", "featuredIn": "特色在於", "featuresHeading": "我們還有其他功能", + "footerDevs": "Developers", "footerCommunity": "社群", "footerCompany": "公司", "footerMobile": "手機版本", @@ -75,7 +77,7 @@ "infhQuote": "在我讀研究所的時候，[Habitica]幫我重建了生活重心！", "invalidEmail": "需要有效的電子郵件地址，以便進行密碼重置。", "irishfeet123Quote": "我曾經有個很糟的習慣，就是吃完飯後不去整理，而把杯子放得到處都是不放回原位。[Habitica] 救了我!", - "joinOthers": "Join <%= userCount %> people making it fun to achieve goals!", + "joinOthers": "與 <%= userCount %> 人一起讓達成目標變得有趣！", "kazuiQuote": "還沒有遇到[Habitica]之前，我被論文給卡住了，而且我要求自己要做到的事也都進度緩慢，像是做家事、背單字，學圍棋等。至從遇到它之後我才發現，原來我把事情分散開來會更好管理，現在做這些每日任務成了我的動力來源！", "landingadminlink": "管理方案", "landingend": "還沒被說服嗎？", @@ -182,6 +184,7 @@ "zelahQuote": "有了 [Habitica]，我可以為了獲得點數(早睡)或損失生命值(晚睡)而提早上床睡覺。", "reportAccountProblems": "回報帳戶問題", "reportCommunityIssues": "檢舉社群的問題", + "subscriptionPaymentIssues": "Subscription and Payment Issues", "generalQuestionsSite": "關於本網站的一般問題", "businessInquiries": "商業調查", "merchandiseInquiries": "商品調查", @@ -222,5 +225,32 @@ "altAttrWebstorm": "WebStorm", "altAttrGithub": "GitHub", "altAttrTrello": "Trello", - "altAttrSlack": "Slack" + "altAttrSlack": "Slack", + "missingAuthHeaders": "Missing authentication headers.", + "missingAuthParams": "Missing authentication parameters.", + "missingUsernameEmail": "Missing username or email.", + "missingEmail": "Missing email.", + "missingUsername": "Missing username.", + "missingPassword": "Missing password.", + "missingNewPassword": "Missing new password.", + "wrongPassword": "Wrong password.", + "notAnEmail": "Invalid email address.", + "emailTaken": "Email address is already used in an account.", + "newEmailRequired": "Missing new email address.", + "usernameTaken": "Username already taken.", + "passwordConfirmationMatch": "Password confirmation doesn't match password.", + "invalidLoginCredentials": "Incorrect username and/or email and/or password.", + "passwordReset": "If we have your email on file, your password reset link has been sent to your email.", + "passwordResetEmailSubject": "Password Reset for Habitica", + "passwordResetEmailText": "Password for <%= username %> has been reset to <%= newPassword %> . Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them. Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "passwordResetEmailHtml": "Password for <%= username %> has been reset to <%= newPassword %>.
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at <%= baseUrl %>. After you have logged in, head to <%= baseUrl %>/#/options/settings/settings and change your password.", + "invalidLoginCredentialsLong": "Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\".", + "invalidCredentials": "There is no account that uses those credentials.", + "accountSuspended": "Account has been suspended, please contact leslie@habitica.com with your User ID \"<%= userId %>\" for assistance.", + "onlyFbSupported": "Only Facebook is supported currently.", + "cantDetachFb": "Account lacks another authentication method, can't detach Facebook.", + "onlySocialAttachLocal": "Local authentication can be added to only a social account.", + "invalidReqParams": "Invalid request parameters.", + "memberIdRequired": "\"member\" must be a valid UUID.", + "heroIdRequired": "\"heroId\" must be a valid UUID." } \ No newline at end of file diff --git a/common/locales/zh_TW/gear.json b/common/locales/zh_TW/gear.json index d84ef1272c..dd5a8756f3 100644 --- a/common/locales/zh_TW/gear.json +++ b/common/locales/zh_TW/gear.json @@ -146,11 +146,11 @@ "weaponSpecialSpring2016RogueText": "烈焰流星錘", "weaponSpecialSpring2016RogueNotes": "你精通了錘球、棍棒和小刀，現在更要駕馭火焰了！哇！增加 <%= str %> 點力量。2016 春季限量裝備。", "weaponSpecialSpring2016WarriorText": "奶酪錘", - "weaponSpecialSpring2016WarriorNotes": "No one has as many friends as the mouse with tender cheeses. Increases Strength by <%= str %>. Limited Edition 2016 Spring Gear.", - "weaponSpecialSpring2016MageText": "Staff of Bells", - "weaponSpecialSpring2016MageNotes": "Abra-cat-abra! So dazzling, you might mesmerize yourself! Ooh... it jingles... Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2016 Spring Gear.", - "weaponSpecialSpring2016HealerText": "Spring Flower Wand", - "weaponSpecialSpring2016HealerNotes": "With a wave and a wink, you bring the fields and forests into bloom! Or bop troublesome mice on the head. Increases Intelligence by <%= int %>. Limited Edition 2016 Spring Gear.", + "weaponSpecialSpring2016WarriorNotes": "擁有柔軟起司的老鼠擁有最多的朋友。增加 <%=str %> 點力量。2016 春季限量裝備。", + "weaponSpecialSpring2016MageText": "鈴杖", + "weaponSpecialSpring2016MageNotes": "阿布拉卡特阿布拉！多麼炫目啊，你可能對自己施放了催眠術！喔... 他叮噹響，增加 <%= int %> 點智力和 <%= per %> 點感知。2016 春季限量裝備。", + "weaponSpecialSpring2016HealerText": "春花魔杖", + "weaponSpecialSpring2016HealerNotes": "只要一個揮舞並施法，你就可以讓整座森林與田野上花朵盛開！討厭的老鼠也都被驅趕走了。增加 <%= int %> 點智力。2016 春季限量裝備。", "weaponMystery201411Text": "盛宴之叉", "weaponMystery201411Notes": "刺傷你的仇敵或是插進你最愛的食物——這把多才多藝的叉子可是無所不能！沒有屬性加成。2014年11月訂閱者物品", "weaponMystery201502Text": "愛與真理之微光翅膀法杖", @@ -166,9 +166,9 @@ "weaponArmoireRancherLassoText": "牛仔套索", "weaponArmoireRancherLassoNotes": "套索：為圍補和牽繩的理想工具。增加<%= str %>點力量， <%= per %>點感知和<%= int %>點智力。神祕寶箱：牛仔系列(3/3)。", "weaponArmoireMythmakerSwordText": "神話英雄之劍", - "weaponArmoireMythmakerSwordNotes": "Though it may seem humble, this sword has made many mythic heroes. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 3 of 3).", + "weaponArmoireMythmakerSwordNotes": "重劍無鋒大巧不工，這把寶劍其實締造了許多神話英雄。增加 <%= attrs %> 點感知和力量。神祕寶箱：黃金戰袍套裝 (3 件中的第 3 件)", "weaponArmoireIronCrookText": "鐵彎杖", - "weaponArmoireIronCrookNotes": "Fiercely hammered from iron, this iron crook is good at herding sheep. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Horned Iron Set (Item 3 of 3).", + "weaponArmoireIronCrookNotes": "純鋼打造，力透杖柄。這柄區柄用來放牧效果極好。增加感知與力量各 <%=attrs %> 點。神秘寶箱：鐵角套裝 (3 件中的第 3 件)", "weaponArmoireGoldWingStaffText": "金翼魔杖", "weaponArmoireGoldWingStaffNotes": "法杖上的風不斷地旋轉扭動，增加所有屬性各<%= attrs %>點。神祕寶箱：獨立物品。", "weaponArmoireBatWandText": "蝙蝠魔杖", @@ -189,6 +189,8 @@ "weaponArmoireMiningPickaxNotes": "Mine the maximum amount of gold from your tasks! Increases Perception by <%= per %>. Enchanted Armoire: Miner Set (Item 3 of 3).", "weaponArmoireBasicLongbowText": "Basic Longbow", "weaponArmoireBasicLongbowNotes": "A serviceable hand-me-down bow. Increases Strength by <%= str %>. Enchanted Armoire: Basic Archer Set (Item 1 of 3).", + "weaponArmoireHabiticanDiplomaText": "Habitican Diploma", + "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).", "armor": "盔甲", "armorBase0Text": "正常服裝", "armorBase0Notes": "普通的衣服。 沒有屬性加成。", @@ -364,6 +366,10 @@ "armorMystery201512Notes": "Summon the icy flames of winter! Confers no benefit. December 2015 Subscriber Item.", "armorMystery201603Text": "幸運服裝", "armorMystery201603Notes": "This suit is sewn from thousands of four-leafed clovers! Confers no benefit. March 2016 Subscriber Item.", + "armorMystery201604Text": "Armor o' Leaves", + "armorMystery201604Notes": "You, too, can be a small but fearsome leaf puff. Confers no benefit. April 2016 Subscriber Item.", + "armorMystery201605Text": "Marching Bard Uniform", + "armorMystery201605Notes": "Unlike the traditional bards who join adventuring parties, bards who join Habitican marching bands are known for grand parades, not dungeon raids. Confers no benefit. May 2016 Subscriber Item.", "armorMystery301404Text": "蒸汽龐克套裝", "armorMystery301404Notes": "精巧又瀟灑，哇嗚！沒有屬性加成。3015年1月訂閱者物品。", "armorArmoireLunarArmorText": "潤月護甲", @@ -394,6 +400,8 @@ "armorArmoireMinerOverallsNotes": "They may seem worn, but they are enchanted to repel dirt. Increases Constitution by <%= con %>. Enchanted Armoire: Miner Set (Item 2 of 3).", "armorArmoireBasicArcherArmorText": "Basic Archer Armor", "armorArmoireBasicArcherArmorNotes": "This camouflaged vest lets you slip unnoticed through the forests. Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 2 of 3).", + "armorArmoireGraduateRobeText": "Graduate Robe", + "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).", "headgear": "頭飾", "headBase0Text": "沒有頭盔", "headBase0Notes": "沒有頭飾", @@ -565,6 +573,10 @@ "headMystery201602Notes": "Shield your identity from all your admirers. Confers no benefit. February 2016 Subscriber Item.", "headMystery201603Text": "幸運帽", "headMystery201603Notes": "This top hat is a magical good-luck charm. Confers no benefit. March 2016 Subscriber Item.", + "headMystery201604Text": "Crown o' Flowers", + "headMystery201604Notes": "These woven flowers make a surprisingly strong helm! Confers no benefit. April 2016 Subscriber Item.", + "headMystery201605Text": "Marching Bard Hat", + "headMystery201605Notes": "Seventy-six dragons led the big parade, with a hundred and ten gryphons close at hand! Confers no benefit. May 2016 Subscriber Item.", "headMystery301404Text": "華麗禮帽", "headMystery301404Notes": "上流社會佼佼者的華麗禮帽！3015年1月訂閱者物品。沒有屬性加成。", "headMystery301405Text": "基礎禮帽", @@ -601,8 +613,8 @@ "headArmoireBlueFloppyHatNotes": "許多咒術被縫進這頂帽子裡，最後再給它一抹燦爛的藍色。增加感知、智力和體質各<%= attrs %>點。神祕寶箱：獨立物品。", "headArmoireShepherdHeaddressText": "牧羊人頭飾", "headArmoireShepherdHeaddressNotes": "你戴上這頂頭飾顯得智力非凡，不過有時候，你放養的獅鷲們喜歡咀嚼它。增加<%= int %>點智力。神秘寶箱：牧羊人系列(3/3)", - "headArmoireCrystalCrescentHatText": "Crystal Crescent Hat", - "headArmoireCrystalCrescentHatNotes": "The design on this hat waxes and wanes with the phases of the moon. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Crystal Crescent Set (Item 1 of 3).", + "headArmoireCrystalCrescentHatText": "水晶弦月帽", + "headArmoireCrystalCrescentHatNotes": "月之盈虧會反映這頂帽子的力量。增加智力和感知各 <%= attrs %> 點。神秘寶箱：水晶弦月套裝 (三件中的第一件)", "headArmoireDragonTamerHelmText": "Dragon Tamer Helm", "headArmoireDragonTamerHelmNotes": "You look exactly like a dragon. The perfect camouflage... Increases Intelligence by <%= int %>. Enchanted Armoire: Dragon Tamer Set (Item 1 of 3).", "headArmoireBarristerWigText": "Barrister Wig", @@ -613,6 +625,8 @@ "headArmoireMinerHelmetNotes": "Protect your head from falling tasks! Increases Intelligence by <%= int %>. Enchanted Armoire: Miner Set (Item 1 of 3).", "headArmoireBasicArcherCapText": "Basic Archer Cap", "headArmoireBasicArcherCapNotes": "No archer would be complete without a jaunty cap! Increases Perception by <%= per %>. Enchanted Armoire: Basic Archer Set (Item 3 of 3).", + "headArmoireGraduateCapText": "Graduate Cap", + "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).", "offhand": "副手物品", "shieldBase0Text": "沒有副手裝備", "shieldBase0Notes": "沒有盾牌或副武器。", @@ -673,7 +687,7 @@ "shieldSpecialWinter2015HealerText": "寬慰之盾", "shieldSpecialWinter2015HealerNotes": "這塊盾牌抵擋了刺骨的寒風。增加<%= con %>點體質。2014-2015冬季限量裝備。", "shieldSpecialSpring2015RogueText": "霹靂爆破管", - "shieldSpecialSpring2015RogueNotes": "別被它的劈哩啪啦聲糊弄了—爆炸起來非常厲害。提高<%= str %>點力量。2015春季限量版裝備。", + "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.", "shieldSpecialSpring2015WarriorText": "盤子鐵餅", "shieldSpecialSpring2015WarriorNotes": "向你的敵人擲去……或者只是單純地拿著它，因為到了晚飯時間它就會裝滿美味的狗食。提高<%= con %>點體質。2015春季限量版裝備。", "shieldSpecialSpring2015HealerText": "印花枕頭", @@ -716,6 +730,8 @@ "shieldArmoireDragonTamerShieldNotes": "Distract enemies with this dragon-shaped shield. Increases Perception by <%= per %>. Enchanted Armoire: Dragon Tamer Set (Item 2 of 3).", "shieldArmoireMysticLampText": "神秘之燈", "shieldArmoireMysticLampNotes": "Light the darkest caves with this mystic lamp! Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFloralBouquetText": "Bouquet o' Flowers", + "shieldArmoireFloralBouquetNotes": "Not much help in battle, but aren't they beautiful? Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "back": "後背附件", "backBase0Text": "沒有後背附件", "backBase0Notes": "沒有後背附件。", @@ -769,17 +785,17 @@ "headAccessorySpecialSpringWarriorNotes": "敏銳的兔耳偵察著每一捆胡蘿蔔。沒有增益效果。2014春季限量版裝備。", "headAccessorySpecialSpringMageText": "藍色的老鼠耳朵", "headAccessorySpecialSpringMageNotes": "這對圓圓的鼠耳如絲綢般柔軟。沒有屬性加成。2014春季限量版裝備。", - "headAccessorySpecialSpringHealerText": "黃色的狗耳朵", + "headAccessorySpecialSpringHealerText": "黃犬順風耳", "headAccessorySpecialSpringHealerNotes": "又軟又可愛。要不要一起玩呀？沒有屬性加成。2014春季限量版裝備。", "headAccessorySpecialSpring2015RogueText": "黃色鼠耳", "headAccessorySpecialSpring2015RogueNotes": "這對耳朵的鋼板能使自己不受爆炸聲干擾。沒有屬性加成。2015春季限量版裝備。", - "headAccessorySpecialSpring2015WarriorText": "紫色犬耳", + "headAccessorySpecialSpring2015WarriorText": "紫犬順風耳", "headAccessorySpecialSpring2015WarriorNotes": "它們是紫色的。它們是狗耳朵。別讓進一步的愚蠢浪費你的時間。沒有屬性加成。2015春季限量版裝備。", "headAccessorySpecialSpring2015MageText": "藍色兔耳", "headAccessorySpecialSpring2015MageNotes": "這對耳朵聽力過人，以防有魔術師在隨處洩密。沒有屬性加成。2015春季限量版裝備。", "headAccessorySpecialSpring2015HealerText": "綠色貓耳", "headAccessorySpecialSpring2015HealerNotes": "這對可愛的貓耳會讓其他人嫉妒到眼睛發綠。沒有屬性加成。2015春季限量版裝備。", - "headAccessorySpecialSpring2016RogueText": "綠犬耳", + "headAccessorySpecialSpring2016RogueText": "綠犬順風耳", "headAccessorySpecialSpring2016RogueNotes": "使用這個，你將可以追蹤到隱形的神秘法師！沒有屬性加成，2016 限量春季裝備。", "headAccessorySpecialSpring2016WarriorText": "赤鼠耳", "headAccessorySpecialSpring2016WarriorNotes": "To better hear your theme song across clamorous battlefields. Confers no benefit. Limited Edition 2016 Spring Gear.", @@ -820,6 +836,20 @@ "eyewear": "眼部配件", "eyewearBase0Text": "沒有眼部配件", "eyewearBase0Notes": "沒有眼部配件", + "eyewearSpecialBlackTopFrameText": "Black Standard Eyeglasses", + "eyewearSpecialBlackTopFrameNotes": "Glasses with a black frame above the lenses. Confers no benefit.", + "eyewearSpecialBlueTopFrameText": "Blue Standard Eyeglasses", + "eyewearSpecialBlueTopFrameNotes": "Glasses with a blue frame above the lenses. Confers no benefit.", + "eyewearSpecialGreenTopFrameText": "Green Standard Eyeglasses", + "eyewearSpecialGreenTopFrameNotes": "Glasses with a green frame above the lenses. Confers no benefit.", + "eyewearSpecialPinkTopFrameText": "Pink Standard Eyeglasses", + "eyewearSpecialPinkTopFrameNotes": "Glasses with a pink frame above the lenses. Confers no benefit.", + "eyewearSpecialRedTopFrameText": "Red Standard Eyeglasses", + "eyewearSpecialRedTopFrameNotes": "Glasses with a red frame above the lenses. Confers no benefit.", + "eyewearSpecialWhiteTopFrameText": "White Standard Eyeglasses", + "eyewearSpecialWhiteTopFrameNotes": "Glasses with a white frame above the lenses. Confers no benefit.", + "eyewearSpecialYellowTopFrameText": "Yellow Standard Eyeglasses", + "eyewearSpecialYellowTopFrameNotes": "Glasses with a yellow frame above the lenses. Confers no benefit.", "eyewearSpecialSummerRogueText": "流氓眼罩", "eyewearSpecialSummerRogueNotes": "即使是無賴也能看出這個眼罩有多時髦！沒有屬性加成。限定版2014夏季裝備。", "eyewearSpecialSummerWarriorText": "時髦眼罩", diff --git a/common/locales/zh_TW/groups.json b/common/locales/zh_TW/groups.json index 6b72e3a014..693c83fb77 100644 --- a/common/locales/zh_TW/groups.json +++ b/common/locales/zh_TW/groups.json @@ -92,6 +92,7 @@ "send": "送出", "messageSentAlert": "已寄出的留言", "pmHeading": "給<%= name %>的私訊", + "pmsMarkedRead": "Your private messages have been marked as read", "clearAll": "刪除所有郵件", "confirmDeleteAllMessages": "你確定要刪除收件箱中的所有郵件？其他用戶仍然會看到你發給他們的郵件。", "optOutPopover": "不喜歡私密留言嗎？點選以更改設定。", @@ -99,6 +100,15 @@ "unblock": "解除鎖定", "pm-reply": "寄出回覆", "inbox": "收信匣", + "messageRequired": "A message is required.", + "toUserIDRequired": "A User ID is required", + "gemAmountRequired": "A number of gems is required", + "notAuthorizedToSendMessageToThisUser": "Can't send message to this user.", + "privateMessageGiftIntro": "Hello <%= receiverName %>, <%= senderName %> has sent you", + "privateMessageGiftGemsMessage": "<%= gemAmount %> gems!", + "privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription!", + "cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.", + "badAmountOfGemsToSend": "Amount must be within 1 and your current number of gems.", "abuseFlag": "舉報社群規範違規事件", "abuseFlagModalHeading": "您確定要舉報 <%= name %> 的違規事件？", "abuseFlagModalBody": "你確定要舉報這則貼文嗎？你只能舉報違反<%= firstLinkStart %>社群規範<%= linkEnd %> 或是 <%= secondLinkStart %>服務條款<%= linkEnd %> 的貼文。任意舉報符合規定的貼文是違反社群條款的，你可能受到懲罰。當貼文涉及以下內容時是適合舉報的：
- 髒話、宗教性詛咒
- 偏激、詆毀
- 成人話題
- 暴力或是過分的玩笑
- 廣告、無意義訊息
They say there lies a terrible evil in the caverns of Mt. Habitica. A monster whose presence twists the wills of the strong heroes of the land, turning them towards bad habits and laziness! The beast is a grand dragon of immense power and comprised of the shadows themselves: Vice, the treacherous Shadow Wyrm. Brave Habiteers, stand up and defeat this foul beast once and for all, but only if you believe you can stand against its immense power.
Vice Part 1:
How can you expect to fight the beast if it already has control over you? Don't fall victim to laziness and vice! Work hard to fight against the dragon's dark influence and dispel his hold on you!
", + "questVice1Notes": "傳言說，有一個可怕的惡魔藏身於Habitica山的洞穴中。它會扭轉接近這片土地的英雄堅強的意志，讓他們染上惡習並變得懶惰！這個野獸由巨大的力量和陰影組成，並化身為一條奸詐的陰影巨龍——惡習之龍。勇敢的Habitica居民，一起站出來，擊敗這個邪惡的怪物。但是，你一定要相信自己能抵抗他巨大的邪惡之力。
惡習第1部：
小心不要讓他控制你的意志，不然你怎麼和他戰鬥？不要成為懶惰和惡習的犧牲品！努力與巨龍的力量對抗吧，逃出他邪惡之力的影響！
", "questVice1Boss": "惡習之龍的陰影", "questVice1DropVice2Quest": "惡習之龍—第 2 部 ( 捲軸 )", "questVice2Text": "惡習，第2部：尋覓巨龍之巢", @@ -74,7 +74,7 @@ "questVice3DropDragonEgg": "龍 ( 蛋 )", "questVice3DropShadeHatchingPotion": "深色孵化藥水", "questMoonstone1Text": "月光石項鍊，第1部：月光石項鍊", - "questMoonstone1Notes": "A terrible affliction has struck Habiticans. Bad Habits thought long-dead are rising back up with a vengeance. Dishes lie unwashed, textbooks linger unread, and procrastination runs rampant!You track some of your own returning Bad Habits to the Swamps of Stagnation and discover the culprit: the ghostly Necromancer, Recidivate. You rush in, weapons swinging, but they slide through her specter uselessly.
\"Don’t bother,\" she hisses with a dry rasp. \"Without a chain of moonstones, nothing can harm me – and master jeweler @aurakami scattered all the moonstones across Habitica long ago!\" Panting, you retreat... but you know what you must do.", + "questMoonstone1Notes": "一個可怕的災難困擾著Habitica居民。已經消失很久的壞習慣回來復仇了。盤子沒有清洗，課本很長時間沒有看,拖延症開始猖獗！
你跟踪著你自己的一些歸來的壞習慣，來到了淤塞之沼，並發現了這一切的元兇：可怕的死靈巫師，雷茜德維特。你衝了進去，揮舞著你的武器，但是它們都穿過了她幽靈一般的身體，沒有造成任何傷害。
“別費勁兒了，”她用粗糙刺耳的聲音嘶嘶得說。 “沒有月長石項鍊的話，沒有什麼可以傷害我--而且寶石大師@aurakami很久以前就將月長石分散到了Habitica的各處！”雖然你氣喘吁籲的撤退了... 但是你知道你需要做什麼。", "questMoonstone1CollectMoonstone": "月之石", "questMoonstone1DropMoonstone2Quest": "月光石項鍊第 2 部分：死靈法師 Recidivate (卷軸)", "questMoonstone2Text": "月光石項鍊，第2部：死靈法師Recidivate", @@ -304,9 +304,21 @@ "questBewilderCompletionChat": "`The Be-Wilder is DEFEATED!`\n\nWe've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself.\n\n`Mistiflying is saved!`\n\nThe April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.”\n\nThe crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash.\n\n“Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.”\n\nRedphoenix coughs meaningfully.\n\n“I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.”\n\nEncouraged, the marching band starts up.\n\nIt isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more.\n\nAs Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these fuzzy Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.”", "questBewilderBossRageTitle": "Beguilement Strike", "questBewilderBossRageDescription": "When this gauge fills, The Be-Wilder will unleash its Beguilement Strike on Habitica!", - "questBewilderDropBumblebeePet": "Bumblebee (Pet)", - "questBewilderDropBumblebeeMount": "Bumblebee (Mount)", + "questBewilderDropBumblebeePet": "Magical Bee (Pet)", + "questBewilderDropBumblebeeMount": "Magical Bee (Mount)", "questBewilderBossRageMarket": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nOh no! Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure.\n\nHurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else.", "questBewilderBossRageStables": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nAhh!!! Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction!", - "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!" + "questBewilderBossRageBailey": "`The Be-Wilder uses BEGUILEMENT STRIKE!`\n\nLook out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on?\n\nDon't give up... we're so close to defeating this bothersome bird for once and for all!", + "questFalconText": "The Birds of Preycrastination", + "questFalconNotes": "Mt. Habitica is being overshadowed by a looming mountain of To-Dos. It used to be a place to picnic and enjoy a sense of accomplishment, until the neglected tasks grew out of control. Now it's home to fearsome Birds of Preycrastination, foul creatures which stop Habiticans from completing their tasks!
\"It's too hard!\" they caw at @JonArinbjorn and @Onheiron. \"It'll take too long to do right now! It won't make any difference if you wait until tomorrow! Why don't you do something fun instead?\"
No more, you vow. You will climb your personal mountain of To-Dos and defeat the Birds of Preycrastination!", + "questFalconCompletion": "Having finally triumphed over the Birds of Preycrastination, you settle down to enjoy the view and your well-earned rest.
\"Wow!\" says @Trogdorina. \"You won!\"
@Squish adds, \"Here, take these eggs I found as a reward.\"", + "questFalconBoss": "Birds of Preycrastination", + "questFalconDropFalconEgg": "Falcon (Egg)", + "questFalconUnlockText": "Unlocks purchasable Falcon eggs in the Market", + "questTreelingText": "The Tangle Tree", + "questTreelingNotes": "It's the annual Garden Competition, and everyone is talking about the mysterious project which @aurakami has promised to unveil. You join the crowd on the day of the big announcement, and marvel at the introduction of a moving tree. @fuzzytrees explains that the tree will help with garden maintenance, showing how it can mow the lawn, trim the hedge and prune the roses all at the same time – until the tree suddenly goes wild, turning its secateurs on its creator! The crowd panics as everyone tries to flee, but you aren't afraid – you leap forward, ready to do battle.", + "questTreelingCompletion": "You dust yourself off as the last few leaves drift to the floor. In spite of the upset, the Garden Competition is now safe – although the tree you just reduced to a heap of wood chips won't be winning any prizes! \"Still a few kinks to work out there,\" @PainterProphet says. \"Perhaps someone else would do a better job of training the saplings. Do you fancy a go?\"", + "questTreelingBoss": "Tangle Tree", + "questTreelingDropTreelingEgg": "Treeling (Egg)", + "questTreelingUnlockText": "Unlocks purchasable Treeling eggs in the Market" } \ No newline at end of file diff --git a/common/locales/zh_TW/rebirth.json b/common/locales/zh_TW/rebirth.json index 081dd5f6cf..8d33046a4f 100644 --- a/common/locales/zh_TW/rebirth.json +++ b/common/locales/zh_TW/rebirth.json @@ -5,7 +5,7 @@ "rebirthStartOver": "「重生」讓你的角色重返等級 1 !", "rebirthAdvList1": "生命值完全復原", "rebirthAdvList2": "你沒有任何經驗值，黃金，或裝備。(除了一些免費的物品例如「神秘物品」)", - "rebirthAdvList3": "你的習慣、日常任務、待辦事項會被重置為黃色，連擊數也會被重置。", + "rebirthAdvList3": "Your Habits, Dailies, and To-Dos reset to yellow, and streaks reset, except for challenge tasks.", "rebirthAdvList4": "你會從戰士職業開始，直到你解鎖了新的職業。", "rebirthInherit": "你的新角色繼承了一些前輩的東西：", "rebirthInList1": "任務、歷史記錄和設置會保留下來。", @@ -24,5 +24,6 @@ "rebirthPop": "開始一個等級 1 的新角色，並保留成就、物品和任務歷史。", "rebirthName": "重生之球", "reborn": "重生，最高級別 <%= reLevel %>", - "confirmReborn": "你確定嗎？" + "confirmReborn": "你確定嗎？", + "rebirthComplete": "You have been reborn!" } \ No newline at end of file diff --git a/common/locales/zh_TW/settings.json b/common/locales/zh_TW/settings.json index a78e61a852..b5d5c99914 100644 --- a/common/locales/zh_TW/settings.json +++ b/common/locales/zh_TW/settings.json @@ -47,6 +47,7 @@ "customDayStart": "設定開始日期", "changeCustomDayStart": "要更改設定日期嗎？", "sureChangeCustomDayStart": "你確定你要更改設定日期嗎？", + "customDayStartHasChanged": "Your custom day start has changed.", "nextCron": "在<%= time %>以後，重新登入 Habitica，你的每日任務將會重新設定。確保<%= time %>前完成你的每日任務。", "customDayStartInfo1": "Habitica 預設每日午夜將會重新結算當日的每日任務於你所在的時區。你可以在這裡更改每日任務結算時間。", "misc": "其他", @@ -61,12 +62,23 @@ "newUsername": "新帳號", "dangerZone": "危險區域", "resetText1": "警告！此功能會重設你角色的多數資料。強烈不建議你這樣做，但是有些人短暫地玩這個網站後，希望能重新開始。", - "resetText2": "你會失去你所有的等級、金幣和經驗值，所有的任務會被永久刪除。你會失去你所有的任務歷史資料。你會失去所有的裝備，包括你曾經擁有過的所有限量版裝備，和訂閱者的神秘物品（你需要變成對應的職業，才能重新購買職業限定的裝備）。但是能夠再把他們買回來。你會保留你的當前職業和你的寵物與坐騎。相比之下，用道具重生球會更安全，你的任務會被保留下來。", + "resetText2": "You will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks.", "deleteText": "確定嗎？這會永久地刪除你的帳號，並且再也無法恢復！如果希望再次使用 Habitica，需要註冊一個全新的帳號。舊帳號內儲存的和花掉的寶石也無法被退費。如果你非常確定要刪除帳號，在下面的文字欄中輸入<%= deleteWord %>。", "API": "API", + "APIv3": "API v3", + "APIv2": "API v2 - Deprecated", "APIText": "這個是使用再第三方應用上面的。但是，你的 API Token 相當於密碼，請不要公開它。有時候別人可能會向你要UUID，但是永遠不要把你的 API token 分享給其他人，包括在 Github 上。", "APIToken": "API Token（這相當於密碼——注意看上面的警告！）", + "thirdPartyApps": "Third Party Apps", + "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.", + "beeminder": "Beeminder", + "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)", + "chromeChatExtension": "Chrome Chat Extension", + "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.", + "otherExtensions": "Other Extensions", + "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.", "resetDo": "好，重置我的帳號！", + "resetComplete": "Reset complete!", "fixValues": "修復數值", "fixValuesText1": "如果你遇到一個程式上的錯誤，或是自己操作錯誤而導致你的角色受到不公平的待遇（如：受了不應該遭受的攻擊，得到你不應該得到的金幣等等），你可以在這裡手動調整這些數值。沒錯，這讓你有機會能作弊：請謹慎地使用這個功能，否則你會破壞你自己的習慣養成計畫！", "fixValuesText2": "注意，你無法在這裡重置單一任務的連擊數。你得編輯每日任務標籤，並進入進階選項，重置連擊數。", @@ -96,6 +108,7 @@ "emailNotifications": "電子郵件通知", "wonChallenge": "你贏得一個挑戰！", "newPM": "收到的私密訊息", + "sentGems": "Sent gems!", "giftedGems": "禮物用寶石", "giftedGemsInfo": "<%= name %> 的 <%= amount %> 個寶石", "giftedSubscription": "禮物用訂閱", @@ -135,6 +148,11 @@ "webhooks": "Webhooks", "enabled": "啟用", "webhookURL": "Webhook URL", + "invalidUrl": "invalid url", + "invalidEnabled": "the \"enabled\" parameter should be a boolean", + "regIdRequired": "RegId is required", + "pushDeviceAdded": "Push device added successfully", + "pushDeviceAlreadyAdded": "The user already has the push device", "add": "增加", "buyGemsGoldCap": "上限提高到<%= amount %>", "mysticHourglass": "<%= amount %>神秘沙漏", @@ -149,5 +167,5 @@ "amazonPayments": "Amazon Payments", "timezone": "時區", "timezoneUTC": "Habitica 使用您電腦的時區，現在是：<%= utc %>", - "timezoneInfo": "如果該時區是錯誤的，首先使用瀏覽器的重載或刷新按鈕，以確保Habitica具有最新的信息刷新頁面。如果它仍然是錯的，調整你的電腦上的時區，然後再次刷新頁面。
如果您在其他PC或移動設備上使用Habitica ，時區必須對他們都一樣如果您有日常任務在錯誤的時間被重設，重複此檢查在所有其他電腦和對您的移動設備瀏覽器。" + "timezoneInfo": "If that time zone is wrong, first reload this page using your browser's reload or refresh button to ensure that Habitica has the most recent information. If it is still wrong, adjust the time zone on your PC and then reload this page again.
If you use Habitica on other PCs or mobile devices, the time zone must be the same on them all. If your Dailies have been resetting at the wrong time, repeat this check on all other PCs and on a browser on your mobile devices." } \ No newline at end of file diff --git a/common/locales/zh_TW/spells.json b/common/locales/zh_TW/spells.json index 38f06d0112..d141c5e462 100644 --- a/common/locales/zh_TW/spells.json +++ b/common/locales/zh_TW/spells.json @@ -35,8 +35,8 @@ "spellSpecialSnowballAuraNotes": "向隊友發射一個雪球，怎麼可能會有什麼問題呢？持續到隊友的下一天。", "spellSpecialSaltText": "鹽", "spellSpecialSaltNotes": "有人向你扔了雪球。哈哈，很好玩。現在把這些雪從我身上弄下來！", - "spellSpecialSpookDustText": "鬼火", - "spellSpecialSpookDustNotes": "把你的朋友變成長著眼睛的漂浮魔毯。", + "spellSpecialSpookySparklesText": "Spooky Sparkles", + "spellSpecialSpookySparklesNotes": "Turn a friend into a floating blanket with eyes!", "spellSpecialOpaquePotionText": "晦暗藥水", "spellSpecialOpaquePotionNotes": "取消鬼火的效果", "spellSpecialShinySeedText": "閃亮種子", @@ -46,5 +46,11 @@ "spellSpecialSeafoamText": "水藍", "spellSpecialSeafoamNotes": "把朋友變成海洋生物！", "spellSpecialSandText": "沙子", - "spellSpecialSandNotes": "取消水藍的效果。" + "spellSpecialSandNotes": "取消水藍的效果。", + "spellNotFound": "Skill \"<%= spellId %>\" not found.", + "partyNotFound": "Party not found", + "targetIdUUID": "\"targetId\" must be a valid User ID.", + "challengeTasksNoCast": "Casting a skill on challenge tasks is not allowed.", + "spellNotOwned": "You don't own this skill.", + "spellLevelTooHigh": "You must be level <%= level %> to use this skill." } \ No newline at end of file diff --git a/common/locales/zh_TW/subscriber.json b/common/locales/zh_TW/subscriber.json index 27405cf248..d7d1564b55 100644 --- a/common/locales/zh_TW/subscriber.json +++ b/common/locales/zh_TW/subscriber.json @@ -4,6 +4,8 @@ "subDescription": "用金幣購買寶石、獲得每月的神秘物品、保留歷史進度、日常掉寶率上限加倍、支持開發者。點擊這裡來獲取更多資訊。", "buyGemsGold": "用金幣購買寶石", "buyGemsGoldText": "商人 Alexander 會以 <%= gemCost %> 金幣販售你 1 單位的寶石。而他每個月可以販售的寶石量從最初的 <%= gemLimit %> 單位的寶石，持續訂閱三個月後將會增加 5 單位的寶石，最高不超過一個月 50 單位的寶石！", + "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP", + "reachedGoldToGemCap": "You've reached the Gold=>Gem conversion cap <%= convCap %> for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month.", "retainHistory": "保留額外的歷史記錄", "retainHistoryText": "讓已完成的代辦事項以及任務的歷史記錄可以保留更久。", "doubleDrops": "日常掉寶率上限加倍", @@ -29,6 +31,7 @@ "manageSub": "按這裡管理訂閱", "cancelSub": "取消訂閱", "canceledSubscription": "已取消訂閱", + "cancelingSubscription": "Canceling the subscription", "adminSub": "管理員訂閱", "morePlans": "更多計畫
即將推出", "organizationSub": "私人組織", @@ -73,6 +76,9 @@ "timeTravelersPopover": "我們發現你擁有神秘沙漏，很高興能為你穿越時空！請選擇你想要的寵物、座騎或神秘物品。你可以在這裡觀看看到往昔物品的清單 ！如果這些無法滿足你，也許你會對我們時髦的未來風蒸氣龐克物品有興趣？", "timeTravelersAlreadyOwned": "恭喜！你已擁有時光旅行者目前所供應的所有物品。感謝你對這個網站的支持！", "mysticHourglassPopover": "神秘沙漏能讓你購買特定的限期物品，像是每個月的神祕物品和世界 Boss 的獎品，取得過去的東西！", + "mysterySetNotFound": "Mystery set not found, or set already owned.", + "mysteryItemIsEmpty": "Mystery items are empty", + "mysteryItemOpened": "Mystery item opened.", "mysterySet201402": "有翼使者長袍套裝", "mysterySet201403": "森林行者套裝", "mysterySet201404": "薄暮蝴蝶套裝", @@ -99,6 +105,8 @@ "mysterySet201601": "決心冠軍套裝", "mysterySet201602": "負心者套裝", "mysterySet201603": "幸運手套套裝", + "mysterySet201604": "Leaf Warrior Set", + "mysterySet201605": "Marching Bard Set", "mysterySet301404": "蒸氣龐克標準套裝", "mysterySet301405": "蒸氣龐克配件套裝", "mysterySetwondercon": "Wondercon 漫畫展", @@ -110,9 +118,25 @@ "hourglassBuyItemConfirm": "使用 1 個神祕沙漏購買這個物品嗎？", "petsAlreadyOwned": "已擁有此寵物。", "mountsAlreadyOwned": "已擁有此座騎。", - "typeNotAllowedHourglass": "此物品類型無法用神秘沙漏購買。適用類型：", + "typeNotAllowedHourglass": "Item type not supported for purchase with Mystic Hourglass. Allowed types: <%= allowedTypes %>", "petsNotAllowedHourglass": "此寵物無法使用神秘沙漏購買。", "mountsNotAllowedHourglass": "此座騎無法使用神秘沙漏購買。", "hourglassPurchase": "使用神秘沙漏購買了一項物品！", - "hourglassPurchaseSet": "使用神秘沙漏購買了一組物品！" + "hourglassPurchaseSet": "使用神秘沙漏購買了一組物品！", + "missingUnsubscriptionCode": "Missing unsubscription code.", + "missingSubscription": "User does not have a plan subscription", + "missingSubscriptionCode": "Missing subscription code. Possible values: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo.", + "cannotDeleteActiveAccount": "You have an active subscription, cancel your plan before deleting your account.", + "paymentNotSuccessful": "The payment was not successful", + "planNotActive": "The plan hasn't activated yet (due to a PayPal bug). It will begin <%= nextBillingDate %>, after which you can cancel to retain your full benefits", + "notAllowedHourglass": "Pet/Mount not available for purchase with Mystic Hourglass.", + "readCard": "<%= cardType %> has been read", + "cardTypeRequired": "Card type required", + "cardTypeNotAllowed": "Unknown card type.", + "invalidCoupon": "Invalid coupon code.", + "couponUsed": "Coupon code already used.", + "noSudoAccess": "You don't have sudo access.", + "couponCodeRequired": "The coupon code is required.", + "eventRequired": "\"req.params.event\" is required.", + "countRequired": "\"req.query.count\" is required." } \ No newline at end of file diff --git a/common/locales/zh_TW/tasks.json b/common/locales/zh_TW/tasks.json index dfbffbedff..5ff68283bc 100644 --- a/common/locales/zh_TW/tasks.json +++ b/common/locales/zh_TW/tasks.json @@ -73,6 +73,7 @@ "clearTags": "清除", "hideTags": "隱藏標籤", "showTags": "展開標籤", + "toRequired": "You must supply a to value", "startDate": "開始日", "startDateHelpTitle": "這個任務的開始日？", "startDateHelp": "設定這個認識開始有效的日期，在那之前它不會出現在到期清單。", @@ -88,8 +89,9 @@ "fortifyName": "穩固藥水", "fortifyPop": "將所有任務調回中性 ( 黃色 )，並將 HP 補滿。", "fortify": "穩固", - "fortifyText": "鞏固會將你的任務回復到中性狀態 ( 黃色 ，如同剛新增時)，並把你的生命值補滿。把它當成無計可施時的最後王牌！紅色會為進步提供良好的動力，但如果滿目紅色讓你難過，且每天開始時都對你致命，那麼花費寶石來喘口氣吧！", + "fortifyText": "Fortify will return all your tasks, except challenge tasks, to a neutral (yellow) state, as if you'd just added them, and top your Health off to full. This is great if all your red tasks are making the game too hard, or all your blue tasks are making the game too easy. If starting fresh sounds much more motivating, spend the Gems and catch a reprieve!", "confirmFortify": "你確定嗎？", + "fortifyComplete": "Fortify complete!", "sureDelete": "你確定要收回 <%= taskType %> 的挑戰 \"<%= taskText %>\" 嗎？", "streakCoins": "連擊獎勵", "pushTaskToTop": "按著 ctrl 或 cmd 來置頂。", @@ -112,5 +114,18 @@ "rewardHelp2": "裝備會影響你的屬性。 (<%= linkStart %>角色 > 屬性<%= linkEnd %>。)", "rewardHelp3": "在世界事件發生時，特殊的裝備會出現。", "rewardHelp4": "不知道要怎麼自訂獎勵嗎？ 點擊這裡有一些參考範例。", - "clickForHelp": "點選獲得協助" + "clickForHelp": "點選獲得協助", + "taskIdRequired": "\"taskId\" must be a valid UUID.", + "taskNotFound": "Task not found.", + "invalidTaskType": "Task type must be one of \"habit\", \"daily\", \"todo\", \"reward\".", + "cantDeleteChallengeTasks": "A task belonging to a challenge can't be deleted.", + "checklistOnlyDailyTodo": "Checklists are supported only on dailies and todos", + "checklistItemNotFound": "No checklist item was found with given id.", + "itemIdRequired": "\"itemId\" must be a valid UUID.", + "tagNotFound": "No tag item was found with given id.", + "tagIdRequired": "\"tagId\" must be a valid UUID corresponding to a tag belonging to the user.", + "positionRequired": "\"position\" is required and must be a number.", + "cantMoveCompletedTodo": "Can't move a completed todo.", + "directionUpDown": "\"direction\" is required and must be 'up' or 'down'", + "alreadyTagged": "The task is already tagged with given tag." } \ No newline at end of file diff --git a/common/script/.eslintrc b/common/script/.eslintrc new file mode 100644 index 0000000000..0b1303a736 --- /dev/null +++ b/common/script/.eslintrc @@ -0,0 +1,6 @@ +{ + "extends": [ + "habitrpg/browser", + "habitrpg/babel" + ] +} diff --git a/common/script/constants.js b/common/script/constants.js index d6e0aa9384..040b968f8f 100644 --- a/common/script/constants.js +++ b/common/script/constants.js @@ -1,3 +1,5 @@ export const MAX_HEALTH = 50; export const MAX_LEVEL = 100; export const MAX_STAT_POINTS = MAX_LEVEL; +export const ATTRIBUTES = ['str', 'int', 'per', 'con']; +export const TAVERN_ID = '00000000-0000-4000-A000-000000000000'; diff --git a/common/script/content/appearance/backgrounds.js b/common/script/content/appearance/backgrounds.js index cce821d36c..d3efc73fa3 100644 --- a/common/script/content/appearance/backgrounds.js +++ b/common/script/content/appearance/backgrounds.js @@ -325,6 +325,34 @@ let backgrounds = { notes: t('backgroundRainbowsEndNotes'), }, }, + backgrounds052016: { + beehive: { + text: t('backgroundBeehiveText'), + notes: t('backgroundBeehiveNotes'), + }, + gazebo: { + text: t('backgroundGazeboText'), + notes: t('backgroundGazeboNotes'), + }, + tree_roots: { + text: t('backgroundTreeRootsText'), + notes: t('backgroundTreeRootsNotes'), + }, + }, + backgrounds062016: { + lighthouse_shore: { + text: t('backgroundLighthouseShoreText'), + notes: t('backgroundLighthouseShoreNotes'), + }, + lilypad: { + text: t('backgroundLilypadText'), + notes: t('backgroundLilypadNotes'), + }, + waterfall_rock: { + text: t('backgroundWaterfallRockText'), + notes: t('backgroundWaterfallRockNotes'), + }, + }, }; /* eslint-enable quote-props */ diff --git a/common/script/content/appearance/chair.js b/common/script/content/appearance/chair.js index ab51bbf6aa..ab52b334ea 100644 --- a/common/script/content/appearance/chair.js +++ b/common/script/content/appearance/chair.js @@ -3,4 +3,9 @@ import prefill from './prefill.js'; export default prefill({ none: {}, black: {}, + blue: {}, + green: {}, + pink: {}, + red: {}, + yellow: {}, }); diff --git a/common/script/content/gear/sets/armoire.js b/common/script/content/gear/sets/armoire.js index 5d342db308..d20c933b22 100644 --- a/common/script/content/gear/sets/armoire.js +++ b/common/script/content/gear/sets/armoire.js @@ -126,6 +126,22 @@ let armor = { set: 'basicArcher', canOwn: ownsItem('armor_armoire_basicArcherArmor'), }, + graduateRobe: { + text: t('armorArmoireGraduateRobeText'), + notes: t('armorArmoireGraduateRobeNotes', { int: 10 }), + value: 100, + int: 10, + set: 'graduate', + canOwn: ownsItem('armor_armoire_graduateRobe'), + }, + stripedSwimsuit: { + text: t('armorArmoireStripedSwimsuitText'), + notes: t('armorArmoireStripedSwimsuitNotes', { con: 13 }), + value: 100, + con: 13, + set: 'seaside', + canOwn: ownsItem('armor_armoire_stripedSwimsuit'), + }, }; let eyewear = { @@ -330,6 +346,23 @@ let head = { set: 'basicArcher', canOwn: ownsItem('head_armoire_basicArcherCap'), }, + graduateCap: { + text: t('headArmoireGraduateCapText'), + notes: t('headArmoireGraduateCapNotes', { int: 9 }), + value: 100, + int: 9, + set: 'graduate', + canOwn: ownsItem('head_armoire_graduateCap'), + }, + greenFloppyHat: { + text: t('headArmoireGreenFloppyHatText'), + notes: t('headArmoireGreenFloppyHatNotes', { attrs: 8 }), + value: 100, + per: 8, + int: 8, + con: 8, + canOwn: ownsItem('head_armoire_greenFloppyHat'), + }, }; let shield = { @@ -375,6 +408,21 @@ let shield = { per: 15, canOwn: ownsItem('shield_armoire_mysticLamp'), }, + floralBouquet: { + text: t('shieldArmoireFloralBouquetText'), + notes: t('shieldArmoireFloralBouquetNotes', { con: 3 }), + value: 100, + con: 3, + canOwn: ownsItem('shield_armoire_floralBouquet'), + }, + sandyBucket: { + text: t('shieldArmoireSandyBucketText'), + notes: t('shieldArmoireSandyBucketNotes', { per: 10 }), + value: 100, + per: 10, + set: 'seaside', + canOwn: ownsItem('shield_armoire_sandyBucket'), + }, }; let headAccessory = { @@ -521,6 +569,22 @@ let weapon = { set: 'basicArcher', canOwn: ownsItem('weapon_armoire_basicLongbow'), }, + habiticanDiploma: { + text: t('weaponArmoireHabiticanDiplomaText'), + notes: t('weaponArmoireHabiticanDiplomaNotes', { int: 11 }), + value: 100, + int: 11, + set: 'graduate', + canOwn: ownsItem('weapon_armoire_habiticanDiploma'), + }, + sandySpade: { + text: t('weaponArmoireSandySpadeText'), + notes: t('weaponArmoireSandySpadeNotes', { str: 10 }), + value: 100, + str: 10, + set: 'seaside', + canOwn: ownsItem('weapon_armoire_sandySpade'), + }, }; let armoireSet = { diff --git a/common/script/content/gear/sets/mystery.js b/common/script/content/gear/sets/mystery.js index 33f40ae47c..de7a0a322f 100644 --- a/common/script/content/gear/sets/mystery.js +++ b/common/script/content/gear/sets/mystery.js @@ -109,6 +109,18 @@ let armor = { mystery: '201603', value: 0, }, + 201604: { + text: t('armorMystery201604Text'), + notes: t('armorMystery201604Notes'), + mystery: '201604', + value: 0, + }, + 201605: { + text: t('armorMystery201605Text'), + notes: t('armorMystery201605Notes'), + mystery: '201605', + value: 0, + }, 301404: { text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), @@ -292,6 +304,18 @@ let head = { mystery: '201603', value: 0, }, + 201604: { + text: t('headMystery201604Text'), + notes: t('headMystery201604Notes'), + mystery: '201604', + value: 0, + }, + 201605: { + text: t('headMystery201605Text'), + notes: t('headMystery201605Notes'), + mystery: '201605', + value: 0, + }, 301404: { text: t('headMystery301404Text'), notes: t('headMystery301404Notes'), diff --git a/common/script/content/gear/sets/special/index.js b/common/script/content/gear/sets/special/index.js index 5111eaa793..cad6ae6f97 100644 --- a/common/script/content/gear/sets/special/index.js +++ b/common/script/content/gear/sets/special/index.js @@ -62,9 +62,6 @@ let armor = { notes: t('armorSpecialSpringRogueNotes', { per: 15 }), value: 90, per: 15, - canBuy: () => { - return true; - }, }, springWarrior: { event: EVENTS.spring, @@ -73,9 +70,6 @@ let armor = { notes: t('armorSpecialSpringWarriorNotes', { con: 9 }), value: 90, con: 9, - canBuy: () => { - return true; - }, }, springMage: { event: EVENTS.spring, @@ -84,9 +78,6 @@ let armor = { notes: t('armorSpecialSpringMageNotes', { int: 9 }), value: 90, int: 9, - canBuy: () => { - return true; - }, }, springHealer: { event: EVENTS.spring, @@ -95,9 +86,6 @@ let armor = { notes: t('armorSpecialSpringHealerNotes', { con: 15 }), value: 90, con: 15, - canBuy: () => { - return true; - }, }, summerRogue: { event: EVENTS.summer, @@ -208,9 +196,6 @@ let armor = { notes: t('armorSpecialSpring2015RogueNotes', { per: 15 }), value: 90, per: 15, - canBuy: () => { - return true; - }, }, spring2015Warrior: { event: EVENTS.spring2015, @@ -219,9 +204,6 @@ let armor = { notes: t('armorSpecialSpring2015WarriorNotes', { con: 9 }), value: 90, con: 9, - canBuy: () => { - return true; - }, }, spring2015Mage: { event: EVENTS.spring2015, @@ -230,9 +212,6 @@ let armor = { notes: t('armorSpecialSpring2015MageNotes', { int: 9 }), value: 90, int: 9, - canBuy: () => { - return true; - }, }, spring2015Healer: { event: EVENTS.spring2015, @@ -241,9 +220,6 @@ let armor = { notes: t('armorSpecialSpring2015HealerNotes', { con: 15 }), value: 90, con: 15, - canBuy: () => { - return true; - }, }, summer2015Rogue: { event: EVENTS.summer2015, @@ -457,6 +433,48 @@ let eyewear = { notes: t('eyewearSpecialSummerWarriorNotes'), value: 20, }, + blackTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialBlackTopFrameText'), + notes: t('eyewearSpecialBlackTopFrameNotes'), + value: 0, + }, + blueTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialBlueTopFrameText'), + notes: t('eyewearSpecialBlueTopFrameNotes'), + value: 0, + }, + greenTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialGreenTopFrameText'), + notes: t('eyewearSpecialGreenTopFrameNotes'), + value: 0, + }, + pinkTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialPinkTopFrameText'), + notes: t('eyewearSpecialPinkTopFrameNotes'), + value: 0, + }, + redTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialRedTopFrameText'), + notes: t('eyewearSpecialRedTopFrameNotes'), + value: 0, + }, + whiteTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialWhiteTopFrameText'), + notes: t('eyewearSpecialWhiteTopFrameNotes'), + value: 0, + }, + yellowTopFrame: { + gearSet: 'glasses', + text: t('eyewearSpecialYellowTopFrameText'), + notes: t('eyewearSpecialYellowTopFrameNotes'), + value: 0, + }, }; let head = { @@ -515,9 +533,6 @@ let head = { notes: t('headSpecialSpringRogueNotes', { per: 9 }), value: 60, per: 9, - canBuy: () => { - return true; - }, }, springWarrior: { event: EVENTS.spring, @@ -526,9 +541,6 @@ let head = { notes: t('headSpecialSpringWarriorNotes', { str: 9 }), value: 60, str: 9, - canBuy: () => { - return true; - }, }, springMage: { event: EVENTS.spring, @@ -537,9 +549,6 @@ let head = { notes: t('headSpecialSpringMageNotes', { per: 7 }), value: 60, per: 7, - canBuy: () => { - return true; - }, }, springHealer: { event: EVENTS.spring, @@ -548,9 +557,6 @@ let head = { notes: t('headSpecialSpringHealerNotes', { int: 7 }), value: 60, int: 7, - canBuy: () => { - return true; - }, }, summerRogue: { event: EVENTS.summer, @@ -661,9 +667,6 @@ let head = { notes: t('headSpecialSpring2015RogueNotes', { per: 9 }), value: 60, per: 9, - canBuy: () => { - return true; - }, }, spring2015Warrior: { event: EVENTS.spring2015, @@ -672,9 +675,6 @@ let head = { notes: t('headSpecialSpring2015WarriorNotes', { str: 9 }), value: 60, str: 9, - canBuy: () => { - return true; - }, }, spring2015Mage: { event: EVENTS.spring2015, @@ -683,9 +683,6 @@ let head = { notes: t('headSpecialSpring2015MageNotes', { per: 7 }), value: 60, per: 7, - canBuy: () => { - return true; - }, }, spring2015Healer: { event: EVENTS.spring2015, @@ -694,9 +691,6 @@ let head = { notes: t('headSpecialSpring2015HealerNotes', { int: 7 }), value: 60, int: 7, - canBuy: () => { - return true; - }, }, summer2015Rogue: { event: EVENTS.summer2015, @@ -847,9 +841,6 @@ let headAccessory = { text: t('headAccessorySpecialSpringRogueText'), notes: t('headAccessorySpecialSpringRogueNotes'), value: 20, - canBuy: () => { - return true; - }, }, springWarrior: { event: EVENTS.spring, @@ -857,9 +848,6 @@ let headAccessory = { text: t('headAccessorySpecialSpringWarriorText'), notes: t('headAccessorySpecialSpringWarriorNotes'), value: 20, - canBuy: () => { - return true; - }, }, springMage: { event: EVENTS.spring, @@ -867,9 +855,6 @@ let headAccessory = { text: t('headAccessorySpecialSpringMageText'), notes: t('headAccessorySpecialSpringMageNotes'), value: 20, - canBuy: () => { - return true; - }, }, springHealer: { event: EVENTS.spring, @@ -877,9 +862,6 @@ let headAccessory = { text: t('headAccessorySpecialSpringHealerText'), notes: t('headAccessorySpecialSpringHealerNotes'), value: 20, - canBuy: () => { - return true; - }, }, spring2015Rogue: { event: EVENTS.spring2015, @@ -887,9 +869,6 @@ let headAccessory = { text: t('headAccessorySpecialSpring2015RogueText'), notes: t('headAccessorySpecialSpring2015RogueNotes'), value: 20, - canBuy: () => { - return true; - }, }, spring2015Warrior: { event: EVENTS.spring2015, @@ -897,9 +876,6 @@ let headAccessory = { text: t('headAccessorySpecialSpring2015WarriorText'), notes: t('headAccessorySpecialSpring2015WarriorNotes'), value: 20, - canBuy: () => { - return true; - }, }, spring2015Mage: { event: EVENTS.spring2015, @@ -907,9 +883,6 @@ let headAccessory = { text: t('headAccessorySpecialSpring2015MageText'), notes: t('headAccessorySpecialSpring2015MageNotes'), value: 20, - canBuy: () => { - return true; - }, }, spring2015Healer: { event: EVENTS.spring2015, @@ -917,9 +890,6 @@ let headAccessory = { text: t('headAccessorySpecialSpring2015HealerText'), notes: t('headAccessorySpecialSpring2015HealerNotes'), value: 20, - canBuy: () => { - return true; - }, }, bearEars: { gearSet: 'animal', @@ -1080,9 +1050,6 @@ let shield = { notes: t('shieldSpecialSpringRogueNotes', { str: 8 }), value: 80, str: 8, - canBuy: () => { - return true; - }, }, springWarrior: { event: EVENTS.spring, @@ -1091,9 +1058,6 @@ let shield = { notes: t('shieldSpecialSpringWarriorNotes', { con: 7 }), value: 70, con: 7, - canBuy: () => { - return true; - }, }, springHealer: { event: EVENTS.spring, @@ -1102,9 +1066,6 @@ let shield = { notes: t('shieldSpecialSpringHealerNotes', { con: 9 }), value: 70, con: 9, - canBuy: () => { - return true; - }, }, summerRogue: { event: EVENTS.summer, @@ -1137,9 +1098,6 @@ let shield = { notes: t('shieldSpecialFallRogueNotes', { str: 8 }), value: 80, str: 8, - canBuy: () => { - return true; - }, }, fallWarrior: { event: EVENTS.fall, @@ -1148,9 +1106,6 @@ let shield = { notes: t('shieldSpecialFallWarriorNotes', { con: 7 }), value: 70, con: 7, - canBuy: () => { - return true; - }, }, fallHealer: { event: EVENTS.fall, @@ -1159,9 +1114,6 @@ let shield = { notes: t('shieldSpecialFallHealerNotes', { con: 9 }), value: 70, con: 9, - canBuy: () => { - return true; - }, }, winter2015Rogue: { event: EVENTS.winter2015, @@ -1194,9 +1146,6 @@ let shield = { notes: t('shieldSpecialSpring2015RogueNotes', { str: 8 }), value: 80, str: 8, - canBuy: () => { - return true; - }, }, spring2015Warrior: { event: EVENTS.spring2015, @@ -1205,9 +1154,6 @@ let shield = { notes: t('shieldSpecialSpring2015WarriorNotes', { con: 7 }), value: 70, con: 7, - canBuy: () => { - return true; - }, }, spring2015Healer: { event: EVENTS.spring2015, @@ -1216,9 +1162,6 @@ let shield = { notes: t('shieldSpecialSpring2015HealerNotes', { con: 9 }), value: 70, con: 9, - canBuy: () => { - return true; - }, }, summer2015Rogue: { event: EVENTS.summer2015, @@ -1227,9 +1170,6 @@ let shield = { notes: t('shieldSpecialSummer2015RogueNotes', { str: 8 }), value: 80, str: 8, - canBuy: () => { - return true; - }, }, summer2015Warrior: { event: EVENTS.summer2015, @@ -1375,9 +1315,6 @@ let weapon = { notes: t('weaponSpecialSpringRogueNotes', { str: 8 }), value: 80, str: 8, - canBuy: () => { - return true; - }, }, springWarrior: { event: EVENTS.spring, @@ -1386,9 +1323,6 @@ let weapon = { notes: t('weaponSpecialSpringWarriorNotes', { str: 15 }), value: 90, str: 15, - canBuy: () => { - return true; - }, }, springMage: { event: EVENTS.spring, @@ -1399,9 +1333,6 @@ let weapon = { value: 160, int: 15, per: 7, - canBuy: () => { - return true; - }, }, springHealer: { event: EVENTS.spring, @@ -1410,9 +1341,6 @@ let weapon = { notes: t('weaponSpecialSpringHealerNotes', { int: 9 }), value: 90, int: 9, - canBuy: () => { - return true; - }, }, summerRogue: { event: EVENTS.summer, @@ -1523,9 +1451,6 @@ let weapon = { notes: t('weaponSpecialSpring2015RogueNotes', { str: 8 }), value: 80, str: 8, - canBuy: () => { - return true; - }, }, spring2015Warrior: { event: EVENTS.spring2015, @@ -1534,9 +1459,6 @@ let weapon = { notes: t('weaponSpecialSpring2015WarriorNotes', { str: 15 }), value: 90, str: 15, - canBuy: () => { - return true; - }, }, spring2015Mage: { event: EVENTS.spring2015, @@ -1547,9 +1469,6 @@ let weapon = { value: 160, int: 15, per: 7, - canBuy: () => { - return true; - }, }, spring2015Healer: { event: EVENTS.spring2015, @@ -1558,9 +1477,6 @@ let weapon = { notes: t('weaponSpecialSpring2015HealerNotes', { int: 9 }), value: 90, int: 9, - canBuy: () => { - return true; - }, }, summer2015Rogue: { event: EVENTS.summer2015, diff --git a/common/script/content/index.js b/common/script/content/index.js index fc283e9442..9cdc643023 100644 --- a/common/script/content/index.js +++ b/common/script/content/index.js @@ -378,7 +378,21 @@ api.questEggs = { adjective: t('questEggSnailAdjective'), canBuy: (function(u) { return u.achievements.quests && (u.achievements.quests.snail != null) > 0; - }) + }), + }, + Falcon: { + text: t('questEggFalconText'), + adjective: t('questEggFalconAdjective'), + canBuy: (function(u) { + return u.achievements.quests && (u.achievements.quests.falcon != null) > 0; + }), + }, + Treeling: { + text: t('questEggTreelingText'), + adjective: t('questEggTreelingAdjective'), + canBuy: (function(u) { + return u.achievements.quests && (u.achievements.quests.treeling != null) > 0; + }), }, }; @@ -411,7 +425,8 @@ api.specialPets = { 'Tiger-Veteran': 'veteranTiger', 'Phoenix-Base': 'phoenix', 'Turkey-Gilded': 'gildedTurkey', - 'Bumblebee-Base': 'bumblebee', + 'MagicalBee-Base': 'magicalBee', + 'Lion-Veteran': 'veteranLion', }; api.specialMounts = { @@ -424,7 +439,7 @@ api.specialMounts = { 'Gryphon-RoyalPurple': 'royalPurpleGryphon', 'Phoenix-Base': 'phoenix', 'JackOLantern-Base': 'jackolantern', - 'Bumblebee-Base': 'bumblebee', + 'MagicalBee-Base': 'magicalBee', }; api.timeTravelStable = { @@ -499,7 +514,15 @@ api.premiumHatchingPotions = { canBuy: (function() { return false; }) - } + }, + Floral: { + value: 2, + text: t('hatchingPotionFloral'), + limited: true, + canBuy: (function() { + return false; + }), + }, }; _.each(api.dropHatchingPotions, function(pot, key) { @@ -579,6 +602,14 @@ api.questMounts = _.transform(api.questEggs, function(m, egg) { })); }); +api.premiumMounts = _.transform(api.dropEggs, function(m, egg) { + return _.defaults(m, _.transform(api.hatchingPotions, function(m2, pot) { + if (pot.premium) { + return m2[egg.key + "-" + pot.key] = true; + } + })); +}); + api.food = { Meat: { text: t('foodMeat'), @@ -2557,11 +2588,11 @@ api.quests = { items: [ { type: 'pets', - key: 'Bumblebee-Base', + key: 'MagicalBee-Base', text: t('questBewilderDropBumblebeePet') }, { type: 'mounts', - key: 'Bumblebee-Base', + key: 'MagicalBee-Base', text: t('questBewilderDropBumblebeeMount') }, { type: 'food', @@ -2609,6 +2640,70 @@ api.quests = { exp: 0, }, }, + falcon: { + text: t('questFalconText'), + notes: t('questFalconNotes'), + completion: t('questFalconCompletion'), + value: 4, + category: 'pet', + boss: { + name: t('questFalconBoss'), + hp: 700, + str: 2, + }, + drop: { + items: [ + { + type: 'eggs', + key: 'Falcon', + text: t('questFalconDropFalconEgg'), + }, { + type: 'eggs', + key: 'Falcon', + text: t('questFalconDropFalconEgg'), + }, { + type: 'eggs', + key: 'Falcon', + text: t('questFalconDropFalconEgg'), + } + ], + gp: 49, + exp: 425, + unlock: t('questFalconUnlockText'), + }, + }, + treeling: { + text: t('questTreelingText'), + notes: t('questTreelingNotes'), + completion: t('questTreelingCompletion'), + value: 4, + category: 'pet', + boss: { + name: t('questTreelingBoss'), + hp: 600, + str: 1.5, + }, + drop: { + items: [ + { + type: 'eggs', + key: 'Treeling', + text: t('questTreelingDropTreelingEgg'), + }, { + type: 'eggs', + key: 'Treeling', + text: t('questTreelingDropTreelingEgg'), + }, { + type: 'eggs', + key: 'Treeling', + text: t('questTreelingDropTreelingEgg'), + } + ], + gp: 43, + exp: 350, + unlock: t('questTreelingUnlockText'), + }, + }, }; _.each(api.quests, function(v, key) { diff --git a/common/script/content/mystery-sets.js b/common/script/content/mystery-sets.js index 841727a713..8eae5a9392 100644 --- a/common/script/content/mystery-sets.js +++ b/common/script/content/mystery-sets.js @@ -106,6 +106,14 @@ let mysterySets = { start: '2016-03-24', end: '2016-04-02', }, + 201604: { + start: '2016-04-25', + end: '2016-05-02', + }, + 201605: { + start: '2016-05-25', + end: '2016-06-02', + }, 301404: { start: '3014-03-24', end: '3014-04-02', diff --git a/common/script/content/spells.js b/common/script/content/spells.js index 3150bd0da9..9b0514974d 100644 --- a/common/script/content/spells.js +++ b/common/script/content/spells.js @@ -1,6 +1,6 @@ import t from './translation'; import _ from 'lodash'; - +import { NotAuthorized } from '../libs/errors'; /* --------------------------------------------------------------- Spells @@ -15,7 +15,7 @@ import _ from 'lodash'; web, this function can be performed on the client and on the server. `user` param is self (needed for determining your own stats for effectiveness of cast), and `target` param is one of [task, party, user]. In the case of `self` spells, you act on `user` instead of `target`. You can trust these are the correct objects, as long as the `target` attr of the - spell is correct. Take a look at habitrpg/src/models/user.js and habitrpg/src/models/task.js for what attributes are + spell is correct. Take a look at habitrpg/website/server/models/user.js and habitrpg/website/server/models/task.js for what attributes are available on each model. Note `task.value` is its "redness". If party is passed in, it's an array of users, so you'll want to iterate over them like: `_.each(target,function(member){...})` @@ -40,14 +40,12 @@ spells.wizard = { lvl: 11, target: 'task', notes: t('spellWizardFireballNotes'), - cast (user, target) { + cast (user, target, req) { let bonus = user._statsComputed.int * user.fns.crit('per'); bonus *= Math.ceil((target.value < 0 ? 1 : target.value + 1) * 0.075); user.stats.exp += diminishingReturns(bonus, 75); if (!user.party.quest.progress) user.party.quest.progress = 0; user.party.quest.progress.up += Math.ceil(user._statsComputed.int * 0.1); - // TODO change, pass req to spell? - let req = {language: user.preferences.language}; user.fns.updateStats(user.stats, req); }, }, @@ -166,12 +164,11 @@ spells.rogue = { lvl: 12, target: 'task', notes: t('spellRogueBackStabNotes'), - cast (user, target) { + cast (user, target, req) { let _crit = user.fns.crit('str', 0.3); let bonus = calculateBonus(target.value, user._statsComputed.str, _crit); user.stats.exp += diminishingReturns(bonus, 75, 50); user.stats.gp += diminishingReturns(bonus, 18, 75); - let req = {language: user.preferences.language}; user.fns.updateStats(user.stats, req); }, }, @@ -197,7 +194,7 @@ spells.rogue = { notes: t('spellRogueStealthNotes'), cast (user) { if (!user.stats.buffs.stealth) user.stats.buffs.stealth = 0; - user.stats.buffs.stealth += Math.ceil(diminishingReturns(user._statsComputed.per, user.dailys.length * 0.64, 55)); + user.stats.buffs.stealth += Math.ceil(diminishingReturns(user._statsComputed.per, user.tasksOrder.dailys.length * 0.64, 55)); }, }, }; @@ -218,10 +215,10 @@ spells.healer = { text: t('spellHealerBrightnessText'), mana: 15, lvl: 12, - target: 'self', + target: 'tasks', notes: t('spellHealerBrightnessNotes'), - cast (user) { - _.each(user.tasks, (task) => { + cast (user, tasks) { + _.each(tasks, (task) => { if (task.type !== 'reward') { task.value += 4 * (user._statsComputed.int / (user._statsComputed.int + 40)); } @@ -242,7 +239,7 @@ spells.healer = { }); }, }, - heallAll: { // Blessing + healAll: { // Blessing text: t('spellHealerHealAllText'), mana: 25, lvl: 14, @@ -262,11 +259,13 @@ spells.special = { text: t('spellSpecialSnowballAuraText'), mana: 0, value: 15, + previousPurchase: true, target: 'user', notes: t('spellSpecialSnowballAuraNotes'), - cast (user, target) { + cast (user, target, req) { + if (!user.items.special.snowball) throw new NotAuthorized(t('spellNotOwned')(req.language)); target.stats.buffs.snowball = true; - target.stats.buffs.spookDust = false; + target.stats.buffs.spookySparkles = false; target.stats.buffs.shinySeed = false; target.stats.buffs.seafoam = false; if (!target.achievements.snowball) target.achievements.snowball = 0; @@ -286,20 +285,22 @@ spells.special = { user.stats.gp -= 5; }, }, - spookDust: { - text: t('spellSpecialSpookDustText'), + spookySparkles: { + text: t('spellSpecialSpookySparklesText'), mana: 0, value: 15, + previousPurchase: true, target: 'user', - notes: t('spellSpecialSpookDustNotes'), - cast (user, target) { + notes: t('spellSpecialSpookySparklesNotes'), + cast (user, target, req) { + if (!user.items.special.spookySparkles) throw new NotAuthorized(t('spellNotOwned')(req.language)); target.stats.buffs.snowball = false; - target.stats.buffs.spookDust = true; + target.stats.buffs.spookySparkles = true; target.stats.buffs.shinySeed = false; target.stats.buffs.seafoam = false; - if (!target.achievements.spookDust) target.achievements.spookDust = 0; - target.achievements.spookDust++; - user.items.special.spookDust--; + if (!target.achievements.spookySparkles) target.achievements.spookySparkles = 0; + target.achievements.spookySparkles++; + user.items.special.spookySparkles--; }, }, opaquePotion: { @@ -310,7 +311,7 @@ spells.special = { target: 'self', notes: t('spellSpecialOpaquePotionNotes'), cast (user) { - user.stats.buffs.spookDust = false; + user.stats.buffs.spookySparkles = false; user.stats.gp -= 5; }, }, @@ -318,11 +319,13 @@ spells.special = { text: t('spellSpecialShinySeedText'), mana: 0, value: 15, + previousPurchase: true, target: 'user', notes: t('spellSpecialShinySeedNotes'), - cast (user, target) { + cast (user, target, req) { + if (!user.items.special.shinySeed) throw new NotAuthorized(t('spellNotOwned')(req.language)); target.stats.buffs.snowball = false; - target.stats.buffs.spookDust = false; + target.stats.buffs.spookySparkles = false; target.stats.buffs.shinySeed = true; target.stats.buffs.seafoam = false; if (!target.achievements.shinySeed) target.achievements.shinySeed = 0; @@ -346,11 +349,13 @@ spells.special = { text: t('spellSpecialSeafoamText'), mana: 0, value: 15, + previousPurchase: true, target: 'user', notes: t('spellSpecialSeafoamNotes'), - cast (user, target) { + cast (user, target, req) { + if (!user.items.special.seafoam) throw new NotAuthorized(t('spellNotOwned')(req.language)); target.stats.buffs.snowball = false; - target.stats.buffs.spookDust = false; + target.stats.buffs.spookySparkles = false; target.stats.buffs.shinySeed = false; target.stats.buffs.seafoam = true; if (!target.achievements.seafoam) target.achievements.seafoam = 0; @@ -391,7 +396,10 @@ spells.special = { if (!target.items.special.nyeReceived) target.items.special.nyeReceived = []; target.items.special.nyeReceived.push(user.profile.name); + + if (!target.flags) target.flags = {}; target.flags.cardReceived = true; + user.stats.gp -= 10; }, }, @@ -416,7 +424,10 @@ spells.special = { if (!target.items.special.valentineReceived) target.items.special.valentineReceived = []; target.items.special.valentineReceived.push(user.profile.name); + + if (!target.flags) target.flags = {}; target.flags.cardReceived = true; + user.stats.gp -= 10; }, }, @@ -440,7 +451,10 @@ spells.special = { if (!target.items.special.greetingReceived) target.items.special.greetingReceived = []; target.items.special.greetingReceived.push(user.profile.name); + + if (!target.flags) target.flags = {}; target.flags.cardReceived = true; + user.stats.gp -= 10; }, }, @@ -465,7 +479,10 @@ spells.special = { if (!target.items.special.thankyouReceived) target.items.special.thankyouReceived = []; target.items.special.thankyouReceived.push(user.profile.name); + + if (!target.flags) target.flags = {}; target.flags.cardReceived = true; + user.stats.gp -= 10; }, }, @@ -487,9 +504,13 @@ spells.special = { u.achievements.birthday++; }); } + if (!target.items.special.birthdayReceived) target.items.special.birthdayReceived = []; target.items.special.birthdayReceived.push(user.profile.name); + + if (!target.flags) target.flags = {}; target.flags.cardReceived = true; + user.stats.gp -= 10; }, }, @@ -499,8 +520,8 @@ _.each(spells, (spellClass) => { _.each(spellClass, (spell, key) => { spell.key = key; let _cast = spell.cast; - spell.cast = function castSpell (user, target) { - _cast(user, target); + spell.cast = function castSpell (user, target, req) { + _cast(user, target, req); user.stats.mp -= spell.mana; }; }); diff --git a/common/script/count.js b/common/script/count.js index 4572e29dd8..3b4c303b3b 100644 --- a/common/script/count.js +++ b/common/script/count.js @@ -8,7 +8,7 @@ import content from './content/index'; const DROP_ANIMALS = keys(content.pets); -function beastMasterProgress (pets) { +function beastMasterProgress (pets = {}) { let count = 0; each(DROP_ANIMALS, (animal) => { @@ -19,7 +19,7 @@ function beastMasterProgress (pets) { return count; } -function dropPetsCurrentlyOwned (pets) { +function dropPetsCurrentlyOwned (pets = {}) { let count = 0; each(DROP_ANIMALS, (animal) => { @@ -30,7 +30,7 @@ function dropPetsCurrentlyOwned (pets) { return count; } -function mountMasterProgress (mounts) { +function mountMasterProgress (mounts = {}) { let count = 0; each(DROP_ANIMALS, (animal) => { @@ -41,7 +41,7 @@ function mountMasterProgress (mounts) { return count; } -function remainingGearInSet (userGear, set) { +function remainingGearInSet (userGear = {}, set) { let gear = filter(content.gear.flat, (item) => { let setMatches = item.klass === set; let hasItem = userGear[item.key]; @@ -54,7 +54,7 @@ function remainingGearInSet (userGear, set) { return count; } -function questsOfCategory (userQuests, category) { +function questsOfCategory (userQuests = {}, category) { let quests = filter(content.quests, (quest) => { let categoryMatches = quest.category === category; let hasQuest = userQuests[quest.key]; diff --git a/common/script/cron.js b/common/script/cron.js index 2c0760fcc9..a0f28f9d5a 100644 --- a/common/script/cron.js +++ b/common/script/cron.js @@ -1,3 +1,4 @@ +// TODO what can be moved to /website/server? /* ------------------------------------------------------ Cron and time / day functions diff --git a/common/script/fns/autoAllocate.js b/common/script/fns/autoAllocate.js index ab037e628b..71a4898031 100644 --- a/common/script/fns/autoAllocate.js +++ b/common/script/fns/autoAllocate.js @@ -7,50 +7,69 @@ import splitWhitespace from '../libs/splitWhitespace'; {update} if aggregated changes, pass in userObj as update. otherwise commits will be made immediately */ -module.exports = function(user) { - return user.stats[(function() { - var diff, ideal, lvlDiv7, preference, stats, suggested; - switch (user.preferences.allocationMode) { - case "flat": - stats = _.pick(user.stats, splitWhitespace('con str per int')); - return _.invert(stats)[_.min(stats)]; - case "classbased": - lvlDiv7 = user.stats.lvl / 7; - ideal = [lvlDiv7 * 3, lvlDiv7 * 2, lvlDiv7, lvlDiv7]; - preference = (function() { - switch (user.stats["class"]) { - case "wizard": - return ["int", "per", "con", "str"]; - case "rogue": - return ["per", "str", "int", "con"]; - case "healer": - return ["con", "int", "str", "per"]; - default: - return ["str", "con", "per", "int"]; - } - })(); - diff = [user.stats[preference[0]] - ideal[0], user.stats[preference[1]] - ideal[1], user.stats[preference[2]] - ideal[2], user.stats[preference[3]] - ideal[3]]; - suggested = _.findIndex(diff, (function(val) { - if (val === _.min(diff)) { - return true; - } - })); - if (~suggested) { - return preference[suggested]; - } else { - return "str"; - } - case "taskbased": - suggested = _.invert(user.stats.training)[_.max(user.stats.training)]; - _.merge(user.stats.training, { - str: 0, - int: 0, - con: 0, - per: 0 - }); - return suggested || "str"; - default: - return "str"; +function getStatToAllocate (user) { + let suggested; + + let statsObj = user.stats.toObject ? user.stats.toObject() : user.stats; + + switch (user.preferences.allocationMode) { + case 'flat': { + let stats = _.pick(statsObj, splitWhitespace('con str per int')); + return _.invert(stats)[_.min(stats)]; } - })()]++; + case 'classbased': { + let lvlDiv7 = statsObj.lvl / 7; + let ideal = [lvlDiv7 * 3, lvlDiv7 * 2, lvlDiv7, lvlDiv7]; + + let preference; + switch (statsObj.class) { + case 'wizard': { + preference = ['int', 'per', 'con', 'str']; + break; + } + case 'rogue': { + preference = ['per', 'str', 'int', 'con']; + break; + } + case 'healer': { + preference = ['con', 'int', 'str', 'per']; + break; + } + default: { + preference = ['str', 'con', 'per', 'int']; + } + } + + let diff = [ + statsObj[preference[0]] - ideal[0], + statsObj[preference[1]] - ideal[1], + statsObj[preference[2]] - ideal[2], + statsObj[preference[3]] - ideal[3], + ]; + + suggested = _.findIndex(diff, (val) => { + if (val === _.min(diff)) return true; + }); + + return suggested !== -1 ? preference[suggested] : 'str'; + } + case 'taskbased': { + suggested = _.invert(statsObj.training)[_.max(statsObj.training)]; + + let training = statsObj.training; + training.str = 0; + training.int = 0; + training.con = 0; + training.per = 0; + + return suggested || 'str'; + } + default: { + return 'str'; + } + } +} + +module.exports = function autoAllocate (user) { + return user.stats[getStatToAllocate(user)]++; }; diff --git a/common/script/fns/crit.js b/common/script/fns/crit.js index 69ac9e5b93..65a0cbb062 100644 --- a/common/script/fns/crit.js +++ b/common/script/fns/crit.js @@ -1,13 +1,8 @@ -module.exports = function(user, stat, chance) { - var s; - if (stat == null) { - stat = 'str'; - } - if (chance == null) { - chance = .03; - } - s = user._statsComputed[stat]; - if (user.fns.predictableRandom() <= chance * (1 + s / 100)) { +import predictableRandom from './predictableRandom'; + +module.exports = function crit (user, stat = 'str', chance = 0.03) { + let s = user._statsComputed[stat]; + if (predictableRandom(user) <= chance * (1 + s / 100)) { return 1.5 + 4 * s / (s + 200); } else { return 1; diff --git a/common/script/fns/cron.js b/common/script/fns/cron.js deleted file mode 100644 index 1e3470d7f9..0000000000 --- a/common/script/fns/cron.js +++ /dev/null @@ -1,358 +0,0 @@ -import moment from 'moment'; -import _ from 'lodash'; -import { - daysSince, - shouldDo, -} from '../cron'; -import { - capByLevel, - toNextLevel, -} from '../statHelpers'; -/* - ------------------------------------------------------ - Cron - ------------------------------------------------------ - */ - -/* - At end of day, add value to all incomplete Daily & Todo tasks (further incentive) - For incomplete Dailys, deduct experience - Make sure to run this function once in a while as server will not take care of overnight calculations. - And you have to run it every time client connects. - {user} - */ - -module.exports = function(user, options) { - var _progress, analyticsData, base, base1, base2, base3, base4, clearBuffs, dailyChecked, dailyDueUnchecked, daysMissed, expTally, lvl, lvlDiv2, multiDaysCountAsOneDay, now, perfect, plan, progress, ref, ref1, ref2, ref3, todoTally, timezoneOffsetFromUserPrefs, timezoneOffsetFromBrowser, timezoneOffsetAtLastCron; - if (options == null) { - options = {}; - } - now = +options.now || +(new Date); - - // If the user's timezone has changed (due to travel or daylight savings), - // cron can be triggered twice in one day, so we check for that and use - // both timezones to work out if cron should run. - // CDS = Custom Day Start time. - timezoneOffsetFromUserPrefs = user.preferences.timezoneOffset || 0; - timezoneOffsetAtLastCron = (_.isFinite(user.preferences.timezoneOffsetAtLastCron)) ? user.preferences.timezoneOffsetAtLastCron : timezoneOffsetFromUserPrefs; - timezoneOffsetFromBrowser = (_.isFinite(+options.timezoneOffset)) ? +options.timezoneOffset : timezoneOffsetFromUserPrefs; - // NB: All timezone offsets can be 0, so can't use `... || ...` to apply non-zero defaults - - if (timezoneOffsetFromBrowser !== timezoneOffsetFromUserPrefs) { - // The user's browser has just told Habitica that the user's timezone has - // changed so store and use the new zone. - user.preferences.timezoneOffset = timezoneOffsetFromBrowser; - timezoneOffsetFromUserPrefs = timezoneOffsetFromBrowser; - } - - // How many days have we missed using the user's current timezone: - daysMissed = daysSince(user.lastCron, _.defaults({ - now: now - }, user.preferences)); - - if (timezoneOffsetAtLastCron != timezoneOffsetFromUserPrefs) { - // Since cron last ran, the user's timezone has changed. - // How many days have we missed using the old timezone: - let daysMissedNewZone = daysMissed; - let daysMissedOldZone = daysSince(user.lastCron, _.defaults({ - now: now, - timezoneOffsetOverride: timezoneOffsetAtLastCron, - }, user.preferences)); - - if (timezoneOffsetAtLastCron < timezoneOffsetFromUserPrefs) { - // The timezone change was in the unsafe direction. - // E.g., timezone changes from UTC+1 (offset -60) to UTC+0 (offset 0). - // or timezone changes from UTC-4 (offset 240) to UTC-5 (offset 300). - // Local time changed from, for example, 03:00 to 02:00. - - if (daysMissedOldZone > 0 && daysMissedNewZone > 0) { - // Both old and new timezones indicate that we SHOULD run cron, so - // it is safe to do so immediately. - daysMissed = Math.min(daysMissedOldZone, daysMissedNewZone); - // use minimum value to be nice to user - } - else if (daysMissedOldZone > 0) { - // The old timezone says that cron should run; the new timezone does not. - // This should be impossible for this direction of timezone change, but - // just in case I'm wrong... - console.log("zone has changed - old zone says run cron, NEW zone says no - stop cron now only -- SHOULD NOT HAVE GOT TO HERE", timezoneOffsetAtLastCron, timezoneOffsetFromUserPrefs, now); // used in production for confirming this never happens - } - else if (daysMissedNewZone > 0) { - // The old timezone says that cron should NOT run -- i.e., cron has - // already run today, from the old timezone's point of view. - // The new timezone says that cron SHOULD run, but this is almost - // certainly incorrect. - // This happens when cron occurred at a time soon after the CDS. When - // you reinterpret that time in the new timezone, it looks like it - // was before the CDS, because local time has stepped backwards. - // To fix this, rewrite the cron time to a time that the new - // timezone interprets as being in today. - - daysMissed = 0; // prevent cron running now - let timezoneOffsetDiff = timezoneOffsetAtLastCron - timezoneOffsetFromUserPrefs; - // e.g., for dangerous zone change: 240 - 300 = -60 or -660 - -600 = -60 - - user.lastCron = moment(user.lastCron).subtract(timezoneOffsetDiff, 'minutes'); - // NB: We don't change user.auth.timestamps.loggedin so that will still record the time that the previous cron actually ran. - // From now on we can ignore the old timezone: - user.preferences.timezoneOffsetAtLastCron = timezoneOffsetFromUserPrefs; - } - else { - // Both old and new timezones indicate that cron should - // NOT run. - daysMissed = 0; // prevent cron running now - } - } - else if (timezoneOffsetAtLastCron > timezoneOffsetFromUserPrefs) { - daysMissed = daysMissedNewZone; - // TODO: Either confirm that there is nothing that could possibly go wrong here and remove the need for this else branch, or fix stuff. There are probably situations where the Dailies do not reset early enough for a user who was expecting the zone change and wants to use all their Dailies immediately in the new zone; if so, we should provide an option for easy reset of Dailies (can't be automatic because there will be other situations where the user was not prepared). - } - } - - if (!(daysMissed > 0)) { - return; - } - user.auth.timestamps.loggedin = new Date(); - user.lastCron = now; - user.preferences.timezoneOffsetAtLastCron = timezoneOffsetFromUserPrefs; - if (user.items.lastDrop.count > 0) { - user.items.lastDrop.count = 0; - } - perfect = true; - clearBuffs = { - str: 0, - int: 0, - per: 0, - con: 0, - stealth: 0, - streaks: false - }; - plan = (ref = user.purchased) != null ? ref.plan : void 0; - if (plan != null ? plan.customerId : void 0) { - if (typeof plan.dateUpdated === "undefined") { - // partial compensation for bug in subscription creation - https://github.com/HabitRPG/habitrpg/issues/6682 - plan.dateUpdated = new Date(); - } - if (moment(plan.dateUpdated).format('MMYYYY') !== moment().format('MMYYYY')) { - plan.gemsBought = 0; - plan.dateUpdated = new Date(); - _.defaults(plan.consecutive, { - count: 0, - offset: 0, - trinkets: 0, - gemCapExtra: 0 - }); - plan.consecutive.count++; - if (plan.consecutive.offset > 0) { - plan.consecutive.offset--; - } else if (plan.consecutive.count % 3 === 0) { - plan.consecutive.trinkets++; - plan.consecutive.gemCapExtra += 5; - if (plan.consecutive.gemCapExtra > 25) { - plan.consecutive.gemCapExtra = 25; - } - } - } - if (plan.dateTerminated && moment(plan.dateTerminated).isBefore(+(new Date))) { - _.merge(plan, { - planId: null, - customerId: null, - paymentMethod: null - }); - _.merge(plan.consecutive, { - count: 0, - offset: 0, - gemCapExtra: 0 - }); - if (typeof user.markModified === "function") { - user.markModified('purchased.plan'); - } - } - } - if (user.preferences.sleep === true) { - user.stats.buffs = clearBuffs; - user.dailys.forEach(function(daily) { - var completed, repeat, thatDay; - completed = daily.completed, repeat = daily.repeat; - thatDay = moment(now).subtract({ - days: 1 - }); - if (shouldDo(thatDay.toDate(), daily, user.preferences) || completed) { - _.each(daily.checklist, (function(box) { - box.completed = false; - return true; - })); - } - return daily.completed = false; - }); - return; - } - multiDaysCountAsOneDay = true; - todoTally = 0; - user.todos.forEach(function(task) { - var absVal, completed, delta, id; - if (!task) { - return; - } - id = task.id, completed = task.completed; - delta = user.ops.score({ - params: { - id: task.id, - direction: 'down' - }, - query: { - times: multiDaysCountAsOneDay != null ? multiDaysCountAsOneDay : { - 1: daysMissed - }, - cron: true - } - }); - absVal = completed ? Math.abs(task.value) : task.value; - return todoTally += absVal; - }); - dailyChecked = 0; - dailyDueUnchecked = 0; - if ((base = user.party.quest.progress).down == null) { - base.down = 0; - } - user.dailys.forEach(function(task) { - var EvadeTask, completed, delta, fractionChecked, id, j, n, ref1, ref2, scheduleMisses, thatDay; - if (!task) { - return; - } - id = task.id, completed = task.completed; - EvadeTask = 0; - scheduleMisses = daysMissed; - if (completed) { - dailyChecked += 1; - } else { - scheduleMisses = 0; - for (n = j = 0, ref1 = daysMissed; 0 <= ref1 ? j < ref1 : j > ref1; n = 0 <= ref1 ? ++j : --j) { - thatDay = moment(now).subtract({ - days: n + 1 - }); - if (shouldDo(thatDay.toDate(), task, user.preferences)) { - scheduleMisses++; - if (user.stats.buffs.stealth) { - user.stats.buffs.stealth--; - EvadeTask++; - } - if (multiDaysCountAsOneDay) { - break; - } - } - } - if (scheduleMisses > EvadeTask) { - perfect = false; - if (((ref2 = task.checklist) != null ? ref2.length : void 0) > 0) { - fractionChecked = _.reduce(task.checklist, (function(m, i) { - return m + (i.completed ? 1 : 0); - }), 0) / task.checklist.length; - dailyDueUnchecked += 1 - fractionChecked; - dailyChecked += fractionChecked; - } else { - dailyDueUnchecked += 1; - } - delta = user.ops.score({ - params: { - id: task.id, - direction: 'down' - }, - query: { - times: multiDaysCountAsOneDay != null ? multiDaysCountAsOneDay : { - 1: scheduleMisses - EvadeTask - }, - cron: true - } - }); - user.party.quest.progress.down += delta * (task.priority < 1 ? task.priority : 1); - } - } - (task.history != null ? task.history : task.history = []).push({ - date: +(new Date), - value: task.value - }); - task.completed = false; - if (completed || (scheduleMisses > 0)) { - return _.each(task.checklist, (function(i) { - i.completed = false; - return true; - })); - } - }); - user.habits.forEach(function(task) { - if (task.up === false || task.down === false) { - if (Math.abs(task.value) < 0.1) { - return task.value = 0; - } else { - return task.value = task.value / 2; - } - } - }); - ((base1 = (user.history != null ? user.history : user.history = {})).todos != null ? base1.todos : base1.todos = []).push({ - date: now, - value: todoTally - }); - expTally = user.stats.exp; - lvl = 0; - while (lvl < (user.stats.lvl - 1)) { - lvl++; - expTally += toNextLevel(lvl); - } - ((base2 = user.history).exp != null ? base2.exp : base2.exp = []).push({ - date: now, - value: expTally - }); - if (!((ref1 = user.purchased) != null ? (ref2 = ref1.plan) != null ? ref2.customerId : void 0 : void 0)) { - user.fns.preenUserHistory(); - if (typeof user.markModified === "function") { - user.markModified('history'); - } - if (typeof user.markModified === "function") { - user.markModified('dailys'); - } - } - user.stats.buffs = perfect ? ((base3 = user.achievements).perfect != null ? base3.perfect : base3.perfect = 0, user.achievements.perfect++, lvlDiv2 = Math.ceil(capByLevel(user.stats.lvl) / 2), { - str: lvlDiv2, - int: lvlDiv2, - per: lvlDiv2, - con: lvlDiv2, - stealth: 0, - streaks: false - }) : clearBuffs; - if (dailyDueUnchecked === 0 && dailyChecked === 0) { - dailyChecked = 1; - } - user.stats.mp += _.max([10, .1 * user._statsComputed.maxMP]) * dailyChecked / (dailyDueUnchecked + dailyChecked); - if (user.stats.mp > user._statsComputed.maxMP) { - user.stats.mp = user._statsComputed.maxMP; - } - progress = user.party.quest.progress; - _progress = _.cloneDeep(progress); - _.merge(progress, { - down: 0, - up: 0 - }); - progress.collect = _.transform(progress.collect, (function(m, v, k) { - return m[k] = 0; - })); - if ((base4 = user.flags).cronCount == null) { - base4.cronCount = 0; - } - user.flags.cronCount++; - analyticsData = { - category: 'behavior', - gaLabel: 'Cron Count', - gaValue: user.flags.cronCount, - uuid: user._id, - user: user, - resting: user.preferences.sleep, - cronCount: user.flags.cronCount, - progressUp: _.min([_progress.up, 900]), - progressDown: _progress.down - }; - if ((ref3 = options.analytics) != null) { - ref3.track('Cron', analyticsData); - } - return _progress; -}; diff --git a/common/script/fns/dotGet.js b/common/script/fns/dotGet.js index c95ba55656..3b45e54c71 100644 --- a/common/script/fns/dotGet.js +++ b/common/script/fns/dotGet.js @@ -1,5 +1,7 @@ -import dotGet from '../libs/dotGet'; +import _ from 'lodash'; -module.exports = function(user, path) { - return dotGet(user, path); +// TODO remove completely, use _.get, only used in client + +module.exports = function dotGet (user, path) { + return _.get(user, path); }; diff --git a/common/script/fns/dotSet.js b/common/script/fns/dotSet.js index 283e7a50d0..ceb21605af 100644 --- a/common/script/fns/dotSet.js +++ b/common/script/fns/dotSet.js @@ -1,12 +1,14 @@ -import dotSet from '../libs/dotSet'; +import _ from 'lodash'; /* -This allows you to set object properties by dot-path. Eg, you can run pathSet('stats.hp',50,user) which is the same as -user.stats.hp = 50. This is useful because in our habitrpg-shared functions we're returning changesets as {path:value}, -so that different consumers can implement setters their own way. Derby needs model.set(path, value) for example, where -Angular sets object properties directly - in which case, this function will be used. - */ + This allows you to set object properties by dot-path. Eg, you can run pathSet('stats.hp',50,user) which is the same as + user.stats.hp = 50. This is useful because in our habitrpg-shared functions we're returning changesets as {path:value}, + so that different consumers can implement setters their own way. Derby needs model.set(path, value) for example, where + Angular sets object properties directly - in which case, this function will be used. +*/ -module.exports = function(user, path, val) { - return dotSet(user, path, val); +// TODO use directly _.set and remove this fn, only used in client + +module.exports = function dotSet (user, path, val) { + return _.set(user, path, val); }; diff --git a/common/script/fns/getItem.js b/common/script/fns/getItem.js deleted file mode 100644 index b73ecf9073..0000000000 --- a/common/script/fns/getItem.js +++ /dev/null @@ -1,11 +0,0 @@ -import content from '../content/index'; -import i18n from '../i18n'; - -module.exports = function(user, type) { - var item; - item = content.gear.flat[user.items.gear.equipped[type]]; - if (!item) { - return content.gear.flat[type + "_base_0"]; - } - return item; -}; diff --git a/common/script/fns/handleTwoHanded.js b/common/script/fns/handleTwoHanded.js index c700346988..a861a10e68 100644 --- a/common/script/fns/handleTwoHanded.js +++ b/common/script/fns/handleTwoHanded.js @@ -1,24 +1,23 @@ import content from '../content/index'; import i18n from '../i18n'; -module.exports = function(user, item, type, req) { - var message, currentWeapon, currentShield; - if (type == null) { - type = 'equipped'; - } - currentShield = content.gear.flat[user.items.gear[type].shield]; - currentWeapon = content.gear.flat[user.items.gear[type].weapon]; +module.exports = function handleTwoHanded (user, item, type = 'equipped', req = {}) { + let currentShield = content.gear.flat[user.items.gear[type].shield]; + let currentWeapon = content.gear.flat[user.items.gear[type].weapon]; - if (item.type === "shield" && (currentWeapon ? currentWeapon.twoHanded : false)) { + let message; + + if (item.type === 'shield' && (currentWeapon ? currentWeapon.twoHanded : false)) { user.items.gear[type].weapon = 'weapon_base_0'; message = i18n.t('messageTwoHandedUnequip', { twoHandedText: currentWeapon.text(req.language), offHandedText: item.text(req.language), }, req.language); - } else if (item.twoHanded && (currentShield && user.items.gear[type].shield != "shield_base_0")) { - user.items.gear[type].shield = "shield_base_0"; + } else if (item.twoHanded && (currentShield && user.items.gear[type].shield !== 'shield_base_0')) { + user.items.gear[type].shield = 'shield_base_0'; message = i18n.t('messageTwoHandedEquip', { twoHandedText: item.text(req.language), offHandedText: currentShield.text(req.language), }, req.language); } + return message; }; diff --git a/common/script/fns/index.js b/common/script/fns/index.js index 24f3ab604b..04fddb2d75 100644 --- a/common/script/fns/index.js +++ b/common/script/fns/index.js @@ -1,4 +1,3 @@ -import getItem from './getItem'; import handleTwoHanded from './handleTwoHanded'; import predictableRandom from './predictableRandom'; import crit from './crit'; @@ -8,13 +7,10 @@ import dotGet from './dotGet'; import randomDrop from './randomDrop'; import autoAllocate from './autoAllocate'; import updateStats from './updateStats'; -import cron from './cron'; -import preenUserHistory from './preenUserHistory'; import ultimateGear from './ultimateGear'; import nullify from './nullify'; module.exports = { - getItem, handleTwoHanded, predictableRandom, crit, @@ -24,8 +20,6 @@ module.exports = { randomDrop, autoAllocate, updateStats, - cron, - preenUserHistory, ultimateGear, nullify, }; diff --git a/common/script/fns/nullify.js b/common/script/fns/nullify.js index b6e30aa3b9..38753071fc 100644 --- a/common/script/fns/nullify.js +++ b/common/script/fns/nullify.js @@ -1,5 +1,7 @@ -module.exports = function(user) { +// TODO remove once v2 is retired + +module.exports = function nullify (user) { user.ops = null; user.fns = null; - return user = null; + user = null; }; diff --git a/common/script/fns/predictableRandom.js b/common/script/fns/predictableRandom.js index 64c8153746..e67daf3b62 100644 --- a/common/script/fns/predictableRandom.js +++ b/common/script/fns/predictableRandom.js @@ -1,20 +1,24 @@ import _ from 'lodash'; -/* -Because the same op needs to be performed on the client and the server (critical hits, item drops, etc), -we need things to be "random", but technically predictable so that they don't go out-of-sync - */ -module.exports = function(user, seed) { - var x; +// Because the same op needs to be performed on the client and the server (critical hits, item drops, etc), +// we need things to be "random", but technically predictable so that they don't go out-of-sync + +module.exports = function predictableRandom (user, seed) { if (!seed || seed === Math.PI) { - seed = _.reduce(user.stats, (function(m, v) { - if (_.isNumber(v)) { - return m + v; + let stats = user.stats.toObject ? user.stats.toObject() : user.stats; + // These items are not part of the stat object but exists on the server (see controllers/user#getUser) + // we remove them in order to use the same user.stats both on server and on client + stats = _.omit(stats, 'toNextLevel', 'maxHealth', 'maxMP'); + + seed = _.reduce(stats, (accumulator, val) => { + if (_.isNumber(val)) { + return accumulator + val; } else { - return m; + return accumulator; } - }), 0); + }, 0); } - x = Math.sin(seed++) * 10000; + + let x = Math.sin(seed++) * 10000; return x - Math.floor(x); }; diff --git a/common/script/fns/preenUserHistory.js b/common/script/fns/preenUserHistory.js deleted file mode 100644 index a45dd82719..0000000000 --- a/common/script/fns/preenUserHistory.js +++ /dev/null @@ -1,25 +0,0 @@ -import _ from 'lodash'; -import preenHistory from '../libs/preenHistory'; - -module.exports = function(user, minHistLen) { - if (minHistLen == null) { - minHistLen = 7; - } - _.each(user.habits.concat(user.dailys), function(task) { - var ref; - if (((ref = task.history) != null ? ref.length : void 0) > minHistLen) { - task.history = preenHistory(task.history); - } - return true; - }); - _.defaults(user.history, { - todos: [], - exp: [] - }); - if (user.history.exp.length > minHistLen) { - user.history.exp = preenHistory(user.history.exp); - } - if (user.history.todos.length > minHistLen) { - return user.history.todos = preenHistory(user.history.todos); - } -}; diff --git a/common/script/fns/randomDrop.js b/common/script/fns/randomDrop.js index b0121b157b..ec6f350d4c 100644 --- a/common/script/fns/randomDrop.js +++ b/common/script/fns/randomDrop.js @@ -3,80 +3,119 @@ import content from '../content/index'; import i18n from '../i18n'; import { daysSince } from '../cron'; import { diminishingReturns } from '../statHelpers'; +import _predictableRandom from './predictableRandom'; +import randomVal from './randomVal'; // Clone a drop object maintaining its functions so that we can change it without affecting the original item function cloneDropItem (drop) { - return _.cloneDeep(drop, function (val) { + return _.cloneDeep(drop, (val) => { return _.isFunction(val) ? val : undefined; // undefined will be handled by lodash }); } -module.exports = function(user, modifiers, req) { - var acceptableDrops, base, base1, base2, chance, drop, dropK, dropMultiplier, name, name1, name2, quest, rarity, ref, ref1, ref2, ref3, task; - task = modifiers.task; - chance = _.min([Math.abs(task.value - 21.27), 37.5]) / 150 + .02; - chance *= task.priority * (1 + (task.streak / 100 || 0)) * (1 + (user._statsComputed.per / 100)) * (1 + (user.contributor.level / 40 || 0)) * (1 + (user.achievements.rebirths / 20 || 0)) * (1 + (user.achievements.streak / 200 || 0)) * (user._tmp.crit || 1) * (1 + .5 * (_.reduce(task.checklist, (function(m, i) { - return m + (i.completed ? 1 : 0); - }), 0) || 0)); +module.exports = function randomDrop (user, options, req = {}) { + let acceptableDrops; + let chance; + let drop; + let dropK; + let dropMultiplier; + let quest; + let rarity; + let task; + + let predictableRandom = options.predictableRandom || _predictableRandom; + task = options.task; + + chance = _.min([Math.abs(task.value - 21.27), 37.5]) / 150 + 0.02; + chance *= task.priority * // Task priority: +50% for Medium, +100% for Hard + (1 + (task.streak / 100 || 0)) * // Streak bonus: +1% per streak + (1 + user._statsComputed.per / 100) * // PERception: +1% per point + (1 + (user.contributor.level / 40 || 0)) * // Contrib levels: +2.5% per level + (1 + (user.achievements.rebirths / 20 || 0)) * // Rebirths: +5% per achievement + (1 + (user.achievements.streak / 200 || 0)) * // Streak achievements: +0.5% per achievement + (user._tmp.crit || 1) * (1 + 0.5 * (_.reduce(task.checklist, (m, i) => { + return m + (i.completed ? 1 : 0); // +50% per checklist item complete. TODO: make this into X individual drop chances instead + }, 0) || 0)); chance = diminishingReturns(chance, 0.75); - quest = content.quests[(ref = user.party.quest) != null ? ref.key : void 0]; - if ((quest != null ? quest.collect : void 0) && user.fns.predictableRandom(user.stats.gp) < chance) { - dropK = user.fns.randomVal(quest.collect, { - key: true + + if (user.party.quest.key) + quest = content.quests[user.party.quest.key]; + if (quest && quest.collect && predictableRandom(user, user.stats.gp) < chance) { + dropK = randomVal(user, quest.collect, { + key: true, }); + if (!user.party.quest.progress.collect[dropK]) + user.party.quest.progress.collect[dropK] = 0; user.party.quest.progress.collect[dropK]++; - if (typeof user.markModified === "function") { - user.markModified('party.quest.progress'); - } + user.markModified('party.quest.progress'); } - dropMultiplier = ((ref1 = user.purchased) != null ? (ref2 = ref1.plan) != null ? ref2.customerId : void 0 : void 0) ? 2 : 1; - if ((daysSince(user.items.lastDrop.date, user.preferences) === 0) && (user.items.lastDrop.count >= dropMultiplier * (5 + Math.floor(user._statsComputed.per / 25) + (user.contributor.level || 0)))) { + + if (user.purchased && user.purchased.plan && user.purchased.plan.customerId) { + dropMultiplier = 2; + } else { + dropMultiplier = 1; + } + + if (daysSince(user.items.lastDrop.date, user.preferences) === 0 && + user.items.lastDrop.count >= dropMultiplier * (5 + Math.floor(user._statsComputed.per / 25) + (user.contributor.level || 0))) { return; } - if (((ref3 = user.flags) != null ? ref3.dropsEnabled : void 0) && user.fns.predictableRandom(user.stats.exp) < chance) { - rarity = user.fns.predictableRandom(user.stats.gp); - if (rarity > .6) { - drop = cloneDropItem(user.fns.randomVal(_.where(content.food, { - canDrop: true + + if (user.flags && user.flags.dropsEnabled && predictableRandom(user, user.stats.exp) < chance) { + rarity = predictableRandom(user, user.stats.gp); + + if (rarity > 0.6) { // food 40% chance + drop = cloneDropItem(randomVal(user, _.where(content.food, { + canDrop: true, }))); - if ((base = user.items.food)[name = drop.key] == null) { - base[name] = 0; + + if (!user.items.food[drop.key]) { + user.items.food[drop.key] = 0; } user.items.food[drop.key] += 1; drop.type = 'Food'; drop.dialog = i18n.t('messageDropFood', { dropArticle: drop.article, dropText: drop.text(req.language), - dropNotes: drop.notes(req.language) + dropNotes: drop.notes(req.language), }, req.language); - } else if (rarity > .3) { - drop = cloneDropItem(user.fns.randomVal(content.dropEggs)); - if ((base1 = user.items.eggs)[name1 = drop.key] == null) { - base1[name1] = 0; + } else if (rarity > 0.3) { // eggs 30% chance + drop = cloneDropItem(randomVal(user, content.dropEggs)); + if (!user.items.eggs[drop.key]) { + user.items.eggs[drop.key] = 0; } user.items.eggs[drop.key]++; drop.type = 'Egg'; drop.dialog = i18n.t('messageDropEgg', { dropText: drop.text(req.language), - dropNotes: drop.notes(req.language) + dropNotes: drop.notes(req.language), }, req.language); - } else { - acceptableDrops = rarity < .02 ? ['Golden'] : rarity < .09 ? ['Zombie', 'CottonCandyPink', 'CottonCandyBlue'] : rarity < .18 ? ['Red', 'Shade', 'Skeleton'] : ['Base', 'White', 'Desert']; - drop = cloneDropItem(user.fns.randomVal(_.pick(content.hatchingPotions, (function(v, k) { + } else { // Hatching Potion, 30% chance - break down by rarity. + if (rarity < 0.02) { // Very Rare: 10% (of 30%) + acceptableDrops = ['Golden']; + } else if (rarity < 0.09) { // Rare: 20% of 30% + acceptableDrops = ['Zombie', 'CottonCandyPink', 'CottonCandyBlue']; + } else if (rarity < 0.18) { // uncommon: 30% of 30% + acceptableDrops = ['Red', 'Shade', 'Skeleton']; + } else { // common, 40% of 30% + acceptableDrops = ['Base', 'White', 'Desert']; + } + drop = cloneDropItem(randomVal(user, _.pick(content.hatchingPotions, (v, k) => { return acceptableDrops.indexOf(k) >= 0; - })))); - if ((base2 = user.items.hatchingPotions)[name2 = drop.key] == null) { - base2[name2] = 0; + }))); + if (!user.items.hatchingPotions[drop.key]) { + user.items.hatchingPotions[drop.key] = 0; } user.items.hatchingPotions[drop.key]++; drop.type = 'HatchingPotion'; drop.dialog = i18n.t('messageDropPotion', { dropText: drop.text(req.language), - dropNotes: drop.notes(req.language) + dropNotes: drop.notes(req.language), }, req.language); } + user._tmp.drop = drop; - user.items.lastDrop.date = +(new Date); - return user.items.lastDrop.count++; + user.items.lastDrop.date = Number(new Date()); + user.items.lastDrop.count++; } }; diff --git a/common/script/fns/randomVal.js b/common/script/fns/randomVal.js index 3c2b5b82e8..2244d04558 100644 --- a/common/script/fns/randomVal.js +++ b/common/script/fns/randomVal.js @@ -1,14 +1,12 @@ import _ from 'lodash'; +import predictableRandom from './predictableRandom'; -/* - Get a random property from an object - returns random property (the value) - */ +// Get a random property from an object +// returns random property (the value) -module.exports = function(user, obj, options) { - var array, rand; - array = (options != null ? options.key : void 0) ? _.keys(obj) : _.values(obj); - rand = user.fns.predictableRandom(options != null ? options.seed : void 0); +module.exports = function randomVal (user, obj, options = {}) { + let array = options.key ? _.keys(obj) : _.values(obj); + let rand = predictableRandom(user, options.seed); array.sort(); return array[Math.floor(rand * array.length)]; }; diff --git a/common/script/fns/resetGear.js b/common/script/fns/resetGear.js new file mode 100644 index 0000000000..2625f5c9b8 --- /dev/null +++ b/common/script/fns/resetGear.js @@ -0,0 +1,25 @@ +import _ from 'lodash'; +import content from '../content/index'; + +module.exports = function resetGear (user) { + let gear = user.items.gear; + + _.each(['equipped', 'costume'], function resetUserGear (type) { + gear[type] = {}; + gear[type].armor = 'armor_base_0'; + gear[type].weapon = 'weapon_warrior_0'; + gear[type].head = 'head_base_0'; + gear[type].shield = 'shield_base_0'; + }); + + // Gear.owned is a Mongo object so the _.each function iterates over hidden properties. + // The content.gear.flat[k] check should prevent this causing an error + _.each(gear.owned, function resetOwnedGear (v, k) { + if (gear.owned[k] && content.gear.flat[k] && content.gear.flat[k].value) { + gear.owned[k] = false; + } + }); + + gear.owned.weapon_warrior_0 = true; // eslint-disable-line camelcase + user.preferences.costume = false; +}; diff --git a/common/script/fns/ultimateGear.js b/common/script/fns/ultimateGear.js index 1333e8cc38..5bca8ff912 100644 --- a/common/script/fns/ultimateGear.js +++ b/common/script/fns/ultimateGear.js @@ -1,33 +1,32 @@ import content from '../content/index'; import _ from 'lodash'; -module.exports = function(user) { - var base, owned; - owned = typeof window !== "undefined" && window !== null ? user.items.gear.owned : user.items.gear.owned.toObject(); - if ((base = user.achievements).ultimateGearSets == null) { - base.ultimateGearSets = { - healer: false, - wizard: false, - rogue: false, - warrior: false - }; - } - content.classes.forEach(function(klass) { +module.exports = function ultimateGear (user) { + let owned = typeof window !== 'undefined' ? user.items.gear.owned : user.items.gear.owned.toObject(); + + content.classes.forEach((klass) => { if (user.achievements.ultimateGearSets[klass] !== true) { - return user.achievements.ultimateGearSets[klass] = _.reduce(['armor', 'shield', 'head', 'weapon'], function(soFarGood, type) { - var found; - found = _.find(content.gear.tree[type][klass], { - last: true + user.achievements.ultimateGearSets[klass] = _.reduce(['armor', 'shield', 'head', 'weapon'], (soFarGood, type) => { + let found = _.find(content.gear.tree[type][klass], { + last: true, }); return soFarGood && (!found || owned[found.key] === true); }, true); } }); - if (typeof user.markModified === "function") { - user.markModified('achievements.ultimateGearSets'); + + let ultimateGearSetValues; + if (user.achievements.ultimateGearSets.toObject) { + ultimateGearSetValues = Object.values(user.achievements.ultimateGearSets.toObject()); + } else { + ultimateGearSetValues = Object.values(user.achievements.ultimateGearSets); } - if (_.contains(user.achievements.ultimateGearSets, true) && user.flags.armoireEnabled !== true) { + + let hasFullSet = _.includes(ultimateGearSetValues, true); + + if (hasFullSet && user.flags.armoireEnabled !== true) { user.flags.armoireEnabled = true; - return typeof user.markModified === "function" ? user.markModified('flags') : void 0; } + + return; }; diff --git a/common/script/fns/updateStats.js b/common/script/fns/updateStats.js index 3ce83ed664..6061f717ab 100644 --- a/common/script/fns/updateStats.js +++ b/common/script/fns/updateStats.js @@ -1,21 +1,19 @@ import _ from 'lodash'; import { MAX_HEALTH, - MAX_STAT_POINTS + MAX_STAT_POINTS, } from '../constants'; import { toNextLevel } from '../statHelpers'; -module.exports = function (user, stats, req, analytics) { +import autoAllocate from './autoAllocate'; + +module.exports = function updateStats (user, stats, req = {}, analytics) { let allocatedStatPoints; let totalStatPoints; let experienceToNextLevel; - if (stats.hp <= 0) { - user.stats.hp = 0; - return user.stats.hp; - } - - user.stats.hp = stats.hp; - user.stats.gp = stats.gp >= 0 ? stats.gp : 0; + user.stats.hp = stats.hp > 0 ? stats.hp : 0; + user.stats.gp = stats.gp > 0 ? stats.gp : 0; + if (!user._tmp) user._tmp = {}; experienceToNextLevel = toNextLevel(user.stats.lvl); @@ -35,7 +33,7 @@ module.exports = function (user, stats, req, analytics) { continue; // eslint-disable-line no-continue } if (user.preferences.automaticAllocation) { - user.fns.autoAllocate(); + autoAllocate(user); } else { user.stats.points = user.stats.lvl - allocatedStatPoints; totalStatPoints = user.stats.points + allocatedStatPoints; @@ -52,7 +50,6 @@ module.exports = function (user, stats, req, analytics) { } user.stats.exp = stats.exp; - user.flags = user.flags || {}; if (!user.flags.customizationsNotification && (user.stats.exp > 5 || user.stats.lvl > 1)) { user.flags.customizationsNotification = true; @@ -62,48 +59,39 @@ module.exports = function (user, stats, req, analytics) { } if (!user.flags.dropsEnabled && user.stats.lvl >= 3) { user.flags.dropsEnabled = true; - if (user.items.eggs["Wolf"] > 0) { - user.items.eggs["Wolf"]++; + if (user.items.eggs.Wolf > 0) { + user.items.eggs.Wolf++; } else { - user.items.eggs["Wolf"] = 1; + user.items.eggs.Wolf = 1; } } - if (!user.flags.classSelected && user.stats.lvl >= 10) { - user.flags.classSelected; - } _.each({ vice1: 30, atom1: 15, moonstone1: 60, - goldenknight1: 40 - }, function(lvl, k) { - var analyticsData, base, base1, ref; - if (!((ref = user.flags.levelDrops) != null ? ref[k] : void 0) && user.stats.lvl >= lvl) { - if ((base = user.items.quests)[k] == null) { - base[k] = 0; - } + goldenknight1: 40, + }, (lvl, k) => { + if (user.stats.lvl >= lvl && !user.flags.levelDrops[k]) { + user.flags.levelDrops[k] = true; + if (!user.items.quests[k]) + user.items.quests[k] = 0; user.items.quests[k]++; - ((base1 = user.flags).levelDrops != null ? base1.levelDrops : base1.levelDrops = {})[k] = true; - if (typeof user.markModified === "function") { - user.markModified('flags.levelDrops'); + user.markModified('flags.levelDrops'); + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: k, + acquireMethod: 'Level Drop', + category: 'behavior', + }); } - analyticsData = { - uuid: user._id, - itemKey: k, - acquireMethod: 'Level Drop', - category: 'behavior' - }; - if (analytics != null) { - analytics.track('acquire item', analyticsData); - } - if (!user._tmp) user._tmp = {} - return user._tmp.drop = { + user._tmp.drop = { type: 'Quest', - key: k + key: k, }; } }); if (!user.flags.rebirthEnabled && (user.stats.lvl >= 50 || user.achievements.beastMaster)) { - return user.flags.rebirthEnabled = true; + user.flags.rebirthEnabled = true; } }; diff --git a/common/script/index.js b/common/script/index.js index ea502e9a7d..50b01bf762 100644 --- a/common/script/index.js +++ b/common/script/index.js @@ -1,85 +1,197 @@ -import moment from 'moment'; import _ from 'lodash'; -import { - daysSince, - shouldDo, -} from './cron'; +// When using a common module from the website or the server NEVER import the module directly +// but access it through `api` (the main common) module, otherwise you would require the non transpiled version of the file in production. +let api = module.exports = {}; + +import content from './content/index'; +api.content = content; + +import * as errors from './libs/errors'; +api.errors = errors; +import i18n from './i18n'; +api.i18n = i18n; + +// TODO under api.libs.cron? +import { shouldDo, daysSince } from './cron'; +api.shouldDo = shouldDo; +api.daysSince = daysSince; + +// TODO under api.constants? and capitalize exported names too import { MAX_HEALTH, MAX_LEVEL, MAX_STAT_POINTS, + TAVERN_ID, } from './constants'; -import * as statHelpers from './statHelpers'; - -import importedLibs from './libs'; - -var $w, preenHistory, sortOrder, - indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; - -import content from './content/index'; -import i18n from './i18n'; - -let api = module.exports = {}; - -api.i18n = i18n; -api.shouldDo = shouldDo; - api.maxLevel = MAX_LEVEL; -api.capByLevel = statHelpers.capByLevel; api.maxHealth = MAX_HEALTH; +api.maxStatPoints = MAX_STAT_POINTS; +api.TAVERN_ID = TAVERN_ID; + +// TODO under api.libs.statHelpers? +import * as statHelpers from './statHelpers'; +api.capByLevel = statHelpers.capByLevel; api.tnl = statHelpers.toNextLevel; api.diminishingReturns = statHelpers.diminishingReturns; -$w = api.$w = importedLibs.splitWhitespace; -api.dotSet = importedLibs.dotSet; -api.dotGet = importedLibs.dotGet; -api.refPush = importedLibs.refPush; -api.planGemLimits = importedLibs.planGemLimits; +import splitWhitespace from './libs/splitWhitespace'; +api.$w = splitWhitespace; -preenHistory = importedLibs.preenHistory; +import dotSet from './libs/dotSet'; +api.dotSet = dotSet; -api.preenTodos = importedLibs.preenTodos; -api.updateStore = importedLibs.updateStore; +import dotGet from './libs/dotGet'; +api.dotGet = dotGet; +import refPush from './libs/refPush'; +api.refPush = refPush; -/* ------------------------------------------------------- -Content ------------------------------------------------------- - */ +import planGemLimits from './libs/planGemLimits'; +api.planGemLimits = planGemLimits; -api.content = content; +import preenTodos from './libs/preenTodos'; +api.preenTodos = preenTodos; +import updateStore from './libs/updateStore'; +api.updateStore = updateStore; -/* ------------------------------------------------------- -Misc Helpers ------------------------------------------------------- - */ +import uuid from './libs/uuid'; +api.uuid = uuid; -api.uuid = importedLibs.uuid; -api.countExists = importedLibs.countExists; -api.taskDefaults = importedLibs.taskDefaults; -api.percent = importedLibs.percent; -api.removeWhitespace = importedLibs.removeWhitespace; -api.encodeiCalLink = importedLibs.encodeiCalLink; -api.gold = importedLibs.gold; -api.silver = importedLibs.silver; -api.taskClasses = importedLibs.taskClasses; -api.friendlyTimestamp = importedLibs.friendlyTimestamp; -api.newChatMessages = importedLibs.newChatMessages; -api.noTags = importedLibs.noTags; -api.appliedTags = importedLibs.appliedTags; +import taskDefaults from './libs/taskDefaults'; +api.taskDefaults = taskDefaults; +import percent from './libs/percent'; +api.percent = percent; -/* -Various counting functions - */ +import gold from './libs/gold'; +api.gold = gold; + +import silver from './libs/silver'; +api.silver = silver; + +import taskClasses from './libs/taskClasses'; +api.taskClasses = taskClasses; + +import noTags from './libs/noTags'; +api.noTags = noTags; + +import appliedTags from './libs/appliedTags'; +api.appliedTags = appliedTags; + +import pickDeep from './libs/pickDeep'; +api.pickDeep = pickDeep; import count from './count'; api.count = count; +import statsComputed from './libs/statsComputed'; +api.statsComputed = statsComputed; + +import autoAllocate from './fns/autoAllocate'; +import crit from './fns/crit'; +import handleTwoHanded from './fns/handleTwoHanded'; +import predictableRandom from './fns/predictableRandom'; +import randomDrop from './fns/randomDrop'; +import randomVal from './fns/randomVal'; +import resetGear from './fns/resetGear'; +import ultimateGear from './fns/ultimateGear'; +import updateStats from './fns/updateStats'; + +api.fns = { + autoAllocate, + crit, + handleTwoHanded, + predictableRandom, + randomDrop, + randomVal, + resetGear, + ultimateGear, + updateStats, +}; + +import scoreTask from './ops/scoreTask'; +import sleep from './ops/sleep'; +import allocate from './ops/allocate'; +import buy from './ops/buy'; +import buyGear from './ops/buyGear'; +import buyHealthPotion from './ops/buyHealthPotion'; +import buyArmoire from './ops/buyArmoire'; +import buyMysterySet from './ops/buyMysterySet'; +import buyQuest from './ops/buyQuest'; +import buySpecialSpell from './ops/buySpecialSpell'; +import allocateNow from './ops/allocateNow'; +import hatch from './ops/hatch'; +import feed from './ops/feed'; +import equip from './ops/equip'; +import changeClass from './ops/changeClass'; +import disableClasses from './ops/disableClasses'; +import purchase from './ops/purchase'; +import purchaseHourglass from './ops/hourglassPurchase'; +import readCard from './ops/readCard'; +import openMysteryItem from './ops/openMysteryItem'; +import addWebhook from './ops/addWebhook'; +import updateWebhook from './ops/updateWebhook'; +import deleteWebhook from './ops/deleteWebhook'; +import releasePets from './ops/releasePets'; +import releaseBoth from './ops/releaseBoth'; +import releaseMounts from './ops/releaseMounts'; +import updateTask from './ops/updateTask'; +import clearCompleted from './ops/clearCompleted'; +import sell from './ops/sell'; +import unlock from './ops/unlock'; +import revive from './ops/revive'; +import rebirth from './ops/rebirth'; +import blockUser from './ops/blockUser'; +import clearPMs from './ops/clearPMs'; +import deletePM from './ops/deletePM'; +import reroll from './ops/reroll'; +import addPushDevice from './ops/addPushDevice'; +import reset from './ops/reset'; +import markPmsRead from './ops/markPMSRead'; + +api.ops = { + scoreTask, + sleep, + allocate, + buy, + buyGear, + buyHealthPotion, + buyArmoire, + buyMysterySet, + buySpecialSpell, + buyQuest, + allocateNow, + hatch, + feed, + equip, + changeClass, + disableClasses, + purchase, + purchaseHourglass, + readCard, + openMysteryItem, + addWebhook, + updateWebhook, + deleteWebhook, + releasePets, + releaseBoth, + releaseMounts, + updateTask, + clearCompleted, + sell, + unlock, + revive, + rebirth, + blockUser, + clearPMs, + deletePM, + reroll, + addPushDevice, + reset, + markPmsRead, +}; /* ------------------------------------------------------ @@ -87,10 +199,9 @@ User (prototype wrapper to give it ops, helper funcs, and virtuals ------------------------------------------------------ */ - /* User is now wrapped (both on client and server), adding a few new properties: - * getters (_statsComputed, tasks, etc) + * getters (_statsComputed) * user.fns, which is a bunch of helper functions These were originally up above, but they make more sense belonging to the user object so we don't have to pass the user object all over the place. In fact, we should pull in more functions such as cron(), updateStats(), etc. @@ -121,14 +232,16 @@ TODO import importedOps from './ops'; import importedFns from './fns'; -api.wrap = function(user, main) { - if (main == null) { - main = true; - } - if (user._wrapped) { - return; - } +// TODO Kept for the client side +api.wrap = function wrapUser (user, main = true) { + if (user._wrapped) return; user._wrapped = true; + + // Make markModified available on the client side as a noop function + if (!user.markModified) { + user.markModified = function noopMarkModified () {}; + } + if (main) { user.ops = { update: _.partial(importedOps.update, user), @@ -163,6 +276,9 @@ api.wrap = function(user, main) { releaseMounts: _.partial(importedOps.releaseMounts, user), releaseBoth: _.partial(importedOps.releaseBoth, user), buy: _.partial(importedOps.buy, user), + buyHealthPotion: _.partial(importedOps.buyHealthPotion, user), + buyArmoire: _.partial(importedOps.buyArmoire, user), + buyGear: _.partial(importedOps.buyGear, user), buyQuest: _.partial(importedOps.buyQuest, user), buyMysterySet: _.partial(importedOps.buyMysterySet, user), hourglassPurchase: _.partial(importedOps.hourglassPurchase, user), @@ -175,11 +291,12 @@ api.wrap = function(user, main) { allocate: _.partial(importedOps.allocate, user), readCard: _.partial(importedOps.readCard, user), openMysteryItem: _.partial(importedOps.openMysteryItem, user), - score: _.partial(importedOps.score, user), + score: _.partial(importedOps.scoreTask, user), + markPmsRead: _.partial(importedOps.markPmsRead, user), }; } + user.fns = { - getItem: _.partial(importedFns.getItem, user), handleTwoHanded: _.partial(importedFns.handleTwoHanded, user), predictableRandom: _.partial(importedFns.predictableRandom, user), crit: _.partial(importedFns.crit, user), @@ -189,34 +306,14 @@ api.wrap = function(user, main) { randomDrop: _.partial(importedFns.randomDrop, user), autoAllocate: _.partial(importedFns.autoAllocate, user), updateStats: _.partial(importedFns.updateStats, user), - cron: _.partial(importedFns.cron, user), - preenUserHistory: _.partial(importedFns.preenUserHistory, user), + statsComputed: _.partial(statsComputed, user), ultimateGear: _.partial(importedFns.ultimateGear, user), nullify: _.partial(importedFns.nullify, user), }; + Object.defineProperty(user, '_statsComputed', { - get: function() { - var computed; - computed = _.reduce(['per', 'con', 'str', 'int'], (function(_this) { - return function(m, stat) { - m[stat] = _.reduce($w('stats stats.buffs items.gear.equipped.weapon items.gear.equipped.armor items.gear.equipped.head items.gear.equipped.shield'), function(m2, path) { - var item, val; - val = user.fns.dotGet(path); - return m2 + (~path.indexOf('items.gear') ? (item = content.gear.flat[val], (+(item != null ? item[stat] : void 0) || 0) * ((item != null ? item.klass : void 0) === user.stats["class"] || (item != null ? item.specialClass : void 0) === user.stats["class"] ? 1.5 : 1)) : +val[stat] || 0); - }, 0); - m[stat] += Math.floor(api.capByLevel(user.stats.lvl) / 2); - return m; - }; - })(this), {}); - computed.maxMP = computed.int * 2 + 30; - return computed; - } - }); - return Object.defineProperty(user, 'tasks', { - get: function() { - var tasks; - tasks = user.habits.concat(user.dailys).concat(user.todos).concat(user.rewards); - return _.object(_.pluck(tasks, "id"), tasks); - } + get () { + return statsComputed(user); + }, }); }; diff --git a/common/script/libs/appliedTags.js b/common/script/libs/appliedTags.js index 31302fbe54..ded2a9de23 100644 --- a/common/script/libs/appliedTags.js +++ b/common/script/libs/appliedTags.js @@ -1,19 +1,14 @@ -import _ from 'lodash'; - /* Are there tags applied? */ -module.exports = function(userTags, taskTags) { - var arr; - arr = []; - _.each(userTags, function(t) { - if (t == null) { - return; - } - if (taskTags != null ? taskTags[t.id] : void 0) { - return arr.push(t.name); - } +// TODO move to client + +module.exports = function appliedTags (userTags, taskTags = []) { + let arr = userTags.filter(tag => { + return taskTags.indexOf(tag.id) !== -1; + }).map(tag => { + return tag.name; }); return arr.join(', '); }; diff --git a/common/script/libs/countExists.js b/common/script/libs/countExists.js deleted file mode 100644 index 964e4e286f..0000000000 --- a/common/script/libs/countExists.js +++ /dev/null @@ -1,7 +0,0 @@ -import _ from 'lodash'; - -module.exports = function(items) { - return _.reduce(items, (function(m, v) { - return m + (v ? 1 : 0); - }), 0); -}; diff --git a/common/script/libs/dotGet.js b/common/script/libs/dotGet.js index 4585d8fd53..d8ce026b82 100644 --- a/common/script/libs/dotGet.js +++ b/common/script/libs/dotGet.js @@ -1,9 +1,5 @@ import _ from 'lodash'; -module.exports = function(obj, path) { - return _.reduce(path.split('.'), ((function(_this) { - return function(curr, next) { - return curr != null ? curr[next] : void 0; - }; - })(this)), obj); -}; +// TODO remove completely, only used in client + +module.exports = _.get; diff --git a/common/script/libs/dotSet.js b/common/script/libs/dotSet.js index 40165078aa..b664c54d05 100644 --- a/common/script/libs/dotSet.js +++ b/common/script/libs/dotSet.js @@ -1,14 +1,5 @@ import _ from 'lodash'; -module.exports = function(obj, path, val) { - var arr; - arr = path.split('.'); - return _.reduce(arr, (function(_this) { - return function(curr, next, index) { - if ((arr.length - 1) === index) { - curr[next] = val; - } - return curr[next] != null ? curr[next] : curr[next] = {}; - }; - })(this), obj); -}; +// TODO remove completely, only used in client + +module.exports = _.set; diff --git a/common/script/libs/encodeiCalLink.js b/common/script/libs/encodeiCalLink.js deleted file mode 100644 index 4a85badd59..0000000000 --- a/common/script/libs/encodeiCalLink.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Encode the download link for .ics iCal file - */ - -module.exports = function(uid, apiToken) { - var loc, ref; - loc = (typeof window !== "undefined" && window !== null ? window.location.host : void 0) || (typeof process !== "undefined" && process !== null ? (ref = process.env) != null ? ref.BASE_URL : void 0 : void 0) || ''; - return encodeURIComponent("http://" + loc + "/v1/users/" + uid + "/calendar.ics?apiToken=" + apiToken); -}; diff --git a/common/script/libs/errors.js b/common/script/libs/errors.js new file mode 100644 index 0000000000..cb780d215b --- /dev/null +++ b/common/script/libs/errors.js @@ -0,0 +1,42 @@ +import extendableBuiltin from './extendableBuiltin'; + +// Base class for custom application errors +// It extends Error and capture the stack trace +export class CustomError extends extendableBuiltin(Error) { + constructor () { + super(); + + if (Error.captureStackTrace) { + Error.captureStackTrace(this, this.constructor); + } + } +} + +// We specify an httpCode for all errors so that they can be used in the API too + +export class NotAuthorized extends CustomError { + constructor (customMessage) { + super(); + this.name = this.constructor.name; + this.httpCode = 401; + this.message = customMessage || 'Not authorized.'; + } +} + +export class BadRequest extends CustomError { + constructor (customMessage) { + super(); + this.name = this.constructor.name; + this.httpCode = 400; + this.message = customMessage || 'Bad request.'; + } +} + +export class NotFound extends CustomError { + constructor (customMessage) { + super(); + this.name = this.constructor.name; + this.httpCode = 404; + this.message = customMessage || 'Not found.'; + } +} diff --git a/common/script/libs/extendableBuiltin.js b/common/script/libs/extendableBuiltin.js new file mode 100644 index 0000000000..56186301c4 --- /dev/null +++ b/common/script/libs/extendableBuiltin.js @@ -0,0 +1,11 @@ +// Babel 6 doesn't support extending native class (Error, Array, ...) +// This function makes it possible to extend native classes with the same results as Babel 5 +module.exports = function extendableBuiltin (klass) { + function ExtendableBuiltin () { + klass.apply(this, arguments); + } + ExtendableBuiltin.prototype = Object.create(klass.prototype); + Object.setPrototypeOf(ExtendableBuiltin, klass); + + return ExtendableBuiltin; +}; diff --git a/common/script/libs/friendlyTimestamp.js b/common/script/libs/friendlyTimestamp.js deleted file mode 100644 index dfda6fbed7..0000000000 --- a/common/script/libs/friendlyTimestamp.js +++ /dev/null @@ -1,9 +0,0 @@ -import moment from 'moment'; - -/* -Friendly timestamp - */ - -module.exports = function(timestamp) { - return moment(timestamp).format('MM/DD h:mm:ss a'); -}; diff --git a/common/script/libs/gold.js b/common/script/libs/gold.js index 8016e2cff9..83d9531d5e 100644 --- a/common/script/libs/gold.js +++ b/common/script/libs/gold.js @@ -1,7 +1,9 @@ -module.exports = function(num) { +// TODO move to client + +module.exports = function gold (num) { if (num) { return Math.floor(num); } else { - return "0"; + return '0'; } }; diff --git a/common/script/libs/index.js b/common/script/libs/index.js deleted file mode 100644 index dd0c420d8d..0000000000 --- a/common/script/libs/index.js +++ /dev/null @@ -1,46 +0,0 @@ -import uuid from './uuid'; -import taskDefaults from './taskDefaults'; -import refPush from './refPush'; -import splitWhitespace from './splitWhitespace'; -import planGemLimits from './planGemLimits'; -import preenTodos from './preenTodos'; -import dotSet from './dotSet'; -import dotGet from './dotGet'; -import preenHistory from './preenHistory'; -import countExists from './countExists'; -import updateStore from './updateStore'; - -import appliedTags from './appliedTags'; -import encodeiCalLink from './encodeiCalLink'; -import friendlyTimestamp from './friendlyTimestamp'; -import gold from './gold'; -import newChatMessages from './newChatMessages'; -import noTags from './noTags'; -import percent from './percent'; -import removeWhitespace from './removeWhitespace'; -import silver from './silver'; -import taskClasses from './taskClasses'; - -module.exports = { - uuid, - taskDefaults, - refPush, - splitWhitespace, - planGemLimits, - preenTodos, - dotSet, - dotGet, - preenHistory, - countExists, - updateStore, - appliedTags, - encodeiCalLink, - friendlyTimestamp, - gold, - newChatMessages, - noTags, - percent, - removeWhitespace, - silver, - taskClasses, -}; diff --git a/common/script/libs/newChatMessages.js b/common/script/libs/newChatMessages.js deleted file mode 100644 index abe7680edf..0000000000 --- a/common/script/libs/newChatMessages.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Does user have new chat messages? - */ - -module.exports = function(messages, lastMessageSeen) { - if (!((messages != null ? messages.length : void 0) > 0)) { - return false; - } - return (messages != null ? messages[0] : void 0) && (messages[0].id !== lastMessageSeen); -}; diff --git a/common/script/libs/noTags.js b/common/script/libs/noTags.js index c3abb9054e..16a59d1d31 100644 --- a/common/script/libs/noTags.js +++ b/common/script/libs/noTags.js @@ -4,8 +4,10 @@ import _ from 'lodash'; are any tags active? */ -module.exports = function(tags) { - return _.isEmpty(tags) || _.isEmpty(_.filter(tags, function(t) { +// TODO move to client + +module.exports = function noTags (tags) { + return _.isEmpty(tags) || _.isEmpty(_.filter(tags, (t) => { return t; })); }; diff --git a/common/script/libs/percent.js b/common/script/libs/percent.js index 7439b22285..d7622474dd 100644 --- a/common/script/libs/percent.js +++ b/common/script/libs/percent.js @@ -1,10 +1,12 @@ -module.exports = function(x, y, dir) { - var roundFn; +// TODO move to client + +module.exports = function percent (x, y, dir) { + let roundFn; switch (dir) { - case "up": + case 'up': roundFn = Math.ceil; break; - case "down": + case 'down': roundFn = Math.floor; break; default: diff --git a/common/script/libs/pickDeep.js b/common/script/libs/pickDeep.js new file mode 100644 index 0000000000..919d926854 --- /dev/null +++ b/common/script/libs/pickDeep.js @@ -0,0 +1,13 @@ +// An utility to pick deep properties from an object. +// Works like _.pick but supports nested props (ie pickDeep(obj, ['deep.property'])) + +import _ from 'lodash'; + +module.exports = function pickDeep (obj, properties) { + if (!_.isArray(properties)) throw new Error('"properties" must be an array'); + + let result = {}; + _.each(properties, (prop) => _.set(result, prop, _.get(obj, prop))); + + return result; +}; diff --git a/common/script/libs/preenHistory.js b/common/script/libs/preenHistory.js deleted file mode 100644 index 0d354c238c..0000000000 --- a/common/script/libs/preenHistory.js +++ /dev/null @@ -1,43 +0,0 @@ -import moment from 'moment'; -import _ from 'lodash'; - -/* -Preen history for users with > 7 history entries -This takes an infinite array of single day entries [day day day day day...], and turns it into a condensed array -of averages, condensing more the further back in time we go. Eg, 7 entries each for last 7 days; 1 entry each week -of this month; 1 entry for each month of this year; 1 entry per previous year: [day*7 week*4 month*12 year*infinite] - */ - -module.exports = function(history) { - var newHistory, preen, thisMonth; - history = _.filter(history, function(h) { - return !!h; - }); - newHistory = []; - preen = function(amount, groupBy) { - var groups; - groups = _.chain(history).groupBy(function(h) { - return moment(h.date).format(groupBy); - }).sortBy(function(h, k) { - return k; - }).value(); - groups = groups.slice(-amount); - groups.pop(); - return _.each(groups, function(group) { - newHistory.push({ - date: moment(group[0].date).toDate(), - value: _.reduce(group, (function(m, obj) { - return m + obj.value; - }), 0) / group.length - }); - return true; - }); - }; - preen(50, "YYYY"); - preen(moment().format('MM'), "YYYYMM"); - thisMonth = moment().format('YYYYMM'); - newHistory = newHistory.concat(_.filter(history, function(h) { - return moment(h.date).format('YYYYMM') === thisMonth; - })); - return newHistory; -}; diff --git a/common/script/libs/preenTodos.js b/common/script/libs/preenTodos.js index f07a49c9d0..fcf8775d5f 100644 --- a/common/script/libs/preenTodos.js +++ b/common/script/libs/preenTodos.js @@ -1,14 +1,12 @@ import moment from 'moment'; import _ from 'lodash'; -/* - Preen 3-day past-completed To-Dos from Angular & mobile app - */ +// TODO used only in v2 -module.exports = function(tasks) { - return _.filter(tasks, function(t) { - return !t.completed || (t.challenge && t.challenge.id) || moment(t.dateCompleted).isAfter(moment().subtract({ - days: 3 +module.exports = function preenTodos (tasks) { + return _.filter(tasks, (t) => { + return !t.completed || t.challenge && t.challenge.id || moment(t.dateCompleted).isAfter(moment().subtract({ + days: 3, })); }); }; diff --git a/common/script/libs/refPush.js b/common/script/libs/refPush.js index 06b3617014..1bdddc9edf 100644 --- a/common/script/libs/refPush.js +++ b/common/script/libs/refPush.js @@ -7,13 +7,14 @@ import uuid from './uuid'; no problem. To maintain sorting, we use these helper functions: */ -module.exports = function(reflist, item, prune) { - if (prune == null) { - prune = 0; - } +module.exports = function refPush (reflist, item) { item.sort = _.isEmpty(reflist) ? 0 : _.max(reflist, 'sort').sort + 1; + if (!(item.id && !reflist[item.id])) { item.id = uuid(); } - return reflist[item.id] = item; + + reflist[item.id] = item; + + return reflist[item.id]; }; diff --git a/common/script/libs/removeWhitespace.js b/common/script/libs/removeWhitespace.js deleted file mode 100644 index 1015beda54..0000000000 --- a/common/script/libs/removeWhitespace.js +++ /dev/null @@ -1,10 +0,0 @@ -/* -Remove whitespace #FIXME are we using this anywwhere? Should we be? - */ - -module.exports = function(str) { - if (!str) { - return ''; - } - return str.replace(/\s/g, ''); -}; diff --git a/common/script/libs/silver.js b/common/script/libs/silver.js index 0dbae97b05..1d3620f602 100644 --- a/common/script/libs/silver.js +++ b/common/script/libs/silver.js @@ -2,10 +2,13 @@ Silver amount from their money */ -module.exports = function(num) { +// TODO move to client + +module.exports = function silver (num) { if (num) { - return ("0" + Math.floor((num - Math.floor(num)) * 100)).slice(-2); + let centCount = Math.floor((num - Math.floor(num)) * 100); + return `0${centCount}`.slice(-2); } else { - return "00"; + return '00'; } }; diff --git a/common/script/libs/splitWhitespace.js b/common/script/libs/splitWhitespace.js index 1ef3d513aa..2f8276bcb3 100644 --- a/common/script/libs/splitWhitespace.js +++ b/common/script/libs/splitWhitespace.js @@ -1,3 +1,4 @@ -module.exports = function(s) { + +module.exports = function splitWhitespace (s) { return s.split(' '); }; diff --git a/common/script/libs/statsComputed.js b/common/script/libs/statsComputed.js new file mode 100644 index 0000000000..a239b2039c --- /dev/null +++ b/common/script/libs/statsComputed.js @@ -0,0 +1,28 @@ +import _ from 'lodash'; +import content from '../content/index'; +import * as statHelpers from '../statHelpers'; + +module.exports = function statsComputed (user) { + let paths = ['stats', 'stats.buffs', 'items.gear.equipped.weapon', 'items.gear.equipped.armor', + 'items.gear.equipped.head', 'items.gear.equipped.shield']; + let computed = _.reduce(['per', 'con', 'str', 'int'], (m, stat) => { + m[stat] = _.reduce(paths, (m2, path) => { + let val = _.get(user, path); + let item = content.gear.flat[val]; + if (!item) item = {}; + if (!item[stat]) { + item[stat] = 0; + } else { + item[stat] = Number(item[stat]); + } + let thisMultiplier = item.klass === user.stats.class || item.specialClass === user.stats.class ? 1.5 : 1; + let thisReturn = path.indexOf('items.gear') !== -1 ? item[stat] * thisMultiplier : Number(val[stat]); + return m2 + thisReturn || 0; + }, 0); + m[stat] += Math.floor(statHelpers.capByLevel(user.stats.lvl) / 2); + return m; + }, {}); + + computed.maxMP = computed.int * 2 + 30; + return computed; +}; diff --git a/common/script/libs/taskClasses.js b/common/script/libs/taskClasses.js index 21bed1ad63..9ef223d9f7 100644 --- a/common/script/libs/taskClasses.js +++ b/common/script/libs/taskClasses.js @@ -1,51 +1,45 @@ import { - shouldDo + shouldDo, } from '../cron'; + /* Task classes given everything about the class */ -module.exports = function(task, filters, dayStart, lastCron, showCompleted, main) { - var classes, completed, enabled, filter, priority, ref, repeat, type, value; - if (filters == null) { - filters = []; - } - if (dayStart == null) { - dayStart = 0; - } - if (lastCron == null) { - lastCron = +(new Date); - } - if (showCompleted == null) { - showCompleted = false; - } - if (main == null) { - main = false; - } + +// TODO move to the client + +module.exports = function taskClasses (task, filters = [], dayStart = 0, lastCron = Number(new Date()), showCompleted = false, main = false) { if (!task) { - return; + return ''; } - type = task.type, completed = task.completed, value = task.value, repeat = task.repeat, priority = task.priority; - if (main) { - if (!task._editing) { - for (filter in filters) { - enabled = filters[filter]; - if (enabled && !((ref = task.tags) != null ? ref[filter] : void 0)) { - return 'hidden'; - } + let type = task.type; + let classes = task.type; + let completed = task.completed; + let value = task.value; + let priority = task.priority; + + if (main && !task._editing) { + for (let filter in filters) { + let enabled = filters[filter]; + if (!task.tags) task.tags = []; + if (enabled && task.tags.indexOf(filter) === -1) { + return 'hidden'; } } } - classes = type; + + classes = task.type; if (task._editing) { - classes += " beingEdited"; + classes += ' beingEdited'; } + if (type === 'todo' || type === 'daily') { - if (completed || (type === 'daily' && !shouldDo(+(new Date), task, { - dayStart: dayStart + if (completed || (type === 'daily' && !shouldDo(Number(new Date()), task, { // eslint-disable-line no-extra-parens + dayStart, }))) { - classes += " completed"; + classes += ' completed'; } else { - classes += " uncompleted"; + classes += ' uncompleted'; } } else if (type === 'habit') { if (task.down && task.up) { @@ -55,6 +49,7 @@ module.exports = function(task, filters, dayStart, lastCron, showCompleted, main classes += ' habit-narrow'; } } + if (priority === 0.1) { classes += ' difficulty-trivial'; } else if (priority === 1) { @@ -64,6 +59,7 @@ module.exports = function(task, filters, dayStart, lastCron, showCompleted, main } else if (priority === 2) { classes += ' difficulty-hard'; } + if (value < -20) { classes += ' color-worst'; } else if (value < -10) { @@ -79,5 +75,6 @@ module.exports = function(task, filters, dayStart, lastCron, showCompleted, main } else { classes += ' color-best'; } + return classes; }; diff --git a/common/script/libs/taskDefaults.js b/common/script/libs/taskDefaults.js index 69c815e4fd..e6bdba3def 100644 --- a/common/script/libs/taskDefaults.js +++ b/common/script/libs/taskDefaults.js @@ -1,71 +1,74 @@ -import uuid from './uuid'; +import { v4 as uuid } from 'uuid'; import _ from 'lodash'; +import moment from 'moment'; -/* -Even though Mongoose handles task defaults, we want to make sure defaults are set on the client-side before -sending up to the server for performance - */ +// Even though Mongoose handles task defaults, we want to make sure defaults are set on the client-side before +// sending up to the server for performance -// TODO revisit +// TODO move to client code? -module.exports = function(task) { - var defaults, ref, ref1, ref2; - if (task == null) { - task = {}; - } - if (!(task.type && ((ref = task.type) === 'habit' || ref === 'daily' || ref === 'todo' || ref === 'reward'))) { +const tasksTypes = ['habit', 'daily', 'todo', 'reward']; + +module.exports = function taskDefaults (task = {}) { + if (!task.type || tasksTypes.indexOf(task.type) === -1) { task.type = 'habit'; } - defaults = { - id: uuid(), - text: task.id != null ? task.id : '', + + let defaultId = uuid(); + let defaults = { + _id: defaultId, + text: task._id || defaultId, notes: '', + tags: [], + value: task.type === 'reward' ? 10 : 0, priority: 1, challenge: {}, + reminders: [], attribute: 'str', - dateCreated: new Date() + createdAt: new Date(), // TODO these are going to be overwritten by the server... + updatedAt: new Date(), }; + _.defaults(task, defaults); + + if (task.type === 'habit' || task.type === 'daily') { + _.defaults(task, { + history: [], + }); + } + + if (task.type === 'todo' || task.type === 'daily') { + _.defaults(task, { + completed: false, + collapseChecklist: false, + checklist: [], + }); + } + if (task.type === 'habit') { _.defaults(task, { up: true, - down: true - }); - } - if ((ref1 = task.type) === 'habit' || ref1 === 'daily') { - _.defaults(task, { - history: [] - }); - } - if ((ref2 = task.type) === 'daily' || ref2 === 'todo') { - _.defaults(task, { - completed: false + down: true, }); } + if (task.type === 'daily') { _.defaults(task, { streak: 0, repeat: { - su: true, m: true, t: true, w: true, th: true, f: true, - s: true - } - }, { - startDate: new Date(), + s: true, + su: true, + }, + startDate: moment().startOf('day').toDate(), everyX: 1, - frequency: 'weekly' + frequency: 'weekly', }); } - task._id = task.id; - if (task.value == null) { - task.value = task.type === 'reward' ? 10 : 0; - } - if (!_.isNumber(task.priority)) { - task.priority = 1; - } + return task; }; diff --git a/common/script/libs/updateStore.js b/common/script/libs/updateStore.js index 05d009fd9d..f6593de8fd 100644 --- a/common/script/libs/updateStore.js +++ b/common/script/libs/updateStore.js @@ -1,36 +1,31 @@ import _ from 'lodash'; import content from '../content/index'; -/* - Update the in-browser store with new gear. FIXME this was in user.fns, but it was causing strange issues there - */ +// Return the list of gear items available for purchase -var sortOrder = _.reduce(content.gearTypes, (function(m, v, k) { - m[v] = k; - return m; -}), {}); +let sortOrder = _.reduce(content.gearTypes, (accumulator, val, key) => { + accumulator[val] = key; + return accumulator; +}, {}); -module.exports = function(user) { - var changes; - if (!user) { - return; - } - changes = []; - _.each(content.gearTypes, function(type) { - var found; - found = _.find(content.gear.tree[type][user.stats["class"]], function(item) { +module.exports = function updateStore (user) { + let changes = []; + + _.each(content.gearTypes, (type) => { + let found = _.find(content.gear.tree[type][user.stats.class], (item) => { return !user.items.gear.owned[item.key]; }); - if (found) { - changes.push(found); + + if (found) changes.push(found); + }); + + changes = changes.concat(_.filter(content.gear.flat, (val) => { + if (['special', 'mystery', 'armoire'].indexOf(val.klass) !== -1 && !user.items.gear.owned[val.key] && (val.canOwn ? val.canOwn(user) : false)) { + return true; + } else { + return false; } - return true; - }); - changes = changes.concat(_.filter(content.gear.flat, function(v) { - var ref; - return ((ref = v.klass) === 'special' || ref === 'mystery' || ref === 'armoire') && !user.items.gear.owned[v.key] && (typeof v.canOwn === "function" ? v.canOwn(user) : void 0); })); - return _.sortBy(changes, function(c) { - return sortOrder[c.type]; - }); + + return _.sortBy(changes, (change) => sortOrder[change.type]); }; diff --git a/common/script/libs/uuid.js b/common/script/libs/uuid.js index 4a26440d7d..63f75cf398 100644 --- a/common/script/libs/uuid.js +++ b/common/script/libs/uuid.js @@ -1,9 +1,4 @@ -// TODO use node-uuid module -module.exports = function() { - return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) { - var r, v; - r = Math.random() * 16 | 0; - v = (c === "x" ? r : r & 0x3 | 0x8); - return v.toString(16); - }); -}; +import uuid from 'uuid'; + +// TODO remove this file completely +module.exports = uuid.v4; diff --git a/common/script/ops/addPushDevice.js b/common/script/ops/addPushDevice.js index d96cf249cf..a909fe9feb 100644 --- a/common/script/ops/addPushDevice.js +++ b/common/script/ops/addPushDevice.js @@ -1,20 +1,41 @@ import _ from 'lodash'; +import i18n from '../i18n'; +import { + BadRequest, + NotAuthorized, +} from '../libs/errors'; + +// TODO move to server code +module.exports = function addPushDevice (user, req = {}) { + let regId = _.get(req, 'body.regId'); + if (!regId) throw new BadRequest(i18n.t('regIdRequired', req.language)); + + let type = _.get(req, 'body.type'); + if (!type) throw new BadRequest(i18n.t('typeRequired', req.language)); -module.exports = function(user, req, cb) { - var i, item, pd; if (!user.pushDevices) { user.pushDevices = []; } - pd = user.pushDevices; - item = { - regId: req.body.regId, - type: req.body.type + + let pushDevices = user.pushDevices; + + let item = { + regId, + type, }; - i = _.findIndex(pd, { - regId: item.regId + + let indexOfPushDevice = _.findIndex(pushDevices, { + regId: item.regId, }); - if (i === -1) { - pd.push(item); + + if (indexOfPushDevice !== -1) { + throw new NotAuthorized(i18n.t('pushDeviceAlreadyAdded', req.language)); } - return typeof cb === "function" ? cb(null, user.pushDevices) : void 0; + + pushDevices.push(item); + + return [ + user.pushDevices, + i18n.t('pushDeviceAdded', req.language), + ]; }; diff --git a/common/script/ops/addTag.js b/common/script/ops/addTag.js index a020a5fbaf..b44ead8d2e 100644 --- a/common/script/ops/addTag.js +++ b/common/script/ops/addTag.js @@ -1,12 +1,17 @@ import uuid from '../libs/uuid'; +import _ from 'lodash'; -module.exports = function(user, req, cb) { - if (user.tags == null) { +// TODO used only in client, move there? + +module.exports = function addTag (user, req = {}) { + if (!user.tags) { user.tags = []; } + user.tags.push({ name: req.body.name, - id: req.body.id || uuid() + id: _.get(req, 'body.id') || uuid(), }); - return typeof cb === "function" ? cb(null, user.tags) : void 0; + + return user.tags; }; diff --git a/common/script/ops/addTask.js b/common/script/ops/addTask.js index a2d1895e1e..2c4ea159e2 100644 --- a/common/script/ops/addTask.js +++ b/common/script/ops/addTask.js @@ -1,27 +1,15 @@ import taskDefaults from '../libs/taskDefaults'; -import i18n from '../i18n'; -module.exports = function(user, req, cb) { - var task; - task = taskDefaults(req.body); - if (user.tasks[task.id] != null) { - return typeof cb === "function" ? cb({ - code: 409, - message: i18n.t('messageDuplicateTaskID', req.language) - }) : void 0; - } - user[task.type + "s"].unshift(task); - if (user.preferences.newTaskEdit) { - task._editing = true; - } - if (user.preferences.tagsCollapsed) { - task._tags = true; - } - if (!user.preferences.advancedCollapsed) { - task._advanced = true; - } - if (typeof cb === "function") { - cb(null, task); - } +// TODO move to client since it's only used there? + +module.exports = function addTask (user, req = {body: {}}) { + let task = taskDefaults(req.body); + user.tasksOrder[`${task.type}s`].unshift(task._id); + user[`${task.type}s`].unshift(task); + + task._editing = user.preferences.newTaskEdit; + task._tags = !user.preferences.tagsCollapsed; + task._advanced = !user.preferences.advancedCollapsed; + return task; }; diff --git a/common/script/ops/addWebhook.js b/common/script/ops/addWebhook.js index 99eaf49bba..c308d1b9e5 100644 --- a/common/script/ops/addWebhook.js +++ b/common/script/ops/addWebhook.js @@ -1,15 +1,27 @@ import refPush from '../libs/refPush'; +import validator from 'validator'; +import i18n from '../i18n'; +import { + BadRequest, +} from '../libs/errors'; +import _ from 'lodash'; -module.exports = function(user, req, cb) { - var wh; - wh = user.preferences.webhooks; - refPush(wh, { - url: req.body.url, - enabled: req.body.enabled || true, - id: req.body.id - }); - if (typeof user.markModified === "function") { - user.markModified('preferences.webhooks'); +module.exports = function addWebhook (user, req = {}) { + let wh = user.preferences.webhooks; + + if (!validator.isURL(_.get(req, 'body.url'))) throw new BadRequest(i18n.t('invalidUrl', req.language)); + if (!validator.isBoolean(_.get(req, 'body.enabled'))) throw new BadRequest(i18n.t('invalidEnabled', req.language)); + + user.markModified('preferences.webhooks'); + + if (req.v2 === true) { + return user.preferences.webhooks; + } else { + return [ + refPush(wh, { + url: req.body.url, + enabled: req.body.enabled, + }), + ]; } - return typeof cb === "function" ? cb(null, user.preferences.webhooks) : void 0; }; diff --git a/common/script/ops/allocate.js b/common/script/ops/allocate.js index 92b5ae53fa..8e07e09589 100644 --- a/common/script/ops/allocate.js +++ b/common/script/ops/allocate.js @@ -1,15 +1,31 @@ import _ from 'lodash'; -import splitWhitespace from '../libs/splitWhitespace'; +import { + ATTRIBUTES, +} from '../constants'; +import { + BadRequest, + NotAuthorized, +} from '../libs/errors'; +import i18n from '../i18n'; + +module.exports = function allocate (user, req = {}) { + let stat = _.get(req, 'query.stat', 'str'); + + if (ATTRIBUTES.indexOf(stat) === -1) { + throw new BadRequest(i18n.t('invalidAttribute', {attr: stat}, req.language)); + } -module.exports = function(user, req, cb) { - var stat; - stat = req.query.stat || 'str'; if (user.stats.points > 0) { user.stats[stat]++; user.stats.points--; if (stat === 'int') { user.stats.mp++; } + } else { + throw new NotAuthorized(i18n.t('notEnoughAttrPoints', req.language)); } - return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats'))) : void 0; + + return [ + user.stats, + ]; }; diff --git a/common/script/ops/allocateNow.js b/common/script/ops/allocateNow.js index 815c0b8959..e8ae5d249c 100644 --- a/common/script/ops/allocateNow.js +++ b/common/script/ops/allocateNow.js @@ -1,10 +1,15 @@ import _ from 'lodash'; +import autoAllocate from '../fns/autoAllocate'; -module.exports = function(user, req, cb) { - _.times(user.stats.points, user.fns.autoAllocate); +module.exports = function allocateNow (user, req = {}) { + _.times(user.stats.points, () => autoAllocate(user)); user.stats.points = 0; - if (typeof user.markModified === "function") { - user.markModified('stats'); + + if (req.v2 === true) { + return _.pick(user, 'stats'); + } else { + return [ + user.stats, + ]; } - return typeof cb === "function" ? cb(null, user.stats) : void 0; }; diff --git a/common/script/ops/blockUser.js b/common/script/ops/blockUser.js index dd08925640..5c123735ed 100644 --- a/common/script/ops/blockUser.js +++ b/common/script/ops/blockUser.js @@ -1,13 +1,21 @@ -module.exports = function(user, req, cb) { - var i; - i = user.inbox.blocks.indexOf(req.params.uuid); - if (~i) { - user.inbox.blocks.splice(i, 1); - } else { +import validator from 'validator'; +import i18n from '../i18n'; +import { + BadRequest, +} from '../libs/errors'; + +module.exports = function blockUser (user, req = {}) { + if (!validator.isUUID(req.params.uuid)) throw new BadRequest(i18n.t('invalidUUID', req.language)); + + let i = user.inbox.blocks.indexOf(req.params.uuid); + if (i === -1) { user.inbox.blocks.push(req.params.uuid); + } else { + user.inbox.blocks.splice(i, 1); } - if (typeof user.markModified === "function") { - user.markModified('inbox.blocks'); - } - return typeof cb === "function" ? cb(null, user.inbox.blocks) : void 0; + + user.markModified('inbox.blocks'); + return [ + user.inbox.blocks, + ]; }; diff --git a/common/script/ops/buy.js b/common/script/ops/buy.js index 1686316264..ded5b034d2 100644 --- a/common/script/ops/buy.js +++ b/common/script/ops/buy.js @@ -1,119 +1,24 @@ -import content from '../content/index'; import i18n from '../i18n'; import _ from 'lodash'; -import count from '../count'; -import splitWhitespace from '../libs/splitWhitespace'; +import { + BadRequest, +} from '../libs/errors'; +import buyHealthPotion from './buyHealthPotion'; +import buyArmoire from './buyArmoire'; +import buyGear from './buyGear'; -module.exports = function(user, req, cb, analytics) { - var analyticsData, armoireExp, armoireResp, armoireResult, base, buyResp, drop, eligibleEquipment, item, key, message, name; - key = req.params.key; - item = key === 'potion' ? content.potion : key === 'armoire' ? content.armoire : content.gear.flat[key]; - if (!item) { - return typeof cb === "function" ? cb({ - code: 404, - message: "Item '" + key + " not found (see https://github.com/HabitRPG/habitrpg/blob/develop/common/script/content/index.js)" - }) : void 0; - } - if (user.stats.gp < item.value) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('messageNotEnoughGold', req.language) - }) : void 0; - } - if ((item.canOwn != null) && !item.canOwn(user)) { - return typeof cb === "function" ? cb({ - code: 401, - message: "You can't buy this item" - }) : void 0; - } - armoireResp = void 0; - if (item.key === 'potion') { - user.stats.hp += 15; - if (user.stats.hp > 50) { - user.stats.hp = 50; - } - } else if (item.key === 'armoire') { - armoireResult = user.fns.predictableRandom(user.stats.gp); - eligibleEquipment = _.filter(content.gear.flat, (function(i) { - return i.klass === 'armoire' && !user.items.gear.owned[i.key]; - })); - if (!_.isEmpty(eligibleEquipment) && (armoireResult < .6 || !user.flags.armoireOpened)) { - eligibleEquipment.sort(); - drop = user.fns.randomVal(eligibleEquipment); - user.items.gear.owned[drop.key] = true; - user.flags.armoireOpened = true; - message = i18n.t('armoireEquipment', { - image: '', - dropText: drop.text(req.language) - }, req.language); - if (count.remainingGearInSet(user.items.gear.owned, 'armoire') === 0) { - user.flags.armoireEmpty = true; - } - armoireResp = { - type: "gear", - dropKey: drop.key, - dropText: drop.text(req.language) - }; - } else if ((!_.isEmpty(eligibleEquipment) && armoireResult < .8) || armoireResult < .5) { - drop = user.fns.randomVal(_.where(content.food, { - canDrop: true - })); - if ((base = user.items.food)[name = drop.key] == null) { - base[name] = 0; - } - user.items.food[drop.key] += 1; - message = i18n.t('armoireFood', { - image: '', - dropArticle: drop.article, - dropText: drop.text(req.language) - }, req.language); - armoireResp = { - type: "food", - dropKey: drop.key, - dropArticle: drop.article, - dropText: drop.text(req.language) - }; - } else { - armoireExp = Math.floor(user.fns.predictableRandom(user.stats.exp) * 40 + 10); - user.stats.exp += armoireExp; - message = i18n.t('armoireExp', req.language); - armoireResp = { - "type": "experience", - "value": armoireExp - }; - } +module.exports = function buy (user, req = {}, analytics) { + let key = _.get(req, 'params.key'); + if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language)); + + let buyRes; + if (key === 'potion') { + buyRes = buyHealthPotion(user, req, analytics); + } else if (key === 'armoire') { + buyRes = buyArmoire(user, req, analytics); } else { - if (user.preferences.autoEquip) { - user.items.gear.equipped[item.type] = item.key; - message = user.fns.handleTwoHanded(item, null, req); - } - user.items.gear.owned[item.key] = true; - if (message == null) { - message = i18n.t('messageBought', { - itemText: item.text(req.language) - }, req.language); - } - if (item.last) { - user.fns.ultimateGear(); - } + buyRes = buyGear(user, req, analytics); } - user.stats.gp -= item.value; - analyticsData = { - uuid: user._id, - itemKey: key, - acquireMethod: 'Gold', - goldCost: item.value, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('acquire item', analyticsData); - } - buyResp = _.pick(user, splitWhitespace('items achievements stats flags')); - if (armoireResp) { - buyResp["armoire"] = armoireResp; - } - return typeof cb === "function" ? cb({ - code: 200, - message: message - }, buyResp) : void 0; + + return buyRes; }; diff --git a/common/script/ops/buyArmoire.js b/common/script/ops/buyArmoire.js new file mode 100644 index 0000000000..e183c06984 --- /dev/null +++ b/common/script/ops/buyArmoire.js @@ -0,0 +1,115 @@ +import content from '../content/index'; +import i18n from '../i18n'; +import _ from 'lodash'; +import count from '../count'; +import splitWhitespace from '../libs/splitWhitespace'; +import { + NotAuthorized, +} from '../libs/errors'; +import predictableRandom from '../fns/predictableRandom'; +import randomVal from '../fns/randomVal'; + +module.exports = function buyArmoire (user, req = {}, analytics) { + let item = content.armoire; + + if (user.stats.gp < item.value) { + throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); + } + + if (item.canOwn && !item.canOwn(user)) { + throw new NotAuthorized(i18n.t('cannotBuyItem', req.language)); + } + + let armoireResp; + let armoireResult; + let eligibleEquipment; + let drop; + let message; + + armoireResult = predictableRandom(user, user.stats.gp); + eligibleEquipment = _.filter(content.gear.flat, (eligible) => { + return eligible.klass === 'armoire' && !user.items.gear.owned[eligible.key]; + }); + + if (!_.isEmpty(eligibleEquipment) && (armoireResult < 0.6 || !user.flags.armoireOpened)) { + eligibleEquipment.sort(); + drop = randomVal(user, eligibleEquipment); + + if (user.items.gear.owned[drop.key]) { + throw new NotAuthorized(i18n.t('equipmentAlradyOwned', req.language)); + } + + user.items.gear.owned[drop.key] = true; + user.flags.armoireOpened = true; + message = i18n.t('armoireEquipment', { + image: ``, + dropText: drop.text(req.language), + }, req.language); + + if (count.remainingGearInSet(user.items.gear.owned, 'armoire') === 0) { + user.flags.armoireEmpty = true; + } + + armoireResp = { + type: 'gear', + dropKey: drop.key, + dropText: drop.text(req.language), + }; + } else if ((!_.isEmpty(eligibleEquipment) && armoireResult < 0.8) || armoireResult < 0.5) { // eslint-disable-line no-extra-parens + drop = randomVal(user, _.where(content.food, { + canDrop: true, + })); + user.items.food[drop.key] = user.items.food[drop.key] || 0; + user.items.food[drop.key] += 1; + + message = i18n.t('armoireFood', { + image: ``, + dropArticle: drop.article, + dropText: drop.text(req.language), + }, req.language); + armoireResp = { + type: 'food', + dropKey: drop.key, + dropArticle: drop.article, + dropText: drop.text(req.language), + }; + } else { + let armoireExp = Math.floor(predictableRandom(user, user.stats.exp) * 40 + 10); + user.stats.exp += armoireExp; + message = i18n.t('armoireExp', req.language); + armoireResp = { + type: 'experience', + value: armoireExp, + }; + } + + user.stats.gp -= item.value; + + if (!message) { + message = i18n.t('messageBought', { + itemText: item.text(req.language), + }, req.language); + } + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: 'Armoire', + acquireMethod: 'Gold', + goldCost: item.value, + category: 'behavior', + }); + } + + let resData = _.pick(user, splitWhitespace('items flags')); + if (armoireResp) resData.armoire = armoireResp; + + if (req.v2 === true) { + return resData; + } else { + return [ + resData, + message, + ]; + } +}; diff --git a/common/script/ops/buyGear.js b/common/script/ops/buyGear.js new file mode 100644 index 0000000000..e4f4eb3b68 --- /dev/null +++ b/common/script/ops/buyGear.js @@ -0,0 +1,70 @@ +import content from '../content/index'; +import i18n from '../i18n'; +import _ from 'lodash'; +import splitWhitespace from '../libs/splitWhitespace'; +import { + BadRequest, + NotAuthorized, + NotFound, +} from '../libs/errors'; +import handleTwoHanded from '../fns/handleTwoHanded'; +import ultimateGear from '../fns/ultimateGear'; + +module.exports = function buyGear (user, req = {}, analytics) { + let key = _.get(req, 'params.key'); + if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language)); + + let item = content.gear.flat[key]; + + if (!item) throw new NotFound(i18n.t('itemNotFound', {key}, req.language)); + + if (user.stats.gp < item.value) { + throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); + } + + if (item.canOwn && !item.canOwn(user)) { + throw new NotAuthorized(i18n.t('cannotBuyItem', req.language)); + } + + let message; + + if (user.items.gear.owned[item.key]) { + throw new NotAuthorized(i18n.t('equipmentAlreadyOwned', req.language)); + } + + if (user.preferences.autoEquip) { + user.items.gear.equipped[item.type] = item.key; + message = handleTwoHanded(user, item, undefined, req); + } + + user.items.gear.owned[item.key] = true; + + if (item.last) ultimateGear(user); + + user.stats.gp -= item.value; + + if (!message) { + message = i18n.t('messageBought', { + itemText: item.text(req.language), + }, req.language); + } + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: key, + acquireMethod: 'Gold', + goldCost: item.value, + category: 'behavior', + }); + } + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('items achievements stats flags')); + } else { + return [ + _.pick(user, splitWhitespace('items achievements stats flags')), + message, + ]; + } +}; diff --git a/common/script/ops/buyHealthPotion.js b/common/script/ops/buyHealthPotion.js new file mode 100644 index 0000000000..1a6c8b0e18 --- /dev/null +++ b/common/script/ops/buyHealthPotion.js @@ -0,0 +1,48 @@ +import content from '../content/index'; +import i18n from '../i18n'; +import { + NotAuthorized, +} from '../libs/errors'; + +module.exports = function buyHealthPotion (user, req = {}, analytics) { + let item = content.potion; + + if (user.stats.gp < item.value) { + throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); + } + + if (item.canOwn && !item.canOwn(user)) { + throw new NotAuthorized(i18n.t('cannotBuyItem', req.language)); + } + + user.stats.hp += 15; + if (user.stats.hp > 50) { + user.stats.hp = 50; + } + + user.stats.gp -= item.value; + + let message = i18n.t('messageBought', { + itemText: item.text(req.language), + }, req.language); + + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: 'Potion', + acquireMethod: 'Gold', + goldCost: item.value, + category: 'behavior', + }); + } + + if (req.v2 === true) { + return user.stats; + } else { + return [ + user.stats, + message, + ]; + } +}; diff --git a/common/script/ops/buyMysterySet.js b/common/script/ops/buyMysterySet.js index 44ccdb9aaf..acf0014279 100644 --- a/common/script/ops/buyMysterySet.js +++ b/common/script/ops/buyMysterySet.js @@ -2,42 +2,54 @@ import i18n from '../i18n'; import content from '../content/index'; import _ from 'lodash'; import splitWhitespace from '../libs/splitWhitespace'; +import pickDeep from '../libs/pickDeep'; +import { + BadRequest, + NotAuthorized, + NotFound, +} from '../libs/errors'; + +module.exports = function buyMysterySet (user, req = {}, analytics) { + let key = _.get(req, 'params.key'); + if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language)); -module.exports = function(user, req, cb, analytics) { - var mysterySet, ref; if (!(user.purchased.plan.consecutive.trinkets > 0)) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughHourglasses', req.language) - }) : void 0; - } - mysterySet = (ref = content.timeTravelerStore(user.items.gear.owned)) != null ? ref[req.params.key] : void 0; - if ((typeof window !== "undefined" && window !== null ? window.confirm : void 0) != null) { - if (!window.confirm(i18n.t('hourglassBuyEquipSetConfirm'))) { - return; - } + throw new NotAuthorized(i18n.t('notEnoughHourglasses', req.language)); } + + let ref = content.timeTravelerStore(user.items.gear.owned); + let mysterySet = ref ? ref[key] : undefined; + if (!mysterySet) { - return typeof cb === "function" ? cb({ - code: 404, - message: "Mystery set not found, or set already owned" - }) : void 0; + throw new NotFound(i18n.t('mysterySetNotFound', req.language)); } - _.each(mysterySet.items, function(i) { - var analyticsData; - user.items.gear.owned[i.key] = true; - analyticsData = { - uuid: user._id, - itemKey: i.key, - itemType: 'Subscriber Gear', - acquireMethod: 'Hourglass', - category: 'behavior' - }; - return analytics != null ? analytics.track('acquire item', analyticsData) : void 0; + + if (typeof window !== 'undefined' && window.confirm) { // TODO move to client + if (!window.confirm(i18n.t('hourglassBuyEquipSetConfirm'))) return; + } + + _.each(mysterySet.items, item => { + user.items.gear.owned[item.key] = true; + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: item.key, + itemType: 'Subscriber Gear', + acquireMethod: 'Hourglass', + category: 'behavior', + }); + } }); + user.purchased.plan.consecutive.trinkets--; - return typeof cb === "function" ? cb({ - code: 200, - message: i18n.t('hourglassPurchaseSet', req.language) - }, _.pick(user, splitWhitespace('items purchased.plan.consecutive'))) : void 0; + + + if (req.v2 === true) { + return pickDeep(user, splitWhitespace('items purchased.plan.consecutive')); + } else { + return [ + { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive }, + i18n.t('hourglassPurchaseSet', req.language), + ]; + } }; diff --git a/common/script/ops/buyQuest.js b/common/script/ops/buyQuest.js index b7653d43ce..af7c384419 100644 --- a/common/script/ops/buyQuest.js +++ b/common/script/ops/buyQuest.js @@ -1,49 +1,50 @@ import i18n from '../i18n'; import content from '../content/index'; +import { + BadRequest, + NotAuthorized, + NotFound, +} from '../libs/errors'; +import _ from 'lodash'; + +// buy a quest with gold +module.exports = function buyQuest (user, req = {}, analytics) { + let key = _.get(req, 'params.key'); + if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language)); + + let item = content.quests[key]; + if (!item) throw new NotFound(i18n.t('questNotFound', {key}, req.language)); -module.exports = function(user, req, cb, analytics) { - var analyticsData, base, item, key, message, name; - key = req.params.key; - item = content.quests[key]; - if (!item) { - return typeof cb === "function" ? cb({ - code: 404, - message: "Quest '" + key + " not found (see https://github.com/HabitRPG/habitrpg/blob/develop/common/script/content/index.js)" - }) : void 0; - } if (!(item.category === 'gold' && item.goldValue)) { - return typeof cb === "function" ? cb({ - code: 404, - message: "Quest '" + key + " is not a Gold-purchasable quest (see https://github.com/HabitRPG/habitrpg/blob/develop/common/script/content/index.js)" - }) : void 0; + throw new NotAuthorized(i18n.t('questNotGoldPurchasable', {key}, req.language)); } if (user.stats.gp < item.goldValue) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('messageNotEnoughGold', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); } - message = i18n.t('messageBought', { - itemText: item.text(req.language) - }, req.language); - if ((base = user.items.quests)[name = item.key] == null) { - base[name] = 0; - } - user.items.quests[item.key] += 1; + + user.items.quests[item.key] = user.items.quests[item.key] || 0; + user.items.quests[item.key]++; user.stats.gp -= item.goldValue; - analyticsData = { - uuid: user._id, - itemKey: item.key, - itemType: 'Market', - goldCost: item.goldValue, - acquireMethod: 'Gold', - category: 'behavior' - }; - if (analytics != null) { - analytics.track('acquire item', analyticsData); + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: item.key, + itemType: 'Market', + goldCost: item.goldValue, + acquireMethod: 'Gold', + category: 'behavior', + }); + } + + if (req.v2 === true) { + return user.items.quests; + } else { + return [ + user.items.quests, + i18n.t('messageBought', { + itemText: item.text(req.language), + }, req.language), + ]; } - return typeof cb === "function" ? cb({ - code: 200, - message: message - }, user.items.quests) : void 0; }; diff --git a/common/script/ops/buySpecialSpell.js b/common/script/ops/buySpecialSpell.js index e2a9dc8deb..20ea0251aa 100644 --- a/common/script/ops/buySpecialSpell.js +++ b/common/script/ops/buySpecialSpell.js @@ -2,30 +2,34 @@ import i18n from '../i18n'; import content from '../content/index'; import _ from 'lodash'; import splitWhitespace from '../libs/splitWhitespace'; +import { + BadRequest, + NotAuthorized, + NotFound, +} from '../libs/errors'; + +module.exports = function buySpecialSpell (user, req = {}) { + let key = _.get(req, 'params.key'); + if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language)); + + let item = content.special[key]; + if (!item) throw new NotFound(i18n.t('spellNotFound', {spellId: key}, req.language)); -module.exports = function(user, req, cb) { - var base, item, key, message; - key = req.params.key; - item = content.special[key]; if (user.stats.gp < item.value) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('messageNotEnoughGold', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); } user.stats.gp -= item.value; - if ((base = user.items.special)[key] == null) { - base[key] = 0; - } + user.items.special[key]++; - if (typeof user.markModified === "function") { - user.markModified('items.special'); + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('items stats')); + } else { + return [ + _.pick(user, splitWhitespace('items stats')), + i18n.t('messageBought', { + itemText: item.text(req.language), + }, req.language), + ]; } - message = i18n.t('messageBought', { - itemText: item.text(req.language) - }, req.language); - return typeof cb === "function" ? cb({ - code: 200, - message: message - }, _.pick(user, splitWhitespace('items stats'))) : void 0; }; diff --git a/common/script/ops/changeClass.js b/common/script/ops/changeClass.js index 98fd8fd58d..4b3eb6b289 100644 --- a/common/script/ops/changeClass.js +++ b/common/script/ops/changeClass.js @@ -2,58 +2,77 @@ import i18n from '../i18n'; import _ from 'lodash'; import splitWhitespace from '../libs/splitWhitespace'; import { capByLevel } from '../statHelpers'; +import { + NotAuthorized, +} from '../libs/errors'; -module.exports = function(user, req, cb, analytics) { - var analyticsData, klass, ref; - klass = (ref = req.query) != null ? ref["class"] : void 0; - if (klass === 'warrior' || klass === 'rogue' || klass === 'wizard' || klass === 'healer') { - analyticsData = { - uuid: user._id, - "class": klass, - acquireMethod: 'Gems', - gemCost: 3, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('change class', analyticsData); - } - user.stats["class"] = klass; +module.exports = function changeClass (user, req = {}, analytics) { + let klass = _.get(req, 'query.class'); + + // user.flags.classSelected is set to false after the user paid the 3 gems + if (user.stats.lvl < 10) { + throw new NotAuthorized(i18n.t('lvl10ChangeClass', req.language)); + } else if (!user.flags.classSelected && (klass === 'warrior' || klass === 'rogue' || klass === 'wizard' || klass === 'healer')) { + user.stats.class = klass; user.flags.classSelected = true; - _.each(["weapon", "armor", "shield", "head"], function(type) { - var foundKey; - foundKey = false; - _.findLast(user.items.gear.owned, function(v, k) { - if (~k.indexOf(type + "_" + klass) && v === true) { - return foundKey = k; + + _.each(['weapon', 'armor', 'shield', 'head'], (type) => { + let foundKey = false; + _.findLast(user.items.gear.owned, (val, key) => { + if (key.indexOf(`${type}_${klass}`) !== -1 && val === true) { + foundKey = key; + return true; } }); - user.items.gear.equipped[type] = foundKey ? foundKey : type === "weapon" ? "weapon_" + klass + "_0" : type === "shield" && klass === "rogue" ? "shield_rogue_0" : type + "_base_0"; - if (type === "weapon" || (type === "shield" && klass === "rogue")) { - user.items.gear.owned[type + "_" + klass + "_0"] = true; + + if (!foundKey) { + if (type === 'weapon') { + foundKey = `weapon_${klass}_0`; + } else if (type === 'shield' && klass === 'rogue') { + foundKey = 'shield_rogue_0'; + } else { + foundKey = `${type}_base_0`; + } + } + + user.items.gear.equipped[type] = foundKey; + + if (type === 'weapon' || (type === 'shield' && klass === 'rogue')) { // eslint-disable-line no-extra-parens + user.items.gear.owned[`${type}_${klass}_0`] = true; } - return true; }); + + if (analytics) { + analytics.track('change class', { + uuid: user._id, + class: klass, + acquireMethod: 'Gems', + gemCost: 3, + category: 'behavior', + }); + } } else { if (user.preferences.disableClasses) { user.preferences.disableClasses = false; user.preferences.autoAllocate = false; } else { - if (!(user.balance >= .75)) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; - } - user.balance -= .75; + if (user.balance < 0.75) throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); + user.balance -= 0.75; } - _.merge(user.stats, { - str: 0, - con: 0, - per: 0, - int: 0, - points: capByLevel(user.stats.lvl) - }); + + user.stats.str = 0; + user.stats.con = 0; + user.stats.per = 0; + user.stats.int = 0; + user.stats.points = capByLevel(user.stats.lvl); user.flags.classSelected = false; } - return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats flags items preferences'))) : void 0; + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('stats flags items preferences')); + } else { + return [ + _.pick(user, splitWhitespace('stats flags items preferences')), + ]; + } }; diff --git a/common/script/ops/clearCompleted.js b/common/script/ops/clearCompleted.js index d60f12704f..26fb1727d9 100644 --- a/common/script/ops/clearCompleted.js +++ b/common/script/ops/clearCompleted.js @@ -1,12 +1,10 @@ import _ from 'lodash'; -module.exports = function(user, req, cb) { - _.remove(user.todos, function(t) { - var ref; - return t.completed && !((ref = t.challenge) != null ? ref.id : void 0); +// TODO move to client since it's only used there? +// TODO rename file to clearCompletedTodos + +module.exports = function clearCompletedTodos (todos) { + _.remove(todos, todo => { + return todo.completed && (!todo.challenge || !todo.challenge.id || todo.challenge.broken); }); - if (typeof user.markModified === "function") { - user.markModified('todos'); - } - return typeof cb === "function" ? cb(null, user.todos) : void 0; }; diff --git a/common/script/ops/clearPMs.js b/common/script/ops/clearPMs.js index 47e0a6ebc6..765ecc3b56 100644 --- a/common/script/ops/clearPMs.js +++ b/common/script/ops/clearPMs.js @@ -1,7 +1,7 @@ -module.exports = function(user, req, cb) { +module.exports = function clearPMs (user) { user.inbox.messages = {}; - if (typeof user.markModified === "function") { - user.markModified('inbox.messages'); - } - return typeof cb === "function" ? cb(null, user.inbox.messages) : void 0; + user.markModified('inbox.messages'); + return [ + user.inbox.messages, + ]; }; diff --git a/common/script/ops/deletePM.js b/common/script/ops/deletePM.js index ad95bc9ae0..84bb7ee33a 100644 --- a/common/script/ops/deletePM.js +++ b/common/script/ops/deletePM.js @@ -1,7 +1,9 @@ -module.exports = function(user, req, cb) { - delete user.inbox.messages[req.params.id]; - if (typeof user.markModified === "function") { - user.markModified('inbox.messages.' + req.params.id); - } - return typeof cb === "function" ? cb(null, user.inbox.messages) : void 0; +import _ from 'lodash'; + +module.exports = function deletePM (user, req = {}) { + delete user.inbox.messages[_.get(req, 'params.id')]; + user.markModified(`inbox.messages.${req.params.id}`); + return [ + user.inbox.messages, + ]; }; diff --git a/common/script/ops/deleteTag.js b/common/script/ops/deleteTag.js index a82af59e86..c40fe79ba5 100644 --- a/common/script/ops/deleteTag.js +++ b/common/script/ops/deleteTag.js @@ -1,26 +1,32 @@ import i18n from '../i18n'; import _ from 'lodash'; +import { NotFound } from '../libs/errors'; -module.exports = function(user, req, cb) { - var i, tag, tid; - tid = req.params.id; - i = _.findIndex(user.tags, { - id: tid +// TODO used only in client, move there? + +module.exports = function deleteTag (user, req = {}) { + let tid = _.get(req, 'params.id'); + + let index = _.findIndex(user.tags, { + id: tid, }); - if (!~i) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTagNotFound', req.language) - }) : void 0; + + if (index === -1) { + throw new NotFound(i18n.t('messageTagNotFound', req.language)); } - tag = user.tags[i]; + + let tag = user.tags[index]; delete user.filters[tag.id]; - user.tags.splice(i, 1); - _.each(user.tasks, function(task) { + + user.tags.splice(index, 1); + + _.each(user.tasks, (task) => { return delete task.tags[tag.id]; }); - _.each(['habits', 'dailys', 'todos', 'rewards'], function(type) { - return typeof user.markModified === "function" ? user.markModified(type) : void 0; + + _.each(['habits', 'dailys', 'todos', 'rewards'], (type) => { + user.markModified(type); }); - return typeof cb === "function" ? cb(null, user.tags) : void 0; + + return user.tags; }; diff --git a/common/script/ops/deleteTask.js b/common/script/ops/deleteTask.js index 715b102241..a641763de5 100644 --- a/common/script/ops/deleteTask.js +++ b/common/script/ops/deleteTask.js @@ -1,17 +1,22 @@ import i18n from '../i18n'; +import { NotFound } from '../libs/errors'; +import _ from 'lodash'; -module.exports = function(user, req, cb) { - var i, ref, task; - task = user.tasks[(ref = req.params) != null ? ref.id : void 0]; - if (!task) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTaskNotFound', req.language) - }) : void 0; +// TODO used only in client, move there? + +module.exports = function deleteTask (user, req = {}) { + let tid = _.get(req, 'params.id'); + let taskType = _.get(req, 'params.taskType'); + + let index = _.findIndex(user[`${taskType}s`], function findById (task) { + return task._id === tid; + }); + + if (index === -1) { + throw new NotFound(i18n.t('messageTaskNotFound', req.language)); } - i = user[task.type + "s"].indexOf(task); - if (~i) { - user[task.type + "s"].splice(i, 1); - } - return typeof cb === "function" ? cb(null, {}) : void 0; + + user[`${taskType}s`].splice(index, 1); + + return {}; }; diff --git a/common/script/ops/deleteWebhook.js b/common/script/ops/deleteWebhook.js index a187f08770..9c4f67eba8 100644 --- a/common/script/ops/deleteWebhook.js +++ b/common/script/ops/deleteWebhook.js @@ -1,7 +1,10 @@ -module.exports = function(user, req, cb) { - delete user.preferences.webhooks[req.params.id]; - if (typeof user.markModified === "function") { - user.markModified('preferences.webhooks'); - } - return typeof cb === "function" ? cb(null, user.preferences.webhooks) : void 0; +import _ from 'lodash'; + +module.exports = function deleteWebhook (user, req) { + delete user.preferences.webhooks[_.get(req, 'params.id')]; + user.markModified('preferences.webhooks'); + + return [ + user.preferences.webhooks, + ]; }; diff --git a/common/script/ops/disableClasses.js b/common/script/ops/disableClasses.js index 89636ed52d..e611bb0872 100644 --- a/common/script/ops/disableClasses.js +++ b/common/script/ops/disableClasses.js @@ -2,12 +2,19 @@ import splitWhitespace from '../libs/splitWhitespace'; import { capByLevel } from '../statHelpers'; import _ from 'lodash'; -module.exports = function(user, req, cb) { - user.stats["class"] = 'warrior'; +module.exports = function disableClasses (user, req = {}) { + user.stats.class = 'warrior'; user.flags.classSelected = true; user.preferences.disableClasses = true; user.preferences.autoAllocate = true; user.stats.str = capByLevel(user.stats.lvl); user.stats.points = 0; - return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats flags preferences'))) : void 0; + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('stats flags preferences')); + } else { + return [ + _.pick(user, splitWhitespace('stats flags preferences')), + ]; + } }; diff --git a/common/script/ops/equip.js b/common/script/ops/equip.js index 8c07a364b1..9c614915a7 100644 --- a/common/script/ops/equip.js +++ b/common/script/ops/equip.js @@ -1,52 +1,68 @@ import content from '../content/index'; import i18n from '../i18n'; +import handleTwoHanded from '../fns/handleTwoHanded'; +import { + NotFound, + BadRequest, +} from '../libs/errors'; +import _ from 'lodash'; + +module.exports = function equip (user, req = {}) { + // Being type a parameter followed by another parameter + // when using the API it must be passes specifically in the URL, it's won't default to equipped + let type = _.get(req, 'params.type', 'equipped'); + let key = _.get(req, 'params.key'); + + if (!key || !type) throw new BadRequest(i18n.t('missingTypeKeyEquip', req.language)); + if (['mount', 'pet', 'costume', 'equipped'].indexOf(type) === -1) { + throw new BadRequest(i18n.t('invalidTypeEquip', req.language)); + } + + let message; -module.exports = function(user, req, cb) { - var item, key, message, ref, type; - ref = [req.params.type || 'equipped', req.params.key], type = ref[0], key = ref[1]; switch (type) { - case 'mount': + case 'mount': { if (!user.items.mounts[key]) { - return typeof cb === "function" ? cb({ - code: 404, - message: ":You do not own this mount." - }) : void 0; + throw new NotFound(i18n.t('mountNotOwned', req.language)); } + user.items.currentMount = user.items.currentMount === key ? '' : key; break; - case 'pet': + } + case 'pet': { if (!user.items.pets[key]) { - return typeof cb === "function" ? cb({ - code: 404, - message: ":You do not own this pet." - }) : void 0; + throw new NotFound(i18n.t('petNotOwned', req.language)); } + user.items.currentPet = user.items.currentPet === key ? '' : key; break; + } case 'costume': - case 'equipped': - item = content.gear.flat[key]; + case 'equipped': { if (!user.items.gear.owned[key]) { - return typeof cb === "function" ? cb({ - code: 404, - message: ":You do not own this gear." - }) : void 0; + throw new NotFound(i18n.t('gearNotOwned', req.language)); } + + let item = content.gear.flat[key]; + if (user.items.gear[type][item.type] === key) { - user.items.gear[type][item.type] = item.type + "_base_0"; + user.items.gear[type][item.type] = `${item.type}_base_0`; message = i18n.t('messageUnEquipped', { - itemText: item.text(req.language) + itemText: item.text(req.language), }, req.language); } else { user.items.gear[type][item.type] = item.key; - message = user.fns.handleTwoHanded(item, type, req); - } - if (typeof user.markModified === "function") { - user.markModified("items.gear." + type); + message = handleTwoHanded(user, item, type, req); } + break; + } + } + + if (req.v2 === true) { + return user.items; + } else { + let res = [user.items]; + if (message) res.push(message); + return res; } - return typeof cb === "function" ? cb((message ? { - code: 200, - message: message - } : null), user.items) : void 0; }; diff --git a/common/script/ops/feed.js b/common/script/ops/feed.js index 3c9b0f87fd..637d9b3e1d 100644 --- a/common/script/ops/feed.js +++ b/common/script/ops/feed.js @@ -1,78 +1,102 @@ import content from '../content/index'; import i18n from '../i18n'; +import _ from 'lodash'; +import { + BadRequest, + NotAuthorized, + NotFound, +} from '../libs/errors'; + +function evolve (user, pet, petDisplayName, req) { + user.items.pets[pet] = -1; + user.items.mounts[pet] = true; + + if (pet === user.items.currentPet) { + user.items.currentPet = ''; + } + + return i18n.t('messageEvolve', { + egg: petDisplayName, + }, req.language); +} + +module.exports = function feed (user, req = {}) { + let pet = _.get(req, 'params.pet'); + let foodK = _.get(req, 'params.food'); + + if (!pet || !foodK) throw new BadRequest(i18n.t('missingPetFoodFeed', req.language)); + + if (pet.indexOf('-') === -1) { + throw new BadRequest(i18n.t('invalidPetName', req.language)); + } + + let food = content.food[foodK]; + if (!food) { + throw new NotFound(i18n.t('messageFoodNotFound', req.language)); + } + + let userPets = user.items.pets; -module.exports = function(user, req, cb) { - var egg, eggText, evolve, food, message, pet, petDisplayName, potion, potionText, ref, ref1, ref2, userPets; - ref = req.params, pet = ref.pet, food = ref.food; - food = content.food[food]; - ref1 = pet.split('-'), egg = ref1[0], potion = ref1[1]; - userPets = user.items.pets; - potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion; - eggText = content.eggs[egg] ? content.eggs[egg].text() : egg; - petDisplayName = i18n.t('petName', { - potion: potionText, - egg: eggText - }); if (!userPets[pet]) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messagePetNotFound', req.language) - }) : void 0; + throw new NotFound(i18n.t('messagePetNotFound', req.language)); } - if (!((ref2 = user.items.food) != null ? ref2[food.key] : void 0)) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageFoodNotFound', req.language) - }) : void 0; + + let [egg, potion] = pet.split('-'); + + let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text(req.language) : potion; + let eggText = content.eggs[egg] ? content.eggs[egg].text(req.language) : egg; + + let petDisplayName = i18n.t('petName', { + potion: potionText, + egg: eggText, + }, req.language); + + if (!user.items.food[food.key]) { + throw new NotFound(i18n.t('messageFoodNotFound', req.language)); } + if (content.specialPets[pet]) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('messageCannotFeedPet', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('messageCannotFeedPet', req.language)); } + if (user.items.mounts[pet]) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('messageAlreadyMount', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('messageAlreadyMount', req.language)); } - message = ''; - evolve = function() { - userPets[pet] = -1; - user.items.mounts[pet] = true; - if (pet === user.items.currentPet) { - user.items.currentPet = ""; - } - return message = i18n.t('messageEvolve', { - egg: petDisplayName - }, req.language); - }; + + let message; + if (food.key === 'Saddle') { - evolve(); + message = evolve(user, pet, petDisplayName, req); } else { if (food.target === potion || content.hatchingPotions[potion].premium) { userPets[pet] += 5; message = i18n.t('messageLikesFood', { egg: petDisplayName, - foodText: food.text(req.language) + foodText: food.text(req.language), }, req.language); } else { userPets[pet] += 2; message = i18n.t('messageDontEnjoyFood', { egg: petDisplayName, - foodText: food.text(req.language) + foodText: food.text(req.language), }, req.language); } + if (userPets[pet] >= 50 && !user.items.mounts[pet]) { - evolve(); + message = evolve(user, pet, petDisplayName, req); } } + user.items.food[food.key]--; - return typeof cb === "function" ? cb({ - code: 200, - message: message - }, { - value: userPets[pet] - }) : void 0; + + if (req.v2 === true) { + return { + value: userPets[pet], + }; + } else { + return [ + userPets[pet], + message, + ]; + } }; diff --git a/common/script/ops/getTag.js b/common/script/ops/getTag.js index 06f3f24110..4a7db63128 100644 --- a/common/script/ops/getTag.js +++ b/common/script/ops/getTag.js @@ -1,17 +1,18 @@ import _ from 'lodash'; import i18n from '../i18n'; +import { NotFound } from '../libs/errors'; -module.exports = function(user, req, cb) { - var i, tid; - tid = req.params.id; - i = _.findIndex(user.tags, { - id: tid +// TODO used only in client, move there? + +module.exports = function getTag (user, req = {}) { + let tid = _.get(req, 'params.id'); + + let index = _.findIndex(user.tags, { + id: tid, }); - if (!~i) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTagNotFound', req.language) - }) : void 0; + if (index === -1) { + throw new NotFound(i18n.t('messageTagNotFound', req.language)); } - return typeof cb === "function" ? cb(null, user.tags[i]) : void 0; + + return user.tags[index]; }; diff --git a/common/script/ops/getTags.js b/common/script/ops/getTags.js index af9419b050..a96589a831 100644 --- a/common/script/ops/getTags.js +++ b/common/script/ops/getTags.js @@ -1,3 +1,5 @@ -module.exports = function(user, req, cb) { - return typeof cb === "function" ? cb(null, user.tags) : void 0; +// TODO used only in client, move there? + +module.exports = function getTags (user) { + return user.tags; }; diff --git a/common/script/ops/hatch.js b/common/script/ops/hatch.js index 6292e24bcb..87adbf3276 100644 --- a/common/script/ops/hatch.js +++ b/common/script/ops/hatch.js @@ -1,39 +1,44 @@ import content from '../content/index'; import i18n from '../i18n'; +import _ from 'lodash'; +import { + BadRequest, + NotAuthorized, + NotFound, +} from '../libs/errors'; + +module.exports = function hatch (user, req = {}) { + let egg = _.get(req, 'params.egg'); + let hatchingPotion = _.get(req, 'params.hatchingPotion'); -module.exports = function(user, req, cb) { - var egg, hatchingPotion, pet, ref; - ref = req.params, egg = ref.egg, hatchingPotion = ref.hatchingPotion; if (!(egg && hatchingPotion)) { - return typeof cb === "function" ? cb({ - code: 400, - message: "Please specify query.egg & query.hatchingPotion" - }) : void 0; + throw new BadRequest(i18n.t('missingEggHatchingPotionHatch', req.language)); } + if (!(user.items.eggs[egg] > 0 && user.items.hatchingPotions[hatchingPotion] > 0)) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('messageMissingEggPotion', req.language) - }) : void 0; + throw new NotFound(i18n.t('messageMissingEggPotion', req.language)); } + if (content.hatchingPotions[hatchingPotion].premium && !content.dropEggs[egg]) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('messageInvalidEggPotionCombo', req.language) - }) : void 0; + throw new BadRequest(i18n.t('messageInvalidEggPotionCombo', req.language)); } - pet = egg + "-" + hatchingPotion; + + let pet = `${egg}-${hatchingPotion}`; + if (user.items.pets[pet] && user.items.pets[pet] > 0) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('messageAlreadyPet', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('messageAlreadyPet', req.language)); } + user.items.pets[pet] = 5; user.items.eggs[egg]--; user.items.hatchingPotions[hatchingPotion]--; - return typeof cb === "function" ? cb({ - code: 200, - message: i18n.t('messageHatched', req.language) - }, user.items) : void 0; + + if (req.v2 === true) { + return user.items; + } else { + return [ + user.items, + i18n.t('messageHatched', req.language), + ]; + } }; diff --git a/common/script/ops/hourglassPurchase.js b/common/script/ops/hourglassPurchase.js index 4955898f0b..e1d07bb482 100644 --- a/common/script/ops/hourglassPurchase.js +++ b/common/script/ops/hourglassPurchase.js @@ -1,54 +1,61 @@ import content from '../content/index'; import i18n from '../i18n'; import _ from 'lodash'; +import { + BadRequest, + NotAuthorized, +} from '../libs/errors'; import splitWhitespace from '../libs/splitWhitespace'; -module.exports = function(user, req, cb, analytics) { - var analyticsData, key, ref, type; - ref = req.params, type = ref.type, key = ref.key; +module.exports = function purchaseHourglass (user, req = {}, analytics) { + let key = _.get(req, 'params.key'); + if (!key) throw new BadRequest(i18n.t('missingKeyParam', req.language)); + + let type = _.get(req, 'params.type'); + if (!type) throw new BadRequest(i18n.t('missingTypeParam', req.language)); + if (!content.timeTravelStable[type]) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('typeNotAllowedHourglass', req.language) + JSON.stringify(_.keys(content.timeTravelStable)) - }) : void 0; + throw new NotAuthorized(i18n.t('typeNotAllowedHourglass', {allowedTypes: _.keys(content.timeTravelStable).toString()}, req.language)); } + if (!_.contains(_.keys(content.timeTravelStable[type]), key)) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t(type + 'NotAllowedHourglass', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('notAllowedHourglass', req.language)); } + if (user.items[type][key]) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t(type + 'AlreadyOwned', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t(`${type}AlreadyOwned`, req.language)); } - if (!(user.purchased.plan.consecutive.trinkets > 0)) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('notEnoughHourglasses', req.language) - }) : void 0; + + if (user.purchased.plan.consecutive.trinkets <= 0) { + throw new NotAuthorized(i18n.t('notEnoughHourglasses', req.language)); } + user.purchased.plan.consecutive.trinkets--; + if (type === 'pets') { user.items.pets[key] = 5; } + if (type === 'mounts') { user.items.mounts[key] = true; } - analyticsData = { - uuid: user._id, - itemKey: key, - itemType: type, - acquireMethod: 'Hourglass', - category: 'behavior' - }; - if (analytics != null) { - analytics.track('acquire item', analyticsData); + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: key, + itemType: type, + acquireMethod: 'Hourglass', + category: 'behavior', + }); + } + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('items purchased.plan.consecutive')); + } else { + return [ + { items: user.items, purchasedPlanConsecutive: user.purchased.plan.consecutive }, + i18n.t('hourglassPurchase', req.language), + ]; } - return typeof cb === "function" ? cb({ - code: 200, - message: i18n.t('hourglassPurchase', req.language) - }, _.pick(user, splitWhitespace('items purchased.plan.consecutive'))) : void 0; }; diff --git a/common/script/ops/index.js b/common/script/ops/index.js index 1bfd3d55f2..2e8bca246d 100644 --- a/common/script/ops/index.js +++ b/common/script/ops/index.js @@ -30,6 +30,9 @@ import releasePets from './releasePets'; import releaseMounts from './releaseMounts'; import releaseBoth from './releaseBoth'; import buy from './buy'; +import buyGear from './buyGear'; +import buyHealthPotion from './buyHealthPotion'; +import buyArmoire from './buyArmoire'; import buyQuest from './buyQuest'; import buyMysterySet from './buyMysterySet'; import hourglassPurchase from './hourglassPurchase'; @@ -42,7 +45,9 @@ import disableClasses from './disableClasses'; import allocate from './allocate'; import readCard from './readCard'; import openMysteryItem from './openMysteryItem'; -import score from './score'; +import scoreTask from './scoreTask'; +import markPmsRead from './markPMSRead'; + module.exports = { update, @@ -77,6 +82,9 @@ module.exports = { releaseMounts, releaseBoth, buy, + buyGear, + buyHealthPotion, + buyArmoire, buyQuest, buyMysterySet, hourglassPurchase, @@ -89,5 +97,6 @@ module.exports = { allocate, readCard, openMysteryItem, - score, + scoreTask, + markPmsRead, }; diff --git a/common/script/ops/markPMSRead.js b/common/script/ops/markPMSRead.js new file mode 100644 index 0000000000..add9f49de5 --- /dev/null +++ b/common/script/ops/markPMSRead.js @@ -0,0 +1,14 @@ +import i18n from '../i18n'; + +module.exports = function markPmsRead (user, req = {}) { + user.inbox.newMessages = 0; + + if (req.v2 === true) { + return user; + } else { + return [ + user.inbox.newMessages, + i18n.t('pmsMarkedRead'), + ]; + } +}; diff --git a/common/script/ops/openMysteryItem.js b/common/script/ops/openMysteryItem.js index eb28c605e0..9728bc9eb9 100644 --- a/common/script/ops/openMysteryItem.js +++ b/common/script/ops/openMysteryItem.js @@ -1,32 +1,38 @@ import content from '../content/index'; +import i18n from '../i18n'; +import { + BadRequest, +} from '../libs/errors'; +import _ from 'lodash'; + +module.exports = function openMysteryItem (user, req = {}, analytics) { + let item = user.purchased.plan.mysteryItems.shift(); -module.exports = function(user, req, cb, analytics) { - var analyticsData, item, ref, ref1; - item = (ref = user.purchased.plan) != null ? (ref1 = ref.mysteryItems) != null ? ref1.shift() : void 0 : void 0; if (!item) { - return typeof cb === "function" ? cb({ - code: 400, - message: "Empty" - }) : void 0; + throw new BadRequest(i18n.t('mysteryItemIsEmpty', req.language)); } - item = content.gear.flat[item]; + + item = _.cloneDeep(content.gear.flat[item]); user.items.gear.owned[item.key] = true; - if (typeof user.markModified === "function") { - user.markModified('purchased.plan.mysteryItems'); + + user.markModified('purchased.plan.mysteryItems'); + + if (analytics) { + analytics.track('open mystery item', { + uuid: user._id, + itemKey: item, + itemType: 'Subscriber Gear', + acquireMethod: 'Subscriber', + category: 'behavior', + }); } - item.notificationType = 'Mystery'; - analyticsData = { - uuid: user._id, - itemKey: item, - itemType: 'Subscriber Gear', - acquireMethod: 'Subscriber', - category: 'behavior' - }; - if (analytics != null) { - analytics.track('open mystery item', analyticsData); + + if (req.v2 === true) { + return user.items.gear.owned; + } else { + return [ + item, + i18n.t('mysteryItemOpened', req.language), + ]; } - if (typeof window !== 'undefined') { - (user._tmp != null ? user._tmp : user._tmp = {}).drop = item; - } - return typeof cb === "function" ? cb(null, user.items.gear.owned) : void 0; }; diff --git a/common/script/ops/purchase.js b/common/script/ops/purchase.js index d4d0f78816..79eb0475d4 100644 --- a/common/script/ops/purchase.js +++ b/common/script/ops/purchase.js @@ -3,105 +3,125 @@ import i18n from '../i18n'; import _ from 'lodash'; import splitWhitespace from '../libs/splitWhitespace'; import planGemLimits from '../libs/planGemLimits'; +import { + NotFound, + NotAuthorized, + BadRequest, +} from '../libs/errors'; + +module.exports = function purchase (user, req = {}, analytics) { + let type = _.get(req.params, 'type'); + let key = _.get(req.params, 'key'); + let item; + let price; + + if (!type) { + throw new BadRequest(i18n.t('typeRequired', req.language)); + } + + if (!key) { + throw new BadRequest(i18n.t('keyRequired', req.language)); + } -module.exports = function(user, req, cb, analytics) { - var analyticsData, convCap, convRate, item, key, price, ref, ref1, ref2, ref3, type; - ref = req.params, type = ref.type, key = ref.key; if (type === 'gems' && key === 'gem') { - ref1 = planGemLimits, convRate = ref1.convRate, convCap = ref1.convCap; + let convRate = planGemLimits.convRate; + let convCap = planGemLimits.convCap; convCap += user.purchased.plan.consecutive.gemCapExtra; - if (!((ref2 = user.purchased) != null ? (ref3 = ref2.plan) != null ? ref3.customerId : void 0 : void 0)) { - return typeof cb === "function" ? cb({ - code: 401, - message: "Must subscribe to purchase gems with GP" - }, req) : void 0; + + if (!user.purchased || !user.purchased.plan || !user.purchased.plan.customerId) { + throw new NotAuthorized(i18n.t('mustSubscribeToPurchaseGems', req.language)); } - if (!(user.stats.gp >= convRate)) { - return typeof cb === "function" ? cb({ - code: 401, - message: "Not enough Gold" - }) : void 0; + + if (user.stats.gp < convRate) { + throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); } + if (user.purchased.plan.gemsBought >= convCap) { - return typeof cb === "function" ? cb({ - code: 401, - message: "You've reached the Gold=>Gem conversion cap (" + convCap + ") for this month. We have this to prevent abuse / farming. The cap will reset within the first three days of next month." - }) : void 0; + throw new NotAuthorized(i18n.t('reachedGoldToGemCap', {convCap}, req.language)); } - user.balance += .25; + + user.balance += 0.25; user.purchased.plan.gemsBought++; user.stats.gp -= convRate; - analyticsData = { - uuid: user._id, - itemKey: key, - acquireMethod: 'Gold', - goldCost: convRate, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('purchase gems', analyticsData); + + if (analytics) { + analytics.track('purchase gems', { + uuid: user._id, + itemKey: key, + acquireMethod: 'Gold', + goldCost: convRate, + category: 'behavior', + }); } - return typeof cb === "function" ? cb({ - code: 200, - message: "+1 Gem" - }, _.pick(user, splitWhitespace('stats balance'))) : void 0; + + return [ + _.pick(user, splitWhitespace('stats balance')), + i18n.t('plusOneGem'), + ]; } - if (type !== 'eggs' && type !== 'hatchingPotions' && type !== 'food' && type !== 'quests' && type !== 'gear') { - return typeof cb === "function" ? cb({ - code: 404, - message: ":type must be in [eggs,hatchingPotions,food,quests,gear]" - }, req) : void 0; + + let acceptedTypes = ['eggs', 'hatchingPotions', 'food', 'quests', 'gear']; + if (acceptedTypes.indexOf(type) === -1) { + throw new NotFound(i18n.t('notAccteptedType', req.language)); } + if (type === 'gear') { item = content.gear.flat[key]; - if (user.items.gear.owned[key]) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('alreadyHave', req.language) - }) : void 0; + + if (!item) { + throw new NotFound(i18n.t('contentKeyNotFound', {type}, req.language)); } + + if (user.items.gear.owned[key]) { + throw new NotAuthorized(i18n.t('alreadyHave', req.language)); + } + price = (item.twoHanded || item.gearSet === 'animal' ? 2 : 1) / 4; } else { item = content[type][key]; + + if (!item) { + throw new NotFound(i18n.t('contentKeyNotFound', {type}, req.language)); + } + price = item.value / 4; } - if (!item) { - return typeof cb === "function" ? cb({ - code: 404, - message: ":key not found for Content." + type - }, req) : void 0; - } + if (!item.canBuy(user)) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('messageNotAvailable', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('messageNotAvailable', req.language)); } - if ((user.balance < price) || !user.balance) { - return typeof cb === "function" ? cb({ - code: 403, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; + + if (!user.balance || user.balance < price) { + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); } + user.balance -= price; + if (type === 'gear') { user.items.gear.owned[key] = true; } else { - if (!(user.items[type][key] > 0)) { + if (!user.items[type][key] || user.items[type][key] < 0) { user.items[type][key] = 0; } user.items[type][key]++; } - analyticsData = { - uuid: user._id, - itemKey: key, - itemType: 'Market', - acquireMethod: 'Gems', - gemCost: item.value, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('acquire item', analyticsData); + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: key, + itemType: 'Market', + acquireMethod: 'Gems', + gemCost: item.value, + category: 'behavior', + }); + } + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('items balance')); + } else { + return [ + _.pick(user, splitWhitespace('items balance')), + ]; } - return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('items balance'))) : void 0; }; diff --git a/common/script/ops/readCard.js b/common/script/ops/readCard.js index a6eb5c05f1..57b0da4b00 100644 --- a/common/script/ops/readCard.js +++ b/common/script/ops/readCard.js @@ -1,10 +1,32 @@ -module.exports = function(user, req, cb) { - var cardType; - cardType = req.params.cardType; - user.items.special[cardType + "Received"].shift(); - if (typeof user.markModified === "function") { - user.markModified("items.special." + cardType + "Received"); +import splitWhitespace from '../libs/splitWhitespace'; +import _ from 'lodash'; +import i18n from '../i18n'; +import { + BadRequest, + NotAuthorized, +} from '../libs/errors'; +import content from '../content/index'; + +module.exports = function readCard (user, req = {}) { + let cardType = _.get(req.params, 'cardType'); + + if (!cardType) { + throw new BadRequest(i18n.t('cardTypeRequired', req.language)); } + + if (_.keys(content.cardTypes).indexOf(cardType) === -1) { + throw new NotAuthorized(i18n.t('cardTypeNotAllowed', req.language)); + } + + user.items.special[`${cardType}Received`].shift(); user.flags.cardReceived = false; - return typeof cb === "function" ? cb(null, 'items.special flags.cardReceived') : void 0; + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('items.special flags.cardReceived')); + } else { + return [ + { specialItems: user.items.special, cardReceived: user.flags.cardReceived }, + i18n.t('readCard', {cardType}, req.language), + ]; + } }; diff --git a/common/script/ops/rebirth.js b/common/script/ops/rebirth.js index 1ddb75aba1..54f9533fc5 100644 --- a/common/script/ops/rebirth.js +++ b/common/script/ops/rebirth.js @@ -1,21 +1,25 @@ -import content from '../content/index'; import i18n from '../i18n'; import _ from 'lodash'; import { capByLevel } from '../statHelpers'; import { MAX_LEVEL } from '../constants'; +import { + NotAuthorized, +} from '../libs/errors'; +import resetGear from '../fns/resetGear'; +import equip from './equip'; -module.exports = function(user, req, cb, analytics) { - var analyticsData, flags, gear, lvl, stats; +const USERSTATSLIST = ['per', 'int', 'con', 'str', 'points', 'gp', 'exp', 'mp']; + +module.exports = function rebirth (user, tasks = [], req = {}, analytics) { if (user.balance < 2 && user.stats.lvl < MAX_LEVEL) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); } - analyticsData = { + + let analyticsData = { uuid: user._id, - category: 'behavior' + category: 'behavior', }; + if (user.stats.lvl < MAX_LEVEL) { user.balance -= 2; analyticsData.acquireMethod = 'Gems'; @@ -24,63 +28,55 @@ module.exports = function(user, req, cb, analytics) { analyticsData.gemCost = 0; analyticsData.acquireMethod = '> 100'; } - if (analytics != null) { + + if (analytics) { analytics.track('Rebirth', analyticsData); } - lvl = capByLevel(user.stats.lvl); - _.each(user.tasks, function(task) { - if (task.type !== 'reward') { - task.value = 0; - } - if (task.type === 'daily') { - return task.streak = 0; + + let lvl = capByLevel(user.stats.lvl); + + _.each(tasks, function resetTasks (task) { + if (!task.challenge || !task.challenge.id || task.challenge.broken) { + if (task.type !== 'reward') { + task.value = 0; + } + if (task.type === 'daily') { + task.streak = 0; + } } }); - stats = user.stats; + + let stats = user.stats; stats.buffs = {}; stats.hp = 50; stats.lvl = 1; - stats["class"] = 'warrior'; - _.each(['per', 'int', 'con', 'str', 'points', 'gp', 'exp', 'mp'], function(value) { - return stats[value] = 0; - }); - // TODO during refactoring: move all gear code from rebirth() to its own function and then call it in reset() as well - gear = user.items.gear; - _.each(['equipped', 'costume'], function(type) { - gear[type] = {}; - gear[type].armor = 'armor_base_0'; - gear[type].weapon = 'weapon_warrior_0'; - gear[type].head = 'head_base_0'; - return gear[type].shield = 'shield_base_0'; + stats.class = 'warrior'; + + _.each(USERSTATSLIST, function resetStats (value) { + stats[value] = 0; }); + + resetGear(user); + if (user.items.currentPet) { - user.ops.equip({ + equip(user, { params: { type: 'pet', - key: user.items.currentPet - } + key: user.items.currentPet, + }, }); } + if (user.items.currentMount) { - user.ops.equip({ + equip(user, { params: { type: 'mount', - key: user.items.currentMount - } + key: user.items.currentMount, + }, }); } - _.each(gear.owned, function(v, k) { - if (gear.owned[k] && content.gear.flat[k].value) { - gear.owned[k] = false; - return true; - } - }); - gear.owned.weapon_warrior_0 = true; - if (typeof user.markModified === "function") { - user.markModified('items.gear.owned'); - } - user.preferences.costume = false; - flags = user.flags; + + let flags = user.flags; if (!user.achievements.beastMaster) { flags.rebirthEnabled = false; } @@ -88,13 +84,23 @@ module.exports = function(user, req, cb, analytics) { flags.dropsEnabled = false; flags.classSelected = false; flags.levelDrops = {}; + if (!user.achievements.rebirths) { user.achievements.rebirths = 1; user.achievements.rebirthLevel = lvl; - } else if (lvl > user.achievements.rebirthLevel || lvl === 100) { + } else if (lvl > user.achievements.rebirthLevel || lvl === MAX_LEVEL) { user.achievements.rebirths++; user.achievements.rebirthLevel = lvl; } + user.stats.buffs = {}; - return typeof cb === "function" ? cb(null, user) : void 0; + + if (req.v2 === true) { + return user; + } else { + return [ + {user, tasks}, + i18n.t('rebirthComplete'), + ]; + } }; diff --git a/common/script/ops/releaseBoth.js b/common/script/ops/releaseBoth.js index a782581f85..cf7d2267ca 100644 --- a/common/script/ops/releaseBoth.js +++ b/common/script/ops/releaseBoth.js @@ -1,50 +1,68 @@ import content from '../content/index'; import i18n from '../i18n'; +import { + NotAuthorized, +} from '../libs/errors'; +import splitWhitespace from '../libs/splitWhitespace'; +import _ from 'lodash'; + +module.exports = function releaseBoth (user, req = {}, analytics) { + let animal; -module.exports = function(user, req, cb, analytics) { - var analyticsData, animal, giveTriadBingo; if (user.balance < 1.5 && !user.achievements.triadBingo) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; - } else { - giveTriadBingo = true; - if (!user.achievements.triadBingo) { - analyticsData = { + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); + } + + let giveTriadBingo = true; + + if (!user.achievements.triadBingo) { + if (analytics) { + analytics.track('release pets & mounts', { uuid: user._id, acquireMethod: 'Gems', gemCost: 6, - category: 'behavior' - }; - if (typeof analytics !== "undefined" && analytics !== null) { - analytics.track('release pets & mounts', analyticsData); - } - user.balance -= 1.5; - } - user.items.currentMount = ""; - user.items.currentPet = ""; - for (animal in content.pets) { - if (user.items.pets[animal] === -1) { - giveTriadBingo = false; - } - user.items.pets[animal] = 0; - user.items.mounts[animal] = null; - } - if (!user.achievements.beastMasterCount) { - user.achievements.beastMasterCount = 0; - } - user.achievements.beastMasterCount++; - if (!user.achievements.mountMasterCount) { - user.achievements.mountMasterCount = 0; - } - user.achievements.mountMasterCount++; - if (giveTriadBingo) { - if (!user.achievements.triadBingoCount) { - user.achievements.triadBingoCount = 0; - } - user.achievements.triadBingoCount++; + category: 'behavior', + }); } + + user.balance -= 1.5; + } + + user.items.currentMount = ''; + user.items.currentPet = ''; + + for (animal in content.pets) { + if (user.items.pets[animal] === -1) { + giveTriadBingo = false; + } + + user.items.pets[animal] = 0; + user.items.mounts[animal] = null; + } + + if (!user.achievements.beastMasterCount) { + user.achievements.beastMasterCount = 0; + } + user.achievements.beastMasterCount++; + + if (!user.achievements.mountMasterCount) { + user.achievements.mountMasterCount = 0; + } + user.achievements.mountMasterCount++; + + if (giveTriadBingo) { + if (!user.achievements.triadBingoCount) { + user.achievements.triadBingoCount = 0; + } + user.achievements.triadBingoCount++; + } + + if (req.v2 === true) { + return user; + } else { + return [ + _.pick(user, splitWhitespace('achievements items balance')), + i18n.t('mountsAndPetsReleased'), + ]; } - return typeof cb === "function" ? cb(null, user) : void 0; }; diff --git a/common/script/ops/releaseMounts.js b/common/script/ops/releaseMounts.js index 4aefab6b40..d8b8dde659 100644 --- a/common/script/ops/releaseMounts.js +++ b/common/script/ops/releaseMounts.js @@ -1,32 +1,43 @@ import content from '../content/index'; import i18n from '../i18n'; +import { + NotAuthorized, +} from '../libs/errors'; + +module.exports = function releaseMounts (user, req = {}, analytics) { + let mount; -module.exports = function(user, req, cb, analytics) { - var analyticsData, mount; if (user.balance < 1) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); + } + + user.balance -= 1; + user.items.currentMount = ''; + + for (mount in content.pets) { + user.items.mounts[mount] = null; + } + + if (!user.achievements.mountMasterCount) { + user.achievements.mountMasterCount = 0; + } + user.achievements.mountMasterCount++; + + if (analytics) { + analytics.track('release mounts', { + uuid: user._id, + acquireMethod: 'Gems', + gemCost: 4, + category: 'behavior', + }); + } + + if (req.v2 === true) { + return user; } else { - user.balance -= 1; - user.items.currentMount = ""; - for (mount in content.pets) { - user.items.mounts[mount] = null; - } - if (!user.achievements.mountMasterCount) { - user.achievements.mountMasterCount = 0; - } - user.achievements.mountMasterCount++; + return [ + user.items.mounts, + i18n.t('mountsReleased'), + ]; } - analyticsData = { - uuid: user._id, - acquireMethod: 'Gems', - gemCost: 4, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('release mounts', analyticsData); - } - return typeof cb === "function" ? cb(null, user) : void 0; }; diff --git a/common/script/ops/releasePets.js b/common/script/ops/releasePets.js index a4b452cd86..9466e1ccda 100644 --- a/common/script/ops/releasePets.js +++ b/common/script/ops/releasePets.js @@ -1,32 +1,41 @@ import content from '../content/index'; import i18n from '../i18n'; +import { + NotAuthorized, +} from '../libs/errors'; -module.exports = function(user, req, cb, analytics) { - var analyticsData, pet; +module.exports = function releasePets (user, req = {}, analytics) { if (user.balance < 1) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); + } + + user.balance -= 1; + user.items.currentPet = ''; + + for (let pet in content.pets) { + user.items.pets[pet] = 0; + } + + if (!user.achievements.beastMasterCount) { + user.achievements.beastMasterCount = 0; + } + user.achievements.beastMasterCount++; + + if (analytics) { + analytics.track('release pets', { + uuid: user._id, + acquireMethod: 'Gems', + gemCost: 4, + category: 'behavior', + }); + } + + if (req.v2 === true) { + return user; } else { - user.balance -= 1; - for (pet in content.pets) { - user.items.pets[pet] = 0; - } - if (!user.achievements.beastMasterCount) { - user.achievements.beastMasterCount = 0; - } - user.achievements.beastMasterCount++; - user.items.currentPet = ""; + return [ + user.items.pets, + i18n.t('petsReleased'), + ]; } - analyticsData = { - uuid: user._id, - acquireMethod: 'Gems', - gemCost: 4, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('release pets', analyticsData); - } - return typeof cb === "function" ? cb(null, user) : void 0; }; diff --git a/common/script/ops/reroll.js b/common/script/ops/reroll.js index f6a0862f1d..3087845509 100644 --- a/common/script/ops/reroll.js +++ b/common/script/ops/reroll.js @@ -1,29 +1,40 @@ import i18n from '../i18n'; import _ from 'lodash'; +import { + NotAuthorized, +} from '../libs/errors'; -module.exports = function(user, req, cb, analytics) { - var analyticsData; +module.exports = function reroll (user, tasks = [], req = {}, analytics) { if (user.balance < 1) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); } + user.balance--; - _.each(user.tasks, function(task) { - if (task.type !== 'reward') { - return task.value = 0; + user.stats.hp = 50; + + _.each(tasks, function resetTaskValues (task) { + if (!task.challenge || !task.challenge.id || task.challenge.broken) { + if (task.type !== 'reward') { + task.value = 0; + } } }); - user.stats.hp = 50; - analyticsData = { - uuid: user._id, - acquireMethod: 'Gems', - gemCost: 4, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('Fortify Potion', analyticsData); + + if (analytics) { + analytics.track('Fortify Potion', { + uuid: user._id, + acquireMethod: 'Gems', + gemCost: 4, + category: 'behavior', + }); + } + + if (req.v2 === true) { + return user; + } else { + return [ + {user, tasks}, + i18n.t('fortifyComplete'), + ]; } - return typeof cb === "function" ? cb(null, user) : void 0; }; diff --git a/common/script/ops/reset.js b/common/script/ops/reset.js index fbe87729e3..3e48fa4f2d 100644 --- a/common/script/ops/reset.js +++ b/common/script/ops/reset.js @@ -1,35 +1,29 @@ -import _ from 'lodash'; +import resetGear from '../fns/resetGear'; +import i18n from '../i18n'; -module.exports = function(user, req, cb) { - var gear; - user.habits = []; - user.dailys = []; - user.todos = []; - user.rewards = []; +module.exports = function reset (user, tasks = [], req = {}) { user.stats.hp = 50; user.stats.lvl = 1; user.stats.gp = 0; user.stats.exp = 0; - gear = user.items.gear; - _.each(['equipped', 'costume'], function(type) { - gear[type].armor = 'armor_base_0'; - gear[type].weapon = 'weapon_base_0'; - gear[type].head = 'head_base_0'; - return gear[type].shield = 'shield_base_0'; - }); - if (typeof gear.owned === 'undefined') { - gear.owned = {}; - } - _.each(gear.owned, function(v, k) { - if (gear.owned[k]) { - gear.owned[k] = false; + + let tasksToRemove = []; + tasks.forEach(task => { + if (!task.challenge || !task.challenge.id || task.challenge.broken) { + tasksToRemove.push(task._id); + let i = user.tasksOrder[`${task.type}s`].indexOf(task._id); + if (i !== -1) user.tasksOrder[`${task.type}s`].splice(i, 1); } - return true; }); - gear.owned.weapon_warrior_0 = true; - if (typeof user.markModified === "function") { - user.markModified('items.gear.owned'); + + resetGear(user); + + if (req.v2 === true) { + return user; + } else { + return [ + {user, tasksToRemove}, + i18n.t('resetComplete'), + ]; } - user.preferences.costume = false; - return typeof cb === "function" ? cb(null, user) : void 0; }; diff --git a/common/script/ops/revive.js b/common/script/ops/revive.js index 7b6fe8445f..30b29a78fc 100644 --- a/common/script/ops/revive.js +++ b/common/script/ops/revive.js @@ -1,72 +1,107 @@ import content from '../content/index'; import i18n from '../i18n'; import _ from 'lodash'; +import { + NotAuthorized, +} from '../libs/errors'; +import randomVal from '../fns/randomVal'; -module.exports = function(user, req, cb, analytics) { - var analyticsData, base, cl, gearOwned, item, losableItems, lostItem, lostStat; - if (!(user.stats.hp <= 0)) { - return typeof cb === "function" ? cb({ - code: 400, - message: "Cannot revive if not dead" - }) : void 0; +module.exports = function revive (user, req = {}, analytics) { + if (user.stats.hp > 0) { + throw new NotAuthorized(i18n.t('cannotRevive', req.language)); } + _.merge(user.stats, { hp: 50, exp: 0, - gp: 0 + gp: 0, }); + if (user.stats.lvl > 1) { user.stats.lvl--; } - lostStat = user.fns.randomVal(_.reduce(['str', 'con', 'per', 'int'], (function(m, k) { + + let lostStat = randomVal(user, _.reduce(['str', 'con', 'per', 'int'], function findRandomStat (m, k) { if (user.stats[k]) { m[k] = k; } return m; - }), {})); + }, {})); + if (lostStat) { user.stats[lostStat]--; } - cl = user.stats["class"]; - gearOwned = (typeof (base = user.items.gear.owned).toObject === "function" ? base.toObject() : void 0) || user.items.gear.owned; - losableItems = {}; - _.each(gearOwned, function(v, k) { - var itm; - if (v) { - itm = content.gear.flat['' + k]; + + let base = user.items.gear.owned; + let gearOwned; + + if (typeof base.toObject === 'function') { + gearOwned = base.toObject(); + } else { + gearOwned = user.items.gear.owned; + } + + let losableItems = {}; + let userClass = user.stats.class; + + _.each(gearOwned, function findLosableItems (value, key) { + let itm; + if (value) { + itm = content.gear.flat[key]; + if (itm) { - if ((itm.value > 0 || k === 'weapon_warrior_0') && (itm.klass === cl || (itm.klass === 'special' && (!itm.specialClass || itm.specialClass === cl)) || itm.klass === 'armoire')) { - return losableItems['' + k] = '' + k; + let itemHasValueOrWarrior0 = itm.value > 0 || key === 'weapon_warrior_0'; + + let itemClassEqualsUserClass = itm.klass === userClass; + + let itemClassSpecial = itm.klass === 'special'; + let itemNotSpecialOrUserClassIsSpecial = !itm.specialClass || itm.specialClass === userClass; + let itemIsSpecial = itemNotSpecialOrUserClassIsSpecial && itemClassSpecial; + + let itemIsArmoire = itm.klass === 'armoire'; + + if (itemHasValueOrWarrior0 && (itemClassEqualsUserClass || itemIsSpecial || itemIsArmoire)) { + losableItems[key] = key; + return losableItems[key]; } } } }); - lostItem = user.fns.randomVal(losableItems); - if (item = content.gear.flat[lostItem]) { + + let lostItem = randomVal(user, losableItems); + + let message = ''; + let item = content.gear.flat[lostItem]; + + if (item) { user.items.gear.owned[lostItem] = false; + if (user.items.gear.equipped[item.type] === lostItem) { - user.items.gear.equipped[item.type] = item.type + "_base_0"; + user.items.gear.equipped[item.type] = `${item.type}_base_0`; } + if (user.items.gear.costume[item.type] === lostItem) { - user.items.gear.costume[item.type] = item.type + "_base_0"; + user.items.gear.costume[item.type] = `${item.type}_base_0`; } + + message = i18n.t('messageLostItem', { itemText: item.text(req.language)}, req.language); } - if (typeof user.markModified === "function") { - user.markModified('items.gear'); + + if (analytics) { + analytics.track('Death', { + uuid: user._id, + lostItem, + gaLabel: lostItem, + category: 'behavior', + }); } - analyticsData = { - uuid: user._id, - lostItem: lostItem, - gaLabel: lostItem, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('Death', analyticsData); + + if (req.v2 === true) { + return user; + } else { + return [ + user.items, + message, + ]; } - return typeof cb === "function" ? cb((item ? { - code: 200, - message: i18n.t('messageLostItem', { - itemText: item.text(req.language) - }, req.language) - } : null), user) : void 0; }; diff --git a/common/script/ops/score.js b/common/script/ops/score.js deleted file mode 100644 index ec0d2a70e2..0000000000 --- a/common/script/ops/score.js +++ /dev/null @@ -1,221 +0,0 @@ -import moment from 'moment'; -import _ from 'lodash'; -import i18n from '../i18n'; - -module.exports = function(user, req, cb) { - var addPoints, calculateDelta, calculateReverseDelta, changeTaskValue, delta, direction, gainMP, id, multiplier, num, options, ref, stats, subtractPoints, task, th; - ref = req.params, id = ref.id, direction = ref.direction; - task = user.tasks[id]; - options = req.query || {}; - _.defaults(options, { - times: 1, - cron: false - }); - user._tmp = {}; - stats = { - gp: +user.stats.gp, - hp: +user.stats.hp, - exp: +user.stats.exp - }; - task.value = +task.value; - task.streak = ~~task.streak; - if (task.priority == null) { - task.priority = 1; - } - if (task.value > stats.gp && task.type === 'reward') { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('messageNotEnoughGold', req.language) - }) : void 0; - } - delta = 0; - calculateDelta = function() { - var currVal, nextDelta, ref1; - currVal = task.value < -47.27 ? -47.27 : task.value > 21.27 ? 21.27 : task.value; - nextDelta = Math.pow(0.9747, currVal) * (direction === 'down' ? -1 : 1); - if (((ref1 = task.checklist) != null ? ref1.length : void 0) > 0) { - if (direction === 'down' && task.type === 'daily' && options.cron) { - nextDelta *= 1 - _.reduce(task.checklist, (function(m, i) { - return m + (i.completed ? 1 : 0); - }), 0) / task.checklist.length; - } - if (task.type === 'todo') { - nextDelta *= 1 + _.reduce(task.checklist, (function(m, i) { - return m + (i.completed ? 1 : 0); - }), 0); - } - } - return nextDelta; - }; - calculateReverseDelta = function() { - var calc, closeEnough, currVal, diff, nextDelta, ref1, testVal; - currVal = task.value < -47.27 ? -47.27 : task.value > 21.27 ? 21.27 : task.value; - testVal = currVal + Math.pow(0.9747, currVal) * (direction === 'down' ? -1 : 1); - closeEnough = 0.00001; - while (true) { - calc = testVal + Math.pow(0.9747, testVal); - diff = currVal - calc; - if (Math.abs(diff) < closeEnough) { - break; - } - if (diff > 0) { - testVal -= diff; - } else { - testVal += diff; - } - } - nextDelta = testVal - currVal; - if (((ref1 = task.checklist) != null ? ref1.length : void 0) > 0) { - if (task.type === 'todo') { - nextDelta *= 1 + _.reduce(task.checklist, (function(m, i) { - return m + (i.completed ? 1 : 0); - }), 0); - } - } - return nextDelta; - }; - changeTaskValue = function() { - return _.times(options.times, function() { - var nextDelta, ref1; - nextDelta = !options.cron && direction === 'down' ? calculateReverseDelta() : calculateDelta(); - if (task.type !== 'reward') { - if (user.preferences.automaticAllocation === true && user.preferences.allocationMode === 'taskbased' && !(task.type === 'todo' && direction === 'down')) { - user.stats.training[task.attribute] += nextDelta; - } - if (direction === 'up') { - user.party.quest.progress.up = user.party.quest.progress.up || 0; - if ((ref1 = task.type) === 'daily' || ref1 === 'todo') { - user.party.quest.progress.up += nextDelta * (1 + (user._statsComputed.str / 200)); - } - if (task.type === 'habit') { - user.party.quest.progress.up += nextDelta * (0.5 + (user._statsComputed.str / 400)); - } - } - task.value += nextDelta; - } - return delta += nextDelta; - }); - }; - addPoints = function() { - var _crit, afterStreak, currStreak, gpMod, intBonus, perBonus, streakBonus; - _crit = (delta > 0 ? user.fns.crit() : 1); - if (_crit > 1) { - user._tmp.crit = _crit; - } - intBonus = 1 + (user._statsComputed.int * .025); - stats.exp += Math.round(delta * intBonus * task.priority * _crit * 6); - perBonus = 1 + user._statsComputed.per * .02; - gpMod = delta * task.priority * _crit * perBonus; - return stats.gp += task.streak ? (currStreak = direction === 'down' ? task.streak - 1 : task.streak, streakBonus = currStreak / 100 + 1, afterStreak = gpMod * streakBonus, currStreak > 0 ? gpMod > 0 ? user._tmp.streakBonus = afterStreak - gpMod : void 0 : void 0, afterStreak) : gpMod; - }; - subtractPoints = function() { - var conBonus, hpMod; - conBonus = 1 - (user._statsComputed.con / 250); - if (conBonus < .1) { - conBonus = 0.1; - } - hpMod = delta * conBonus * task.priority * 2; - return stats.hp += Math.round(hpMod * 10) / 10; - }; - gainMP = function(delta) { - delta *= user._tmp.crit || 1; - user.stats.mp += delta; - if (user.stats.mp >= user._statsComputed.maxMP) { - user.stats.mp = user._statsComputed.maxMP; - } - if (user.stats.mp < 0) { - return user.stats.mp = 0; - } - }; - switch (task.type) { - case 'habit': - changeTaskValue(); - if (delta > 0) { - addPoints(); - } else { - subtractPoints(); - } - gainMP(_.max([0.25, .0025 * user._statsComputed.maxMP]) * (direction === 'down' ? -1 : 1)); - th = (task.history != null ? task.history : task.history = []); - if (th[th.length - 1] && moment(th[th.length - 1].date).isSame(new Date, 'day')) { - th[th.length - 1].value = task.value; - } else { - th.push({ - date: +(new Date), - value: task.value - }); - } - if (typeof user.markModified === "function") { - user.markModified("habits." + (_.findIndex(user.habits, { - id: task.id - })) + ".history"); - } - break; - case 'daily': - if (options.cron) { - changeTaskValue(); - subtractPoints(); - if (!user.stats.buffs.streaks) { - task.streak = 0; - } - } else { - changeTaskValue(); - if (direction === 'down') { - delta = calculateDelta(); - } - addPoints(); - gainMP(_.max([1, .01 * user._statsComputed.maxMP]) * (direction === 'down' ? -1 : 1)); - if (direction === 'up') { - task.streak = task.streak ? task.streak + 1 : 1; - if ((task.streak % 21) === 0) { - user.achievements.streak = user.achievements.streak ? user.achievements.streak + 1 : 1; - } - } else { - if ((task.streak % 21) === 0) { - user.achievements.streak = user.achievements.streak ? user.achievements.streak - 1 : 0; - } - task.streak = task.streak ? task.streak - 1 : 0; - } - } - break; - case 'todo': - if (options.cron) { - changeTaskValue(); - } else { - task.dateCompleted = direction === 'up' ? new Date : void 0; - changeTaskValue(); - if (direction === 'down') { - delta = calculateDelta(); - } - addPoints(); - multiplier = _.max([ - _.reduce(task.checklist, (function(m, i) { - return m + (i.completed ? 1 : 0); - }), 1), 1 - ]); - gainMP(_.max([multiplier, .01 * user._statsComputed.maxMP * multiplier]) * (direction === 'down' ? -1 : 1)); - } - break; - case 'reward': - changeTaskValue(); - stats.gp -= Math.abs(task.value); - num = parseFloat(task.value).toFixed(2); - if (stats.gp < 0) { - stats.hp += stats.gp; - stats.gp = 0; - } - } - user.fns.updateStats(stats, req); - if (typeof window === 'undefined') { - if (direction === 'up') { - user.fns.randomDrop({ - task: task, - delta: delta - }, req); - } - } - if (typeof cb === "function") { - cb(null, user); - } - return delta; -}; diff --git a/common/script/ops/scoreTask.js b/common/script/ops/scoreTask.js new file mode 100644 index 0000000000..c366b84624 --- /dev/null +++ b/common/script/ops/scoreTask.js @@ -0,0 +1,260 @@ +import _ from 'lodash'; +import { + NotAuthorized, +} from '../libs/errors'; +import i18n from '../i18n'; +import updateStats from '../fns/updateStats'; +import crit from '../fns/crit'; + +const MAX_TASK_VALUE = 21.27; +const MIN_TASK_VALUE = -47.27; +const CLOSE_ENOUGH = 0.00001; + +function _getTaskValue (taskValue) { + if (taskValue < MIN_TASK_VALUE) { + return MIN_TASK_VALUE; + } else if (taskValue > MAX_TASK_VALUE) { + return MAX_TASK_VALUE; + } else { + return taskValue; + } +} + +// Calculates the next task.value based on direction +// Uses a capped inverse log y=.95^x, y>= -5 +function _calculateDelta (task, direction, cron) { + // Min/max on task redness + let currVal = _getTaskValue(task.value); + let nextDelta = Math.pow(0.9747, currVal) * (direction === 'down' ? -1 : 1); + + // Checklists + if (task.checklist && task.checklist.length > 0) { + // If the Daily, only dock them a portion based on their checklist completion + if (direction === 'down' && task.type === 'daily' && cron) { + nextDelta *= 1 - _.reduce(task.checklist, (m, i) => m + (i.completed ? 1 : 0), 0) / task.checklist.length; + } + + // If To-Do, point-match the TD per checklist item completed + if (task.type === 'todo') { + nextDelta *= 1 + _.reduce(task.checklist, (m, i) => m + (i.completed ? 1 : 0), 0); + } + } + + return nextDelta; +} + +// Approximates the reverse delta for the task value +// This is meant to return the task value to its original value when unchecking a task. +// First, calculate the value using the normal way for our first guess although +// it will be a bit off +function _calculateReverseDelta (task, direction) { + let currVal = _getTaskValue(task.value); + let testVal = currVal + Math.pow(0.9747, currVal) * (direction === 'down' ? -1 : 1); + + // Now keep moving closer to the original value until we get "close enough" + // Check how close we are to the original value by computing the delta off our guess + // and looking at the difference between that and our current value. + while (true) { // eslint-disable-line no-constant-condition + let calc = testVal + Math.pow(0.9747, testVal); + let diff = currVal - calc; + + if (Math.abs(diff) < CLOSE_ENOUGH) break; + + if (diff > 0) { + testVal -= diff; + } else { + testVal += diff; + } + } + + // When we get close enough, return the difference between our approximated value + // and the current value. This will be the delta calculated from the original value + // before the task was checked. + let nextDelta = testVal - currVal; + + // Checklists - If To-Do, point-match the TD per checklist item completed + if (task.checklist && task.checklist.length > 0 && task.type === 'todo') { + nextDelta *= 1 + _.reduce(task.checklist, (m, i) => m + (i.completed ? 1 : 0), 0); + } + + return nextDelta; +} + +function _gainMP (user, val) { + val *= user._tmp.crit || 1; + user.stats.mp += val; + + if (user.stats.mp >= user._statsComputed.maxMP) user.stats.mp = user._statsComputed.maxMP; + if (user.stats.mp < 0) { + user.stats.mp = 0; + } +} + +// HP modifier +// ===== CONSTITUTION ===== +// TODO Decreases HP loss from bad habits / missed dailies by 0.5% per point. +function _subtractPoints (user, task, stats, delta) { + let conBonus = 1 - user._statsComputed.con / 250; + if (conBonus < 0.1) conBonus = 0.1; + + let hpMod = delta * conBonus * task.priority * 2; // constant 2 multiplier for better results + stats.hp += Math.round(hpMod * 10) / 10; // round to 1dp + return stats.hp; +} + +function _addPoints (user, task, stats, direction, delta) { + // ===== CRITICAL HITS ===== + // allow critical hit only when checking off a task, not when unchecking it: + let _crit = delta > 0 ? crit(user) : 1; + // if there was a crit, alert the user via notification + if (_crit > 1) user._tmp.crit = _crit; + + // Exp Modifier + // ===== Intelligence ===== + // TODO Increases Experience gain by .2% per point. + let intBonus = 1 + user._statsComputed.int * 0.025; + stats.exp += Math.round(delta * intBonus * task.priority * _crit * 6); + + // GP modifier + // ===== PERCEPTION ===== + // TODO Increases Gold gained from tasks by .3% per point. + let perBonus = 1 + user._statsComputed.per * 0.02; + let gpMod = delta * task.priority * _crit * perBonus; + + if (task.streak) { + let currStreak = direction === 'down' ? task.streak - 1 : task.streak; + let streakBonus = currStreak / 100 + 1; // eg, 1-day streak is 1.01, 2-day is 1.02, etc + let afterStreak = gpMod * streakBonus; + if (currStreak > 0 && gpMod > 0) { + user._tmp.streakBonus = afterStreak - gpMod; // keep this on-hand for later, so we can notify streak-bonus + } + + stats.gp += afterStreak; + } else { + stats.gp += gpMod; + } +} + +function _changeTaskValue (user, task, direction, times, cron) { + let addToDelta = 0; + + // If multiple days have passed, multiply times days missed + _.times(times, () => { + // Each iteration calculate the nextDelta, which is then accumulated in the total delta. + let nextDelta = !cron && direction === 'down' ? _calculateReverseDelta(task, direction) : _calculateDelta(task, direction, cron); + + if (task.type !== 'reward') { + if (user.preferences.automaticAllocation === true && user.preferences.allocationMode === 'taskbased' && !(task.type === 'todo' && direction === 'down')) { + user.stats.training[task.attribute] += nextDelta; + } + + if (direction === 'up') { // Make progress on quest based on STR + user.party.quest.progress.up = user.party.quest.progress.up || 0; + + if (task.type === 'todo' || task.type === 'daily') { + user.party.quest.progress.up += nextDelta * (1 + user._statsComputed.str / 200); + } else if (task.type === 'habit') { + user.party.quest.progress.up += nextDelta * (0.5 + user._statsComputed.str / 400); + } + } + + task.value += nextDelta; + } + + addToDelta += nextDelta; + }); + + return addToDelta; +} + +module.exports = function scoreTask (options = {}, req = {}) { + let {user, task, direction, times = 1, cron = false} = options; + let delta = 0; + let stats = { + gp: user.stats.gp, + hp: user.stats.hp, + exp: user.stats.exp, + }; + + // This is for setting one-time temporary flags, such as streakBonus or itemDropped. Useful for notifying + // the API consumer, then cleared afterwards + user._tmp = {}; + + // If they're trying to purchase a too-expensive reward, don't allow them to do that. + if (task.value > user.stats.gp && task.type === 'reward') throw new NotAuthorized(i18n.t('messageNotEnoughGold', req.language)); + + if (task.type === 'habit') { + delta += _changeTaskValue(user, task, direction, times, cron); + + // Add habit value to habit-history (if different) + if (delta > 0) { + _addPoints(user, task, stats, direction, delta); + } else { + _subtractPoints(user, task, stats, delta); + } + _gainMP(user, _.max([0.25, 0.0025 * user._statsComputed.maxMP]) * (direction === 'down' ? -1 : 1)); + + task.history = task.history || []; + // Add history entry, even more than 1 per day + task.history.push({ + date: Number(new Date()), + value: task.value, + }); + } else if (task.type === 'daily') { + if (cron) { + delta += _changeTaskValue(user, task, direction, times, cron); + _subtractPoints(user, task, stats, delta); + if (!user.stats.buffs.streaks) task.streak = 0; + } else { + delta += _changeTaskValue(user, task, direction, times, cron); + if (direction === 'down') delta = _calculateDelta(task, direction, cron); // recalculate delta for unchecking so the gp and exp come out correctly + _addPoints(user, task, stats, direction, delta); // obviously for delta>0, but also a trick to undo accidental checkboxes + _gainMP(user, _.max([1, 0.01 * user._statsComputed.maxMP]) * (direction === 'down' ? -1 : 1)); + + if (direction === 'up') { + task.streak += 1; + // Give a streak achievement when the streak is a multiple of 21 + if (task.streak % 21 === 0) user.achievements.streak = user.achievements.streak ? user.achievements.streak + 1 : 1; + task.completed = true; + } else if (direction === 'down') { + // Remove a streak achievement if streak was a multiple of 21 and the daily was undone + if (task.streak % 21 === 0) user.achievements.streak = user.achievements.streak ? user.achievements.streak - 1 : 0; + task.streak -= 1; + task.completed = false; + } + } + } else if (task.type === 'todo') { + if (cron) { // don't touch stats on cron + delta += _changeTaskValue(user, task, direction, times, cron); + } else { + if (direction === 'up') { + task.dateCompleted = new Date(); + task.completed = true; + } else if (direction === 'down') { + task.completed = false; + task.dateCompleted = undefined; + } + + delta += _changeTaskValue(user, task, direction, times, cron); + if (direction === 'down') delta = _calculateDelta(task, direction, cron); // recalculate delta for unchecking so the gp and exp come out correctly + _addPoints(user, task, stats, direction, delta); + + // MP++ per checklist item in ToDo, bonus per CLI + let multiplier = _.max([_.reduce(task.checklist, (m, i) => m + (i.completed ? 1 : 0), 1), 1]); + _gainMP(user, _.max([multiplier, 0.01 * user._statsComputed.maxMP * multiplier]) * (direction === 'down' ? -1 : 1)); + } + } else if (task.type === 'reward') { + // Don't adjust values for rewards + delta += _changeTaskValue(user, task, direction, times, cron); + // purchase item + stats.gp -= Math.abs(task.value); + // hp - gp difference + if (stats.gp < 0) { + stats.hp += stats.gp; + stats.gp = 0; + } + } + + updateStats(user, stats, req); + return [delta]; +}; diff --git a/common/script/ops/sell.js b/common/script/ops/sell.js index 33e5f7d673..10412da222 100644 --- a/common/script/ops/sell.js +++ b/common/script/ops/sell.js @@ -1,23 +1,43 @@ import content from '../content/index'; +import i18n from '../i18n'; import _ from 'lodash'; import splitWhitespace from '../libs/splitWhitespace'; +import { + NotFound, + NotAuthorized, + BadRequest, +} from '../libs/errors'; -module.exports = function(user, req, cb) { - var key, ref, type; - ref = req.params, key = ref.key, type = ref.type; - if (type !== 'eggs' && type !== 'hatchingPotions' && type !== 'food') { - return typeof cb === "function" ? cb({ - code: 404, - message: ":type not found. Must bes in [eggs, hatchingPotions, food]" - }) : void 0; +const ACCEPTEDTYPES = ['eggs', 'hatchingPotions', 'food']; + +module.exports = function sell (user, req = {}) { + let key = _.get(req.params, 'key'); + let type = _.get(req.params, 'type'); + + if (!type) { + throw new BadRequest(i18n.t('typeRequired', req.language)); } + + if (!key) { + throw new BadRequest(i18n.t('keyRequired', req.language)); + } + + if (ACCEPTEDTYPES.indexOf(type) === -1) { + throw new NotAuthorized(i18n.t('typeNotSellable', {acceptedTypes: ACCEPTEDTYPES.join(', ')}, req.language)); + } + if (!user.items[type][key]) { - return typeof cb === "function" ? cb({ - code: 404, - message: ":key not found for user.items." + type - }) : void 0; + throw new NotFound(i18n.t('userItemsKeyNotFound', {type}, req.language)); } + user.items[type][key]--; user.stats.gp += content[type][key].value; - return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('stats items'))) : void 0; + + if (req.v2 === true) { + return _.pick(user, splitWhitespace('stats items')); + } else { + return [ + _.pick(user, splitWhitespace('stats items')), + ]; + } }; diff --git a/common/script/ops/sleep.js b/common/script/ops/sleep.js index dec8095ad3..1a531ecb88 100644 --- a/common/script/ops/sleep.js +++ b/common/script/ops/sleep.js @@ -1,4 +1,9 @@ -module.exports = function(user, req, cb) { +module.exports = function sleep (user, req = {}) { user.preferences.sleep = !user.preferences.sleep; - return typeof cb === "function" ? cb(null, {}) : void 0; + + if (req.v2 === true) { + return {}; + } else { + return [user.preferences.sleep]; + } }; diff --git a/common/script/ops/sortTag.js b/common/script/ops/sortTag.js index 85dcda169f..c1fc42f330 100644 --- a/common/script/ops/sortTag.js +++ b/common/script/ops/sortTag.js @@ -1,9 +1,19 @@ -module.exports = function(user, req, cb) { - var from, ref, to; - ref = req.query, to = ref.to, from = ref.from; - if (!((to != null) && (from != null))) { - return typeof cb === "function" ? cb('?to=__&from=__ are required') : void 0; +import { BadRequest } from '../libs/errors'; +import _ from 'lodash'; + +// TODO used only in client, move there? + +module.exports = function sortTag (user, req = {}) { + let to = _.get(req, 'query.to'); + let fromParam = _.get(req, 'query.from'); + + let invalidTo = !to && to !== 0; + let invalidFrom = !fromParam && fromParam !== 0; + + if (invalidTo || invalidFrom) { + throw new BadRequest('?to=__&from=__ are required'); } - user.tags.splice(to, 0, user.tags.splice(from, 1)[0]); - return typeof cb === "function" ? cb(null, user.tags) : void 0; + + user.tags.splice(to, 0, user.tags.splice(fromParam, 1)[0]); + return user.tags; }; diff --git a/common/script/ops/sortTask.js b/common/script/ops/sortTask.js index b903b692dc..07db8289cf 100644 --- a/common/script/ops/sortTask.js +++ b/common/script/ops/sortTask.js @@ -1,39 +1,49 @@ import i18n from '../i18n'; import preenTodos from '../libs/preenTodos'; +import { + NotFound, + BadRequest, +} from '../libs/errors'; +import _ from 'lodash'; -module.exports = function(user, req, cb) { - var from, id, movedTask, preenedTasks, ref, task, tasks, to; - id = req.params.id; - ref = req.query, to = ref.to, from = ref.from; - task = user.tasks[id]; - if (!task) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTaskNotFound', req.language) - }) : void 0; +// TODO used only in client, move there? + +module.exports = function sortTask (user, req = {}) { + let id = _.get(req, 'params.id'); + let to = _.get(req, 'query.to'); + let fromParam = _.get(req, 'query.from'); + let taskType = _.get(req, 'params.taskType'); + + let index = _.findIndex(user[`${taskType}s`], function findById (task) { + return task._id === id; + }); + + if (index === -1) { + throw new NotFound(i18n.t('messageTaskNotFound', req.language)); } - if (!((to != null) && (from != null))) { - return typeof cb === "function" ? cb('?to=__&from=__ are required') : void 0; + if (to == null && fromParam == null) { // eslint-disable-line eqeqeq + throw new BadRequest('?to=__&from=__ are required'); } - tasks = user[task.type + "s"]; - if (task.type === 'todo' && tasks[from] !== task) { - preenedTasks = preenTodos(tasks); + + let tasks = user[`${taskType}s`]; + + if (taskType === 'todo') { + let preenedTasks = preenTodos(tasks); + if (to !== -1) { to = tasks.indexOf(preenedTasks[to]); } - from = tasks.indexOf(preenedTasks[from]); + + fromParam = tasks.indexOf(preenedTasks[fromParam]); } - if (tasks[from] !== task) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTaskNotFound', req.language) - }) : void 0; - } - movedTask = tasks.splice(from, 1)[0]; + + let movedTask = tasks.splice(fromParam, 1)[0]; + if (to === -1) { tasks.push(movedTask); } else { tasks.splice(to, 0, movedTask); } - return typeof cb === "function" ? cb(null, tasks) : void 0; + + return tasks; }; diff --git a/common/script/ops/unlock.js b/common/script/ops/unlock.js index c53a5997ec..62f1420e2a 100644 --- a/common/script/ops/unlock.js +++ b/common/script/ops/unlock.js @@ -1,63 +1,118 @@ import i18n from '../i18n'; import _ from 'lodash'; import splitWhitespace from '../libs/splitWhitespace'; +import { + NotAuthorized, + BadRequest, +} from '../libs/errors'; +import setWith from 'lodash.setwith'; // Not available in lodash 3 -module.exports = function(user, req, cb, analytics) { - var alreadyOwns, analyticsData, cost, fullSet, k, path, split, v; - path = req.query.path; - fullSet = ~path.indexOf(","); - cost = ~path.indexOf('background.') ? fullSet ? 3.75 : 1.75 : fullSet ? 1.25 : 0.5; - alreadyOwns = !fullSet && user.fns.dotGet("purchased." + path) === true; - if ((user.balance < cost || !user.balance) && !alreadyOwns) { - return typeof cb === "function" ? cb({ - code: 401, - message: i18n.t('notEnoughGems', req.language) - }) : void 0; +// If item is already purchased -> equip it +// Otherwise unlock it +module.exports = function unlock (user, req = {}, analytics) { + let path = _.get(req.query, 'path'); + + if (!path) { + throw new BadRequest(i18n.t('pathRequired', req.language)); } - if (fullSet) { - _.each(path.split(","), function(p) { - if (~path.indexOf('gear.')) { - user.fns.dotSet("" + p, true); - true; - } else { + let isFullSet = path.indexOf(',') !== -1; + let isBackground = path.indexOf('background.') !== -1; + + let cost; + if (isBackground && isFullSet) { + cost = 3.75; + } else if (isBackground) { + cost = 1.75; + } else if (isFullSet) { + cost = 1.25; + } else { + cost = 0.5; + } + + let setPaths; + let alreadyOwns; + + if (isFullSet) { + setPaths = path.split(','); + let alreadyOwnedItems = 0; + + _.each(setPaths, singlePath => { + if (_.get(user, `purchased.${singlePath}`) === true) { + alreadyOwnedItems++; } - user.fns.dotSet("purchased." + p, true); - return true; + }); + + if (alreadyOwnedItems === setPaths.length) { + throw new NotAuthorized(i18n.t('alreadyUnlocked', req.language)); + // TODO write math formula to check if buying the full set is cheaper than the items individually + // (item cost * number of remaining items) < setCost` + } /* else if (alreadyOwnedItems > 0) { + throw new NotAuthorized(i18n.t('alreadyUnlockedPart', req.language)); + } */ + } else { + alreadyOwns = _.get(user, `purchased.${path}`) === true; + } + + if ((!user.balance || user.balance < cost) && !alreadyOwns) { + throw new NotAuthorized(i18n.t('notEnoughGems', req.language)); + } + + if (isFullSet) { + _.each(setPaths, function markItemsAsPurchased (pathPart) { + if (path.indexOf('gear.') !== -1) { + // Using Object so path[1] won't create an array but an object {path: {1: value}} + setWith(user, pathPart, true, Object); + } + + // Using Object so path[1] won't create an array but an object {path: {1: value}} + setWith(user, `purchased.${pathPart}`, true, Object); }); } else { - if (alreadyOwns) { - split = path.split('.'); - v = split.pop(); - k = split.join('.'); - if (k === 'background' && v === user.preferences.background) { - v = ''; + if (alreadyOwns) { // eslint-disable-line no-lonely-if + let split = path.split('.'); + let value = split.pop(); + let key = split.join('.'); + if (key === 'background' && value === user.preferences.background) { + value = ''; } - user.fns.dotSet("preferences." + k, v); - return typeof cb === "function" ? cb(null, req) : void 0; + + // Using Object so path[1] won't create an array but an object {path: {1: value}} + setWith(user, `preferences.${key}`, value, Object); + } else { + // Using Object so path[1] won't create an array but an object {path: {1: value}} + setWith(user, `purchased.${path}`, true, Object); } - user.fns.dotSet("purchased." + path, true); } - user.balance -= cost; - if (~path.indexOf('gear.')) { - if (typeof user.markModified === "function") { - user.markModified('gear.owned'); - } - } else { - if (typeof user.markModified === "function") { + + if (!alreadyOwns) { + if (path.indexOf('gear.') === -1) { user.markModified('purchased'); } + + user.balance -= cost; + + if (analytics) { + analytics.track('acquire item', { + uuid: user._id, + itemKey: path, + itemType: 'customization', + acquireMethod: 'Gems', + gemCost: cost / 0.25, + category: 'behavior', + }); + } } - analyticsData = { - uuid: user._id, - itemKey: path, - itemType: 'customization', - acquireMethod: 'Gems', - gemCost: cost / .25, - category: 'behavior' - }; - if (analytics != null) { - analytics.track('acquire item', analyticsData); + + let response = [ + _.pick(user, splitWhitespace('purchased preferences items')), + ]; + + if (!alreadyOwns) response.push(i18n.t('unlocked', req.language)); + + if (req.v2 === true) { + return response[0]; + } else { + return response; } - return typeof cb === "function" ? cb(null, _.pick(user, splitWhitespace('purchased preferences items'))) : void 0; }; diff --git a/common/script/ops/update.js b/common/script/ops/update.js index 12a100e372..c41e74180e 100644 --- a/common/script/ops/update.js +++ b/common/script/ops/update.js @@ -1,9 +1,11 @@ import _ from 'lodash'; -module.exports = function(user, req, cb) { - _.each(req.body, function(v, k) { - user.fns.dotSet(k, v); - return true; +// TODO used only in client, move there? + +module.exports = function updateUser (user, req = {}) { + _.each(req.body, (val, key) => { + _.set(user, key, val); }); - return typeof cb === "function" ? cb(null, user) : void 0; + + return user; }; diff --git a/common/script/ops/updateTag.js b/common/script/ops/updateTag.js index 8e4019fa51..ade87f916d 100644 --- a/common/script/ops/updateTag.js +++ b/common/script/ops/updateTag.js @@ -1,18 +1,20 @@ import i18n from '../i18n'; import _ from 'lodash'; +import { NotFound } from '../libs/errors'; -module.exports = function(user, req, cb) { - var i, tid; - tid = req.params.id; - i = _.findIndex(user.tags, { - id: tid +// TODO used only in client, move there? + +module.exports = function updateTag (user, req = {}) { + let tid = _.get(req, 'params.id'); + + let index = _.findIndex(user.tags, { + id: tid, }); - if (!~i) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTagNotFound', req.language) - }) : void 0; + + if (index === -1) { + throw new NotFound(i18n.t('messageTagNotFound', req.language)); } - user.tags[i].name = req.body.name; - return typeof cb === "function" ? cb(null, user.tags[i]) : void 0; + + user.tags[index].name = _.get(req, 'body.name'); + return user.tags[index]; }; diff --git a/common/script/ops/updateTask.js b/common/script/ops/updateTask.js index 427104f15e..2a2b1edba2 100644 --- a/common/script/ops/updateTask.js +++ b/common/script/ops/updateTask.js @@ -1,23 +1,25 @@ -import i18n from '../i18n'; import _ from 'lodash'; -module.exports = function(user, req, cb) { - var ref, task; - if (!(task = user.tasks[(ref = req.params) != null ? ref.id : void 0])) { - return typeof cb === "function" ? cb({ - code: 404, - message: i18n.t('messageTaskNotFound', req.language) - }) : void 0; +// From server pass task.toObject() not the task document directly +module.exports = function updateTask (task, req = {}) { + let body = req.body || {}; + + // If reminders are updated -> replace the original ones + if (body.reminders) { + task.reminders = body.reminders; } - _.merge(task, _.omit(req.body, ['checklist', 'reminders', 'id', 'type'])); - if (req.body.checklist) { - task.checklist = req.body.checklist; + + // If checklist is updated -> replace the original one + if (body.checklist) { + task.checklist = body.checklist; } - if (req.body.reminders) { - task.reminders = req.body.reminders; + + // If tags are updated -> replace the original ones + if (body.tags) { + task.tags = body.tags; } - if (typeof task.markModified === "function") { - task.markModified('tags'); - } - return typeof cb === "function" ? cb(null, task) : void 0; + + _.merge(task, _.omit(body, ['_id', 'id', 'type', 'reminders', 'checklist', 'tags'])); + + return [task]; }; diff --git a/common/script/ops/updateWebhook.js b/common/script/ops/updateWebhook.js index e2775a40b4..63fed89b17 100644 --- a/common/script/ops/updateWebhook.js +++ b/common/script/ops/updateWebhook.js @@ -1,9 +1,20 @@ -import _ from 'lodash'; +import validator from 'validator'; +import i18n from '../i18n'; +import { + BadRequest, +} from '../libs/errors'; -module.exports = function(user, req, cb) { - _.merge(user.preferences.webhooks[req.params.id], req.body); - if (typeof user.markModified === "function") { - user.markModified('preferences.webhooks'); +module.exports = function updateWebhook (user, req) { + if (!validator.isURL(req.body.url)) throw new BadRequest(i18n.t('invalidUrl', req.language)); + if (!validator.isBoolean(req.body.enabled)) throw new BadRequest(i18n.t('invalidEnabled', req.language)); + + user.markModified('preferences.webhooks'); + user.preferences.webhooks[req.params.id].url = req.body.url; + user.preferences.webhooks[req.params.id].enabled = req.body.enabled; + + if (req.v2 === true) { + return user.preferences.webhooks; + } else { + return [user.preferences.webhooks[req.params.id]]; } - return typeof cb === "function" ? cb(null, user.preferences.webhooks) : void 0; }; diff --git a/common/script/public/config.js b/common/script/public/config.js index bb78e244bd..4456909ef4 100644 --- a/common/script/public/config.js +++ b/common/script/public/config.js @@ -1,8 +1,48 @@ 'use strict'; -angular.module('habitrpg').config(['$httpProvider', function($httpProvider){ + +angular.module('habitrpg') +.config(['$httpProvider', function($httpProvider){ $httpProvider.interceptors.push(['$q', '$rootScope', function($q, $rootScope){ + var resyncNumber = 0; + var lastResync = 0; + + // Verify that the user was not updated from another browser/app/client + // If it was, sync + function verifyUserUpdated (response) { + var isApiCall = response.config.url.indexOf('api/v3') !== -1; + var isUserAvailable = $rootScope.User && $rootScope.User.user && $rootScope.User.user._wrapped === true; + var hasUserV = response.data && response.data.userV; + var isNotSync = response.config.url.indexOf('/api/v3/user') !== 0; + + if (isApiCall && isUserAvailable && hasUserV) { + var oldUserV = $rootScope.User.user._v; + $rootScope.User.user._v = response.data.userV; + + // Something has changed on the user object that was not tracked here, sync the user + if (isNotSync && ($rootScope.User.user._v - oldUserV) > 1) { + $rootScope.User.sync(); + } + } + } + return { + request: function (config) { + var url = config.url; + + if (url.indexOf('api/v3') !== -1) { + if ($rootScope.User && $rootScope.User.user) { + if (url.indexOf('?') !== -1) { + config.url += '&userV=' + $rootScope.User.user._v; + } else { + config.url += '?userV=' + $rootScope.User.user._v; + } + } + } + + return config; + }, response: function(response) { + verifyUserUpdated(response); return response; }, responseError: function(response) { @@ -21,25 +61,43 @@ angular.module('habitrpg').config(['$httpProvider', function($httpProvider){ if (!mobileApp) // skip mobile for now $rootScope.$broadcast('responseError', "The site has been updated and the page needs to refresh. The last action has not been recorded, please refresh and try again."); - } else if (response.data.code && response.data.code === 'ACCOUNT_SUSPENDED') { + } else if (response.data && response.data.code && response.data.code === 'ACCOUNT_SUSPENDED') { confirm(response.data.err); localStorage.clear(); window.location.href = mobileApp ? '/app/login' : '/logout'; //location.reload() - // 400 range? + // 400 range + } else if (response.status < 400) { + // never triggered because we're in responseError + $rootScope.$broadcast('responseText', response.data && response.data.message); } else if (response.status < 500) { - $rootScope.$broadcast('responseText', response.data.err || response.data); - // Need to reject the prompse so the error is handled correctly - if (response.status === 401) - return $q.reject(response); + if (response.status === 400 && response.data && response.data.errors && _.isArray(response.data.errors)) { // bad requests with more info + response.data.errors.forEach(function (err) { + $rootScope.$broadcast('responseError', err.message); + }); + } else { + $rootScope.$broadcast('responseError', response.data && response.data.message); + } + if ($rootScope.User && $rootScope.User.sync) { + if (resyncNumber < 100 && (Date.now() - lastResync) > 500) { // avoid thousands of requests when user is not found + $rootScope.User.sync(); + resyncNumber++; + lastResync = Date.now(); + } + } + + // Need to reject the prompse so the error is handled correctly + if (response.status === 401) { + return $q.reject(response); + } // Error } else { - var error = window.env.t('requestError') + '
"' + - window.env.t('error') + ' ' + (response.data.err || response.data || 'something went wrong') + + var error = window.env.t('requestError') + '
"' + + window.env.t('error') + ' ' + (response.data.message || response.data.error || response.data || 'something went wrong') + '"
' + window.env.t('seeConsole'); if (mobileApp) error = 'Error contacting the server. Please try again in a few minutes.'; - $rootScope.$broadcast('responseError', error); + $rootScope.$broadcast('responseError500', error); console.error(response); } @@ -47,4 +105,4 @@ angular.module('habitrpg').config(['$httpProvider', function($httpProvider){ } }; }]); -}]); \ No newline at end of file +}]); diff --git a/common/script/public/directives.js b/common/script/public/directives.js index 5662014e39..cd43ccb67c 100644 --- a/common/script/public/directives.js +++ b/common/script/public/directives.js @@ -2,90 +2,26 @@ /** * Markdown - * See http://www.heikura.me/#!/angularjs-markdown-directive */ (function(){ var md = function () { - marked.setOptions({ - gfm:true, - pedantic:false, - sanitize:true - // callback for code highlighter - // Uncomment this (and htljs.tabReplace below) if we add in highlight.js (http://www.heikura.me/#!/angularjs-markdown-directive) -// highlight:function (code, lang) { -// if (lang != undefined) -// return hljs.highlight(lang, code).value; -// -// return hljs.highlightAuto(code).value; -// } - }); - - emoji.img_path = 'common/img/emoji/unicode/'; + var mdown = window.habiticaMarkdown; var toHtml = function (markdown) { if (markdown == undefined) return ''; - markdown = marked(markdown); - markdown = emoji.replace_colons(markdown); - markdown = emoji.replace_unified(markdown); + markdown = mdown.render(markdown); return markdown; }; - // [nickgordon20131123] this hacky override wraps images with a link to the image in a new window, and also adds some classes in case we want to style - marked.InlineLexer.prototype.outputLink = function(cap, link) { - var escape = function(html, encode) { - return html - .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&') - .replace(//g, '>') - .replace(/"/g, '"') - .replace(/'/g, '''); - }; - if (cap[0].charAt(0) !== '!') { - return '' - + this.output(cap[1]) - + ''; - } else { - return '
Unsubscribed successfully!
You won\'t receive any other email from Habitica.'); + }); + + it('returns okay when email is already unsubscribed', async () => { + let code = encrypt(JSON.stringify({ + email: testEmail, + })); + + let unsubscribedMessage = await user.get(`/email/unsubscribe?code=${code}`); + + expect(unsubscribedMessage).to.equal('Unsubscribed successfully!
You won\'t receive any other email from Habitica.'); + }); +}); diff --git a/test/api/v3/integration/groups/GET-groups.test.js b/test/api/v3/integration/groups/GET-groups.test.js new file mode 100644 index 0000000000..8e1e9dfbfc --- /dev/null +++ b/test/api/v3/integration/groups/GET-groups.test.js @@ -0,0 +1,115 @@ +import { + generateUser, + resetHabiticaDB, + generateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { + TAVERN_ID, +} from '../../../../../website/server/models/group'; + +describe('GET /groups', () => { + let user; + const NUMBER_OF_PUBLIC_GUILDS = 3; // 2 + the tavern + const NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER = 1; + const NUMBER_OF_USERS_PRIVATE_GUILDS = 1; + const NUMBER_OF_GROUPS_USER_CAN_VIEW = 5; + + before(async () => { + await resetHabiticaDB(); + + let leader = await generateUser({ balance: 10 }); + user = await generateUser({balance: 4}); + + let publicGuildUserIsMemberOf = await generateGroup(leader, { + name: 'public guild - is member', + type: 'guild', + privacy: 'public', + }); + await leader.post(`/groups/${publicGuildUserIsMemberOf._id}/invite`, { uuids: [user._id]}); + await user.post(`/groups/${publicGuildUserIsMemberOf._id}/join`); + + await generateGroup(leader, { + name: 'public guild - is not member', + type: 'guild', + privacy: 'public', + }); + + let privateGuildUserIsMemberOf = await generateGroup(leader, { + name: 'private guild - is member', + type: 'guild', + privacy: 'private', + }); + await leader.post(`/groups/${privateGuildUserIsMemberOf._id}/invite`, { uuids: [user._id]}); + await user.post(`/groups/${privateGuildUserIsMemberOf._id}/join`); + + await generateGroup(leader, { + name: 'private guild - is not member', + type: 'guild', + privacy: 'private', + }); + + await generateGroup(leader, { + name: 'party - is not member', + type: 'party', + privacy: 'private', + }); + + await user.post('/groups', { + name: 'party - is member', + type: 'party', + privacy: 'private', + }); + }); + + it('returns error when no query passed in', async () => { + await expect(user.get('/groups')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when an invalid ?type query is passed', async () => { + await expect(user.get('/groups?type=invalid')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('groupTypesRequired'), + }); + }); + + it('returns only the tavern when tavern passed in as query', async () => { + await expect(user.get('/groups?type=tavern')) + .to.eventually.have.a.lengthOf(1) + .and.to.have.deep.property('[0]') + .and.to.have.property('_id', TAVERN_ID); + }); + + it('returns only the user\'s party when party passed in as query', async () => { + await expect(user.get('/groups?type=party')) + .to.eventually.have.a.lengthOf(1) + .and.to.have.deep.property('[0]'); + }); + + it('returns all public guilds when publicGuilds passed in as query', async () => { + await expect(user.get('/groups?type=publicGuilds')) + .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS); + }); + + it('returns all the user\'s guilds when guilds passed in as query', async () => { + await expect(user.get('/groups?type=guilds')) + .to.eventually.have.a.lengthOf(NUMBER_OF_PUBLIC_GUILDS_USER_IS_MEMBER + NUMBER_OF_USERS_PRIVATE_GUILDS); + }); + + it('returns all private guilds user is a part of when privateGuilds passed in as query', async () => { + await expect(user.get('/groups?type=privateGuilds')) + .to.eventually.have.a.lengthOf(NUMBER_OF_USERS_PRIVATE_GUILDS); + }); + + it('returns a list of groups user has access to', async () => { + await expect(user.get('/groups?type=privateGuilds,publicGuilds,party,tavern')) + .to.eventually.have.lengthOf(NUMBER_OF_GROUPS_USER_CAN_VIEW); + }); +}); diff --git a/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js b/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js new file mode 100644 index 0000000000..1b7c172d94 --- /dev/null +++ b/test/api/v3/integration/groups/GET-groups_groupId_invites.test.js @@ -0,0 +1,102 @@ +import { + generateUser, + generateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /groups/:groupId/invites', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('validates optional req.query.lastId to be an UUID', async () => { + await expect(user.get('/groups/groupId/invites?lastId=invalidUUID')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('fails if group doesn\'t exists', async () => { + await expect(user.get(`/groups/${generateUUID()}/invites`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('fails if user doesn\'t have access to the group', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + let anotherUser = await generateUser(); + await expect(anotherUser.get(`/groups/${group._id}/invites`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('works when passing party as req.params.groupId', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + let invited = await generateUser(); + await user.post(`/groups/${group._id}/invite`, {uuids: [invited._id]}); + let res = await user.get('/groups/party/invites'); + + expect(res).to.be.an('array'); + expect(res.length).to.equal(1); + expect(res[0]).to.eql({ + _id: invited._id, + id: invited._id, + profile: {name: invited.profile.name}, + }); + }); + + it('populates only some fields', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + let invited = await generateUser(); + await user.post(`/groups/${group._id}/invite`, {uuids: [invited._id]}); + let res = await user.get('/groups/party/invites'); + expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']); + expect(res[0].profile).to.have.all.keys(['name']); + }); + + it('returns only first 30 invites', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + let invitesToGenerate = []; + for (let i = 0; i < 31; i++) { + invitesToGenerate.push(generateUser()); + } + let generatedInvites = await Promise.all(invitesToGenerate); + await user.post(`/groups/${group._id}/invite`, {uuids: generatedInvites.map(invite => invite._id)}); + + let res = await user.get('/groups/party/invites'); + expect(res.length).to.equal(30); + res.forEach(member => { + expect(member).to.have.all.keys(['_id', 'id', 'profile']); + expect(member.profile).to.have.all.keys(['name']); + }); + }); + + it('supports using req.query.lastId to get more invites', async () => { + let leader = await generateUser({balance: 4}); + let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()}); + + let invitesToGenerate = []; + for (let i = 0; i < 32; i++) { + invitesToGenerate.push(generateUser()); + } + let generatedInvites = await Promise.all(invitesToGenerate); // Group has 32 invites + let expectedIds = generatedInvites.map(generatedInvite => generatedInvite._id); + await user.post(`/groups/${group._id}/invite`, {uuids: expectedIds}); + + let res = await user.get(`/groups/${group._id}/invites`); + expect(res.length).to.equal(30); + let res2 = await user.get(`/groups/${group._id}/invites?lastId=${res[res.length - 1]._id}`); + expect(res2.length).to.equal(2); + + let resIds = res.concat(res2).map(invite => invite._id); + expect(resIds).to.eql(expectedIds.sort()); + }); +}); diff --git a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js new file mode 100644 index 0000000000..5827de782d --- /dev/null +++ b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js @@ -0,0 +1,113 @@ +import { + generateUser, + generateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /groups/:groupId/members', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('validates optional req.query.lastId to be an UUID', async () => { + await expect(user.get('/groups/groupId/members?lastId=invalidUUID')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('fails if group doesn\'t exists', async () => { + await expect(user.get(`/groups/${generateUUID()}/members`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('fails if user doesn\'t have access to the group', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + let anotherUser = await generateUser(); + await expect(anotherUser.get(`/groups/${group._id}/members`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('works when passing party as req.params.groupId', async () => { + await generateGroup(user, {type: 'party', name: generateUUID()}); + let res = await user.get('/groups/party/members'); + expect(res).to.be.an('array'); + expect(res.length).to.equal(1); + expect(res[0]).to.eql({ + _id: user._id, + id: user._id, + profile: {name: user.profile.name}, + }); + }); + + it('populates only some fields', async () => { + await generateGroup(user, {type: 'party', name: generateUUID()}); + let res = await user.get('/groups/party/members'); + expect(res[0]).to.have.all.keys(['_id', 'id', 'profile']); + expect(res[0].profile).to.have.all.keys(['name']); + }); + + it('returns only first 30 members', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + + let usersToGenerate = []; + for (let i = 0; i < 31; i++) { + usersToGenerate.push(generateUser({party: {_id: group._id}})); + } + await Promise.all(usersToGenerate); + + let res = await user.get('/groups/party/members'); + expect(res.length).to.equal(30); + res.forEach(member => { + expect(member).to.have.all.keys(['_id', 'id', 'profile']); + expect(member.profile).to.have.all.keys(['name']); + }); + }); + + it('returns only first 30 members even when ?includeAllMembers=true', async () => { + let group = await generateGroup(user, {type: 'party', name: generateUUID()}); + + let usersToGenerate = []; + for (let i = 0; i < 31; i++) { + usersToGenerate.push(generateUser({party: {_id: group._id}})); + } + await Promise.all(usersToGenerate); + + let res = await user.get('/groups/party/members?includeAllMembers=true'); + expect(res.length).to.equal(30); + res.forEach(member => { + expect(member).to.have.all.keys(['_id', 'id', 'profile']); + expect(member.profile).to.have.all.keys(['name']); + }); + }); + + it('supports using req.query.lastId to get more members', async () => { + let leader = await generateUser({balance: 4}); + let group = await generateGroup(leader, {type: 'guild', privacy: 'public', name: generateUUID()}); + + let usersToGenerate = []; + for (let i = 0; i < 57; i++) { + usersToGenerate.push(generateUser({guilds: [group._id]})); + } + let generatedUsers = await Promise.all(usersToGenerate); // Group has 59 members (1 is the leader) + let expectedIds = [leader._id].concat(generatedUsers.map(generatedUser => generatedUser._id)); + + let res = await user.get(`/groups/${group._id}/members`); + expect(res.length).to.equal(30); + let res2 = await user.get(`/groups/${group._id}/members?lastId=${res[res.length - 1]._id}`); + expect(res2.length).to.equal(28); + + let resIds = res.concat(res2).map(member => member._id); + expect(resIds).to.eql(expectedIds.sort()); + }); +}); diff --git a/test/api/v3/integration/groups/GET-groups_id.test.js b/test/api/v3/integration/groups/GET-groups_id.test.js new file mode 100644 index 0000000000..2ecb53a33f --- /dev/null +++ b/test/api/v3/integration/groups/GET-groups_id.test.js @@ -0,0 +1,298 @@ +import { + generateUser, + createAndPopulateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; + +import { + each, +} from 'lodash'; + +describe('GET /groups/:id', () => { + let typesOfGroups = {}; + typesOfGroups['public guild'] = { type: 'guild', privacy: 'public' }; + typesOfGroups['private guild'] = { type: 'guild', privacy: 'private' }; + typesOfGroups.party = { type: 'party', privacy: 'private' }; + + each(typesOfGroups, (groupDetails, groupType) => { + context(`Member of a ${groupType}`, () => { + let leader, member, createdGroup; + + before(async () => { + let groupData = await createAndPopulateGroup({ + members: 30, + groupDetails, + }); + + leader = groupData.groupLeader; + member = groupData.members[0]; + createdGroup = groupData.group; + }); + + it('returns the group object', async () => { + let group = await member.get(`/groups/${createdGroup._id}`); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); + }); + + it('transforms leader id to leader object', async () => { + let group = await member.get(`/groups/${createdGroup._id}`); + + expect(group.leader._id).to.eql(leader._id); + expect(group.leader.profile.name).to.eql(leader.profile.name); + }); + }); + }); + + context('Non-member of a public guild', () => { + let nonMember, createdGroup; + + before(async () => { + let groupData = await createAndPopulateGroup({ + members: 1, + groupDetails: { + name: 'test guild', + type: 'guild', + privacy: 'public', + }, + }); + + createdGroup = groupData.group; + nonMember = await generateUser(); + }); + + it('returns the group object for a non-member', async () => { + let group = await nonMember.get(`/groups/${createdGroup._id}`); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); + }); + }); + + context('Non-member of a private guild', () => { + let nonMember, createdGroup; + + before(async () => { + let groupData = await createAndPopulateGroup({ + members: 1, + groupDetails: { + name: 'test guild', + type: 'guild', + privacy: 'private', + }, + }); + + createdGroup = groupData.group; + nonMember = await generateUser(); + }); + + it('does not return the group object for a non-member', async () => { + await expect(nonMember.get(`/groups/${createdGroup._id}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + }); + + context('Non-member of a party', () => { + let nonMember, createdGroup; + + before(async () => { + let groupData = await createAndPopulateGroup({ + members: 1, + groupDetails: { + name: 'test party', + type: 'party', + privacy: 'private', + }, + }); + + createdGroup = groupData.group; + nonMember = await generateUser(); + }); + + it('does not return the group object for a non-member', async () => { + await expect(nonMember.get(`/groups/${createdGroup._id}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + }); + + context('Member of a party', () => { + let member, createdGroup; + + before(async () => { + let groupData = await createAndPopulateGroup({ + members: 1, + groupDetails: { + name: 'test party', + type: 'party', + privacy: 'private', + }, + }); + + createdGroup = groupData.group; + member = groupData.members[0]; + }); + + it('returns the user\'s party if an id of "party" is passed in', async () => { + let group = await member.get('/groups/party'); + + expect(group._id).to.eql(createdGroup._id); + expect(group.name).to.eql(createdGroup.name); + expect(group.type).to.eql(createdGroup.type); + expect(group.privacy).to.eql(createdGroup.privacy); + }); + }); + + context('Non-existent group', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns error if group does not exist', async () => { + await expect(user.get('/groups/group-that-does-not-exist')) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + }); + + context('Flagged messages', () => { + let group; + + let chat1 = { + id: 'chat1', + text: 'chat 1', + flags: {}, + }; + + let chat2 = { + id: 'chat2', + text: 'chat 2', + flags: {}, + flagCount: 0, + }; + + let chat3 = { + id: 'chat3', + text: 'chat 3', + flags: { + 'user-id': true, + }, + flagCount: 1, + }; + + let chat4 = { + id: 'chat4', + text: 'chat 4', + flags: { + 'user-id': true, + 'other-user-id': true, + }, + flagCount: 2, + }; + + let chat5 = { + id: 'chat5', + text: 'chat 5', + flags: { + 'user-id': true, + 'other-user-id': true, + 'yet-another-user-id': true, + }, + flagCount: 3, + }; + + beforeEach(async () => { + let groupData = await createAndPopulateGroup({ + groupDetails: { + name: 'test guild', + type: 'guild', + privacy: 'public', + chat: [ + chat1, + chat2, + chat3, + chat4, + chat5, + ], + }, + }); + + group = groupData.group; + + await group.addChat([chat1, chat2, chat3, chat4, chat5]); + }); + + context('non-admin', () => { + let nonAdmin; + + beforeEach(async () => { + nonAdmin = await generateUser(); + }); + + it('does not include messages with a flag count of 2 or greater', async () => { + let fetchedGroup = await nonAdmin.get(`/groups/${group._id}`); + + expect(fetchedGroup.chat).to.have.lengthOf(3); + expect(fetchedGroup.chat[0].id).to.eql(chat1.id); + expect(fetchedGroup.chat[1].id).to.eql(chat2.id); + expect(fetchedGroup.chat[2].id).to.eql(chat3.id); + }); + + it('does not include user ids in flags object', async () => { + let fetchedGroup = await nonAdmin.get(`/groups/${group._id}`); + let chatWithOneFlag = fetchedGroup.chat[2]; + + expect(chatWithOneFlag.id).to.eql(chat3.id); + expect(chat3.flags).to.eql({ 'user-id': true }); + expect(chatWithOneFlag.flags).to.eql({}); + }); + }); + + context('admin', () => { + let admin; + + beforeEach(async () => { + admin = await generateUser({ + 'contributor.admin': true, + }); + }); + + it('includes all messages', async () => { + let fetchedGroup = await admin.get(`/groups/${group._id}`); + + expect(fetchedGroup.chat).to.have.lengthOf(5); + expect(fetchedGroup.chat[0].id).to.eql(chat1.id); + expect(fetchedGroup.chat[1].id).to.eql(chat2.id); + expect(fetchedGroup.chat[2].id).to.eql(chat3.id); + expect(fetchedGroup.chat[3].id).to.eql(chat4.id); + expect(fetchedGroup.chat[4].id).to.eql(chat5.id); + }); + + it('includes user ids in flags object', async () => { + let fetchedGroup = await admin.get(`/groups/${group._id}`); + let chatWithOneFlag = fetchedGroup.chat[2]; + + expect(chatWithOneFlag.id).to.eql(chat3.id); + expect(chat3.flags).to.eql({ 'user-id': true }); + expect(chatWithOneFlag.flags).to.eql(chat3.flags); + }); + }); + }); +}); diff --git a/test/api/v3/integration/groups/POST-groups.test.js b/test/api/v3/integration/groups/POST-groups.test.js new file mode 100644 index 0000000000..ad8f7a6c92 --- /dev/null +++ b/test/api/v3/integration/groups/POST-groups.test.js @@ -0,0 +1,228 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('POST /group', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ balance: 10 }); + }); + + context('All Groups', () => { + it('it returns validation error when type is not provided', async () => { + await expect( + user.post('/groups', { name: 'Test Group Without Type' }) + ).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Group validation failed', + }); + }); + + it('it returns validation error when type is not supported', async () => { + await expect( + user.post('/groups', { name: 'Group with unsupported type', type: 'foo' }) + ).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Group validation failed', + }); + }); + + it('sets the group leader to the user who created the group', async () => { + let group = await user.post('/groups', { + name: 'Test Public Guild', + type: 'guild', + }); + + expect(group.leader).to.eql({ + _id: user._id, + profile: { + name: user.profile.name, + }, + }); + }); + }); + + context('Guilds', () => { + it('returns an error when a user with insufficient funds attempts to create a guild', async () => { + await user.update({ balance: 0 }); + + await expect( + user.post('/groups', { + name: 'Test Public Guild', + type: 'guild', + }) + ).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageInsufficientGems'), + }); + }); + + it('adds guild to user\'s list of guilds', async () => { + let guild = await user.post('/groups', { + name: 'some guild', + type: 'guild', + privacy: 'public', + }); + + let updatedUser = await user.get('/user'); + + expect(updatedUser.guilds).to.include(guild._id); + }); + + context('public guild', () => { + it('creates a group', async () => { + let groupName = 'Test Public Guild'; + let groupType = 'guild'; + let groupPrivacy = 'public'; + + let publicGuild = await user.post('/groups', { + name: groupName, + type: groupType, + privacy: groupPrivacy, + }); + + expect(publicGuild._id).to.exist; + expect(publicGuild.name).to.equal(groupName); + expect(publicGuild.type).to.equal(groupType); + expect(publicGuild.memberCount).to.equal(1); + expect(publicGuild.privacy).to.equal(groupPrivacy); + expect(publicGuild.leader).to.eql({ + _id: user._id, + profile: { + name: user.profile.name, + }, + }); + }); + }); + + context('private guild', () => { + let groupName = 'Test Private Guild'; + let groupType = 'guild'; + let groupPrivacy = 'private'; + + it('creates a group', async () => { + let privateGuild = await user.post('/groups', { + name: groupName, + type: groupType, + privacy: groupPrivacy, + }); + + expect(privateGuild._id).to.exist; + expect(privateGuild.name).to.equal(groupName); + expect(privateGuild.type).to.equal(groupType); + expect(privateGuild.memberCount).to.equal(1); + expect(privateGuild.privacy).to.equal(groupPrivacy); + expect(privateGuild.leader).to.eql({ + _id: user._id, + profile: { + name: user.profile.name, + }, + }); + }); + + it('deducts gems from user and adds them to guild bank', async () => { + let privateGuild = await user.post('/groups', { + name: groupName, + type: groupType, + privacy: groupPrivacy, + }); + + expect(privateGuild.balance).to.eql(1); + + let updatedUser = await user.get('/user'); + + expect(updatedUser.balance).to.eql(user.balance - 1); + }); + }); + }); + + context('Parties', () => { + let partyName = 'Test Party'; + let partyType = 'party'; + + it('creates a party', async () => { + let party = await user.post('/groups', { + name: partyName, + type: partyType, + }); + + expect(party._id).to.exist; + expect(party.name).to.equal(partyName); + expect(party.type).to.equal(partyType); + expect(party.memberCount).to.equal(1); + expect(party.leader).to.eql({ + _id: user._id, + profile: { + name: user.profile.name, + }, + }); + }); + + it('does not require gems to create a party', async () => { + await user.update({ balance: 0 }); + + let party = await user.post('/groups', { + name: partyName, + type: partyType, + }); + + expect(party._id).to.exist; + + let updatedUser = await user.get('/user'); + + expect(updatedUser.balance).to.eql(user.balance); + }); + + it('sets party id on user object', async () => { + let party = await user.post('/groups', { + name: partyName, + type: partyType, + }); + + let updatedUser = await user.get('/user'); + + expect(updatedUser.party._id).to.eql(party._id); + }); + + it('does not award Party Up achievement to solo partier', async () => { + await user.post('/groups', { + name: partyName, + type: partyType, + }); + + let updatedUser = await user.get('/user'); + + expect(updatedUser.achievements.partyUp).to.not.eql(true); + }); + + it('prevents user in a party from creating another party', async () => { + await user.post('/groups', { + name: partyName, + type: partyType, + }); + + await expect(user.post('/groups')).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupAlreadyInParty'), + }); + }); + + it('prevents creating a public party', async () => { + await expect(user.post('/groups', { + name: partyName, + type: partyType, + privacy: 'public', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('partyMustbePrivate'), + }); + }); + }); +}); diff --git a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js new file mode 100644 index 0000000000..f47a734e89 --- /dev/null +++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js @@ -0,0 +1,286 @@ +import { + generateUser, + createAndPopulateGroup, + checkExistence, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /group/:groupId/join', () => { + const PET_QUEST = 'whale'; + + it('returns error when groupId is not for a valid group', async () => { + let joiningUser = await generateUser(); + + await expect(joiningUser.post(`/groups/${generateUUID()}/join`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + context('Joining a public guild', () => { + let user, joiningUser, publicGuild; + + beforeEach(async () => { + let {group, groupLeader} = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Guild', + type: 'guild', + privacy: 'public', + }, + }); + + publicGuild = group; + user = groupLeader; + joiningUser = await generateUser(); + }); + + it('allows non-invited users to join public guilds', async () => { + let res = await joiningUser.post(`/groups/${publicGuild._id}/join`); + + await expect(joiningUser.get('/user')).to.eventually.have.property('guilds').to.include(publicGuild._id); + expect(res.leader._id).to.eql(user._id); + expect(res.leader.profile.name).to.eql(user.profile.name); + }); + + it('returns an error is user was already a member', async () => { + await joiningUser.post(`/groups/${publicGuild._id}/join`); + await expect(joiningUser.post(`/groups/${publicGuild._id}/join`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('userAlreadyInGroup'), + }); + }); + + it('promotes joining member in a public empty guild to leader', async () => { + await user.post(`/groups/${publicGuild._id}/leave`); + + await joiningUser.post(`/groups/${publicGuild._id}/join`); + + await expect(joiningUser.get(`/groups/${publicGuild._id}`)).to.eventually.have.deep.property('leader._id', joiningUser._id); + }); + + it('increments memberCount when joining guilds', async () => { + let oldMemberCount = publicGuild.memberCount; + + await joiningUser.post(`/groups/${publicGuild._id}/join`); + + await expect(joiningUser.get(`/groups/${publicGuild._id}`)).to.eventually.have.property('memberCount', oldMemberCount + 1); + }); + }); + + context('Joining a private guild', () => { + let user, invitedUser, guild; + + beforeEach(async () => { + let { group, groupLeader, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Guild', + type: 'guild', + privacy: 'private', + }, + invites: 1, + }); + + guild = group; + user = groupLeader; + invitedUser = invitees[0]; + }); + + it('returns error when user is not invited to private guild', async () => { + let userWithoutInvite = await generateUser(); + + await expect(userWithoutInvite.post(`/groups/${guild._id}/join`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupRequiresInvite'), + }); + }); + + context('User is invited', () => { + it('allows invited user to join private guilds', async () => { + await invitedUser.post(`/groups/${guild._id}/join`); + + await expect(invitedUser.get('/user')).to.eventually.have.property('guilds').to.include(guild._id); + }); + + it('clears invitation from user when joining guilds', async () => { + await invitedUser.post(`/groups/${guild._id}/join`); + + await expect(invitedUser.get('/user')) + .to.eventually.have.deep.property('invitations.guilds') + .to.not.include({id: guild._id}); + }); + + it('increments memberCount when joining guilds', async () => { + let oldMemberCount = guild.memberCount; + + await invitedUser.post(`/groups/${guild._id}/join`); + + await expect(invitedUser.get(`/groups/${guild._id}`)).to.eventually.have.property('memberCount', oldMemberCount + 1); + }); + + it('does not give basilist quest to inviter when joining a guild', async () => { + await invitedUser.post(`/groups/${guild._id}/join`); + + await expect(user.get('/user')).to.eventually.not.have.deep.property('items.quests.basilist'); + }); + + it('does not increment basilist quest count to inviter with basilist when joining a guild', async () => { + await user.update({ 'items.quests.basilist': 1 }); + + await invitedUser.post(`/groups/${guild._id}/join`); + + await expect(user.get('/user')).to.eventually.have.deep.property('items.quests.basilist', 1); + }); + }); + }); + + context('Joining a party', () => { + let user, invitedUser, party; + + beforeEach(async () => { + let { group, groupLeader, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Party', + type: 'party', + }, + members: 2, + invites: 1, + }); + + party = group; + user = groupLeader; + invitedUser = invitees[0]; + }); + + it('returns error when user is not invited to party', async () => { + let userWithoutInvite = await generateUser(); + + await expect(userWithoutInvite.post(`/groups/${party._id}/join`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupRequiresInvite'), + }); + }); + + context('User is invited', () => { + it('allows invited user to join party', async () => { + await invitedUser.post(`/groups/${party._id}/join`); + + await expect(invitedUser.get('/user')).to.eventually.have.deep.property('party._id', party._id); + }); + + it('clears invitation from user when joining party', async () => { + await invitedUser.post(`/groups/${party._id}/join`); + + await expect(invitedUser.get('/user')).to.eventually.not.have.deep.property('invitations.party.id'); + }); + + it('increments memberCount when joining party', async () => { + let oldMemberCount = party.memberCount; + + await invitedUser.post(`/groups/${party._id}/join`); + + await expect(invitedUser.get(`/groups/${party._id}`)).to.eventually.have.property('memberCount', oldMemberCount + 1); + }); + + it('gives basilist quest item to the inviter when joining a party', async () => { + await invitedUser.post(`/groups/${party._id}/join`); + + await expect(user.get('/user')).to.eventually.have.deep.property('items.quests.basilist', 1); + }); + + it('increments basilist quest item count to inviter when joining a party', async () => { + await user.update({'items.quests.basilist': 1 }); + + await invitedUser.post(`/groups/${party._id}/join`); + + await expect(user.get('/user')).to.eventually.have.deep.property('items.quests.basilist', 2); + }); + + it('deletes previous party where the user was the only member', async () => { + let userToInvite = await generateUser(); + let oldParty = await userToInvite.post('/groups', { // add user to a party + name: 'Another Test Party', + type: 'party', + }); + + await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(true); + await user.post(`/groups/${party._id}/invite`, { + uuids: [userToInvite._id], + }); + await userToInvite.post(`/groups/${party._id}/join`); + + await expect(user.get('/user')).to.eventually.have.deep.property('party._id', party._id); + await expect(checkExistence('groups', oldParty._id)).to.eventually.equal(false); + }); + + it('invites joining member to active quest', async () => { + await user.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + await user.post(`/groups/${party._id}/quests/invite/${PET_QUEST}`); + + await invitedUser.post(`/groups/${party._id}/join`); + + await invitedUser.sync(); + await party.sync(); + + expect(invitedUser).to.have.deep.property('party.quest.RSVPNeeded', true); + expect(invitedUser).to.have.deep.property('party.quest.key', party.quest.key); + expect(party.quest.members[invitedUser._id]).to.be.null; + }); + }); + }); + + context('Party incentive achievements', () => { + let leader, member, party; + + beforeEach(async () => { + leader = await generateUser(); + member = await generateUser(); + party = await leader.post('/groups', { + name: 'Testing Party', + type: 'party', + }); + await leader.post(`/groups/${party._id}/invite`, { + uuids: [member._id], + }); + await member.post(`/groups/${party._id}/join`); + }); + + it('awards Party Up achievement to party of size 2', async () => { + await member.sync(); + await leader.sync(); + + expect(member).to.have.deep.property('achievements.partyUp', true); + expect(leader).to.have.deep.property('achievements.partyUp', true); + }); + + it('does not award Party On achievement to party of size 2', async () => { + await member.sync(); + await leader.sync(); + + expect(member).to.not.have.deep.property('achievements.partyOn'); + expect(leader).to.not.have.deep.property('achievements.partyOn'); + }); + + it('awards Party On achievement to party of size 4', async () => { + let addlMemberOne = await generateUser(); + let addlMemberTwo = await generateUser(); + await leader.post(`/groups/${party._id}/invite`, { + uuids: [addlMemberOne._id, addlMemberTwo._id], + }); + await addlMemberOne.post(`/groups/${party._id}/join`); + await addlMemberTwo.post(`/groups/${party._id}/join`); + + await member.sync(); + await leader.sync(); + + expect(member).to.have.deep.property('achievements.partyOn', true); + expect(leader).to.have.deep.property('achievements.partyOn', true); + }); + }); +}); diff --git a/test/api/v3/integration/groups/POST-groups_groupId_leave.js b/test/api/v3/integration/groups/POST-groups_groupId_leave.js new file mode 100644 index 0000000000..3e13634bd8 --- /dev/null +++ b/test/api/v3/integration/groups/POST-groups_groupId_leave.js @@ -0,0 +1,210 @@ +import { + generateChallenge, + checkExistence, + createAndPopulateGroup, + sleep, + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { + each, +} from 'lodash'; + +describe('POST /groups/:groupId/leave', () => { + let typesOfGroups = { + 'public guild': { type: 'guild', privacy: 'public' }, + 'private guild': { type: 'guild', privacy: 'private' }, + party: { type: 'party', privacy: 'private' }, + }; + + each(typesOfGroups, (groupDetails, groupType) => { + context(`Leaving a ${groupType}`, () => { + let groupToLeave; + let leader; + let member; + let memberCount; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails, + members: 1, + }); + + groupToLeave = group; + leader = groupLeader; + member = members[0]; + memberCount = group.memberCount; + }); + + it('prevents non members from leaving', async () => { + let user = await generateUser(); + await expect(user.post(`/groups/${groupToLeave._id}/leave`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it(`lets user leave a ${groupType}`, async () => { + await member.post(`/groups/${groupToLeave._id}/leave`); + + let userThatLeftGroup = await member.get('/user'); + + expect(userThatLeftGroup.guilds).to.be.empty; + expect(userThatLeftGroup.party._id).to.not.exist; + await groupToLeave.sync(); + expect(groupToLeave.memberCount).to.equal(memberCount - 1); + }); + + it(`sets a new group leader when leader leaves a ${groupType}`, async () => { + await leader.post(`/groups/${groupToLeave._id}/leave`); + + await groupToLeave.sync(); + expect(groupToLeave.memberCount).to.equal(memberCount - 1); + expect(groupToLeave.leader).to.equal(member._id); + }); + + context('With challenges', () => { + let challenge; + + beforeEach(async () => { + challenge = await generateChallenge(leader, groupToLeave); + + await leader.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + }); + + await sleep(0.5); + }); + + it('removes all challenge tasks when keep parameter is set to remove', async () => { + await leader.post(`/groups/${groupToLeave._id}/leave?keep=remove-all`); + + let userWithoutChallengeTasks = await leader.get('/user'); + + expect(userWithoutChallengeTasks.challenges).to.not.include(challenge._id); + expect(userWithoutChallengeTasks.tasksOrder.habits).to.be.empty; + }); + + it('keeps all challenge tasks when keep parameter is not set', async () => { + await leader.post(`/groups/${groupToLeave._id}/leave`); + + let userWithChallengeTasks = await leader.get('/user'); + + expect(userWithChallengeTasks.challenges).to.not.include(challenge._id); + // @TODO find elegant way to assert against the task existing + expect(userWithChallengeTasks.tasksOrder.habits).to.not.be.empty; + }); + }); + + it('prevents quest leader from leaving a groupToLeave'); + it('prevents a user from leaving during an active quest'); + }); + }); + + context('Leaving a group as the last member', () => { + context('private guild', () => { + let privateGuild; + let leader; + let invitedUser; + + beforeEach(async () => { + let { group, groupLeader, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Private Guild', + type: 'guild', + }, + invites: 1, + }); + + privateGuild = group; + leader = groupLeader; + invitedUser = invitees[0]; + }); + + it('removes a group when the last member leaves', async () => { + await leader.post(`/groups/${privateGuild._id}/leave`); + + await expect(checkExistence('groups', privateGuild._id)).to.eventually.equal(false); + }); + + it('removes invitations when the last member leaves', async () => { + await leader.post(`/groups/${privateGuild._id}/leave`); + + let userWithoutInvitation = await invitedUser.get('/user'); + + expect(userWithoutInvitation.invitations.guilds).to.be.empty; + }); + }); + + context('public guild', () => { + let publicGuild; + let leader; + let invitedUser; + + beforeEach(async () => { + let { group, groupLeader, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Public Guild', + type: 'guild', + privacy: 'public', + }, + invites: 1, + }); + + publicGuild = group; + leader = groupLeader; + invitedUser = invitees[0]; + }); + + it('keeps the group when the last member leaves', async () => { + await leader.post(`/groups/${publicGuild._id}/leave`); + + await expect(checkExistence('groups', publicGuild._id)).to.eventually.equal(true); + }); + + it('keeps the invitations when the last member leaves a public guild', async () => { + await leader.post(`/groups/${publicGuild._id}/leave`); + + let userWithoutInvitation = await invitedUser.get('/user'); + + expect(userWithoutInvitation.invitations.guilds).to.not.be.empty; + }); + }); + + context('party', () => { + let party; + let leader; + let invitedUser; + + beforeEach(async () => { + let { group, groupLeader, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Party', + type: 'party', + }, + invites: 1, + }); + + party = group; + leader = groupLeader; + invitedUser = invitees[0]; + }); + + it('removes a group when the last member leaves a party', async () => { + await leader.post(`/groups/${party._id}/leave`); + + await expect(checkExistence('party', party._id)).to.eventually.equal(false); + }); + + it('removes invitations when the last member leaves a party', async () => { + await leader.post(`/groups/${party._id}/leave`); + + let userWithoutInvitation = await invitedUser.get('/user'); + + expect(userWithoutInvitation.invitations.party).to.be.empty; + }); + }); + }); +}); diff --git a/test/api/v3/integration/groups/POST-groups_groupId_reject.test.js b/test/api/v3/integration/groups/POST-groups_groupId_reject.test.js new file mode 100644 index 0000000000..18f83fe9c9 --- /dev/null +++ b/test/api/v3/integration/groups/POST-groups_groupId_reject.test.js @@ -0,0 +1,113 @@ +import { + generateUser, + createAndPopulateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('POST /group/:groupId/reject-invite', () => { + context('Rejecting a public guild invite', () => { + let publicGuild, invitedUser; + + beforeEach(async () => { + let {group, invitees} = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Guild', + type: 'guild', + privacy: 'public', + }, + invites: 1, + }); + + publicGuild = group; + invitedUser = invitees[0]; + }); + + it('returns error when user is not invited', async () => { + let userWithoutInvite = await generateUser(); + + await expect(userWithoutInvite.post(`/groups/${publicGuild._id}/reject-invite`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupRequiresInvite'), + }); + }); + + it('clears invitation from user', async () => { + await invitedUser.post(`/groups/${publicGuild._id}/reject-invite`); + + await expect(invitedUser.get('/user')) + .to.eventually.have.deep.property('invitations.guilds') + .to.not.include({id: publicGuild._id}); + }); + }); + + context('Rejecting a private guild invite', () => { + let invitedUser, guild; + + beforeEach(async () => { + let { group, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Guild', + type: 'guild', + privacy: 'private', + }, + invites: 1, + }); + + guild = group; + invitedUser = invitees[0]; + }); + + it('returns error when user is not invited', async () => { + let userWithoutInvite = await generateUser(); + + await expect(userWithoutInvite.post(`/groups/${guild._id}/reject-invite`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupRequiresInvite'), + }); + }); + + it('clears invitation from user', async () => { + await invitedUser.post(`/groups/${guild._id}/reject-invite`); + + await expect(invitedUser.get('/user')) + .to.eventually.have.deep.property('invitations.guilds') + .to.not.include({id: guild._id}); + }); + }); + + context('Rejecting a party invite', () => { + let invitedUser, party; + + beforeEach(async () => { + let { group, invitees } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Party', + type: 'party', + }, + members: 2, + invites: 1, + }); + + party = group; + invitedUser = invitees[0]; + }); + + it('returns error when user is not invited', async () => { + let userWithoutInvite = await generateUser(); + + await expect(userWithoutInvite.post(`/groups/${party._id}/reject-invite`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupRequiresInvite'), + }); + }); + + it('clears invitation from user', async () => { + await invitedUser.post(`/groups/${party._id}/reject-invite`); + + await expect(invitedUser.get('/user')).to.eventually.not.have.deep.property('invitations.party.id'); + }); + }); +}); diff --git a/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js b/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js new file mode 100644 index 0000000000..0ebde39361 --- /dev/null +++ b/test/api/v3/integration/groups/POST-groups_id_removeMember.test.js @@ -0,0 +1,130 @@ +import { + generateUser, + createAndPopulateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('POST /groups/:groupId/removeMember/:memberId', () => { + let leader; + let invitedUser; + let guild; + let member; + let member2; + + beforeEach(async () => { + let { group, groupLeader, invitees, members } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Guild', + type: 'guild', + privacy: 'private', + }, + invites: 1, + members: 2, + }); + + guild = group; + leader = groupLeader; + invitedUser = invitees[0]; + member = members[0]; + member2 = members[1]; + }); + + context('All Groups', () => { + it('returns an error when user is not member of the group', async () => { + let nonMember = await generateUser(); + + expect(nonMember.post(`/groups/${guild._id}/removeMember/${member._id}`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + type: 'NotAuthorized', + message: t('onlyLeaderCanRemoveMember'), + }); + }); + + it('returns an error when user is a non-leader member of a group', async () => { + expect(member2.post(`/groups/${guild._id}/removeMember/${member._id}`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + type: 'NotAuthorized', + message: t('onlyLeaderCanRemoveMember'), + }); + }); + + it('does not allow leader to remove themselves', async () => { + expect(leader.post(`/groups/${guild._id}/removeMember/${leader._id}`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + text: t('messageGroupCannotRemoveSelf'), + }); + }); + }); + + context('Guilds', () => { + it('can remove other members', async () => { + await leader.post(`/groups/${guild._id}/removeMember/${member._id}`); + let memberRemoved = await member.get('/user'); + + expect(memberRemoved.guilds.indexOf(guild._id)).eql(-1); + }); + + it('updates memberCount', async () => { + let oldMemberCount = guild.memberCount; + await leader.post(`/groups/${guild._id}/removeMember/${member._id}`); + await expect(leader.get(`/groups/${guild._id}`)).to.eventually.have.property('memberCount', oldMemberCount - 1); + }); + + it('can remove other invites', async () => { + await leader.post(`/groups/${guild._id}/removeMember/${invitedUser._id}`); + + let invitedUserWithoutInvite = await invitedUser.get('/user'); + + expect(_.findIndex(invitedUserWithoutInvite.invitations.guilds, {id: guild._id})).eql(-1); + }); + }); + + context('Party', () => { + let party; + let partyleader; + let partyInvitedUser; + let partyMember; + + beforeEach(async () => { + let { group, groupLeader, invitees, members } = await createAndPopulateGroup({ + groupDetails: { + name: 'Test Party', + type: 'party', + privacy: 'private', + }, + invites: 1, + members: 1, + }); + + party = group; + partyleader = groupLeader; + partyInvitedUser = invitees[0]; + partyMember = members[0]; + }); + + it('can remove other members', async () => { + await partyleader.post(`/groups/${party._id}/removeMember/${partyMember._id}`); + + let memberRemoved = await partyMember.get('/user'); + + expect(memberRemoved.party._id).eql(undefined); + }); + + it('updates memberCount', async () => { + let oldMemberCount = party.memberCount; + await partyleader.post(`/groups/${party._id}/removeMember/${partyMember._id}`); + await expect(partyleader.get(`/groups/${party._id}`)).to.eventually.have.property('memberCount', oldMemberCount - 1); + }); + + it('can remove other invites', async () => { + await partyleader.post(`/groups/${party._id}/removeMember/${partyInvitedUser._id}`); + + let invitedUserWithoutInvite = await partyInvitedUser.get('/user'); + + expect(_.findIndex(invitedUserWithoutInvite.invitations.party, {id: party._id})).eql(-1); + }); + }); +}); diff --git a/test/api/v3/integration/groups/POST-groups_invite.test.js b/test/api/v3/integration/groups/POST-groups_invite.test.js new file mode 100644 index 0000000000..3e6ed0be30 --- /dev/null +++ b/test/api/v3/integration/groups/POST-groups_invite.test.js @@ -0,0 +1,343 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +const INVITES_LIMIT = 100; + +describe('Post /groups/:groupId/invite', () => { + let inviter; + let group; + let groupName = 'Test Public Guild'; + + beforeEach(async () => { + inviter = await generateUser({balance: 1}); + group = await inviter.post('/groups', { + name: groupName, + type: 'guild', + }); + }); + + describe('user id invites', () => { + it('returns an error when invited user is not found', async () => { + let fakeID = generateUUID(); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [fakeID], + })) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', {userId: fakeID}), + }); + }); + + it('returns an error when inviting yourself to a group', async () => { + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [inviter._id], + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('cannotInviteSelfToGroup'), + }); + }); + + it('returns an error when uuids is not an array', async () => { + let fakeID = generateUUID(); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: {fakeID}, + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('uuidsMustBeAnArray'), + }); + }); + + it('returns empty when uuids is empty', async () => { + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [], + })) + .to.eventually.be.empty; + }); + + it('returns an error when there are more than INVITES_LIMIT uuids', async () => { + let uuids = []; + + for (let i = 0; i < 101; i += 1) { + uuids.push(generateUUID()); + } + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids, + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('canOnlyInviteMaxInvites', {maxInvites: INVITES_LIMIT}), + }); + }); + + it('invites a user to a group by uuid', async () => { + let userToInvite = await generateUser(); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInvite._id], + })).to.eventually.deep.equal([{ + id: group._id, + name: groupName, + inviter: inviter._id, + }]); + + await expect(userToInvite.get('/user')) + .to.eventually.have.deep.property('invitations.guilds[0].id', group._id); + }); + + it('invites multiple users to a group by uuid', async () => { + let userToInvite = await generateUser(); + let userToInvite2 = await generateUser(); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInvite._id, userToInvite2._id], + })).to.eventually.deep.equal([ + { + id: group._id, + name: groupName, + inviter: inviter._id, + }, + { + id: group._id, + name: groupName, + inviter: inviter._id, + }, + ]); + + await expect(userToInvite.get('/user')).to.eventually.have.deep.property('invitations.guilds[0].id', group._id); + await expect(userToInvite2.get('/user')).to.eventually.have.deep.property('invitations.guilds[0].id', group._id); + }); + + it('returns an error when inviting multiple users and a user is not found', async () => { + let userToInvite = await generateUser(); + let fakeID = generateUUID(); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInvite._id, fakeID], + })) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', {userId: fakeID}), + }); + }); + }); + + describe('email invites', () => { + let testInvite = {name: 'test', email: 'test@habitica.com'}; + + it('returns an error when invite is missing an email', async () => { + await expect(inviter.post(`/groups/${group._id}/invite`, { + emails: [{name: 'test'}], + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('inviteMissingEmail'), + }); + }); + + it('returns an error when emails is not an array', async () => { + await expect(inviter.post(`/groups/${group._id}/invite`, { + emails: {testInvite}, + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('emailsMustBeAnArray'), + }); + }); + + it('returns empty when emails is an empty array', async () => { + await expect(inviter.post(`/groups/${group._id}/invite`, { + emails: [], + })) + .to.eventually.be.empty; + }); + + it('returns an error when there are more than INVITES_LIMIT emails', async () => { + let emails = []; + + for (let i = 0; i < 101; i += 1) { + emails.push(`${generateUUID()}@habitica.com`); + } + + await expect(inviter.post(`/groups/${group._id}/invite`, { + emails, + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('canOnlyInviteMaxInvites', {maxInvites: INVITES_LIMIT}), + }); + }); + + it('invites a user to a group by email', async () => { + let res = await inviter.post(`/groups/${group._id}/invite`, { + emails: [testInvite], + inviter: 'inviter name', + }); + + expect(res).to.exist; + }); + + it('invites multiple users to a group by email', async () => { + let res = await inviter.post(`/groups/${group._id}/invite`, { + emails: [testInvite, {name: 'test2', email: 'test2@habitica.com'}], + }); + + expect(res).to.exist; + }); + }); + + describe('user and email invites', () => { + it('returns an error when emails and uuids are not provided', async () => { + await expect(inviter.post(`/groups/${group._id}/invite`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('canOnlyInviteEmailUuid'), + }); + }); + + it('returns an error when there are more than INVITES_LIMIT uuids and emails', async () => { + let emails = []; + let uuids = []; + + for (let i = 0; i < 50; i += 1) { + emails.push(`${generateUUID()}@habitica.com`); + } + + for (let i = 0; i < 51; i += 1) { + uuids.push(generateUUID()); + } + + await expect(inviter.post(`/groups/${group._id}/invite`, { + emails, + uuids, + })) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('canOnlyInviteMaxInvites', {maxInvites: INVITES_LIMIT}), + }); + }); + + it('invites users to a group by uuid and email', async () => { + let newUser = await generateUser(); + let invite = await inviter.post(`/groups/${group._id}/invite`, { + uuids: [newUser._id], + emails: [{name: 'test', email: 'test@habitica.com'}], + }); + let invitedUser = await newUser.get('/user'); + + expect(invitedUser.invitations.guilds[0].id).to.equal(group._id); + expect(invite).to.exist; + }); + }); + + describe('guild invites', () => { + it('returns an error when invited user is already invited to the group', async () => { + let userToInivite = await generateUser(); + await inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInivite._id], + }); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInivite._id], + })) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('userAlreadyInvitedToGroup'), + }); + }); + + it('returns an error when invited user is already in the group', async () => { + let userToInvite = await generateUser(); + await inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInvite._id], + }); + await userToInvite.post(`/groups/${group._id}/join`); + + await expect(inviter.post(`/groups/${group._id}/invite`, { + uuids: [userToInvite._id], + })) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('userAlreadyInGroup'), + }); + }); + }); + + describe('party invites', () => { + let party; + + beforeEach(async () => { + party = await inviter.post('/groups', { + name: 'Test Party', + type: 'party', + }); + }); + + it('returns an error when invited user has a pending invitation to the party', async () => { + let userToInvite = await generateUser(); + await inviter.post(`/groups/${party._id}/invite`, { + uuids: [userToInvite._id], + }); + + await expect(inviter.post(`/groups/${party._id}/invite`, { + uuids: [userToInvite._id], + })) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('userAlreadyPendingInvitation'), + }); + }); + + it('returns an error when invited user is already in a party of more than 1 member', async () => { + let userToInvite = await generateUser(); + let userToInvite2 = await generateUser(); + await inviter.post(`/groups/${party._id}/invite`, { + uuids: [userToInvite._id, userToInvite2._id], + }); + await userToInvite.post(`/groups/${party._id}/join`); + await userToInvite2.post(`/groups/${party._id}/join`); + + await expect(inviter.post(`/groups/${party._id}/invite`, { + uuids: [userToInvite._id], + })) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('userAlreadyInAParty'), + }); + }); + + it('allow inviting a user to a party if he\'s partying solo', async () => { + let userToInvite = await generateUser(); + await userToInvite.post('/groups', { // add user to a party + name: 'Another Test Party', + type: 'party', + }); + + await inviter.post(`/groups/${party._id}/invite`, { + uuids: [userToInvite._id], + }); + expect((await userToInvite.get('/user')).invitations.party.id).to.equal(party._id); + }); + }); +}); diff --git a/test/api/v3/integration/groups/PUT-groups.test.js b/test/api/v3/integration/groups/PUT-groups.test.js new file mode 100644 index 0000000000..8d581d56ca --- /dev/null +++ b/test/api/v3/integration/groups/PUT-groups.test.js @@ -0,0 +1,46 @@ +import { + createAndPopulateGroup, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('PUT /group', () => { + let leader, nonLeader, groupToUpdate; + let groupName = 'Test Public Guild'; + let groupType = 'guild'; + let groupUpdatedName = 'Test Public Guild Updated'; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { + name: groupName, + type: groupType, + privacy: 'public', + }, + members: 1, + }); + + groupToUpdate = group; + leader = groupLeader; + nonLeader = members[0]; + }); + + it('returns an error when a non group leader tries to update', async () => { + await expect(nonLeader.put(`/groups/${groupToUpdate._id}`, { + name: groupUpdatedName, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageGroupOnlyLeaderCanUpdate'), + }); + }); + + it('updates a group', async () => { + let updatedGroup = await leader.put(`/groups/${groupToUpdate._id}`, { + name: groupUpdatedName, + }); + + expect(updatedGroup.leader._id).to.eql(leader._id); + expect(updatedGroup.leader.profile.name).to.eql(leader.profile.name); + expect(updatedGroup.name).to.equal(groupUpdatedName); + }); +}); diff --git a/test/api/v3/integration/hall/GET-hall_heroes.test.js b/test/api/v3/integration/hall/GET-hall_heroes.test.js new file mode 100644 index 0000000000..745bc7739c --- /dev/null +++ b/test/api/v3/integration/hall/GET-hall_heroes.test.js @@ -0,0 +1,29 @@ +import { + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('GET /hall/heroes', () => { + it('returns all heroes sorted by -contributor.level and with correct fields', async () => { + let nonHero = await generateUser(); + let hero1 = await generateUser({ + contributor: {level: 1}, + }); + let hero2 = await generateUser({ + contributor: {level: 3}, + }); + + let heroes = await nonHero.get('/hall/heroes'); + expect(heroes.length).to.equal(2); + expect(heroes[0]._id).to.equal(hero2._id); + expect(heroes[1]._id).to.equal(hero1._id); + + expect(heroes[0]).to.have.all.keys(['_id', 'contributor', 'backer', 'profile']); + expect(heroes[1]).to.have.all.keys(['_id', 'contributor', 'backer', 'profile']); + + expect(heroes[0].profile).to.have.all.keys(['name']); + expect(heroes[1].profile).to.have.all.keys(['name']); + + expect(heroes[0].profile.name).to.equal(hero2.profile.name); + expect(heroes[1].profile.name).to.equal(hero1.profile.name); + }); +}); diff --git a/test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js b/test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js new file mode 100644 index 0000000000..2bf1a0a017 --- /dev/null +++ b/test/api/v3/integration/hall/GET-hall_heroes_heroId.test.js @@ -0,0 +1,56 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /heroes/:heroId', () => { + let user; + + before(async () => { + user = await generateUser({ + contributor: {admin: true}, + }); + }); + + it('requires the caller to be an admin', async () => { + let nonAdmin = await generateUser(); + + await expect(nonAdmin.get(`/hall/heroes/${user._id}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('noAdminAccess'), + }); + }); + + it('validates req.params.heroId', async () => { + await expect(user.get('/hall/heroes/invalidUUID')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('handles non-existing heroes', async () => { + let dummyId = generateUUID(); + await expect(user.get(`/hall/heroes/${dummyId}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', {userId: dummyId}), + }); + }); + + it('returns only necessary hero data', async () => { + let hero = await generateUser({ + contributor: {tier: 23}, + }); + let heroRes = await user.get(`/hall/heroes/${hero._id}`); + + expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys + '_id', 'id', 'balance', 'profile', 'purchased', + 'contributor', 'auth', 'items', + ]); + expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']); + expect(heroRes.profile).to.have.all.keys(['name']); + }); +}); diff --git a/test/api/v3/integration/hall/GET-hall_patrons.test.js b/test/api/v3/integration/hall/GET-hall_patrons.test.js new file mode 100644 index 0000000000..9599daef89 --- /dev/null +++ b/test/api/v3/integration/hall/GET-hall_patrons.test.js @@ -0,0 +1,60 @@ +import { + generateUser, + translate as t, + resetHabiticaDB, +} from '../../../../helpers/api-v3-integration.helper'; +import { times } from 'lodash'; + +describe('GET /hall/patrons', () => { + let user; + + beforeEach(async () => { + await resetHabiticaDB(); + user = await generateUser(); + }); + + it('fails if req.query.page is not numeric', async () => { + await expect(user.get('/hall/patrons?page=notNumber')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns all patrons sorted by -backer.tier and with correct fields', async () => { + let patron1 = await generateUser({ + backer: {tier: 1}, + }); + let patron2 = await generateUser({ + backer: {tier: 3}, + }); + + let patrons = await user.get('/hall/patrons'); + expect(patrons.length).to.equal(2); + expect(patrons[0]._id).to.equal(patron2._id); + expect(patrons[1]._id).to.equal(patron1._id); + + expect(patrons[0]).to.have.all.keys(['_id', 'contributor', 'backer', 'profile']); + expect(patrons[1]).to.have.all.keys(['_id', 'contributor', 'backer', 'profile']); + + expect(patrons[0].profile).to.have.all.keys(['name']); + expect(patrons[1].profile).to.have.all.keys(['name']); + + expect(patrons[0].profile.name).to.equal(patron2.profile.name); + expect(patrons[1].profile.name).to.equal(patron1.profile.name); + }); + + it('returns only first 50 patrons per request, more if req.query.page is passed', async () => { + await Promise.all(times(53, n => { + return generateUser({backer: {tier: n}}); + })); + + let patrons = await user.get('/hall/patrons'); + expect(patrons.length).to.equal(50); + + let morePatrons = await user.get('/hall/patrons?page=1'); + expect(morePatrons.length).to.equal(2); + expect(morePatrons[0].backer.tier).to.equal(2); + expect(morePatrons[1].backer.tier).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js b/test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js new file mode 100644 index 0000000000..bb724a51b4 --- /dev/null +++ b/test/api/v3/integration/hall/PUT-hall_heores_heroId.test.js @@ -0,0 +1,146 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('PUT /heroes/:heroId', () => { + let user; + + before(async () => { + user = await generateUser({ + contributor: {admin: true}, + }); + }); + + it('requires the caller to be an admin', async () => { + let nonAdmin = await generateUser(); + + await expect(nonAdmin.put(`/hall/heroes/${user._id}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('noAdminAccess'), + }); + }); + + it('validates req.params.heroId', async () => { + await expect(user.put('/hall/heroes/invalidUUID')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('handles non-existing heroes', async () => { + let dummyId = generateUUID(); + await expect(user.put(`/hall/heroes/${dummyId}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', {userId: dummyId}), + }); + }); + + it('updates contributor level, balance, ads, blocked', async () => { + let hero = await generateUser(); + let heroRes = await user.put(`/hall/heroes/${hero._id}`, { + balance: 3, + contributor: {level: 1}, + purchased: {ads: true}, + auth: {blocked: true}, + }); + + // test response + expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys + '_id', 'balance', 'profile', 'purchased', + 'contributor', 'auth', 'items', + ]); + expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']); + expect(heroRes.profile).to.have.all.keys(['name']); + + // test response values + expect(heroRes.balance).to.equal(3 + 0.75); // 3+0.75 for first contrib level + expect(heroRes.contributor.level).to.equal(1); + expect(heroRes.purchased.ads).to.equal(true); + expect(heroRes.auth.blocked).to.equal(true); + // test hero values + await hero.sync(); + expect(hero.balance).to.equal(3 + 0.75); // 3+0.75 for first contrib level + expect(hero.contributor.level).to.equal(1); + expect(hero.purchased.ads).to.equal(true); + expect(hero.auth.blocked).to.equal(true); + }); + + it('updates contributor level', async () => { + let hero = await generateUser({ + contributor: {level: 5}, + }); + let heroRes = await user.put(`/hall/heroes/${hero._id}`, { + contributor: {level: 6}, + }); + + // test response + expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys + '_id', 'balance', 'profile', 'purchased', + 'contributor', 'auth', 'items', + ]); + expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']); + expect(heroRes.profile).to.have.all.keys(['name']); + + // test response values + expect(heroRes.balance).to.equal(1); // 0+1 for sixth contrib level + expect(heroRes.contributor.level).to.equal(6); + expect(heroRes.items.pets['Dragon-Hydra']).to.equal(5); + // test hero values + await hero.sync(); + expect(hero.balance).to.equal(1); // 0+1 for sixth contrib level + expect(hero.contributor.level).to.equal(6); + expect(hero.items.pets['Dragon-Hydra']).to.equal(5); + }); + + it('updates contributor data', async () => { + let hero = await generateUser({ + contributor: {level: 5}, + }); + let heroRes = await user.put(`/hall/heroes/${hero._id}`, { + contributor: {text: 'Astronaut'}, + }); + + // test response + expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys + '_id', 'balance', 'profile', 'purchased', + 'contributor', 'auth', 'items', + ]); + expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']); + expect(heroRes.profile).to.have.all.keys(['name']); + + // test response values + expect(heroRes.contributor.level).to.equal(5); // doesn't modify previous values + expect(heroRes.contributor.text).to.equal('Astronaut'); + // test hero values + await hero.sync(); + expect(hero.contributor.level).to.equal(5); // doesn't modify previous values + expect(hero.contributor.text).to.equal('Astronaut'); + }); + + it('updates items', async () => { + let hero = await generateUser(); + let heroRes = await user.put(`/hall/heroes/${hero._id}`, { + itemPath: 'items.special.snowball', + itemVal: 5, + }); + + // test response + expect(heroRes).to.have.all.keys([ // works as: object has all and only these keys + '_id', 'balance', 'profile', 'purchased', + 'contributor', 'auth', 'items', + ]); + expect(heroRes.auth.local).not.to.have.keys(['salt', 'hashed_password']); + expect(heroRes.profile).to.have.all.keys(['name']); + + // test response values + expect(heroRes.items.special.snowball).to.equal(5); + // test hero values + await hero.sync(); + expect(hero.items.special.snowball).to.equal(5); + }); +}); diff --git a/test/api/v3/integration/members/GET-members_id.test.js b/test/api/v3/integration/members/GET-members_id.test.js new file mode 100644 index 0000000000..a802a1e8a7 --- /dev/null +++ b/test/api/v3/integration/members/GET-members_id.test.js @@ -0,0 +1,49 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /members/:memberId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('validates req.params.memberId', async () => { + await expect(user.get('/members/invalidUUID')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns a member public data only', async () => { + let member = await generateUser({ // make sure user has all the fields that can be returned by the getMember call + contributor: {level: 1}, + backer: {tier: 3}, + preferences: { + costume: false, + background: 'volcano', + }, + }); + let memberRes = await user.get(`/members/${member._id}`); + expect(memberRes).to.have.all.keys([ // works as: object has all and only these keys + '_id', 'id', 'preferences', 'profile', 'stats', 'achievements', 'party', + 'backer', 'contributor', 'auth', 'items', + ]); + expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); + expect(Object.keys(memberRes.preferences).sort()).to.eql(['size', 'hair', 'skin', 'shirt', + 'chair', 'costume', 'sleep', 'background'].sort()); + }); + + it('handles non-existing members', async () => { + let dummyId = generateUUID(); + await expect(user.get(`/members/${dummyId}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', {userId: dummyId}), + }); + }); +}); diff --git a/test/api/v3/integration/members/POST-send_private_message.test.js b/test/api/v3/integration/members/POST-send_private_message.test.js new file mode 100644 index 0000000000..3bd3380437 --- /dev/null +++ b/test/api/v3/integration/members/POST-send_private_message.test.js @@ -0,0 +1,107 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /members/send-private-message', () => { + let userToSendMessage; + let messageToSend = 'Test Private Message'; + + beforeEach(async () => { + userToSendMessage = await generateUser(); + }); + + it('returns error when message is not provided', async () => { + await expect(userToSendMessage.post('/members/send-private-message')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when toUserId is not provided', async () => { + await expect(userToSendMessage.post('/members/send-private-message', { + message: messageToSend, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when to user is not found', async () => { + await expect(userToSendMessage.post('/members/send-private-message', { + message: messageToSend, + toUserId: generateUUID(), + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userNotFound'), + }); + }); + + it('returns error when to user has blocked the sender', async () => { + let receiver = await generateUser({'inbox.blocks': [userToSendMessage._id]}); + + await expect(userToSendMessage.post('/members/send-private-message', { + message: messageToSend, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notAuthorizedToSendMessageToThisUser'), + }); + }); + + it('returns error when sender has blocked to user', async () => { + let receiver = await generateUser(); + let sender = await generateUser({'inbox.blocks': [receiver._id]}); + + await expect(sender.post('/members/send-private-message', { + message: messageToSend, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notAuthorizedToSendMessageToThisUser'), + }); + }); + + it('returns error when to user has opted out of messaging', async () => { + let receiver = await generateUser({'inbox.optOut': true}); + + await expect(userToSendMessage.post('/members/send-private-message', { + message: messageToSend, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notAuthorizedToSendMessageToThisUser'), + }); + }); + + it('sends a private message to a user', async () => { + let receiver = await generateUser(); + + await userToSendMessage.post('/members/send-private-message', { + message: messageToSend, + toUserId: receiver._id, + }); + + let updatedReceiver = await receiver.get('/user'); + let updatedSender = await userToSendMessage.get('/user'); + + let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (message) => { + return message.uuid === userToSendMessage._id && message.text === messageToSend; + }); + + let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (message) => { + return message.uuid === receiver._id && message.text === messageToSend; + }); + + expect(sendersMessageInReceiversInbox).to.exist; + expect(sendersMessageInSendersInbox).to.exist; + }); +}); diff --git a/test/api/v3/integration/members/POST-transfer_gems.test.js b/test/api/v3/integration/members/POST-transfer_gems.test.js new file mode 100644 index 0000000000..96644a3e88 --- /dev/null +++ b/test/api/v3/integration/members/POST-transfer_gems.test.js @@ -0,0 +1,174 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /members/transfer-gems', () => { + let userToSendMessage; + let receiver; + let message = 'Test Private Message'; + let gemAmount = 20; + + beforeEach(async () => { + userToSendMessage = await generateUser({balance: 5}); + receiver = await generateUser(); + }); + + it('returns error when no parameters are provided', async () => { + await expect(userToSendMessage.post('/members/transfer-gems')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when toUserId is not provided', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when to user is not found', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount, + toUserId: generateUUID(), + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userNotFound'), + }); + }); + + it('returns error when to user attempts to send gems to themselves', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount, + toUserId: userToSendMessage._id, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cannotSendGemsToYourself'), + }); + }); + + it('returns error when there is no gemAmount', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when gemAmount is not an integer', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount: 1.5, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when gemAmount is negative', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount: -5, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('badAmountOfGemsToSend'), + }); + }); + + it('returns error when gemAmount is more than the sender\'s balance', async () => { + await expect(userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount: gemAmount + 4, + toUserId: receiver._id, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('badAmountOfGemsToSend'), + }); + }); + + it('sends a private message about gems to a user', async () => { + await userToSendMessage.post('/members/transfer-gems', { + message, + gemAmount, + toUserId: receiver._id, + }); + + let updatedReceiver = await receiver.get('/user'); + let updatedSender = await userToSendMessage.get('/user'); + + let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (inboxMessage) => { + return inboxMessage.uuid === userToSendMessage._id; + }); + + let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (inboxMessage) => { + return inboxMessage.uuid === receiver._id; + }); + + let messageSentContent = t('privateMessageGiftIntro', { + receiverName: receiver.profile.name, + senderName: userToSendMessage.profile.name, + }); + messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount}); + messageSentContent += message; + + expect(sendersMessageInReceiversInbox).to.exist; + expect(sendersMessageInReceiversInbox.text).to.equal(messageSentContent); + expect(updatedReceiver.balance).to.equal(gemAmount / 4); + + expect(sendersMessageInSendersInbox).to.exist; + expect(sendersMessageInSendersInbox.text).to.equal(messageSentContent); + expect(updatedSender.balance).to.equal(0); + }); + + it('does not requrie a message', async () => { + await userToSendMessage.post('/members/transfer-gems', { + gemAmount, + toUserId: receiver._id, + }); + + let updatedReceiver = await receiver.get('/user'); + let updatedSender = await userToSendMessage.get('/user'); + + let sendersMessageInReceiversInbox = _.find(updatedReceiver.inbox.messages, (inboxMessage) => { + return inboxMessage.uuid === userToSendMessage._id; + }); + + let sendersMessageInSendersInbox = _.find(updatedSender.inbox.messages, (inboxMessage) => { + return inboxMessage.uuid === receiver._id; + }); + + let messageSentContent = t('privateMessageGiftIntro', { + receiverName: receiver.profile.name, + senderName: userToSendMessage.profile.name, + }); + messageSentContent += t('privateMessageGiftGemsMessage', {gemAmount}); + + expect(sendersMessageInReceiversInbox).to.exist; + expect(sendersMessageInReceiversInbox.text).to.equal(messageSentContent); + expect(updatedReceiver.balance).to.equal(gemAmount / 4); + + expect(sendersMessageInSendersInbox).to.exist; + expect(sendersMessageInSendersInbox.text).to.equal(messageSentContent); + expect(updatedSender.balance).to.equal(0); + }); +}); diff --git a/test/api/v3/integration/models/GET-model_paths.test.js b/test/api/v3/integration/models/GET-model_paths.test.js new file mode 100644 index 0000000000..0a9a94451a --- /dev/null +++ b/test/api/v3/integration/models/GET-model_paths.test.js @@ -0,0 +1,32 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('GET /models/:model/paths', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('returns an error when model is not accessible or doesn\'t exists', async () => { + await expect(user.get('/models/1234/paths')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + let models = ['habit', 'daily', 'todo', 'reward', 'user', 'tag', 'challenge', 'group']; + models.forEach(model => { + it(`returns the model paths for ${model}`, async () => { + let res = await user.get(`/models/${model}/paths`); + + if (model !== 'tag') expect(res._id).to.equal('String'); + if (model === 'tag') expect(res.id).to.equal('String'); + + expect(res).to.not.have.keys('__v'); + }); + }); +}); diff --git a/test/api/v3/integration/notFound.test.js b/test/api/v3/integration/notFound.test.js new file mode 100644 index 0000000000..747b370af9 --- /dev/null +++ b/test/api/v3/integration/notFound.test.js @@ -0,0 +1,13 @@ +import { requester } from '../../../helpers/api-integration/v3'; + +describe('notFound Middleware', () => { + it('returns a 404 error when the resource is not found', async () => { + let request = requester().get('/api/v3/dummy-url'); + + await expect(request).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: 'Not found.', + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_amazon_subscribe_cancel.test.js b/test/api/v3/integration/payments/GET-payments_amazon_subscribe_cancel.test.js new file mode 100644 index 0000000000..37588d1f18 --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_amazon_subscribe_cancel.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('payments : amazon #subscribeCancel', () => { + let endpoint = '/amazon/subscribe/cancel'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies subscription', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_paypal_checkout.test.js b/test/api/v3/integration/payments/GET-payments_paypal_checkout.test.js new file mode 100644 index 0000000000..7c692f31d1 --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_paypal_checkout.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +xdescribe('payments : paypal #checkout', () => { + let endpoint = '/paypal/checkout'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies subscription', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_paypal_checkout_success.test.js b/test/api/v3/integration/payments/GET-payments_paypal_checkout_success.test.js new file mode 100644 index 0000000000..6de04c8848 --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_paypal_checkout_success.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +xdescribe('payments : paypal #checkoutSuccess', () => { + let endpoint = '/paypal/checkout/success'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies subscription', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_paypal_subscribe.test.js b/test/api/v3/integration/payments/GET-payments_paypal_subscribe.test.js new file mode 100644 index 0000000000..54c540ee39 --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_paypal_subscribe.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +xdescribe('payments : paypal #subscribe', () => { + let endpoint = '/paypal/subscribe'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_paypal_subscribe_cancel.test.js b/test/api/v3/integration/payments/GET-payments_paypal_subscribe_cancel.test.js new file mode 100644 index 0000000000..1ba8b7af16 --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_paypal_subscribe_cancel.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('payments : paypal #subscribeCancel', () => { + let endpoint = '/paypal/subscribe/cancel'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_paypal_subscribe_success.test.js b/test/api/v3/integration/payments/GET-payments_paypal_subscribe_success.test.js new file mode 100644 index 0000000000..1a38342e9c --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_paypal_subscribe_success.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +xdescribe('payments : paypal #subscribeSuccess', () => { + let endpoint = '/paypal/subscribe/success'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/GET-payments_stripe_subscribe_cancel.test.js b/test/api/v3/integration/payments/GET-payments_stripe_subscribe_cancel.test.js new file mode 100644 index 0000000000..6d7ac87d0f --- /dev/null +++ b/test/api/v3/integration/payments/GET-payments_stripe_subscribe_cancel.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - stripe - #subscribeCancel', () => { + let endpoint = '/stripe/subscribe/cancel'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.get(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_amazon_checkout.test.js b/test/api/v3/integration/payments/POST-payments_amazon_checkout.test.js new file mode 100644 index 0000000000..8745a74e85 --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_amazon_checkout.test.js @@ -0,0 +1,20 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - amazon - #checkout', () => { + let endpoint = '/amazon/checkout'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Missing req.body.orderReferenceId', + }); + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js b/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js new file mode 100644 index 0000000000..17a50520eb --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js @@ -0,0 +1,22 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - amazon - #createOrderReferenceId', () => { + let endpoint = '/amazon/createOrderReferenceId'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies billingAgreementId', async (done) => { + try { + await user.post(endpoint); + } catch (e) { + // Parameter AWSAccessKeyId cannot be empty. + expect(e.error).to.eql('BadRequest'); + done(); + } + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_amazon_subscribe.test.js b/test/api/v3/integration/payments/POST-payments_amazon_subscribe.test.js new file mode 100644 index 0000000000..5c3b98ad87 --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_amazon_subscribe.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - amazon - #subscribe', () => { + let endpoint = '/amazon/subscribe'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies subscription code', async () => { + await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('missingSubscriptionCode'), + }); + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_amazon_verifyAccessToken.test.js b/test/api/v3/integration/payments/POST-payments_amazon_verifyAccessToken.test.js new file mode 100644 index 0000000000..51ccf8c41c --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_amazon_verifyAccessToken.test.js @@ -0,0 +1,20 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('payments : amazon', () => { + let endpoint = '/amazon/verifyAccessToken'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies access token', async () => { + await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Missing req.body.access_token', + }); + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_paypal_ipn.test.js b/test/api/v3/integration/payments/POST-payments_paypal_ipn.test.js new file mode 100644 index 0000000000..219e9ce35b --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_paypal_ipn.test.js @@ -0,0 +1,17 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - paypal - #ipn', () => { + let endpoint = '/paypal/ipn'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + let result = await user.post(endpoint); + expect(result).to.eql('OK'); + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_stripe_checkout.test.js b/test/api/v3/integration/payments/POST-payments_stripe_checkout.test.js new file mode 100644 index 0000000000..1443a3af74 --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_stripe_checkout.test.js @@ -0,0 +1,20 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - stripe - #checkout', () => { + let endpoint = '/stripe/checkout'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.post(endpoint, {id: 123})).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'Error', + message: 'Invalid API Key provided: ****************************1111', + }); + }); +}); diff --git a/test/api/v3/integration/payments/POST-payments_stripe_subscribe_edit.test.js b/test/api/v3/integration/payments/POST-payments_stripe_subscribe_edit.test.js new file mode 100644 index 0000000000..d6d568ace4 --- /dev/null +++ b/test/api/v3/integration/payments/POST-payments_stripe_subscribe_edit.test.js @@ -0,0 +1,21 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('payments - stripe - #subscribeEdit', () => { + let endpoint = '/stripe/subscribe/edit'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('verifies credentials', async () => { + await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('missingSubscription'), + }); + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js new file mode 100644 index 0000000000..665a185279 --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js @@ -0,0 +1,119 @@ +import { + createAndPopulateGroup, + translate as t, + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('POST /groups/:groupId/quests/accept', () => { + const PET_QUEST = 'whale'; + + let questingGroup; + let leader; + let partyMembers; + let user; + + beforeEach(async () => { + user = await generateUser(); + + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 2, + }); + + questingGroup = group; + leader = groupLeader; + partyMembers = members; + + await leader.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + }); + + context('failure conditions', () => { + it('does not accept quest without an invite', async () => { + await expect(leader.post(`/groups/${questingGroup._id}/quests/accept`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('questInviteNotFound'), + }); + }); + + it('does not accept quest for a group in which user is not a member', async () => { + await expect(user.post(`/groups/${questingGroup._id}/quests/accept`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('does not accept quest for a guild', async () => { + let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'private' }, + }); + + await expect(guildLeader.post(`/groups/${guild._id}/quests/accept`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('does not accept invite twice', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('questAlreadyAccepted'), + }); + }); + + it('does not accept invite for a quest already underway', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + // quest will start after everyone has accepted + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questAlreadyUnderway'), + }); + }); + }); + + context('successfully accepting a quest invitation', () => { + it('joins a quest from an invitation', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + + await Promise.all([partyMembers[0].sync(), questingGroup.sync()]); + expect(leader.party.quest.RSVPNeeded).to.equal(false); + expect(questingGroup.quest.members[partyMembers[0]._id]); + }); + + it('does not begin the quest if pending invitations remain', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + + await questingGroup.sync(); + expect(questingGroup.quest.active).to.equal(false); + }); + + it('begins the quest if accepting the last pending invite', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + // quest will start after everyone has accepted + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await questingGroup.sync(); + expect(questingGroup.quest.active).to.equal(true); + }); + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js new file mode 100644 index 0000000000..b6d43f826b --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js @@ -0,0 +1,126 @@ +import { + createAndPopulateGroup, + translate as t, + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('POST /groups/:groupId/quests/force-start', () => { + const PET_QUEST = 'whale'; + + let questingGroup; + let leader; + let partyMembers; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 2, + }); + + questingGroup = group; + leader = groupLeader; + partyMembers = members; + + await leader.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + }); + + context('failure conditions', () => { + it('does not force start a quest for a group in which user is not a member', async () => { + let nonMember = await generateUser(); + + await expect(nonMember.post(`/groups/${questingGroup._id}/quests/force-start`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('does not force start quest for a guild', async () => { + let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'private' }, + }); + + await expect(guildLeader.post(`/groups/${guild._id}/quests/force-start`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('does not force start for a party without a pending quest', async () => { + await expect(leader.post(`/groups/${questingGroup._id}/quests/force-start`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('questNotPending'), + }); + }); + + it('does not force start for a quest already underway', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + // quest will start after everyone has accepted + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(leader.post(`/groups/${questingGroup._id}/quests/force-start`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questAlreadyUnderway'), + }); + }); + + it('does not allow non-quest leader or non-group leader to force start a quest', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/force-start`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questOrGroupLeaderOnlyStartQuest'), + }); + }); + }); + + context('successfully force starting a quest', () => { + it('allows quest leader to force start quest', async () => { + let questLeader = partyMembers[0]; + await questLeader.update({[`items.quests.${PET_QUEST}`]: 1}); + await questLeader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await questLeader.post(`/groups/${questingGroup._id}/quests/force-start`); + + await questingGroup.sync(); + + expect(questingGroup.quest.active).to.eql(true); + }); + + it('allows group leader to force start quest', async () => { + let questLeader = partyMembers[0]; + await questLeader.update({[`items.quests.${PET_QUEST}`]: 1}); + await questLeader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await leader.post(`/groups/${questingGroup._id}/quests/force-start`); + + await questingGroup.sync(); + + expect(questingGroup.quest.active).to.eql(true); + }); + + it('sends back the quest object', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + let quest = await leader.post(`/groups/${questingGroup._id}/quests/force-start`); + + expect(quest.active).to.eql(true); + expect(quest.key).to.eql(PET_QUEST); + expect(quest.members).to.eql({ + [`${leader._id}`]: true, + }); + }); + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js b/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js new file mode 100644 index 0000000000..973a51a1a5 --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js @@ -0,0 +1,192 @@ +import { + createAndPopulateGroup, + translate as t, + sleep, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; +import { quests as questScrolls } from '../../../../../common/script/content'; + +describe('POST /groups/:groupId/quests/invite/:questKey', () => { + let questingGroup; + let leader; + let member; + const PET_QUEST = 'whale'; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 1, + }); + + questingGroup = group; + leader = groupLeader; + member = members[0]; + }); + + context('failure conditions', () => { + it('does not issue invites with an invalid group ID', async () => { + await expect(leader.post(`/groups/${generateUUID()}/quests/invite/${PET_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('does not issue invites for a group in which user is not a member', async () => { + let { group } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 1, + }); + + let alternateGroup = group; + + await expect(leader.post(`/groups/${alternateGroup._id}/quests/invite/${PET_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('does not issue invites for Guilds', async () => { + let { group } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'public' }, + members: 1, + }); + + let alternateGroup = group; + + await expect(leader.post(`/groups/${alternateGroup._id}/quests/invite/${PET_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('does not issue invites with an invalid quest key', async () => { + const FAKE_QUEST = 'herkimer'; + + await expect(leader.post(`/groups/${questingGroup._id}/quests/invite/${FAKE_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('questNotFound', {key: FAKE_QUEST}), + }); + }); + + it('does not issue invites for a quest the user does not own', async () => { + await expect(leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questNotOwned'), + }); + }); + + it('does not issue invites if the user is of insufficient Level', async () => { + const LEVELED_QUEST = 'atom1'; + const LEVELED_QUEST_REQ = questScrolls[LEVELED_QUEST].lvl; + const leaderUpdate = {}; + leaderUpdate[`items.quests.${LEVELED_QUEST}`] = 1; + leaderUpdate['stats.lvl'] = LEVELED_QUEST_REQ - 1; + + await leader.update(leaderUpdate); + + await expect(leader.post(`/groups/${questingGroup._id}/quests/invite/${LEVELED_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questLevelTooHigh', {level: LEVELED_QUEST_REQ}), + }); + }); + + it('does not issue invites if a quest is already underway', async () => { + const QUEST_IN_PROGRESS = 'atom1'; + const leaderUpdate = {}; + leaderUpdate[`items.quests.${PET_QUEST}`] = 1; + + await leader.update(leaderUpdate); + await questingGroup.update({ 'quest.key': QUEST_IN_PROGRESS }); + + await expect(leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questAlreadyUnderway'), + }); + }); + }); + + context('successfully issuing a quest invitation', () => { + beforeEach(async () => { + const memberUpdate = {}; + memberUpdate[`items.quests.${PET_QUEST}`] = 1; + + await Promise.all([ + leader.update(memberUpdate), + member.update(memberUpdate), + ]); + }); + + it('adds quest details to group object', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await questingGroup.sync(); + + let quest = questingGroup.quest; + + expect(quest.key).to.eql(PET_QUEST); + expect(quest.active).to.eql(false); + expect(quest.leader).to.eql(leader._id); + expect(quest.members).to.have.property(leader._id, true); + expect(quest.members).to.have.property(member._id, null); + expect(quest).to.have.property('progress'); + }); + + it('adds quest details to user objects', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await sleep(0.1); // member updates happen in the background + + await Promise.all([ + leader.sync(), + member.sync(), + ]); + + expect(leader.party.quest.key).to.eql(PET_QUEST); + expect(member.party.quest.key).to.eql(PET_QUEST); + expect(leader.party.quest.RSVPNeeded).to.eql(false); + expect(member.party.quest.RSVPNeeded).to.eql(true); + }); + + it('sends back the quest object', async () => { + let inviteResponse = await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + expect(inviteResponse.key).to.eql(PET_QUEST); + expect(inviteResponse.active).to.eql(false); + expect(inviteResponse.leader).to.eql(leader._id); + expect(inviteResponse.members).to.have.property(leader._id, true); + expect(inviteResponse.members).to.have.property(member._id, null); + expect(inviteResponse).to.have.property('progress'); + }); + + it('allows non-party-leader party members to send invites', async () => { + let inviteResponse = await member.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await questingGroup.sync(); + + expect(inviteResponse.key).to.eql(PET_QUEST); + expect(questingGroup.quest.key).to.eql(PET_QUEST); + }); + + it('starts quest automatically if user is in a solo party', async () => { + let leaderDetails = { balance: 10 }; + leaderDetails[`items.quests.${PET_QUEST}`] = 1; + let { group, groupLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + leaderDetails, + }); + + await groupLeader.post(`/groups/${group._id}/quests/invite/${PET_QUEST}`); + + await group.sync(); + + expect(group.quest.active).to.eql(true); + }); + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupid_quests_abort.test.js b/test/api/v3/integration/quests/POST-groups_groupid_quests_abort.test.js new file mode 100644 index 0000000000..850cf53646 --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupid_quests_abort.test.js @@ -0,0 +1,126 @@ +import { + createAndPopulateGroup, + translate as t, + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /groups/:groupId/quests/abort', () => { + let questingGroup; + let partyMembers; + let user; + let leader; + + const PET_QUEST = 'whale'; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 2, + }); + + questingGroup = group; + leader = groupLeader; + partyMembers = members; + + await leader.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + user = await generateUser(); + }); + + context('failure conditions', () => { + it('returns an error when group is not found', async () => { + await expect(partyMembers[0].post(`/groups/${generateUUID()}/quests/abort`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('returns an error for a group in which user is not a member', async () => { + await expect(user.post(`/groups/${questingGroup._id}/quests/abort`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('returns an error when group is a guild', async () => { + let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'private' }, + }); + + await expect(guildLeader.post(`/groups/${guild._id}/quests/abort`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('returns an error when quest is not active', async () => { + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/abort`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('noActiveQuestToAbort'), + }); + }); + + it('returns an error when non quest leader attempts to abort', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/abort`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyLeaderAbortQuest'), + }); + }); + }); + + it('aborts a quest', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + let res = await leader.post(`/groups/${questingGroup._id}/quests/abort`); + await Promise.all([ + leader.sync(), + questingGroup.sync(), + partyMembers[0].sync(), + partyMembers[1].sync(), + ]); + + let cleanUserQuestObj = { + key: null, + progress: { + up: 0, + down: 0, + collect: {}, + }, + completed: null, + RSVPNeeded: false, + }; + + expect(leader.party.quest).to.eql(cleanUserQuestObj); + expect(partyMembers[0].party.quest).to.eql(cleanUserQuestObj); + expect(partyMembers[1].party.quest).to.eql(cleanUserQuestObj); + expect(leader.items.quests[PET_QUEST]).to.equal(1); + expect(questingGroup.quest).to.deep.equal(res); + expect(questingGroup.quest).to.eql({ + key: null, + active: false, + leader: null, + progress: { + collect: {}, + }, + members: {}, + }); + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupid_quests_cancel.test.js b/test/api/v3/integration/quests/POST-groups_groupid_quests_cancel.test.js new file mode 100644 index 0000000000..f3bd03a180 --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupid_quests_cancel.test.js @@ -0,0 +1,138 @@ +import { + createAndPopulateGroup, + translate as t, + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /groups/:groupId/quests/cancel', () => { + let questingGroup; + let partyMembers; + let user; + let leader; + + const PET_QUEST = 'whale'; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 2, + }); + + questingGroup = group; + leader = groupLeader; + partyMembers = members; + + await leader.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + user = await generateUser(); + }); + + context('failure conditions', () => { + it('returns an error when group is not found', async () => { + await expect(partyMembers[0].post(`/groups/${generateUUID()}/quests/cancel`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('does not reject quest for a group in which user is not a member', async () => { + await expect(user.post(`/groups/${questingGroup._id}/quests/cancel`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('returns an error when group is a guild', async () => { + let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'private' }, + }); + + await expect(guildLeader.post(`/groups/${guild._id}/quests/cancel`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('returns an error when group is not on a quest', async () => { + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/cancel`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('questInvitationDoesNotExist'), + }); + }); + + it('only the leader can cancel the quest', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/cancel`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyLeaderCancelQuest'), + }); + }); + + it('does not cancel a quest already underway', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + // quest will start after everyone has accepted + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(leader.post(`/groups/${questingGroup._id}/quests/cancel`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cantCancelActiveQuest'), + }); + }); + }); + + it('cancels a quest', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + + let res = await leader.post(`/groups/${questingGroup._id}/quests/cancel`); + + await Promise.all([ + leader.sync(), + partyMembers[0].sync(), + partyMembers[1].sync(), + questingGroup.sync(), + ]); + + let clean = { + key: null, + progress: { + up: 0, + down: 0, + collect: {}, + }, + completed: null, + RSVPNeeded: false, + }; + + expect(leader.party.quest).to.eql(clean); + expect(partyMembers[1].party.quest).to.eql(clean); + expect(partyMembers[0].party.quest).to.eql(clean); + + expect(res).to.eql(questingGroup.quest); + expect(questingGroup.quest).to.eql({ + key: null, + active: false, + leader: null, + progress: { + collect: {}, + }, + members: {}, + }); + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupid_quests_leave.test.js b/test/api/v3/integration/quests/POST-groups_groupid_quests_leave.test.js new file mode 100644 index 0000000000..65d781c163 --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupid_quests_leave.test.js @@ -0,0 +1,124 @@ +import { + createAndPopulateGroup, + translate as t, + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /groups/:groupId/quests/leave', () => { + let questingGroup; + let partyMembers; + let user; + let leader; + + const PET_QUEST = 'whale'; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 2, + }); + + questingGroup = group; + leader = groupLeader; + partyMembers = members; + + await leader.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + user = await generateUser(); + }); + + context('failure conditions', () => { + it('returns an error when group is not found', async () => { + await expect(partyMembers[0].post(`/groups/${generateUUID()}/quests/leave`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('returns an error for a group in which user is not a member', async () => { + await expect(user.post(`/groups/${questingGroup._id}/quests/leave`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('returns an error when group is a guild', async () => { + let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'private' }, + }); + + await expect(guildLeader.post(`/groups/${guild._id}/quests/leave`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('returns an error when quest is not active', async () => { + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/leave`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('noActiveQuestToLeave'), + }); + }); + + it('returns an error when quest leader attempts to leave', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(leader.post(`/groups/${questingGroup._id}/quests/leave`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questLeaderCannotLeaveQuest'), + }); + }); + + it('returns an error when non quest member attempts to leave', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/reject`); + + await expect(partyMembers[1].post(`/groups/${questingGroup._id}/quests/leave`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notPartOfQuest'), + }); + }); + }); + + it('leaves a quest', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + let leaveResult = await partyMembers[0].post(`/groups/${questingGroup._id}/quests/leave`); + await Promise.all([ + partyMembers[0].sync(), + questingGroup.sync(), + ]); + + expect(partyMembers[0].party.quest).to.eql({ + key: null, + progress: { + up: 0, + down: 0, + collect: {}, + }, + completed: null, + RSVPNeeded: false, + }); + expect(questingGroup.quest).to.deep.equal(leaveResult); + expect(questingGroup.quest.members[partyMembers[0]._id]).to.be.false; + }); +}); diff --git a/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js b/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js new file mode 100644 index 0000000000..2dcddfe727 --- /dev/null +++ b/test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js @@ -0,0 +1,146 @@ +import { + createAndPopulateGroup, + translate as t, + generateUser, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /groups/:groupId/quests/reject', () => { + let questingGroup; + let partyMembers; + let user; + let leader; + + const PET_QUEST = 'whale'; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 2, + }); + + questingGroup = group; + leader = groupLeader; + partyMembers = members; + + await leader.update({ + [`items.quests.${PET_QUEST}`]: 1, + }); + user = await generateUser(); + }); + + context('failure conditions', () => { + it('returns an error when group is not found', async () => { + await expect(partyMembers[0].post(`/groups/${generateUUID()}/quests/reject`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('does not accept quest for a group in which user is not a member', async () => { + await expect(user.post(`/groups/${questingGroup._id}/quests/accept`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('groupNotFound'), + }); + }); + + it('returns an error when group is a guild', async () => { + let { group: guild, groupLeader: guildLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'guild', privacy: 'private' }, + }); + + await expect(guildLeader.post(`/groups/${guild._id}/quests/reject`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('guildQuestsNotSupported'), + }); + }); + + it('returns an error when group is not on a quest', async () => { + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('questInvitationDoesNotExist'), + }); + }); + + it('return an error when a user rejects an invite twice', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('questAlreadyRejected'), + }); + }); + + it('return an error when a user rejects an invite already accepted', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('questAlreadyAccepted'), + }); + }); + + it('does not reject invite for a quest already underway', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + // quest will start after everyone has accepted + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`); + + await expect(partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('questAlreadyUnderway'), + }); + }); + }); + + context('successfully quest rejection', () => { + let cleanUserQuestObj = { + key: null, + progress: { + up: 0, + down: 0, + collect: {}, + }, + completed: null, + RSVPNeeded: false, + }; + + it('rejects a quest invitation', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + + let res = await partyMembers[0].post(`/groups/${questingGroup._id}/quests/reject`); + await partyMembers[0].sync(); + await questingGroup.sync(); + + expect(partyMembers[0].party.quest).to.eql(cleanUserQuestObj); + expect(questingGroup.quest.members[partyMembers[0]._id]).to.be.false; + expect(questingGroup.quest.active).to.be.false; + expect(res).to.eql(questingGroup.quest); + }); + + it('starts the quest when the last user reject', async () => { + await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`); + await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`); + await partyMembers[1].post(`/groups/${questingGroup._id}/quests/reject`); + await questingGroup.sync(); + + expect(questingGroup.quest.active).to.be.true; + }); + }); +}); diff --git a/test/api/v3/integration/status/GET-status.test.js b/test/api/v3/integration/status/GET-status.test.js new file mode 100644 index 0000000000..1d4d33a7d7 --- /dev/null +++ b/test/api/v3/integration/status/GET-status.test.js @@ -0,0 +1,12 @@ +import { + requester, +} from '../../../../helpers/api-v3-integration.helper'; + +describe('GET /status', () => { + it('returns status: up', async () => { + let res = await requester().get('/status'); + expect(res).to.eql({ + status: 'up', + }); + }); +}); diff --git a/test/api/v3/integration/tags/DELETE-tags_id.test.js b/test/api/v3/integration/tags/DELETE-tags_id.test.js new file mode 100644 index 0000000000..c03e8bb9e0 --- /dev/null +++ b/test/api/v3/integration/tags/DELETE-tags_id.test.js @@ -0,0 +1,27 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('DELETE /tags/:tagId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('deletes a tag given it\'s id', async () => { + let tagName = 'Tag 1'; + let tag = await user.post('/tags', {name: tagName}); + let numberOfTags = (await user.get('/tags')).length; + + await user.del(`/tags/${tag.id}`); + + let tags = await user.get('/tags'); + let tagNames = tags.map((t) => { + return t.name; + }); + + expect(tags.length).to.equal(numberOfTags - 1); + expect(tagNames).to.not.include(tagName); + }); +}); diff --git a/test/api/v3/integration/tags/GET-tags.test.js b/test/api/v3/integration/tags/GET-tags.test.js new file mode 100644 index 0000000000..7a24963474 --- /dev/null +++ b/test/api/v3/integration/tags/GET-tags.test.js @@ -0,0 +1,22 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('GET /tags', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('returns all user\'s tags', async () => { + let tag1 = await user.post('/tags', {name: 'Tag 1'}); + let tag2 = await user.post('/tags', {name: 'Tag 2'}); + + let tags = await user.get('/tags'); + + expect(tags.length).to.equal(2 + 3); // + 3 because 1 is a default task + expect(tags[tags.length - 2].name).to.equal(tag1.name); + expect(tags[tags.length - 1].name).to.equal(tag2.name); + }); +}); diff --git a/test/api/v3/integration/tags/GET-tags_id.test.js b/test/api/v3/integration/tags/GET-tags_id.test.js new file mode 100644 index 0000000000..4ab818593d --- /dev/null +++ b/test/api/v3/integration/tags/GET-tags_id.test.js @@ -0,0 +1,20 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('GET /tags/:tagId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('returns a tag given it\'s id', async () => { + let createdTag = await user.post('/tags', {name: 'Tag 1'}); + let tag = await user.get(`/tags/${createdTag.id}`); + + expect(tag).to.deep.equal(createdTag); + }); + + it('handles non-existing tags'); +}); diff --git a/test/api/v3/integration/tags/POST-tag-reorder.test.js b/test/api/v3/integration/tags/POST-tag-reorder.test.js new file mode 100644 index 0000000000..0710cecf3e --- /dev/null +++ b/test/api/v3/integration/tags/POST-tag-reorder.test.js @@ -0,0 +1,44 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /reorder-tags', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('returns error when no parameters are provided', async () => { + await expect(user.post('/reorder-tags')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'Invalid request parameters.', + }); + }); + + it('returns error when tag is not found', async () => { + await expect(user.post('/reorder-tags', {tagId: 'fake-id', to: 3})) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('tagNotFound'), + }); + }); + + it('updates tags', async () => { + let tag1Name = 'Tag 1'; + let tag2Name = 'Tag 2'; + await user.post('/tags', {name: tag1Name}); + await user.post('/tags', {name: tag2Name}); + await user.sync(); + + await user.post('/reorder-tags', {tagId: user.tags[4].id, to: 3}); + await user.sync(); + + expect(user.tags[3].name).to.equal(tag2Name); + expect(user.tags[4].name).to.equal(tag1Name); + }); +}); diff --git a/test/api/v3/integration/tags/POST-tags.test.js b/test/api/v3/integration/tags/POST-tags.test.js new file mode 100644 index 0000000000..93f2dfdb60 --- /dev/null +++ b/test/api/v3/integration/tags/POST-tags.test.js @@ -0,0 +1,25 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /tags', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('creates a tag correctly', async () => { + let tagName = 'Tag 1'; + let createdTag = await user.post('/tags', { + name: tagName, + ignored: false, + }); + + let tag = await user.get(`/tags/${createdTag.id}`); + + expect(tag.name).to.equal(tagName); + expect(tag.ignored).to.not.exist; + expect(tag).to.deep.equal(createdTag); + }); +}); diff --git a/test/api/v3/integration/tags/PUT-tags_id.test.js b/test/api/v3/integration/tags/PUT-tags_id.test.js new file mode 100644 index 0000000000..4c16453ac3 --- /dev/null +++ b/test/api/v3/integration/tags/PUT-tags_id.test.js @@ -0,0 +1,28 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('PUT /tags/:tagId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('updates a tag given it\'s id', async () => { + let updatedTagName = 'Tag updated'; + let createdTag = await user.post('/tags', {name: 'Tag 1'}); + let updatedTag = await user.put(`/tags/${createdTag.id}`, { + name: updatedTagName, + ignored: true, + }); + + createdTag = await user.get(`/tags/${updatedTag.id}`); + + expect(updatedTag.name).to.equal(updatedTagName); + expect(updatedTag.ignored).to.not.exist; + + expect(createdTag.name).to.equal(updatedTagName); + expect(createdTag.ignored).to.not.exist; + }); +}); diff --git a/test/api/v3/integration/tasks/DELETE-tasks_id.test.js b/test/api/v3/integration/tasks/DELETE-tasks_id.test.js new file mode 100644 index 0000000000..bb92e4759f --- /dev/null +++ b/test/api/v3/integration/tasks/DELETE-tasks_id.test.js @@ -0,0 +1,59 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('DELETE /tasks/:id', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + context('task can be deleted', () => { + let task; + + beforeEach(async () => { + task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + }); + + it('deletes a user\'s task', async () => { + await user.del(`/tasks/${task._id}`); + + await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + }); + + context('task cannot be deleted', () => { + it('cannot delete a non-existant task', async () => { + await expect(user.del('/tasks/550e8400-e29b-41d4-a716-446655440000')).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('cannot delete a task owned by someone else', async () => { + let anotherUser = await generateUser(); + let anotherUsersTask = await anotherUser.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + + await expect(user.del(`/tasks/${anotherUsersTask._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('removes a task from user.tasksOrder'); // TODO + }); +}); diff --git a/test/api/v3/integration/tasks/GET-tasks_challenge_challengeId.test.js b/test/api/v3/integration/tasks/GET-tasks_challenge_challengeId.test.js new file mode 100644 index 0000000000..3fed4cfaed --- /dev/null +++ b/test/api/v3/integration/tasks/GET-tasks_challenge_challengeId.test.js @@ -0,0 +1,75 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import { each } from 'lodash'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /tasks/:taskId', () => { + let user; + let guild; + let challenge; + let task; + let tasksToTest = { + habit: { + text: 'test habit', + type: 'habit', + up: false, + down: true, + }, + todo: { + text: 'test todo', + type: 'todo', + }, + daily: { + text: 'test daily', + type: 'daily', + frequency: 'daily', + everyX: 5, + startDate: new Date(), + }, + reward: { + text: 'test reward', + type: 'reward', + }, + }; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + it('returns error when incorrect id is passed', async () => { + await expect(user.get(`/tasks/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + each(tasksToTest, (taskValue, taskType) => { + context(`${taskType}`, () => { + before(async () => { + task = await user.post(`/tasks/challenge/${challenge._id}`, taskValue); + }); + + it('gets challenge task', async () => { + let getTask = await user.get(`/tasks/${task._id}`); + expect(getTask).to.eql(task); + }); + + it('returns error when user is not a member of the challenge', async () => { + let anotherUser = await generateUser(); + + await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/GET-tasks_id.test.js b/test/api/v3/integration/tasks/GET-tasks_id.test.js new file mode 100644 index 0000000000..99f2d769f4 --- /dev/null +++ b/test/api/v3/integration/tasks/GET-tasks_id.test.js @@ -0,0 +1,58 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /tasks/:id', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + context('task can be accessed', async () => { + let task; + + beforeEach(async () => { + task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + }); + + it('gets specified task', async () => { + let getTask = await user.get(`/tasks/${task._id}`); + expect(getTask).to.eql(task); + }); + + // TODO after challenges are implemented + it('can get active challenge task that user does not own'); // Yes? + }); + + context('task cannot be accessed', () => { + it('cannot get a non-existant task', async () => { + let dummyId = generateUUID(); + + await expect(user.get(`/tasks/${dummyId}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('cannot get a task owned by someone else', async () => { + let anotherUser = await generateUser(); + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + + await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/GET-tasks_user.test.js b/test/api/v3/integration/tasks/GET-tasks_user.test.js new file mode 100644 index 0000000000..406c0d43fb --- /dev/null +++ b/test/api/v3/integration/tasks/GET-tasks_user.test.js @@ -0,0 +1,84 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('GET /tasks/user', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns all user\'s tasks', async () => { + let createdTasks = await user.post('/tasks/user', [{text: 'test habit', type: 'habit'}, {text: 'test todo', type: 'todo'}]); + let tasks = await user.get('/tasks/user'); + expect(tasks.length).to.equal(createdTasks.length + 1); // + 1 because 1 is a default task + }); + + it('returns only a type of user\'s tasks if req.query.type is specified', async () => { + let createdTasks = await user.post('/tasks/user', [ + {text: 'test habit', type: 'habit'}, + {text: 'test daily', type: 'daily'}, + {text: 'test reward', type: 'reward'}, + {text: 'test todo', type: 'todo'}, + ]); + let habits = await user.get('/tasks/user?type=habits'); + let dailys = await user.get('/tasks/user?type=dailys'); + let rewards = await user.get('/tasks/user?type=rewards'); + + expect(habits.length).to.be.at.least(1); + expect(habits[0]._id).to.equal(createdTasks[0]._id); + expect(dailys.length).to.be.at.least(1); + expect(dailys[0]._id).to.equal(createdTasks[1]._id); + expect(rewards.length).to.be.at.least(1); + expect(rewards[0]._id).to.equal(createdTasks[2]._id); + }); + + it('returns uncompleted todos if req.query.type is "todos"', async () => { + let existingTodos = await user.get('/tasks/user?type=todos'); + + // populate user with other task types + await user.post('/tasks/user', [ + {text: 'daily', type: 'daily'}, + {text: 'reward', type: 'reward'}, + {text: 'habit', type: 'habit'}, + ]); + + let newUncompletedTodos = await user.post('/tasks/user', [ + {text: 'test todo 1', type: 'todo'}, + {text: 'test todo 2', type: 'todo'}, + ]); + let todoToBeCompleted = await user.post('/tasks/user', { + text: 'wll be completed todo', type: 'todo', + }); + + await user.post(`/tasks/${todoToBeCompleted._id}/score/up`); + + let uncompletedTodos = [...existingTodos, ...newUncompletedTodos]; + + let todos = await user.get('/tasks/user?type=todos'); + + expect(todos.length).to.be.gte(2); + expect(todos.length).to.eql(uncompletedTodos.length); + expect(todos.every(task => task.type === 'todo')); + expect(todos.every(task => task.completed === false)); + }); + + it('returns completed todos sorted by reverse completion date if req.query.type is "completeTodos"', async () => { + let todo1 = await user.post('/tasks/user', {text: 'todo to complete 1', type: 'todo'}); + let todo2 = await user.post('/tasks/user', {text: 'todo to complete 2', type: 'todo'}); + + await user.sync(); + let initialTodoCount = user.tasksOrder.todos.length; + + await user.post(`/tasks/${todo2._id}/score/up`); + await user.post(`/tasks/${todo1._id}/score/up`); + await user.sync(); + + expect(user.tasksOrder.todos.length).to.equal(initialTodoCount - 2); + + let completedTodos = await user.get('/tasks/user?type=completedTodos'); + expect(completedTodos.length).to.equal(2); + expect(completedTodos[completedTodos.length - 1].text).to.equal('todo to complete 2'); // last is the todo that was completed most recently + }); +}); diff --git a/test/api/v3/integration/tasks/POST-tasks_clearCompletedTodos.test.js b/test/api/v3/integration/tasks/POST-tasks_clearCompletedTodos.test.js new file mode 100644 index 0000000000..d6cdf21749 --- /dev/null +++ b/test/api/v3/integration/tasks/POST-tasks_clearCompletedTodos.test.js @@ -0,0 +1,43 @@ +import { + generateUser, + generateGroup, + generateChallenge, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /tasks/clearCompletedTodos', () => { + it('deletes all completed todos except the ones from a challenge', async () => { + let user = await generateUser({balance: 1}); + let guild = await generateGroup(user); + let challenge = await generateChallenge(user, guild); + + let initialTodoCount = user.tasksOrder.todos.length; + await user.post('/tasks/user', [ + {text: 'todo 1', type: 'todo'}, + {text: 'todo 2', type: 'todo'}, + {text: 'todo 3', type: 'todo'}, + {text: 'todo 4', type: 'todo'}, + {text: 'todo 5', type: 'todo'}, + ]); + + await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'todo 6', + type: 'todo', + }); + + let tasks = await user.get('/tasks/user?type=todos'); + expect(tasks.length).to.equal(initialTodoCount + 6); + + for (let task of tasks) { + if (['todo 2', 'todo 3', 'todo 6'].indexOf(task.text) !== -1) { + await user.post(`/tasks/${task._id}/score/up`); // eslint-disable-line babel/no-await-in-loop + } + } + + await user.post('/tasks/clearCompletedTodos'); + let completedTodos = await user.get('/tasks/user?type=completedTodos'); + let todos = await user.get('/tasks/user?type=todos'); + let allTodos = todos.concat(completedTodos); + expect(allTodos.length).to.equal(initialTodoCount + 4); // + 6 - 3 completed (but one is from challenge) + expect(allTodos[allTodos.length - 1].text).to.equal('todo 6'); + }); +}); diff --git a/test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js b/test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js new file mode 100644 index 0000000000..86236fd110 --- /dev/null +++ b/test/api/v3/integration/tasks/POST-tasks_id_score_direction.test.js @@ -0,0 +1,298 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/:id/score/:direction', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'stats.gp': 100, + }); + }); + + context('all', () => { + it('requires a task id', async () => { + await expect(user.post('/tasks/123/score/up')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('requires a task direction', async () => { + await expect(user.post(`/tasks/${generateUUID()}/score/tt`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + }); + + context('todos', () => { + let todo; + + beforeEach(async () => { + todo = await user.post('/tasks/user', { + text: 'test todo', + type: 'todo', + }); + }); + + it('completes todo when direction is up', async () => { + await user.post(`/tasks/${todo._id}/score/up`); + let task = await user.get(`/tasks/${todo._id}`); + + expect(task.completed).to.equal(true); + expect(task.dateCompleted).to.be.a('string'); // date gets converted to a string as json doesn't have a Date type + }); + + it('moves completed todos out of user.tasksOrder.todos', async () => { + let getUser = await user.get('/user'); + expect(getUser.tasksOrder.todos.indexOf(todo._id)).to.not.equal(-1); + + await user.post(`/tasks/${todo._id}/score/up`); + let updatedTask = await user.get(`/tasks/${todo._id}`); + expect(updatedTask.completed).to.equal(true); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.todos.indexOf(todo._id)).to.equal(-1); + }); + + it('moves un-completed todos back into user.tasksOrder.todos', async () => { + let getUser = await user.get('/user'); + expect(getUser.tasksOrder.todos.indexOf(todo._id)).to.not.equal(-1); + + await user.post(`/tasks/${todo._id}/score/up`); + await user.post(`/tasks/${todo._id}/score/down`); + + let updatedTask = await user.get(`/tasks/${todo._id}`); + expect(updatedTask.completed).to.equal(false); + + let updatedUser = await user.get('/user'); + let l = updatedUser.tasksOrder.todos.length; + expect(updatedUser.tasksOrder.todos.indexOf(todo._id)).not.to.equal(-1); + expect(updatedUser.tasksOrder.todos.indexOf(todo._id)).to.equal(l - 1); // Check that it was pushed at the bottom + }); + + it('uncompletes todo when direction is down', async () => { + await user.post(`/tasks/${todo._id}/score/down`); + let updatedTask = await user.get(`/tasks/${todo._id}`); + + expect(updatedTask.completed).to.equal(false); + expect(updatedTask.dateCompleted).to.be.a('undefined'); + }); + + it('scores up todo even if it is already completed'); // Yes? + + it('scores down todo even if it is already uncompleted'); // Yes? + + context('user stats when direction is up', () => { + let updatedUser; + + beforeEach(async () => { + await user.post(`/tasks/${todo._id}/score/up`); + updatedUser = await user.get('/user'); + }); + + it('increases user\'s mp', () => { + expect(updatedUser.stats.mp).to.be.greaterThan(user.stats.mp); + }); + + it('increases user\'s exp', () => { + expect(updatedUser.stats.exp).to.be.greaterThan(user.stats.exp); + }); + + it('increases user\'s gold', () => { + expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp); + }); + }); + + context('user stats when direction is down', () => { + let updatedUser; + + beforeEach(async () => { + await user.post(`/tasks/${todo._id}/score/down`); + updatedUser = await user.get('/user'); + }); + + it('decreases user\'s mp', () => { + expect(updatedUser.stats.mp).to.be.lessThan(user.stats.mp); + }); + + it('decreases user\'s exp', () => { + expect(updatedUser.stats.exp).to.be.lessThan(user.stats.exp); + }); + + it('decreases user\'s gold', () => { + expect(updatedUser.stats.gp).to.be.lessThan(user.stats.gp); + }); + }); + }); + + context('dailys', () => { + let daily; + + beforeEach(async () => { + daily = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + }); + }); + + it('completes daily when direction is up', async () => { + await user.post(`/tasks/${daily._id}/score/up`); + let task = await user.get(`/tasks/${daily._id}`); + + expect(task.completed).to.equal(true); + }); + + it('uncompletes daily when direction is down', async () => { + await user.post(`/tasks/${daily._id}/score/down`); + let task = await user.get(`/tasks/${daily._id}`); + + expect(task.completed).to.equal(false); + }); + + it('scores up daily even if it is already completed'); // Yes? + + it('scores down daily even if it is already uncompleted'); // Yes? + + context('user stats when direction is up', () => { + let updatedUser; + + beforeEach(async () => { + await user.post(`/tasks/${daily._id}/score/up`); + updatedUser = await user.get('/user'); + }); + + it('increases user\'s mp', () => { + expect(updatedUser.stats.mp).to.be.greaterThan(user.stats.mp); + }); + + it('increases user\'s exp', () => { + expect(updatedUser.stats.exp).to.be.greaterThan(user.stats.exp); + }); + + it('increases user\'s gold', () => { + expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp); + }); + }); + + context('user stats when direction is down', () => { + let updatedUser; + + beforeEach(async () => { + await user.post(`/tasks/${daily._id}/score/down`); + updatedUser = await user.get('/user'); + }); + + it('decreases user\'s mp', () => { + expect(updatedUser.stats.mp).to.be.lessThan(user.stats.mp); + }); + + it('decreases user\'s exp', () => { + expect(updatedUser.stats.exp).to.be.lessThan(user.stats.exp); + }); + + it('decreases user\'s gold', () => { + expect(updatedUser.stats.gp).to.be.lessThan(user.stats.gp); + }); + }); + }); + + context('habits', () => { + let habit, minusHabit, plusHabit, neitherHabit; // eslint-disable-line no-unused-vars + + beforeEach(async () => { + habit = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + + minusHabit = await user.post('/tasks/user', { + text: 'test min habit', + type: 'habit', + up: false, + }); + + plusHabit = await user.post('/tasks/user', { + text: 'test plus habit', + type: 'habit', + down: false, + }); + + neitherHabit = await user.post('/tasks/user', { + text: 'test neither habit', + type: 'habit', + up: false, + down: false, + }); + }); + + it('prevents plus only habit from scoring down'); // Yes? + + it('prevents minus only habit from scoring up'); // Yes? + + it('increases user\'s mp when direction is up', async () => { + await user.post(`/tasks/${habit._id}/score/up`); + let updatedUser = await user.get('/user'); + + expect(updatedUser.stats.mp).to.be.greaterThan(user.stats.mp); + }); + + it('decreases user\'s mp when direction is down', async () => { + await user.post(`/tasks/${habit._id}/score/down`); + let updatedUser = await user.get('/user'); + + expect(updatedUser.stats.mp).to.be.lessThan(user.stats.mp); + }); + + it('increases user\'s exp when direction is up', async () => { + await user.post(`/tasks/${habit._id}/score/up`); + let updatedUser = await user.get('/user'); + + expect(updatedUser.stats.exp).to.be.greaterThan(user.stats.exp); + }); + + it('increases user\'s gold when direction is up', async () => { + await user.post(`/tasks/${habit._id}/score/up`); + let updatedUser = await user.get('/user'); + + expect(updatedUser.stats.gp).to.be.greaterThan(user.stats.gp); + }); + }); + + context('reward', () => { + let reward, updatedUser; + + beforeEach(async () => { + reward = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + value: 5, + }); + + await user.post(`/tasks/${reward._id}/score/up`); + updatedUser = await user.get('/user'); + }); + + it('purchases reward', () => { + expect(user.stats.gp).to.equal(updatedUser.stats.gp + 5); + }); + + it('does not change user\'s mp', () => { + expect(user.stats.mp).to.equal(updatedUser.stats.mp); + }); + + it('does not change user\'s exp', () => { + expect(user.stats.exp).to.equal(updatedUser.stats.exp); + }); + + it('does not allow a down direction', () => { + expect(user.stats.mp).to.equal(updatedUser.stats.mp); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/POST-tasks_move_taskId_to_position.test.js b/test/api/v3/integration/tasks/POST-tasks_move_taskId_to_position.test.js new file mode 100644 index 0000000000..211c7ea975 --- /dev/null +++ b/test/api/v3/integration/tasks/POST-tasks_move_taskId_to_position.test.js @@ -0,0 +1,84 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/:taskId/move/to/:position', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('requires a valid taskId', async () => { + await expect(user.post('/tasks/123/move/to/1')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('requires a numeric position parameter', async () => { + await expect(user.post(`/tasks/${generateUUID()}/move/to/notANumber`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('taskId must match a valid task', async () => { + await expect(user.post(`/tasks/${generateUUID()}/move/to/1`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('can move task to new position', async () => { + let tasks = await user.post('/tasks/user', [ + {type: 'habit', text: 'habit 1'}, + {type: 'habit', text: 'habit 2'}, + {type: 'daily', text: 'daily 1'}, + {type: 'habit', text: 'habit 3'}, + {type: 'habit', text: 'habit 4'}, + {type: 'todo', text: 'todo 1'}, + {type: 'habit', text: 'habit 5'}, + ]); + + let taskToMove = tasks[1]; + expect(taskToMove.text).to.equal('habit 2'); + let newOrder = await user.post(`/tasks/${tasks[1]._id}/move/to/3`); + expect(newOrder[3]).to.equal(taskToMove._id); + expect(newOrder.length).to.equal(5); + }); + + it('can\'t move completed todo', async () => { + let task = await user.post('/tasks/user', {type: 'todo', text: 'todo 1'}); + await user.post(`/tasks/${task._id}/score/up`); + + await expect(user.post(`/tasks/${task._id}/move/to/1`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('cantMoveCompletedTodo'), + }); + }); + + it('can push to bottom', async () => { + let tasks = await user.post('/tasks/user', [ + {type: 'habit', text: 'habit 1'}, + {type: 'habit', text: 'habit 2'}, + {type: 'daily', text: 'daily 1'}, + {type: 'habit', text: 'habit 3'}, + {type: 'habit', text: 'habit 4'}, + {type: 'todo', text: 'todo 1'}, + {type: 'habit', text: 'habit 5'}, + ]); + + let taskToMove = tasks[1]; + expect(taskToMove.text).to.equal('habit 2'); + let newOrder = await user.post(`/tasks/${tasks[1]._id}/move/to/-1`); + expect(newOrder[4]).to.equal(taskToMove._id); + expect(newOrder.length).to.equal(5); + }); +}); diff --git a/test/api/v3/integration/tasks/POST-tasks_user.test.js b/test/api/v3/integration/tasks/POST-tasks_user.test.js new file mode 100644 index 0000000000..623d9bb4a4 --- /dev/null +++ b/test/api/v3/integration/tasks/POST-tasks_user.test.js @@ -0,0 +1,593 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/user', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + context('validates params', async () => { + it('returns an error if req.body.type is absent', async () => { + await expect(user.post('/tasks/user', { + notType: 'habit', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidTaskType'), + }); + }); + + it('returns an error if req.body.type is not valid', async () => { + await expect(user.post('/tasks/user', { + type: 'habitF', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidTaskType'), + }); + }); + + it('returns an error if one object inside an array is invalid', async () => { + await expect(user.post('/tasks/user', [ + {type: 'habitF'}, + {type: 'habit'}, + ])).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidTaskType'), + }); + }); + + it('returns an error if req.body.text is absent', async () => { + await expect(user.post('/tasks/user', { + type: 'habit', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'habit validation failed', + }); + }); + + it('does not update user.tasksOrder.{taskType} when the task is not saved because invalid', async () => { + let originalHabitsOrder = (await user.get('/user')).tasksOrder.habits; + await expect(user.post('/tasks/user', { + type: 'habit', + })).to.eventually.be.rejected.and.eql({ // this block is necessary + code: 400, + error: 'BadRequest', + message: 'habit validation failed', + }); + + let updatedHabitsOrder = (await user.get('/user')).tasksOrder.habits; + expect(updatedHabitsOrder).to.eql(originalHabitsOrder); + }); + + it('does not update user.tasksOrder.{taskType} when a task inside an array is not saved because invalid', async () => { + let originalHabitsOrder = (await user.get('/user')).tasksOrder.habits; + await expect(user.post('/tasks/user', [ + {type: 'habit'}, // Missing text + {type: 'habit', text: 'valid'}, // Valid + ])).to.eventually.be.rejected.and.eql({ // this block is necessary + code: 400, + error: 'BadRequest', + message: 'habit validation failed', + }); + + let updatedHabitsOrder = (await user.get('/user')).tasksOrder.habits; + expect(updatedHabitsOrder).to.eql(originalHabitsOrder); + }); + + it('does not save any task sent in an array when 1 is invalid', async () => { + let originalTasks = await user.get('/tasks/user'); + await expect(user.post('/tasks/user', [ + {type: 'habit'}, // Missing text + {type: 'habit', text: 'valid'}, // Valid + ])).to.eventually.be.rejected.and.eql({ // this block is necessary + code: 400, + error: 'BadRequest', + message: 'habit validation failed', + }).then(async () => { + let updatedTasks = await user.get('/tasks/user'); + + expect(updatedTasks).to.eql(originalTasks); + }); + }); + + it('automatically sets "task.userId" to user\'s uuid', async () => { + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + + expect(task.userId).to.equal(user._id); + }); + + it(`ignores setting userId, history, createdAt, + updatedAt, challenge, completed, + dateCompleted fields`, async () => { + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + userId: 123, + history: [123], + createdAt: 'yesterday', + updatedAt: 'tomorrow', + challenge: 'no', + completed: true, + dateCompleted: 'never', + value: 324, // ignored because not a reward + }); + + expect(task.userId).to.equal(user._id); + expect(task.history).to.eql([]); + expect(task.createdAt).not.to.equal('yesterday'); + expect(task.updatedAt).not.to.equal('tomorrow'); + expect(task.challenge).not.to.equal('no'); + expect(task.completed).to.equal(false); + expect(task.streak).not.to.equal('never'); + expect(task.value).not.to.equal(324); + }); + + it('ignores invalid fields', async () => { + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + notValid: true, + }); + + expect(task).not.to.have.property('notValid'); + }); + }); + + context('all types', () => { + it('can create reminders', async () => { + let id1 = generateUUID(); + + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + reminders: [ + {id: id1, startDate: new Date(), time: new Date()}, + ], + }); + + expect(task.reminders).to.be.an('array'); + expect(task.reminders.length).to.eql(1); + expect(task.reminders[0]).to.be.an('object'); + expect(task.reminders[0].id).to.eql(id1); + expect(task.reminders[0].startDate).to.be.a('string'); // json doesn't have dates + expect(task.reminders[0].time).to.be.a('string'); + }); + }); + + context('habits', () => { + it('creates a habit', async () => { + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + up: false, + down: true, + notes: 1976, + }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test habit'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('habit'); + expect(task.up).to.eql(false); + expect(task.down).to.eql(true); + }); + + it('updates user.tasksOrder.habits when a new habit is created', async () => { + let originalHabitsOrderLen = (await user.get('/user')).tasksOrder.habits.length; + let task = await user.post('/tasks/user', { + type: 'habit', + text: 'an habit', + }); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.habits[0]).to.eql(task._id); + expect(updatedUser.tasksOrder.habits.length).to.eql(originalHabitsOrderLen + 1); + }); + + it('updates user.tasksOrder.habits when multiple habits are created', async () => { + let originalHabitsOrderLen = (await user.get('/user')).tasksOrder.habits.length; + let [task, task2] = await user.post('/tasks/user', [{ + type: 'habit', + text: 'an habit', + }, { + type: 'habit', + text: 'another habit', + }]); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.habits[0]).to.eql(task2._id); + expect(updatedUser.tasksOrder.habits[1]).to.eql(task._id); + expect(updatedUser.tasksOrder.habits.length).to.eql(originalHabitsOrderLen + 2); + }); + + it('creates multiple habits', async () => { + let [task, task2] = await user.post('/tasks/user', [{ + text: 'test habit', + type: 'habit', + up: false, + down: true, + notes: 1976, + }, { + text: 'test habit 2', + type: 'habit', + up: true, + down: false, + notes: 1977, + }]); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test habit'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('habit'); + expect(task.up).to.eql(false); + expect(task.down).to.eql(true); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test habit 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('habit'); + expect(task2.up).to.eql(true); + expect(task2.down).to.eql(false); + }); + + it('defaults to setting up and down to true', async () => { + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + notes: 1976, + }); + + expect(task.up).to.eql(true); + expect(task.down).to.eql(true); + }); + + it('cannot create checklists', async () => { + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + checklist: [ + {_id: 123, completed: false, text: 'checklist'}, + ], + }); + + expect(task).not.to.have.property('checklist'); + }); + }); + + context('todos', () => { + it('creates a todo', async () => { + let task = await user.post('/tasks/user', { + text: 'test todo', + type: 'todo', + notes: 1976, + }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test todo'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('todo'); + }); + + it('creates multiple todos', async () => { + let [task, task2] = await user.post('/tasks/user', [{ + text: 'test todo', + type: 'todo', + notes: 1976, + }, { + text: 'test todo 2', + type: 'todo', + notes: 1977, + }]); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test todo'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('todo'); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test todo 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('todo'); + }); + + it('updates user.tasksOrder.todos when a new todo is created', async () => { + let originalTodosOrderLen = (await user.get('/user')).tasksOrder.todos.length; + let task = await user.post('/tasks/user', { + type: 'todo', + text: 'a todo', + }); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.todos[0]).to.eql(task._id); + expect(updatedUser.tasksOrder.todos.length).to.eql(originalTodosOrderLen + 1); + }); + + it('updates user.tasksOrder.todos when multiple todos are created', async () => { + let originalTodosOrderLen = (await user.get('/user')).tasksOrder.todos.length; + let [task, task2] = await user.post('/tasks/user', [{ + type: 'todo', + text: 'a todo', + }, { + type: 'todo', + text: 'another todo', + }]); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.todos[0]).to.eql(task2._id); + expect(updatedUser.tasksOrder.todos[1]).to.eql(task._id); + expect(updatedUser.tasksOrder.todos.length).to.eql(originalTodosOrderLen + 2); + }); + + it('can create checklists', async () => { + let task = await user.post('/tasks/user', { + text: 'test todo', + type: 'todo', + checklist: [ + {completed: false, text: 'checklist'}, + ], + }); + + expect(task.checklist).to.be.an('array'); + expect(task.checklist.length).to.eql(1); + expect(task.checklist[0]).to.be.an('object'); + expect(task.checklist[0].text).to.eql('checklist'); + expect(task.checklist[0].completed).to.eql(false); + expect(task.checklist[0].id).to.be.a('string'); + }); + }); + + context('dailys', () => { + it('creates a daily', async () => { + let now = new Date(); + + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + notes: 1976, + frequency: 'daily', + everyX: 5, + startDate: now, + }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test daily'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('daily'); + expect(task.frequency).to.eql('daily'); + expect(task.everyX).to.eql(5); + expect(new Date(task.startDate)).to.eql(now); + }); + + it('creates multiple dailys', async () => { + let [task, task2] = await user.post('/tasks/user', [{ + text: 'test daily', + type: 'daily', + notes: 1976, + }, { + text: 'test daily 2', + type: 'daily', + notes: 1977, + }]); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test daily'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('daily'); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test daily 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('daily'); + }); + + it('updates user.tasksOrder.dailys when a new daily is created', async () => { + let originalDailysOrderLen = (await user.get('/user')).tasksOrder.dailys.length; + let task = await user.post('/tasks/user', { + type: 'daily', + text: 'a daily', + }); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.dailys[0]).to.eql(task._id); + expect(updatedUser.tasksOrder.dailys.length).to.eql(originalDailysOrderLen + 1); + }); + + it('updates user.tasksOrder.dailys when multiple dailys are created', async () => { + let originalDailysOrderLen = (await user.get('/user')).tasksOrder.dailys.length; + let [task, task2] = await user.post('/tasks/user', [{ + type: 'daily', + text: 'a daily', + }, { + type: 'daily', + text: 'another daily', + }]); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.dailys[0]).to.eql(task2._id); + expect(updatedUser.tasksOrder.dailys[1]).to.eql(task._id); + expect(updatedUser.tasksOrder.dailys.length).to.eql(originalDailysOrderLen + 2); + }); + + it('defaults to a weekly frequency, with every day set', async () => { + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + }); + + expect(task.frequency).to.eql('weekly'); + expect(task.everyX).to.eql(1); + expect(task.repeat).to.eql({ + m: true, + t: true, + w: true, + th: true, + f: true, + s: true, + su: true, + }); + }); + + it('allows repeat field to be configured', async () => { + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + repeat: { + m: false, + w: false, + su: false, + }, + }); + + expect(task.repeat).to.eql({ + m: false, + t: true, + w: false, + th: true, + f: true, + s: true, + su: false, + }); + }); + + it('defaults startDate to today', async () => { + let today = (new Date()).getDay(); + + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + }); + + expect((new Date(task.startDate)).getDay()).to.eql(today); + }); + + it('can create checklists', async () => { + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + checklist: [ + {completed: false, text: 'checklist'}, + ], + }); + + expect(task.checklist).to.be.an('array'); + expect(task.checklist.length).to.eql(1); + expect(task.checklist[0]).to.be.an('object'); + expect(task.checklist[0].text).to.eql('checklist'); + expect(task.checklist[0].completed).to.eql(false); + expect(task.checklist[0].id).to.be.a('string'); + }); + }); + + context('rewards', () => { + it('creates a reward', async () => { + let task = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + notes: 1976, + value: 10, + }); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test reward'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('reward'); + expect(task.value).to.eql(10); + }); + + it('creates multiple rewards', async () => { + let [task, task2] = await user.post('/tasks/user', [{ + text: 'test reward', + type: 'reward', + notes: 1976, + value: 11, + }, { + text: 'test reward 2', + type: 'reward', + notes: 1977, + value: 12, + }]); + + expect(task.userId).to.equal(user._id); + expect(task.text).to.eql('test reward'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('reward'); + expect(task.value).to.eql(11); + + expect(task2.userId).to.equal(user._id); + expect(task2.text).to.eql('test reward 2'); + expect(task2.notes).to.eql('1977'); + expect(task2.type).to.eql('reward'); + expect(task2.value).to.eql(12); + }); + + it('updates user.tasksOrder.rewards when a new reward is created', async () => { + let originalRewardsOrderLen = (await user.get('/user')).tasksOrder.rewards.length; + let task = await user.post('/tasks/user', { + type: 'reward', + text: 'a reward', + }); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.rewards[0]).to.eql(task._id); + expect(updatedUser.tasksOrder.rewards.length).to.eql(originalRewardsOrderLen + 1); + }); + + it('updates user.tasksOrder.dreward when multiple rewards are created', async () => { + let originalRewardsOrderLen = (await user.get('/user')).tasksOrder.rewards.length; + let [task, task2] = await user.post('/tasks/user', [{ + type: 'reward', + text: 'a reward', + }, { + type: 'reward', + text: 'another reward', + }]); + + let updatedUser = await user.get('/user'); + expect(updatedUser.tasksOrder.rewards[0]).to.eql(task2._id); + expect(updatedUser.tasksOrder.rewards[1]).to.eql(task._id); + expect(updatedUser.tasksOrder.rewards.length).to.eql(originalRewardsOrderLen + 2); + }); + + it('defaults to a 0 value', async () => { + let task = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + }); + + expect(task.value).to.eql(0); + }); + + it('requires value to be coerced into a number', async () => { + let task = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + value: '10', + }); + + expect(task.value).to.eql(10); + }); + + it('cannot create checklists', async () => { + let task = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + checklist: [ + {_id: 123, completed: false, text: 'checklist'}, + ], + }); + + expect(task).not.to.have.property('checklist'); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/PUT-tasks_challenge_challengeId.test.js b/test/api/v3/integration/tasks/PUT-tasks_challenge_challengeId.test.js new file mode 100644 index 0000000000..88343cb47c --- /dev/null +++ b/test/api/v3/integration/tasks/PUT-tasks_challenge_challengeId.test.js @@ -0,0 +1,323 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('PUT /tasks/:id', () => { + let user; + let guild; + let challenge; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + context('errors', () => { + let task; + + beforeEach(async () => { + task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + }); + }); + + it('returns error when incorrect id is passed', async () => { + await expect(user.put(`/tasks/${generateUUID()}`, { + text: 'some new text', + up: false, + down: false, + notes: 'some new notes', + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('returns error when user is not a member of the challenge', async () => { + let anotherUser = await generateUser(); + + await expect(anotherUser.put(`/tasks/${task._id}`, { + text: 'some new text', + up: false, + down: false, + notes: 'some new notes', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyChalLeaderEditTasks'), + }); + }); + }); + + context('validates params', () => { + let task; + + beforeEach(async () => { + task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + }); + }); + + it(`ignores setting _id, type, userId, history, createdAt, + updatedAt, challenge, completed, streak, + dateCompleted fields`, async () => { + let savedTask = await user.put(`/tasks/${task._id}`, { + _id: 123, + type: 'daily', + userId: 123, + history: [123], + createdAt: 'yesterday', + updatedAt: 'tomorrow', + challenge: 'no', + completed: true, + streak: 25, + dateCompleted: 'never', + value: 324, // ignored because not a reward + }); + + expect(savedTask._id).to.equal(task._id); + expect(savedTask.type).to.equal(task.type); + expect(savedTask.userId).to.equal(task.userId); + expect(savedTask.history).to.eql(task.history); + expect(savedTask.createdAt).to.equal(task.createdAt); + expect(savedTask.updatedAt).to.be.greaterThan(task.updatedAt); + expect(savedTask.challenge._id).to.equal(task.challenge._id); + expect(savedTask.completed).to.equal(task.completed); + expect(savedTask.streak).to.equal(task.streak); + expect(savedTask.dateCompleted).to.equal(task.dateCompleted); + expect(savedTask.value).to.equal(task.value); + }); + + it('ignores invalid fields', async () => { + let savedTask = await user.put(`/tasks/${task._id}`, { + notValid: true, + }); + + expect(savedTask.notValid).to.be.undefined; + }); + }); + + context('habits', () => { + let habit; + + beforeEach(async () => { + habit = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + notes: 1976, + }); + }); + + it('updates a habit', async () => { + let savedHabit = await user.put(`/tasks/${habit._id}`, { + text: 'some new text', + up: false, + down: false, + notes: 'some new notes', + }); + + expect(savedHabit.text).to.eql('some new text'); + expect(savedHabit.notes).to.eql('some new notes'); + expect(savedHabit.up).to.eql(false); + expect(savedHabit.down).to.eql(false); + }); + }); + + context('todos', () => { + let todo; + + beforeEach(async () => { + todo = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test todo', + type: 'todo', + notes: 1976, + }); + }); + + it('updates a todo', async () => { + let savedTodo = await user.put(`/tasks/${todo._id}`, { + text: 'some new text', + notes: 'some new notes', + }); + + expect(savedTodo.text).to.eql('some new text'); + expect(savedTodo.notes).to.eql('some new notes'); + }); + + it('can update checklists (replace it)', async () => { + await user.put(`/tasks/${todo._id}`, { + checklist: [ + {text: 123, completed: false}, + {text: 456, completed: true}, + ], + }); + + let savedTodo = await user.put(`/tasks/${todo._id}`, { + checklist: [ + {text: 789, completed: false}, + ], + }); + + expect(savedTodo.checklist.length).to.equal(1); + expect(savedTodo.checklist[0].text).to.equal('789'); + expect(savedTodo.checklist[0].completed).to.equal(false); + }); + + it('can update tags (replace them)', async () => { + let finalUUID = generateUUID(); + await user.put(`/tasks/${todo._id}`, { + tags: [generateUUID(), generateUUID()], + }); + + let savedTodo = await user.put(`/tasks/${todo._id}`, { + tags: [finalUUID], + }); + + expect(savedTodo.tags.length).to.equal(1); + expect(savedTodo.tags[0]).to.equal(finalUUID); + }); + }); + + context('dailys', () => { + let daily; + + beforeEach(async () => { + daily = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test daily', + type: 'daily', + notes: 1976, + }); + }); + + it('updates a daily', async () => { + let savedDaily = await user.put(`/tasks/${daily._id}`, { + text: 'some new text', + notes: 'some new notes', + frequency: 'daily', + everyX: 5, + }); + + expect(savedDaily.text).to.eql('some new text'); + expect(savedDaily.notes).to.eql('some new notes'); + expect(savedDaily.frequency).to.eql('daily'); + expect(savedDaily.everyX).to.eql(5); + }); + + it('can update checklists (replace it)', async () => { + await user.put(`/tasks/${daily._id}`, { + checklist: [ + {text: 123, completed: false}, + {text: 456, completed: true}, + ], + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + checklist: [ + {text: 789, completed: false}, + ], + }); + + expect(savedDaily.checklist.length).to.equal(1); + expect(savedDaily.checklist[0].text).to.equal('789'); + expect(savedDaily.checklist[0].completed).to.equal(false); + }); + + it('can update tags (replace them)', async () => { + let finalUUID = generateUUID(); + await user.put(`/tasks/${daily._id}`, { + tags: [generateUUID(), generateUUID()], + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + tags: [finalUUID], + }); + + expect(savedDaily.tags.length).to.equal(1); + expect(savedDaily.tags[0]).to.equal(finalUUID); + }); + + it('updates repeat, even if frequency is set to daily', async () => { + await user.put(`/tasks/${daily._id}`, { + frequency: 'daily', + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + repeat: { + m: false, + su: false, + }, + }); + + expect(savedDaily.repeat).to.eql({ + m: false, + t: true, + w: true, + th: true, + f: true, + s: true, + su: false, + }); + }); + + it('updates everyX, even if frequency is set to weekly', async () => { + await user.put(`/tasks/${daily._id}`, { + frequency: 'weekly', + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + everyX: 5, + }); + + expect(savedDaily.everyX).to.eql(5); + }); + + it('defaults startDate to today if none date object is passed in', async () => { + let savedDaily = await user.put(`/tasks/${daily._id}`, { + frequency: 'weekly', + }); + + expect((new Date(savedDaily.startDate)).getDay()).to.eql((new Date()).getDay()); + }); + }); + + context('rewards', () => { + let reward; + + beforeEach(async () => { + reward = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test reward', + type: 'reward', + notes: 1976, + value: 10, + }); + }); + + it('updates a reward', async () => { + let savedReward = await user.put(`/tasks/${reward._id}`, { + text: 'some new text', + notes: 'some new notes', + value: 11, + }); + + expect(savedReward.text).to.eql('some new text'); + expect(savedReward.notes).to.eql('some new notes'); + expect(savedReward.value).to.eql(11); + }); + + it('requires value to be coerced into a number', async () => { + let savedReward = await user.put(`/tasks/${reward._id}`, { + value: '100', + }); + + expect(savedReward.value).to.eql(100); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/PUT-tasks_id.test.js b/test/api/v3/integration/tasks/PUT-tasks_id.test.js new file mode 100644 index 0000000000..566c1ebe5e --- /dev/null +++ b/test/api/v3/integration/tasks/PUT-tasks_id.test.js @@ -0,0 +1,396 @@ +import { + generateUser, + generateGroup, + sleep, + generateChallenge, +} from '../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('PUT /tasks/:id', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + context('validates params', () => { + let task; + + beforeEach(async () => { + task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + }); + + it(`ignores setting _id, type, userId, history, createdAt, + updatedAt, challenge, completed, streak, + dateCompleted fields`, async () => { + let savedTask = await user.put(`/tasks/${task._id}`, { + _id: 123, + type: 'daily', + userId: 123, + history: [123], + createdAt: 'yesterday', + updatedAt: 'tomorrow', + challenge: 'no', + completed: true, + streak: 25, + dateCompleted: 'never', + }); + + expect(savedTask._id).to.equal(task._id); + expect(savedTask.type).to.equal(task.type); + expect(savedTask.userId).to.equal(task.userId); + expect(savedTask.history).to.eql(task.history); + expect(savedTask.createdAt).to.equal(task.createdAt); + expect(savedTask.updatedAt).to.be.greaterThan(task.updatedAt); + expect(savedTask.challenge).to.eql(task.challenge); + expect(savedTask.completed).to.eql(task.completed); + expect(savedTask.streak).to.equal(savedTask.streak); // it's an habit, dailies can change it + expect(savedTask.dateCompleted).to.equal(task.dateCompleted); + }); + + it('ignores invalid fields', async () => { + let savedTask = await user.put(`/tasks/${task._id}`, { + notValid: true, + }); + + expect(savedTask.notValid).to.be.undefined; + }); + + it(`only allows setting streak, reminders, checklist, notes, attribute, tags + fields for challenge tasks owned by a user`, async () => { + let guild = await generateGroup(user); + let challenge = await generateChallenge(user, guild); + + let challengeTask = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'Daily in challenge', + reminders: [ + {time: new Date(), startDate: new Date()}, + ], + checklist: [ + {text: 123, completed: false}, + ], + }); + await sleep(2); + + await user.sync(); + + // Pick challenge task + let challengeUserTaskId = user.tasksOrder.dailys[user.tasksOrder.dailys.length - 1]; + + let challengeUserTask = await user.get(`/tasks/${challengeUserTaskId}`); + + let savedChallengeUserTask = await user.put(`/tasks/${challengeUserTaskId}`, { + _id: 123, + type: 'daily', + userId: 123, + history: [123], + createdAt: 'yesterday', + updatedAt: 'tomorrow', + challenge: 'no', + completed: true, + streak: 25, + priority: 1.5, + repeat: { + m: false, + }, + everyX: 15, + frequency: 'weekly', + text: 'new text', + dateCompleted: 'never', + reminders: [ + {time: new Date(), startDate: new Date()}, + {time: new Date(), startDate: new Date()}, + ], + checklist: [ + {text: 123, completed: false}, + {text: 456, completed: true}, + ], + notes: 'new notes', + attribute: 'per', + tags: [challengeUserTaskId], + }); + + // original task is not touched + let updatedChallengeTask = await user.get(`/tasks/${challengeTask._id}`); + expect(updatedChallengeTask).to.eql(challengeTask); + + // ignored + expect(savedChallengeUserTask._id).to.equal(challengeUserTask._id); + expect(savedChallengeUserTask.type).to.equal(challengeUserTask.type); + expect(savedChallengeUserTask.repeat.m).to.equal(true); + expect(savedChallengeUserTask.priority).to.equal(challengeUserTask.priority); + expect(savedChallengeUserTask.frequency).to.equal(challengeUserTask.frequency); + expect(savedChallengeUserTask.userId).to.equal(challengeUserTask.userId); + expect(savedChallengeUserTask.text).to.equal(challengeUserTask.text); + expect(savedChallengeUserTask.history).to.eql(challengeUserTask.history); + expect(savedChallengeUserTask.createdAt).to.equal(challengeUserTask.createdAt); + expect(savedChallengeUserTask.updatedAt).to.be.greaterThan(challengeUserTask.updatedAt); + expect(savedChallengeUserTask.challenge).to.eql(challengeUserTask.challenge); + expect(savedChallengeUserTask.completed).to.equal(challengeUserTask.completed); + expect(savedChallengeUserTask.dateCompleted).to.equal(challengeUserTask.dateCompleted); + expect(savedChallengeUserTask.priority).to.equal(challengeUserTask.priority); + + // changed + expect(savedChallengeUserTask.notes).to.equal('new notes'); + expect(savedChallengeUserTask.attribute).to.equal('per'); + expect(savedChallengeUserTask.tags).to.eql([challengeUserTaskId]); + expect(savedChallengeUserTask.streak).to.equal(25); + expect(savedChallengeUserTask.reminders.length).to.equal(2); + expect(savedChallengeUserTask.checklist.length).to.equal(2); + }); + }); + + context('all types', () => { + let daily; + + beforeEach(async () => { + daily = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + notes: 1976, + }); + }); + + it('can update reminders (replace them)', async () => { + await user.put(`/tasks/${daily._id}`, { + reminders: [ + {time: new Date(), startDate: new Date()}, + ], + }); + + let id1 = generateUUID(); + let id2 = generateUUID(); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + reminders: [ + {id: id1, time: new Date(), startDate: new Date()}, + {id: id2, time: new Date(), startDate: new Date()}, + ], + }); + + expect(savedDaily.reminders.length).to.equal(2); + expect(savedDaily.reminders[0].id).to.equal(id1); + expect(savedDaily.reminders[1].id).to.equal(id2); + }); + }); + + context('habits', () => { + let habit; + + beforeEach(async () => { + habit = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + notes: 1976, + }); + }); + + it('updates a habit', async () => { + let savedHabit = await user.put(`/tasks/${habit._id}`, { + text: 'some new text', + up: false, + down: false, + notes: 'some new notes', + }); + + expect(savedHabit.text).to.eql('some new text'); + expect(savedHabit.notes).to.eql('some new notes'); + expect(savedHabit.up).to.eql(false); + expect(savedHabit.down).to.eql(false); + }); + }); + + context('todos', () => { + let todo; + + beforeEach(async () => { + todo = await user.post('/tasks/user', { + text: 'test todo', + type: 'todo', + notes: 1976, + }); + }); + + it('updates a todo', async () => { + let savedTodo = await user.put(`/tasks/${todo._id}`, { + text: 'some new text', + notes: 'some new notes', + }); + + expect(savedTodo.text).to.eql('some new text'); + expect(savedTodo.notes).to.eql('some new notes'); + }); + + it('can update checklists (replace it)', async () => { + await user.put(`/tasks/${todo._id}`, { + checklist: [ + {text: 123, completed: false}, + {text: 456, completed: true}, + ], + }); + + let savedTodo = await user.put(`/tasks/${todo._id}`, { + checklist: [ + {text: 789, completed: false}, + ], + }); + + expect(savedTodo.checklist.length).to.equal(1); + expect(savedTodo.checklist[0].text).to.equal('789'); + expect(savedTodo.checklist[0].completed).to.equal(false); + }); + + it('can update tags (replace them)', async () => { + let finalUUID = generateUUID(); + await user.put(`/tasks/${todo._id}`, { + tags: [generateUUID(), generateUUID()], + }); + + let savedTodo = await user.put(`/tasks/${todo._id}`, { + tags: [finalUUID], + }); + + expect(savedTodo.tags.length).to.equal(1); + expect(savedTodo.tags[0]).to.equal(finalUUID); + }); + }); + + context('dailys', () => { + let daily; + + beforeEach(async () => { + daily = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + notes: 1976, + }); + }); + + it('updates a daily', async () => { + let savedDaily = await user.put(`/tasks/${daily._id}`, { + text: 'some new text', + notes: 'some new notes', + frequency: 'daily', + everyX: 5, + }); + + expect(savedDaily.text).to.eql('some new text'); + expect(savedDaily.notes).to.eql('some new notes'); + expect(savedDaily.frequency).to.eql('daily'); + expect(savedDaily.everyX).to.eql(5); + }); + + it('can update checklists (replace it)', async () => { + await user.put(`/tasks/${daily._id}`, { + checklist: [ + {text: 123, completed: false}, + {text: 456, completed: true}, + ], + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + checklist: [ + {text: 789, completed: false}, + ], + }); + + expect(savedDaily.checklist.length).to.equal(1); + expect(savedDaily.checklist[0].text).to.equal('789'); + expect(savedDaily.checklist[0].completed).to.equal(false); + }); + + it('can update tags (replace them)', async () => { + let finalUUID = generateUUID(); + await user.put(`/tasks/${daily._id}`, { + tags: [generateUUID(), generateUUID()], + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + tags: [finalUUID], + }); + + expect(savedDaily.tags.length).to.equal(1); + expect(savedDaily.tags[0]).to.equal(finalUUID); + }); + + it('updates repeat, even if frequency is set to daily', async () => { + await user.put(`/tasks/${daily._id}`, { + frequency: 'daily', + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + repeat: { + m: false, + su: false, + }, + }); + + expect(savedDaily.repeat).to.eql({ + m: false, + t: true, + w: true, + th: true, + f: true, + s: true, + su: false, + }); + }); + + it('updates everyX, even if frequency is set to weekly', async () => { + await user.put(`/tasks/${daily._id}`, { + frequency: 'weekly', + }); + + let savedDaily = await user.put(`/tasks/${daily._id}`, { + everyX: 5, + }); + + expect(savedDaily.everyX).to.eql(5); + }); + + it('defaults startDate to today if none date object is passed in', async () => { + let savedDaily = await user.put(`/tasks/${daily._id}`, { + frequency: 'weekly', + }); + + expect((new Date(savedDaily.startDate)).getDay()).to.eql((new Date()).getDay()); + }); + }); + + context('rewards', () => { + let reward; + + beforeEach(async () => { + reward = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + notes: 1976, + value: 10, + }); + }); + + it('updates a reward', async () => { + let savedReward = await user.put(`/tasks/${reward._id}`, { + text: 'some new text', + notes: 'some new notes', + value: 10, + }); + + expect(savedReward.text).to.eql('some new text'); + expect(savedReward.notes).to.eql('some new notes'); + expect(savedReward.value).to.eql(10); + }); + + it('requires value to be coerced into a number', async () => { + let savedReward = await user.put(`/tasks/${reward._id}`, { + value: '100', + }); + + expect(savedReward.value).to.eql(100); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/DELETE-tasks_challenge_challengeId_checklist_itemId.test.js b/test/api/v3/integration/tasks/challenges/DELETE-tasks_challenge_challengeId_checklist_itemId.test.js new file mode 100644 index 0000000000..eac6d455ea --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/DELETE-tasks_challenge_challengeId_checklist_itemId.test.js @@ -0,0 +1,115 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('DELETE /tasks/:taskId/checklist/:itemId', () => { + let user; + let guild; + let challenge; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + it('fails on task not found', async () => { + await expect(user.del(`/tasks/${generateUUID()}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('fails on checklist item not found', async () => { + let createdTask = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'daily with checklist', + }); + + await expect(user.del(`/tasks/${createdTask._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('checklistItemNotFound'), + }); + }); + + it('returns error when user is not a member of the challenge', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + completed: false, + }); + + let anotherUser = await generateUser(); + + await expect(anotherUser.del(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyChalLeaderEditTasks'), + }); + }); + + it('deletes a checklist item from a daily', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, {text: 'Checklist Item 1', completed: false}); + + await user.del(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`); + savedTask = await user.get(`/tasks/${task._id}`); + + expect(savedTask.checklist.length).to.equal(0); + }); + + it('deletes a checklist item from a todo', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'todo', + text: 'Todo with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, {text: 'Checklist Item 1', completed: false}); + + await user.del(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`); + savedTask = await user.get(`/tasks/${task._id}`); + + expect(savedTask.checklist.length).to.equal(0); + }); + + it('does not work with habits', async () => { + let habit = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.del(`/tasks/${habit._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('does not work with rewards', async () => { + let reward = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.del(`/tasks/${reward._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/DELETE-tasks_id_challenge_challengeId.test.js b/test/api/v3/integration/tasks/challenges/DELETE-tasks_id_challenge_challengeId.test.js new file mode 100644 index 0000000000..34c93c2f05 --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/DELETE-tasks_id_challenge_challengeId.test.js @@ -0,0 +1,115 @@ +import { + generateUser, + generateGroup, + generateChallenge, + sleep, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('DELETE /tasks/:id', () => { + let user; + let guild; + let challenge; + let task; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + beforeEach(async () => { + task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + }); + }); + + it('cannot delete a non-existant task', async () => { + await expect(user.del(`/tasks/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('returns error when user is not leader of the challenge', async () => { + let anotherUser = await generateUser(); + + await expect(anotherUser.del(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyChalLeaderEditTasks'), + }); + }); + + it('deletes a user\'s task', async () => { + await user.del(`/tasks/${task._id}`); + + await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + context('challenge member', () => { + let anotherUser; + let anotherUsersNewChallengeTaskID; + let newChallengeTask; + + beforeEach(async () => { + anotherUser = await generateUser(); + await user.post(`/groups/${guild._id}/invite`, { uuids: [anotherUser._id] }); + await anotherUser.post(`/groups/${guild._id}/join`); + await anotherUser.post(`/challenges/${challenge._id}/join`); + + newChallengeTask = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + }); + + let anotherUserWithNewChallengeTask = await anotherUser.get('/user'); + anotherUsersNewChallengeTaskID = anotherUserWithNewChallengeTask.tasksOrder.habits[0]; + }); + + it('returns error when user attempts to delete an active challenge task', async () => { + await expect(anotherUser.del(`/tasks/${anotherUsersNewChallengeTaskID}`)) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cantDeleteChallengeTasks'), + }); + }); + + it('allows user to delete challenge task after user leaves challenge', async () => { + await anotherUser.post(`/challenges/${challenge._id}/leave`); + + await anotherUser.del(`/tasks/${anotherUsersNewChallengeTaskID}`); + + await expect(anotherUser.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + // TODO for some reason this test fails on TravisCI, review after mongodb indexes have been added + xit('allows user to delete challenge task after challenge task is broken', async () => { + await expect(user.del(`/tasks/${newChallengeTask._id}`)); + + await sleep(2); + + await expect(anotherUser.del(`/tasks/${anotherUsersNewChallengeTaskID}`)); + + await sleep(2); + + await expect(anotherUser.get(`/tasks/${anotherUsersNewChallengeTaskID}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/GET_tasks_challenge.id.test.js b/test/api/v3/integration/tasks/challenges/GET_tasks_challenge.id.test.js new file mode 100644 index 0000000000..2399db04b6 --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/GET_tasks_challenge.id.test.js @@ -0,0 +1,86 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; +import { each } from 'lodash'; + +describe('GET /tasks/challenge/:challengeId', () => { + let user; + let guild; + let challenge; + let task; + let tasks = []; + let challengeWithTask; + let tasksToTest = { + habit: { + text: 'test habit', + type: 'habit', + up: false, + down: true, + }, + todo: { + text: 'test todo', + type: 'todo', + }, + daily: { + text: 'test daily', + type: 'daily', + frequency: 'daily', + everyX: 5, + startDate: new Date(), + }, + reward: { + text: 'test reward', + type: 'reward', + }, + }; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + it('returns error when challenge is not found', async () => { + let dummyId = generateUUID(); + + await expect(user.get(`/tasks/challenge/${dummyId}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('challengeNotFound'), + }); + }); + + each(tasksToTest, (taskValue, taskType) => { + context(`${taskType}`, () => { + before(async () => { + task = await user.post(`/tasks/challenge/${challenge._id}`, taskValue); + tasks.push(task); + challengeWithTask = await user.get(`/challenges/${challenge._id}`); + }); + + it('gets challenge tasks', async () => { + let getTask = await user.get(`/tasks/challenge/${challengeWithTask._id}`); + expect(getTask).to.eql(tasks); + }); + + it('gets challenge tasks filtered by type', async () => { + let challengeTasks = await user.get(`/tasks/challenge/${challengeWithTask._id}?type=${task.type}s`); + expect(challengeTasks).to.eql([task]); + }); + + it('cannot get a task owned by someone else', async () => { + let anotherUser = await generateUser(); + + await expect(anotherUser.get(`/tasks/challenge/${challengeWithTask._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('challengeNotFound'), + }); + }); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/POST-tasks_challenge_challengeId_taskId_checklist.test.js b/test/api/v3/integration/tasks/challenges/POST-tasks_challenge_challengeId_taskId_checklist.test.js new file mode 100644 index 0000000000..06bc7b68b2 --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/POST-tasks_challenge_challengeId_taskId_checklist.test.js @@ -0,0 +1,119 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/:taskId/checklist/', () => { + let user; + let guild; + let challenge; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + it('fails on task not found', async () => { + await expect(user.post(`/tasks/${generateUUID()}/checklist`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('returns error when user is not a member of the challenge', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'Daily with checklist', + }); + + let anotherUser = await generateUser(); + + await expect(anotherUser.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + ignored: false, + _id: 123, + })) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyChalLeaderEditTasks'), + }); + }); + + it('adds a checklist item to a daily', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + ignored: false, + _id: 123, + }); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].text).to.equal('Checklist Item 1'); + expect(savedTask.checklist[0].completed).to.equal(false); + expect(savedTask.checklist[0].id).to.be.a('string'); + expect(savedTask.checklist[0].id).to.not.equal('123'); + expect(savedTask.checklist[0].ignored).to.be.an('undefined'); + }); + + it('adds a checklist item to a todo', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'todo', + text: 'Todo with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + ignored: false, + _id: 123, + }); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].text).to.equal('Checklist Item 1'); + expect(savedTask.checklist[0].completed).to.equal(false); + expect(savedTask.checklist[0].id).to.be.a('string'); + expect(savedTask.checklist[0].id).to.not.equal('123'); + expect(savedTask.checklist[0].ignored).to.be.an('undefined'); + }); + + it('does not add a checklist to habits', async () => { + let habit = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.post(`/tasks/${habit._id}/checklist`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('does not add a checklist to rewards', async () => { + let reward = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.post(`/tasks/${reward._id}/checklist`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/POST-tasks_challenge_id.test.js b/test/api/v3/integration/tasks/challenges/POST-tasks_challenge_id.test.js new file mode 100644 index 0000000000..62899ffb59 --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/POST-tasks_challenge_id.test.js @@ -0,0 +1,125 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../../helpers/api-v3-integration.helper'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/challenge/:challengeId', () => { + let user; + let guild; + let challenge; + + beforeEach(async () => { + user = await generateUser({balance: 1}); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + it('returns error when challenge is not found', async () => { + let fakeChallengeId = generateUUID(); + + await expect(user.post(`/tasks/challenge/${fakeChallengeId}`, { + text: 'test habit', + type: 'habit', + up: false, + down: true, + notes: 1976, + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('challengeNotFound'), + }); + }); + + it('returns error when user does not have the challenge', async () => { + let userWithoutChallenge = await generateUser(); + + await expect(userWithoutChallenge.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + up: false, + down: true, + notes: 1976, + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('challengeNotFound'), + }); + }); + + it('returns error when non leader tries to edit challenge', async () => { + let userThatIsNotLeaderOfChallenge = await generateUser({ + challenges: [challenge._id], + }); + + await expect(userThatIsNotLeaderOfChallenge.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + up: false, + down: true, + notes: 1976, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyChalLeaderEditTasks'), + }); + }); + + it('creates a habit', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + up: false, + down: true, + notes: 1976, + }); + let challengeWithTask = await user.get(`/challenges/${challenge._id}`); + + expect(challengeWithTask.tasksOrder.habits.indexOf(task._id)).to.be.above(-1); + expect(task.challenge.id).to.equal(challenge._id); + expect(task.text).to.eql('test habit'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('habit'); + expect(task.up).to.eql(false); + expect(task.down).to.eql(true); + }); + + it('creates a todo', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test todo', + type: 'todo', + notes: 1976, + }); + let challengeWithTask = await user.get(`/challenges/${challenge._id}`); + + expect(challengeWithTask.tasksOrder.todos.indexOf(task._id)).to.be.above(-1); + expect(task.challenge.id).to.equal(challenge._id); + expect(task.text).to.eql('test todo'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('todo'); + }); + + it('creates a daily', async () => { + let now = new Date(); + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test daily', + type: 'daily', + notes: 1976, + frequency: 'daily', + everyX: 5, + startDate: now, + }); + let challengeWithTask = await user.get(`/challenges/${challenge._id}`); + + expect(challengeWithTask.tasksOrder.dailys.indexOf(task._id)).to.be.above(-1); + expect(task.challenge.id).to.equal(challenge._id); + expect(task.text).to.eql('test daily'); + expect(task.notes).to.eql('1976'); + expect(task.type).to.eql('daily'); + expect(task.frequency).to.eql('daily'); + expect(task.everyX).to.eql(5); + expect(new Date(task.startDate)).to.eql(now); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/POST-tasks_challenges_challengeId_tasks_id_score_direction.test.js b/test/api/v3/integration/tasks/challenges/POST-tasks_challenges_challengeId_tasks_id_score_direction.test.js new file mode 100644 index 0000000000..0fa8bafd30 --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/POST-tasks_challenges_challengeId_tasks_id_score_direction.test.js @@ -0,0 +1,145 @@ +import { + generateUser, + generateGroup, + generateChallenge, +} from '../../../../../helpers/api-integration/v3'; +import Bluebird from 'bluebird'; +import { find } from 'lodash'; + +describe('POST /tasks/:id/score/:direction', () => { + let user; + let guild; + let challenge; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + context('habits', () => { + let habit; + let usersChallengeTaskId; + let previousTaskHistory; + + before(async () => { + habit = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test habit', + type: 'habit', + }); + await Bluebird.delay(1000); + let updatedUser = await user.get('/user'); + usersChallengeTaskId = updatedUser.tasksOrder.habits[0]; + }); + + it('scores and adds history', async () => { + await user.post(`/tasks/${usersChallengeTaskId}/score/up`); + + let tasks = await user.get(`/tasks/challenge/${challenge._id}`); + let task = find(tasks, {_id: habit._id}); + previousTaskHistory = task.history[0]; + + expect(task.value).to.equal(1); + expect(task.history).to.have.lengthOf(1); + }); + + it('should update the history', async () => { + await user.post(`/tasks/${usersChallengeTaskId}/score/up`); + + let tasks = await user.get(`/tasks/challenge/${challenge._id}`); + let task = find(tasks, {_id: habit._id}); + + expect(task.history).to.have.lengthOf(1); + expect(task.history[0].date).to.not.equal(previousTaskHistory.date); + expect(task.history[0].value).to.not.equal(previousTaskHistory.value); + }); + }); + + context('dailies', () => { + let daily; + let usersChallengeTaskId; + let previousTaskHistory; + + before(async () => { + daily = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test daily', + type: 'daily', + }); + await Bluebird.delay(1000); + let updatedUser = await user.get('/user'); + usersChallengeTaskId = updatedUser.tasksOrder.dailys[0]; + }); + + it('it scores and adds history', async () => { + await user.post(`/tasks/${usersChallengeTaskId}/score/up`); + + let tasks = await user.get(`/tasks/challenge/${challenge._id}`); + let task = find(tasks, {_id: daily._id}); + previousTaskHistory = task.history[0]; + + expect(task.history).to.have.lengthOf(1); + expect(task.value).to.equal(1); + }); + + it('should update the history', async () => { + await user.post(`/tasks/${usersChallengeTaskId}/score/up`); + + let tasks = await user.get(`/tasks/challenge/${challenge._id}`); + let task = find(tasks, {_id: daily._id}); + + expect(task.history).to.have.lengthOf(1); + expect(task.history[0].date).to.not.equal(previousTaskHistory.date); + expect(task.history[0].value).to.not.equal(previousTaskHistory.value); + }); + }); + + context('todos', () => { + let todo; + let usersChallengeTaskId; + + before(async () => { + todo = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test todo', + type: 'todo', + }); + await Bluebird.delay(1000); + let updatedUser = await user.get('/user'); + usersChallengeTaskId = updatedUser.tasksOrder.todos[0]; + }); + + it('scores but does not add history', async () => { + await user.post(`/tasks/${usersChallengeTaskId}/score/up`); + + let tasks = await user.get(`/tasks/challenge/${challenge._id}`); + let task = find(tasks, {_id: todo._id}); + + expect(task.history).to.not.exist; + expect(task.value).to.equal(1); + }); + }); + + context('rewards', () => { + let reward; + let usersChallengeTaskId; + + before(async () => { + reward = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test reward', + type: 'reward', + }); + await Bluebird.delay(1000); + let updatedUser = await user.get('/user'); + usersChallengeTaskId = updatedUser.tasksOrder.todos[0]; + }); + + it('does not score', async () => { + await user.post(`/tasks/${usersChallengeTaskId}/score/up`); + + let tasks = await user.get(`/tasks/challenge/${challenge._id}`); + let task = find(tasks, {_id: reward._id}); + + expect(task.history).to.not.exist; + expect(task.value).to.equal(0); + }); + }); +}); diff --git a/test/api/v3/integration/tasks/challenges/PUT-tasks_challenge_challengeId_tasksId_checklist_itemId.test.js b/test/api/v3/integration/tasks/challenges/PUT-tasks_challenge_challengeId_tasksId_checklist_itemId.test.js new file mode 100644 index 0000000000..4dc2ceaa3e --- /dev/null +++ b/test/api/v3/integration/tasks/challenges/PUT-tasks_challenge_challengeId_tasksId_checklist_itemId.test.js @@ -0,0 +1,155 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('PUT /tasks/:taskId/checklist/:itemId', () => { + let user; + let guild; + let challenge; + + before(async () => { + user = await generateUser(); + guild = await generateGroup(user); + challenge = await generateChallenge(user, guild); + }); + + it('fails on task not found', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'todo', + text: 'Todo with checklist', + }); + + await expect(user.put(`/tasks/${task._id}/checklist/${generateUUID()}`, { + text: 'updated', + completed: true, + _id: 123, // ignored + })) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('checklistItemNotFound'), + }); + }); + + it('returns error when user is not a member of the challenge', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'todo', + text: 'Todo with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + completed: false, + }); + + let anotherUser = await generateUser(); + + await expect(anotherUser.put(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`, { + text: 'updated', + completed: true, + _id: 123, // ignored + })) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyChalLeaderEditTasks'), + }); + }); + + it('updates a checklist item on dailies', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + completed: false, + }); + + savedTask = await user.put(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`, { + text: 'updated', + completed: true, + _id: 123, // ignored + }); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].text).to.equal('updated'); + expect(savedTask.checklist[0].completed).to.equal(true); + expect(savedTask.checklist[0].id).to.not.equal('123'); + }); + + it('updates a checklist item on todos', async () => { + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + type: 'todo', + text: 'Todo with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + completed: false, + }); + + savedTask = await user.put(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`, { + text: 'updated', + completed: true, + _id: 123, // ignored + }); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].text).to.equal('updated'); + expect(savedTask.checklist[0].completed).to.equal(true); + expect(savedTask.checklist[0].id).to.not.equal('123'); + }); + + it('fails on habits', async () => { + let habit = await user.post('/tasks/user', { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.put(`/tasks/${habit._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on rewards', async () => { + let reward = await user.post('/tasks/user', { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.put(`/tasks/${reward._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on task not found', async () => { + await expect(user.put(`/tasks/${generateUUID()}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('fails on checklist item not found', async () => { + let createdTask = await user.post('/tasks/user', { + type: 'daily', + text: 'daily with checklist', + }); + + await expect(user.put(`/tasks/${createdTask._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('checklistItemNotFound'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/checklists/DELETE-tasks_taskId_checklist_itemId.test.js b/test/api/v3/integration/tasks/checklists/DELETE-tasks_taskId_checklist_itemId.test.js new file mode 100644 index 0000000000..2cf08bbece --- /dev/null +++ b/test/api/v3/integration/tasks/checklists/DELETE-tasks_taskId_checklist_itemId.test.js @@ -0,0 +1,74 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('DELETE /tasks/:taskId/checklist/:itemId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('deletes a checklist item', async () => { + let task = await user.post('/tasks/user', { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, {text: 'Checklist Item 1', completed: false}); + + await user.del(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`); + savedTask = await user.get(`/tasks/${task._id}`); + + expect(savedTask.checklist.length).to.equal(0); + }); + + it('does not work with habits', async () => { + let habit = await user.post('/tasks/user', { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.del(`/tasks/${habit._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('does not work with rewards', async () => { + let reward = await user.post('/tasks/user', { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.del(`/tasks/${reward._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on task not found', async () => { + await expect(user.del(`/tasks/${generateUUID()}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('fails on checklist item not found', async () => { + let createdTask = await user.post('/tasks/user', { + type: 'daily', + text: 'daily with checklist', + }); + + await expect(user.del(`/tasks/${createdTask._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('checklistItemNotFound'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/checklists/POST-tasks_taskId_checklist.test.js b/test/api/v3/integration/tasks/checklists/POST-tasks_taskId_checklist.test.js new file mode 100644 index 0000000000..7166db02da --- /dev/null +++ b/test/api/v3/integration/tasks/checklists/POST-tasks_taskId_checklist.test.js @@ -0,0 +1,73 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/:taskId/checklist/', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('adds a checklist item to a task', async () => { + let task = await user.post('/tasks/user', { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + ignored: false, + _id: 123, + }); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].text).to.equal('Checklist Item 1'); + expect(savedTask.checklist[0].completed).to.equal(false); + expect(savedTask.checklist[0].id).to.be.a('string'); + expect(savedTask.checklist[0].id).to.not.equal('123'); + expect(savedTask.checklist[0].ignored).to.be.an('undefined'); + }); + + it('does not add a checklist to habits', async () => { + let habit = await user.post('/tasks/user', { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.post(`/tasks/${habit._id}/checklist`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('does not add a checklist to rewards', async () => { + let reward = await user.post('/tasks/user', { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.post(`/tasks/${reward._id}/checklist`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on task not found', async () => { + await expect(user.post(`/tasks/${generateUUID()}/checklist`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/checklists/POST-tasks_taskId_checklist_itemId_score.test.js b/test/api/v3/integration/tasks/checklists/POST-tasks_taskId_checklist_itemId_score.test.js new file mode 100644 index 0000000000..edb65dfb65 --- /dev/null +++ b/test/api/v3/integration/tasks/checklists/POST-tasks_taskId_checklist_itemId_score.test.js @@ -0,0 +1,79 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/:taskId/checklist/:itemId/score', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('scores a checklist item', async () => { + let task = await user.post('/tasks/user', { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + completed: false, + }); + + savedTask = await user.post(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}/score`); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].completed).to.equal(true); + }); + + it('fails on habits', async () => { + let habit = await user.post('/tasks/user', { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.post(`/tasks/${habit._id}/checklist/${generateUUID()}/score`, { + text: 'Checklist Item 1', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on rewards', async () => { + let reward = await user.post('/tasks/user', { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.post(`/tasks/${reward._id}/checklist/${generateUUID()}/score`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on task not found', async () => { + await expect(user.post(`/tasks/${generateUUID()}/checklist/${generateUUID()}/score`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('fails on checklist item not found', async () => { + let createdTask = await user.post('/tasks/user', { + type: 'daily', + text: 'daily with checklist', + }); + + await expect(user.post(`/tasks/${createdTask._id}/checklist/${generateUUID()}/score`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('checklistItemNotFound'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/checklists/PUT-tasks_taskId_checklist_itemId.test.js b/test/api/v3/integration/tasks/checklists/PUT-tasks_taskId_checklist_itemId.test.js new file mode 100644 index 0000000000..003bcb2650 --- /dev/null +++ b/test/api/v3/integration/tasks/checklists/PUT-tasks_taskId_checklist_itemId.test.js @@ -0,0 +1,83 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('PUT /tasks/:taskId/checklist/:itemId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('updates a checklist item', async () => { + let task = await user.post('/tasks/user', { + type: 'daily', + text: 'Daily with checklist', + }); + + let savedTask = await user.post(`/tasks/${task._id}/checklist`, { + text: 'Checklist Item 1', + completed: false, + }); + + savedTask = await user.put(`/tasks/${task._id}/checklist/${savedTask.checklist[0].id}`, { + text: 'updated', + completed: true, + _id: 123, // ignored + }); + + expect(savedTask.checklist.length).to.equal(1); + expect(savedTask.checklist[0].text).to.equal('updated'); + expect(savedTask.checklist[0].completed).to.equal(true); + expect(savedTask.checklist[0].id).to.not.equal('123'); + }); + + it('fails on habits', async () => { + let habit = await user.post('/tasks/user', { + type: 'habit', + text: 'habit with checklist', + }); + + await expect(user.put(`/tasks/${habit._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on rewards', async () => { + let reward = await user.post('/tasks/user', { + type: 'reward', + text: 'reward with checklist', + }); + + await expect(user.put(`/tasks/${reward._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('checklistOnlyDailyTodo'), + }); + }); + + it('fails on task not found', async () => { + await expect(user.put(`/tasks/${generateUUID()}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('fails on checklist item not found', async () => { + let createdTask = await user.post('/tasks/user', { + type: 'daily', + text: 'daily with checklist', + }); + + await expect(user.put(`/tasks/${createdTask._id}/checklist/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('checklistItemNotFound'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/tags/DELETE-tasks_taskId_tags_tagId.test.js b/test/api/v3/integration/tasks/tags/DELETE-tasks_taskId_tags_tagId.test.js new file mode 100644 index 0000000000..ebb1a3c9e8 --- /dev/null +++ b/test/api/v3/integration/tasks/tags/DELETE-tasks_taskId_tags_tagId.test.js @@ -0,0 +1,42 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('DELETE /tasks/:taskId/tags/:tagId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('removes a tag from a task', async () => { + let task = await user.post('/tasks/user', { + type: 'habit', + text: 'Task with tag', + }); + + let tag = await user.post('/tags', {name: 'Tag 1'}); + + await user.post(`/tasks/${task._id}/tags/${tag.id}`); + await user.del(`/tasks/${task._id}/tags/${tag.id}`); + + let updatedTask = await user.get(`/tasks/${task._id}`); + + expect(updatedTask.tags.length).to.equal(0); + }); + + it('only deletes existing tags', async () => { + let createdTask = await user.post('/tasks/user', { + type: 'habit', + text: 'Task with tag', + }); + + await expect(user.del(`/tasks/${createdTask._id}/tags/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('tagNotFound'), + }); + }); +}); diff --git a/test/api/v3/integration/tasks/tags/POST-tasks_taskId_tags_tagId.test.js b/test/api/v3/integration/tasks/tags/POST-tasks_taskId_tags_tagId.test.js new file mode 100644 index 0000000000..d6cea02036 --- /dev/null +++ b/test/api/v3/integration/tasks/tags/POST-tasks_taskId_tags_tagId.test.js @@ -0,0 +1,55 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateUUID } from 'uuid'; + +describe('POST /tasks/:taskId/tags/:tagId', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('adds a tag to a task', async () => { + let task = await user.post('/tasks/user', { + type: 'habit', + text: 'Task with tag', + }); + + let tag = await user.post('/tags', {name: 'Tag 1'}); + let savedTask = await user.post(`/tasks/${task._id}/tags/${tag.id}`); + + expect(savedTask.tags[0]).to.equal(tag.id); + }); + + it('does not add a tag to a task twice', async () => { + let task = await user.post('/tasks/user', { + type: 'habit', + text: 'Task with tag', + }); + + let tag = await user.post('/tags', {name: 'Tag 1'}); + + await user.post(`/tasks/${task._id}/tags/${tag.id}`); + + await expect(user.post(`/tasks/${task._id}/tags/${tag.id}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('alreadyTagged'), + }); + }); + + it('does not add a non existing tag to a task', async () => { + let task = await user.post('/tasks/user', { + type: 'habit', + text: 'Task with tag', + }); + + await expect(user.post(`/tasks/${task._id}/tags/${generateUUID()}`)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); +}); diff --git a/test/api/v3/integration/user/DELETE-user.test.js b/test/api/v3/integration/user/DELETE-user.test.js new file mode 100644 index 0000000000..2a284add53 --- /dev/null +++ b/test/api/v3/integration/user/DELETE-user.test.js @@ -0,0 +1,176 @@ +import { + checkExistence, + createAndPopulateGroup, + generateGroup, + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import { + find, + each, + map, +} from 'lodash'; +import Bluebird from 'bluebird'; + +describe('DELETE /user', () => { + let user; + let password = 'password'; // from habitrpg/test/helpers/api-integration/v3/object-generators.js + + beforeEach(async () => { + user = await generateUser({balance: 10}); + }); + + it('returns an errors if password is wrong', async () => { + await expect(user.del('/user', { + password: 'wrong-password', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('wrongPassword'), + }); + }); + + it('returns an error if user has active subscription', async () => { + let userWithSubscription = await generateUser({'purchased.plan.customerId': 'fake-customer-id'}); + + await expect(userWithSubscription.del('/user', { + password, + })).to.be.rejected.and.to.eventually.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cannotDeleteActiveAccount'), + }); + }); + + it('deletes the user\'s tasks', async () => { + // gets the user's tasks ids + let ids = []; + each(user.tasksOrder, (idsForOrder) => { + ids.push(...idsForOrder); + }); + + expect(ids.length).to.be.above(0); // make sure the user has some task to delete + + await user.del('/user', { + password, + }); + + await Bluebird.all(map(ids, id => { + return expect(checkExistence('tasks', id)).to.eventually.eql(false); + })); + }); + + it('deletes the user', async () => { + await user.del('/user', { + password, + }); + await expect(checkExistence('users', user._id)).to.eventually.eql(false); + }); + + context('last member of a party', () => { + let party; + + beforeEach(async () => { + party = await generateGroup(user, { + type: 'party', + privacy: 'private', + }); + }); + + it('deletes party when user is the only member', async () => { + await user.del('/user', { + password, + }); + await expect(checkExistence('party', party._id)).to.eventually.eql(false); + }); + }); + + context('last member of a private guild', () => { + let privateGuild; + + beforeEach(async () => { + privateGuild = await generateGroup(user, { + type: 'guild', + privacy: 'private', + }); + }); + + it('deletes guild when user is the only member', async () => { + await user.del('/user', { + password, + }); + await expect(checkExistence('groups', privateGuild._id)).to.eventually.eql(false); + }); + }); + + context('groups user is leader of', () => { + let guild, oldLeader, newLeader; + + beforeEach(async () => { + let { group, groupLeader, members } = await createAndPopulateGroup({ + groupDetails: { + type: 'guild', + privacy: 'public', + }, + members: 1, + }); + + guild = group; + newLeader = members[0]; + oldLeader = groupLeader; + }); + + it('chooses new group leader for any group user was the leader of', async () => { + await oldLeader.del('/user', { + password, + }); + + let updatedGuild = await newLeader.get(`/groups/${guild._id}`); + + expect(updatedGuild.leader).to.exist; + expect(updatedGuild.leader._id).to.not.eql(oldLeader._id); + }); + }); + + context('groups user is a part of', () => { + let group1, group2, userToDelete, otherUser; + + beforeEach(async () => { + userToDelete = await generateUser({balance: 10}); + + group1 = await generateGroup(userToDelete, { + type: 'guild', + privacy: 'public', + }); + + let {group, members} = await createAndPopulateGroup({ + groupDetails: { + type: 'guild', + privacy: 'public', + }, + members: 3, + }); + + group2 = group; + otherUser = members[0]; + + await userToDelete.post(`/groups/${group2._id}/join`); + }); + + it('removes user from all groups user was a part of', async () => { + await userToDelete.del('/user', { + password, + }); + + let updatedGroup1Members = await otherUser.get(`/groups/${group1._id}/members`); + let updatedGroup2Members = await otherUser.get(`/groups/${group2._id}/members`); + let userInGroup = find(updatedGroup2Members, (member) => { + return member._id === userToDelete._id; + }); + + expect(updatedGroup1Members).to.be.empty; + expect(updatedGroup2Members).to.not.be.empty; + expect(userInGroup).to.not.exist; + }); + }); +}); diff --git a/test/api/v3/integration/user/DELETE-user_delete_webhook.test.js b/test/api/v3/integration/user/DELETE-user_delete_webhook.test.js new file mode 100644 index 0000000000..46844dd855 --- /dev/null +++ b/test/api/v3/integration/user/DELETE-user_delete_webhook.test.js @@ -0,0 +1,23 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +let user; +let endpoint = '/user/webhook'; + +describe('DELETE /user/webhook', () => { + beforeEach(async () => { + user = await generateUser(); + }); + + it('succeeds', async () => { + let id = 'some-id'; + user.preferences.webhooks[id] = { url: 'http://some-url.com', enabled: true }; + await user.sync(); + expect(user.preferences.webhooks).to.eql({}); + let response = await user.del(`${endpoint}/${id}`); + expect(response).to.eql({}); + await user.sync(); + expect(user.preferences.webhooks).to.eql({}); + }); +}); diff --git a/test/api/v3/integration/user/DELETE-user_messages.test.js b/test/api/v3/integration/user/DELETE-user_messages.test.js new file mode 100644 index 0000000000..98df8e0209 --- /dev/null +++ b/test/api/v3/integration/user/DELETE-user_messages.test.js @@ -0,0 +1,27 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('DELETE user message', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ inbox: { messages: { first: 'message', second: 'message' } } }); + expect(user.inbox.messages.first).to.eql('message'); + expect(user.inbox.messages.second).to.eql('message'); + }); + + it('one message', async () => { + let result = await user.del('/user/messages/first'); + await user.sync(); + expect(result).to.eql({ second: 'message' }); + expect(user.inbox.messages).to.eql({ second: 'message' }); + }); + + it('clear all', async () => { + let result = await user.del('/user/messages'); + await user.sync(); + expect(user.inbox.messages).to.eql({}); + expect(result).to.eql({}); + }); +}); diff --git a/test/api/v3/integration/user/GET-user.test.js b/test/api/v3/integration/user/GET-user.test.js new file mode 100644 index 0000000000..f4ed75f03f --- /dev/null +++ b/test/api/v3/integration/user/GET-user.test.js @@ -0,0 +1,24 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('GET /user', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('returns the authenticated user', async () => { + let returnedUser = await user.get('/user'); + expect(returnedUser._id).to.equal(user._id); + }); + + it('does not return private paths (and apiToken)', async () => { + let returnedUser = await user.get('/user'); + + expect(returnedUser.auth.local.hashed_password).to.not.exist; + expect(returnedUser.auth.local.salt).to.not.exist; + expect(returnedUser.apiToken).to.not.exist; + }); +}); diff --git a/test/api/v3/integration/user/GET-user_anonymized.test.js b/test/api/v3/integration/user/GET-user_anonymized.test.js new file mode 100644 index 0000000000..136174a75e --- /dev/null +++ b/test/api/v3/integration/user/GET-user_anonymized.test.js @@ -0,0 +1,90 @@ +import { + generateUser, + generateHabit, + generateDaily, + generateReward, +} from '../../../../helpers/api-integration/v3'; +import common from '../../../../../common'; +import { v4 as generateUUID } from 'uuid'; + +describe('GET /user/anonymized', () => { + let user; + let endpoint = '/user/anonymized'; + + before(async () => { + user = await generateUser(); + await user.update({ newMessages: ['some', 'new', 'messages'], 'profile.name': 'profile', 'purchased.plan': 'purchased plan', + contributor: 'contributor', invitations: 'invitations', 'items.special.nyeReceived': 'some', 'items.special.valentineReceived': 'some', + webhooks: 'some', 'achievements.challenges': 'some', + 'inbox.messages': [{ text: 'some text' }], + tags: [{ name: 'some name', challenge: 'some challenge' }], + }); + + await generateHabit({ userId: user._id }); + await generateHabit({ userId: user._id, text: generateUUID() }); + let daily = await generateDaily({ userId: user._id, checklist: [{ completed: false, text: 'this-text' }] }); + expect(daily.checklist[0].text.substr(0, 5)).to.not.eql('item '); + await generateReward({ userId: user._id, text: 'some text 4' }); + + expect(user.newMessages).to.exist; + expect(user.profile).to.exist; + expect(user.purchased.plan).to.exist; + expect(user.contributor).to.exist; + expect(user.invitations).to.exist; + expect(user.items.special.nyeReceived).to.exist; + expect(user.items.special.valentineReceived).to.exist; + expect(user.webhooks).to.exist; + expect(user.achievements.challenges).to.exist; + expect(user.inbox.messages[0].text).to.exist; + expect(user.inbox.messages[0].text).to.not.eql('inbox message text'); + expect(user.tags[0].name).to.exist; + expect(user.tags[0].name).to.not.eql('tag'); + expect(user.tags[0].challenge).to.not.eql('challenge'); + }); + + it('returns the authenticated user', async () => { + let returnedUser = await user.get(endpoint); + returnedUser = returnedUser.user; + expect(returnedUser._id).to.equal(user._id); + }); + + it('does not return private paths (and apiToken)', async () => { + let returnedUser = await user.get(endpoint); + let tasks2 = returnedUser.tasks; + returnedUser = returnedUser.user; + expect(returnedUser.auth.local).to.not.exist; + expect(returnedUser.apiToken).to.not.exist; + expect(returnedUser.stats.maxHealth).to.eql(common.maxHealth); + expect(returnedUser.stats.toNextLevel).to.eql(common.tnl(user.stats.lvl)); + expect(returnedUser.stats.maxMP).to.eql(30); // TODO why 30? + expect(returnedUser.newMessages).to.not.exist; + expect(returnedUser.profile).to.not.exist; + expect(returnedUser.purchased.plan).to.not.exist; + expect(returnedUser.contributor).to.not.exist; + expect(returnedUser.invitations).to.not.exist; + expect(returnedUser.items.special.nyeReceived).to.not.exist; + expect(returnedUser.items.special.valentineReceived).to.not.exist; + expect(returnedUser.webhooks).to.not.exist; + expect(returnedUser.achievements.challenges).to.not.exist; + _.forEach(returnedUser.inbox.messages, (msg) => { + expect(msg.text).to.eql('inbox message text'); + }); + _.forEach(returnedUser.tags, (tag) => { + expect(tag.name).to.eql('tag'); + expect(tag.challenge).to.eql('challenge'); + }); + // tasks + expect(tasks2).to.exist; + expect(tasks2.length).to.eql(5); // +1 because generateUser() assigns one todo + expect(tasks2[0].checklist).to.exist; + _.forEach(tasks2, (task) => { + expect(task.text).to.eql('task text'); + expect(task.notes).to.eql('task notes'); + if (task.checklist) { + _.forEach(task.checklist, (c) => { + expect(c.text.substr(0, 5)).to.eql('item '); + }); + } + }); + }); +}); diff --git a/test/api/v3/integration/user/GET-user_inventory_buy.test.js b/test/api/v3/integration/user/GET-user_inventory_buy.test.js new file mode 100644 index 0000000000..fd2a25b4ee --- /dev/null +++ b/test/api/v3/integration/user/GET-user_inventory_buy.test.js @@ -0,0 +1,26 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('GET /user/inventory/buy', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('returns the gear items available for purchase', async () => { + let buyList = await user.get('/user/inventory/buy'); + + expect(_.find(buyList, item => { + return item.text === t('armorWarrior1Text'); + })).to.exist; + + expect(_.find(buyList, item => { + return item.text === t('armorWarrior2Text'); + })).to.not.exist; + }); +}); diff --git a/test/api/v3/integration/user/POST-user_addPushDevice.test.js b/test/api/v3/integration/user/POST-user_addPushDevice.test.js new file mode 100644 index 0000000000..1a3a5d4f03 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_addPushDevice.test.js @@ -0,0 +1,35 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/addPushDevice', () => { + let user; + let regId = '10'; + let type = 'someRandomType'; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns an error if user already has the push device', async () => { + await user.post('/user/addPushDevice', {type, regId}); + await expect(user.post('/user/addPushDevice', {type, regId})) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('pushDeviceAlreadyAdded'), + }); + }); + + // More tests in common code unit tests + + it('adds a push device to the user', async () => { + let response = await user.post('/user/addPushDevice', {type, regId}); + await user.sync(); + + expect(response.message).to.equal(t('pushDeviceAdded')); + expect(user.pushDevices[0].type).to.equal(type); + expect(user.pushDevices[0].regId).to.equal(regId); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_add_webhook.test.js b/test/api/v3/integration/user/POST-user_add_webhook.test.js new file mode 100644 index 0000000000..d13f15baa4 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_add_webhook.test.js @@ -0,0 +1,29 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +let user; +let endpoint = '/user/webhook'; + +describe('POST /user/webhook', () => { + beforeEach(async () => { + user = await generateUser(); + }); + + it('validates', async () => { + await expect(user.post(endpoint, { enabled: true })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidUrl'), + }); + }); + + it('successfully adds the webhook', async () => { + expect(user.preferences.webhooks).to.eql({}); + let response = await user.post(endpoint, { enabled: true, url: 'http://some-url.com'}); + expect(response.id).to.exist; + await user.sync(); + expect(user.preferences.webhooks).to.not.eql({}); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_allocate.test.js b/test/api/v3/integration/user/POST-user_allocate.test.js new file mode 100644 index 0000000000..02d4990092 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_allocate.test.js @@ -0,0 +1,41 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/allocate', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('returns an error if an invalid attribute is supplied', async () => { + await expect(user.post('/user/allocate?stat=invalid')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidAttribute', {attr: 'invalid'}), + }); + }); + + it('returns an error if the user doesn\'t have attribute points', async () => { + await expect(user.post('/user/allocate')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughAttrPoints'), + }); + }); + + it('allocates attribute points', async () => { + await user.update({'stats.points': 1}); + let res = await user.post('/user/allocate?stat=con'); + await user.sync(); + expect(user.stats.con).to.equal(1); + expect(user.stats.points).to.equal(0); + expect(res.con).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_allocate_now.test.js b/test/api/v3/integration/user/POST-user_allocate_now.test.js new file mode 100644 index 0000000000..b45f2156be --- /dev/null +++ b/test/api/v3/integration/user/POST-user_allocate_now.test.js @@ -0,0 +1,28 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/allocate-now', () => { + // More tests in common code unit tests + + it('auto allocates all points', async () => { + let user = await generateUser({ + 'stats.points': 5, + 'stats.int': 3, + 'stats.con': 9, + 'stats.per': 9, + 'stats.str': 9, + 'preferences.allocationMode': 'flat', + }); + + let res = await user.post('/user/allocate-now'); + await user.sync(); + + expect(res).to.eql(user.stats); + expect(user.stats.points).to.equal(0); + expect(user.stats.con).to.equal(9); + expect(user.stats.int).to.equal(8); + expect(user.stats.per).to.equal(9); + expect(user.stats.str).to.equal(9); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_block.test.js b/test/api/v3/integration/user/POST-user_block.test.js new file mode 100644 index 0000000000..51766eb51e --- /dev/null +++ b/test/api/v3/integration/user/POST-user_block.test.js @@ -0,0 +1,34 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('block user', () => { + let user; + let blockedUser; + let blockedUser2; + + beforeEach(async () => { + blockedUser = await generateUser(); + blockedUser2 = await generateUser(); + user = await generateUser({ inbox: { blocks: [blockedUser._id] } }); + expect(user.inbox.blocks.length).to.eql(1); + expect(user.inbox.blocks).to.eql([blockedUser._id]); + }); + + it('validates uuid', async () => { + await expect(user.post('/user/block/1')).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidUUID'), + }); + }); + + it('successfully', async () => { + let response = await user.post(`/user/block/${blockedUser2._id}`); + await user.sync(); + expect(response).to.eql([blockedUser._id, blockedUser2._id]); + expect(user.inbox.blocks.length).to.eql(2); + expect(user.inbox.blocks).to.include(blockedUser2._id); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy.test.js b/test/api/v3/integration/user/POST-user_buy.test.js new file mode 100644 index 0000000000..ffad12f2a0 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy.test.js @@ -0,0 +1,62 @@ +/* eslint-disable camelcase */ + +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import shared from '../../../../../common/script'; + +let content = shared.content; + +describe('POST /user/buy/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'stats.gp': 400, + }); + }); + + // More tests in common code unit tests + + it('returns an error if the item is not found', async () => { + await expect(user.post('/user/buy/notExisting')) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('itemNotFound', {key: 'notExisting'}), + }); + }); + + it('buys a potion', async () => { + await user.update({ + 'stats.gp': 400, + }); + + let potion = content.potion; + let res = await user.post('/user/buy/potion'); + await user.sync(); + + expect(user.stats.hp).to.equal(50); + expect(res.data).to.eql(user.stats); + expect(res.message).to.equal(t('messageBought', {itemText: potion.text()})); + }); + + it('buys a piece of gear', async () => { + let key = 'armor_warrior_1'; + + await user.post(`/user/buy/${key}`); + await user.sync(); + + expect(user.items.gear.owned).to.eql({ + armor_warrior_1: true, + eyewear_special_blackTopFrame: true, + eyewear_special_blueTopFrame: true, + eyewear_special_greenTopFrame: true, + eyewear_special_pinkTopFrame: true, + eyewear_special_redTopFrame: true, + eyewear_special_whiteTopFrame: true, + eyewear_special_yellowTopFrame: true, + }); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy_armoire.test.js b/test/api/v3/integration/user/POST-user_buy_armoire.test.js new file mode 100644 index 0000000000..32b8134647 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy_armoire.test.js @@ -0,0 +1,41 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/buy-armoire', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'stats.gp': 400, + }); + }); + + // More tests in common code unit tests + + it('returns an error if user does not have enough gold', async () => { + await user.update({ + 'stats.gp': 5, + }); + + await expect(user.post('/user/buy-armoire')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageNotEnoughGold'), + }); + }); + + it('reduces gold when buying from the armoire', async () => { + await user.post('/user/buy-armoire'); + + await user.sync(); + + expect(user.stats.gp).to.equal(300); + }); + + xit('buys a piece of armoire', async () => { + // Skipped because can't stub predictableRandom correctly + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy_gear.test.js b/test/api/v3/integration/user/POST-user_buy_gear.test.js new file mode 100644 index 0000000000..f577263d4a --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy_gear.test.js @@ -0,0 +1,45 @@ +/* eslint-disable camelcase */ + +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/buy-gear/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'stats.gp': 400, + }); + }); + + // More tests in common code unit tests + + it('returns an error if the item is not found', async () => { + await expect(user.post('/user/buy-gear/notExisting')) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('itemNotFound', {key: 'notExisting'}), + }); + }); + + it('buys a piece of gear', async () => { + let key = 'armor_warrior_1'; + + await user.post(`/user/buy-gear/${key}`); + await user.sync(); + + expect(user.items.gear.owned).to.eql({ + armor_warrior_1: true, + eyewear_special_blackTopFrame: true, + eyewear_special_blueTopFrame: true, + eyewear_special_greenTopFrame: true, + eyewear_special_pinkTopFrame: true, + eyewear_special_redTopFrame: true, + eyewear_special_whiteTopFrame: true, + eyewear_special_yellowTopFrame: true, + }); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy_health_potion.test.js b/test/api/v3/integration/user/POST-user_buy_health_potion.test.js new file mode 100644 index 0000000000..835e893bd7 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy_health_potion.test.js @@ -0,0 +1,42 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import shared from '../../../../../common/script'; + +let content = shared.content; + +describe('POST /user/buy-health-potion', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'stats.hp': 40, + }); + }); + + // More tests in common code unit tests + + it('returns an error if user does not have enough gold', async () => { + await expect(user.post('/user/buy-health-potion')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageNotEnoughGold'), + }); + }); + + it('buys a potion', async () => { + await user.update({ + 'stats.gp': 400, + }); + + let potion = content.potion; + let res = await user.post('/user/buy-health-potion'); + await user.sync(); + + expect(user.stats.hp).to.equal(50); + expect(res.data).to.eql(user.stats); + expect(res.message).to.equal(t('messageBought', {itemText: potion.text()})); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy_mystery_set.test.js b/test/api/v3/integration/user/POST-user_buy_mystery_set.test.js new file mode 100644 index 0000000000..da7116d732 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy_mystery_set.test.js @@ -0,0 +1,38 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/buy-mystery-set/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'purchased.plan.consecutive.trinkets': 1, + }); + }); + + // More tests in common code unit tests + + it('returns an error if the mystery set is not found', async () => { + await expect(user.post('/user/buy-mystery-set/notExisting')) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('mysterySetNotFound'), + }); + }); + + it('buys a mystery set', async () => { + let key = 301404; + + let res = await user.post(`/user/buy-mystery-set/${key}`); + await user.sync(); + + expect(res.data).to.eql({ + items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared + purchasedPlanConsecutive: user.purchased.plan.consecutive, + }); + expect(res.message).to.equal(t('hourglassPurchaseSet')); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy_quest.test.js b/test/api/v3/integration/user/POST-user_buy_quest.test.js new file mode 100644 index 0000000000..3330988537 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy_quest.test.js @@ -0,0 +1,40 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import shared from '../../../../../common/script'; + +let content = shared.content; + +describe('POST /user/buy-quest/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('returns an error if the quest is not found', async () => { + await expect(user.post('/user/buy-quest/notExisting')) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('questNotFound', {key: 'notExisting'}), + }); + }); + + it('buys a quest', async () => { + let key = 'dilatoryDistress1'; + let item = content.quests[key]; + + await user.update({'stats.gp': 250}); + let res = await user.post(`/user/buy-quest/${key}`); + await user.sync(); + + expect(res.data).to.eql(user.items.quests); + expect(res.message).to.equal(t('messageBought', { + itemText: item.text(), + })); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_buy_special_spell.test.js b/test/api/v3/integration/user/POST-user_buy_special_spell.test.js new file mode 100644 index 0000000000..2ae16d1baf --- /dev/null +++ b/test/api/v3/integration/user/POST-user_buy_special_spell.test.js @@ -0,0 +1,43 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import shared from '../../../../../common/script'; + +let content = shared.content; + +describe('POST /user/buy-special-spell/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('returns an error if the special spell is not found', async () => { + await expect(user.post('/user/buy-special-spell/notExisting')) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('spellNotFound', {spellId: 'notExisting'}), + }); + }); + + it('buys a special spell', async () => { + let key = 'thankyou'; + let item = content.special[key]; + + await user.update({'stats.gp': 250}); + let res = await user.post(`/user/buy-special-spell/${key}`); + await user.sync(); + + expect(res.data).to.eql({ + items: JSON.parse(JSON.stringify(user.items)), // otherwise dates can't be compared + stats: user.stats, + }); + expect(res.message).to.equal(t('messageBought', { + itemText: item.text(), + })); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_change-class.test.js b/test/api/v3/integration/user/POST-user_change-class.test.js new file mode 100644 index 0000000000..d4b4192f23 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_change-class.test.js @@ -0,0 +1,30 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/change-class', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'flags.classSelected': false, + 'stats.lvl': 10, + }); + }); + + // More tests in common code unit tests + + it('changes class', async () => { + let res = await user.post('/user/change-class?class=rogue'); + await user.sync(); + + expect(res).to.eql(JSON.parse( + JSON.stringify({ + preferences: user.preferences, + stats: user.stats, + flags: user.flags, + items: user.items, + }) + )); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js b/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js new file mode 100644 index 0000000000..8ada2ede7d --- /dev/null +++ b/test/api/v3/integration/user/POST-user_class_cast_spellId.test.js @@ -0,0 +1,172 @@ +import { + generateUser, + translate as t, + createAndPopulateGroup, + generateChallenge, + sleep, +} from '../../../../helpers/api-integration/v3'; + +import { v4 as generateUUID } from 'uuid'; + +describe('POST /user/class/cast/:spellId', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns an error if spell does not exist', async () => { + await user.update({'stats.class': 'rogue'}); + let spellId = 'invalidSpell'; + await expect(user.post(`/user/class/cast/${spellId}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('spellNotFound', {spellId}), + }); + }); + + it('returns an error if spell does not exist in user\'s class', async () => { + let spellId = 'pickPocket'; + await expect(user.post(`/user/class/cast/${spellId}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('spellNotFound', {spellId}), + }); + }); + + it('returns an error if spell.mana > user.mana', async () => { + await user.update({'stats.class': 'rogue'}); + await expect(user.post('/user/class/cast/backStab')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughMana'), + }); + }); + + it('returns an error if spell.value > user.gold', async () => { + await expect(user.post('/user/class/cast/birthday')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('messageNotEnoughGold'), + }); + }); + + it('returns an error if spell.lvl > user.level', async () => { + await user.update({'stats.mp': 200, 'stats.class': 'wizard'}); + await expect(user.post('/user/class/cast/earth')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('spellLevelTooHigh', {level: 13}), + }); + }); + + it('returns an error if user doesn\'t own the spell', async () => { + await expect(user.post('/user/class/cast/snowball')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('spellNotOwned'), + }); + }); + + it('returns an error if targetId is not an UUID', async () => { + await expect(user.post('/user/class/cast/spellId?targetId=notAnUUID')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns an error if targetId is required but missing', async () => { + await user.update({'stats.class': 'rogue', 'stats.lvl': 11}); + await expect(user.post('/user/class/cast/pickPocket')) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('targetIdUUID'), + }); + }); + + it('returns an error if targeted task doesn\'t exist', async () => { + await user.update({'stats.class': 'rogue', 'stats.lvl': 11}); + await expect(user.post(`/user/class/cast/pickPocket?targetId=${generateUUID()}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + }); + + it('returns an error if a challenge task was targeted', async () => { + let {group, groupLeader} = await createAndPopulateGroup(); + let challenge = await generateChallenge(groupLeader, group); + await groupLeader.post(`/tasks/challenge/${challenge._id}`, [ + {type: 'habit', text: 'task text'}, + ]); + await groupLeader.update({'stats.class': 'rogue', 'stats.lvl': 11}); + await sleep(0.5); + await groupLeader.sync(); + await expect(groupLeader.post(`/user/class/cast/pickPocket?targetId=${groupLeader.tasksOrder.habits[0]}`)) + .to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('challengeTasksNoCast'), + }); + }); + + it('returns an error if targeted party member doesn\'t exist', async () => { + let {groupLeader} = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 1, + }); + await groupLeader.update({'items.special.snowball': 3}); + + let target = generateUUID(); + await expect(groupLeader.post(`/user/class/cast/snowball?targetId=${target}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userWithIDNotFound', {userId: target}), + }); + }); + + it('returns an error if party does not exists', async () => { + await user.update({'items.special.snowball': 3}); + + await expect(user.post(`/user/class/cast/snowball?targetId=${generateUUID()}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('partyNotFound'), + }); + }); + + it('send message in party chat if party && !spell.silent', async () => { + let { group, groupLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + members: 1, + }); + await groupLeader.update({'stats.mp': 200, 'stats.class': 'wizard', 'stats.lvl': 13}); + await groupLeader.post('/user/class/cast/earth'); + await sleep(1); + await group.sync(); + expect(group.chat[0]).to.exists; + expect(group.chat[0].uuid).to.equal('system'); + }); + + // TODO find a way to have sinon working in integration tests + // it doesn't work when tests are running separately from server + it('passes correct target to spell when targetType === \'task\''); + it('passes correct target to spell when targetType === \'tasks\''); + it('passes correct target to spell when targetType === \'self\''); + it('passes correct target to spell when targetType === \'party\''); + it('passes correct target to spell when targetType === \'user\''); + it('passes correct target to spell when targetType === \'party\' and user is not in a party'); + it('passes correct target to spell when targetType === \'user\' and user is not in a party'); +}); diff --git a/test/api/v3/integration/user/POST-user_custom-day-start.test.js b/test/api/v3/integration/user/POST-user_custom-day-start.test.js new file mode 100644 index 0000000000..868b9ae91d --- /dev/null +++ b/test/api/v3/integration/user/POST-user_custom-day-start.test.js @@ -0,0 +1,47 @@ +import moment from 'moment'; +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +let user; +let endpoint = '/user/custom-day-start'; + +describe('POST /user/custom-day-start', () => { + beforeEach(async () => { + user = await generateUser(); + }); + + it('updates user.preferences.dayStart', async () => { + expect(user.preferences.dayStart).to.eql(0); + + await user.post(endpoint, { dayStart: 1 }); + await user.sync(); + + expect(user.preferences.dayStart).to.eql(1); + }); + + it('sets lastCron to the current time to prevent an unexpected cron', async () => { + let oldCron = moment().subtract(7, 'hours'); + + await user.update({lastCron: oldCron}); + await user.post(endpoint, { dayStart: 1 }); + await user.sync(); + + expect(user.lastCron.valueOf()).to.be.gt(oldCron.valueOf()); + }); + + it('returns a confirmation message', async () => { + let {message} = await user.post(endpoint, { dayStart: 1 }); + + expect(message).to.eql(t('customDayStartHasChanged')); + }); + + it('errors if invalid value is passed', async () => { + await expect(user.post(endpoint, { dayStart: 'foo' })) + .to.eventually.be.rejected; + + await expect(user.post(endpoint, { dayStart: 24})) + .to.eventually.be.rejected; + }); +}); diff --git a/test/api/v3/integration/user/POST-user_disable-classes.test.js b/test/api/v3/integration/user/POST-user_disable-classes.test.js new file mode 100644 index 0000000000..0632a8adc7 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_disable-classes.test.js @@ -0,0 +1,26 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/disable-classes', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('disable classes', async () => { + let res = await user.post('/user/disable-classes'); + await user.sync(); + + expect(res).to.eql(JSON.parse( + JSON.stringify({ + preferences: user.preferences, + stats: user.stats, + flags: user.flags, + }) + )); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_equip_type_key.test.js b/test/api/v3/integration/user/POST-user_equip_type_key.test.js new file mode 100644 index 0000000000..c5cde777df --- /dev/null +++ b/test/api/v3/integration/user/POST-user_equip_type_key.test.js @@ -0,0 +1,40 @@ +/* eslint-disable camelcase */ + +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/equip/:type/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('equip an item', async () => { + await user.update({ + 'items.gear.owned': { + weapon_warrior_0: true, + weapon_warrior_1: true, + weapon_warrior_2: true, + weapon_wizard_1: true, + weapon_wizard_2: true, + shield_base_0: true, + shield_warrior_1: true, + }, + 'items.gear.equipped': { + weapon: 'weapon_warrior_0', + shield: 'shield_base_0', + }, + 'stats.gp': 200, + }); + + await user.post('/user/equip/equipped/weapon_warrior_1'); + let res = await user.post('/user/equip/equipped/weapon_warrior_2'); + await user.sync(); + + expect(res).to.eql(JSON.parse(JSON.stringify(user.items))); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_feed_pet_food.test.js b/test/api/v3/integration/user/POST-user_feed_pet_food.test.js new file mode 100644 index 0000000000..7581c266ee --- /dev/null +++ b/test/api/v3/integration/user/POST-user_feed_pet_food.test.js @@ -0,0 +1,45 @@ +/* eslint-disable camelcase */ + +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import content from '../../../../../common/script/content'; + +describe('POST /user/feed/:pet/:food', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('does not enjoy the food', async () => { + await user.update({ + 'items.pets.Wolf-Base': 5, + 'items.food.Milk': 2, + }); + + let food = content.food.Milk; + let [egg, potion] = 'Wolf-Base'.split('-'); + let potionText = content.hatchingPotions[potion] ? content.hatchingPotions[potion].text() : potion; + let eggText = content.eggs[egg] ? content.eggs[egg].text() : egg; + + let res = await user.post('/user/feed/Wolf-Base/Milk'); + await user.sync(); + expect(res).to.eql({ + data: user.items.pets['Wolf-Base'], + message: t('messageDontEnjoyFood', { + egg: t('petName', { + potion: potionText, + egg: eggText, + }), + foodText: food.text(), + }), + }); + + expect(user.items.food.Milk).to.equal(1); + expect(user.items.pets['Wolf-Base']).to.equal(7); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js b/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js new file mode 100644 index 0000000000..9621377beb --- /dev/null +++ b/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js @@ -0,0 +1,31 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/hatch/:egg/:hatchingPotion', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('hatch a new pet', async () => { + await user.update({ + 'items.eggs.Wolf': 1, + 'items.hatchingPotions.Base': 1, + }); + let res = await user.post('/user/hatch/Wolf/Base'); + await user.sync(); + expect(user.items.pets['Wolf-Base']).to.equal(5); + expect(user.items.eggs.Wolf).to.equal(0); + expect(user.items.hatchingPotions.Base).to.equal(0); + + expect(res).to.eql({ + message: t('messageHatched'), + data: JSON.parse(JSON.stringify(user.items)), + }); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_mark_pms_read.test.js b/test/api/v3/integration/user/POST-user_mark_pms_read.test.js new file mode 100644 index 0000000000..50552359ef --- /dev/null +++ b/test/api/v3/integration/user/POST-user_mark_pms_read.test.js @@ -0,0 +1,22 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/mark-pms-read', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('marks user\'s private messages as read', async () => { + await user.update({ + 'inbox.newMessages': 1, + }); + await user.post('/user/mark-pms-read'); + await user.sync(); + expect(user.inbox.newMessages).to.equal(0); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_open_mystery_item.test.js b/test/api/v3/integration/user/POST-user_open_mystery_item.test.js new file mode 100644 index 0000000000..6cfc0fe254 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_open_mystery_item.test.js @@ -0,0 +1,31 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import content from '../../../../../common/script/content/index'; + +describe('POST /user/open-mystery-item', () => { + let user; + let mysteryItemKey = 'eyewear_special_summerRogue'; + let mysteryItemIndex = content.gear.flat[mysteryItemKey].index; + let mysteryItemType = content.gear.flat[mysteryItemKey].type; + + beforeEach(async () => { + user = await generateUser({ + 'purchased.plan.mysteryItems': [mysteryItemKey], + }); + }); + + // More tests in common code unit tests + + it('opens a mystery item', async () => { + let response = await user.post('/user/open-mystery-item'); + await user.sync(); + + expect(user.items.gear.owned[mysteryItemKey]).to.be.true; + expect(response.message).to.equal(t('mysteryItemOpened')); + expect(response.data.key).to.eql(mysteryItemKey); + expect(response.data.index).to.eql(mysteryItemIndex); + expect(response.data.type).to.eql(mysteryItemType); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_purchase.test.js b/test/api/v3/integration/user/POST-user_purchase.test.js new file mode 100644 index 0000000000..dff6d59c48 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_purchase.test.js @@ -0,0 +1,34 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/purchase/:type/:key', () => { + let user; + let type = 'hatchingPotions'; + let key = 'Base'; + + beforeEach(async () => { + user = await generateUser({ + balance: 40, + }); + }); + + // More tests in common code unit tests + + it('returns an error when key is not provided', async () => { + await expect(user.post('/user/purchase/gems/gem')) + .to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('mustSubscribeToPurchaseGems'), + }); + }); + + it('purchases a gem item', async () => { + await user.post(`/user/purchase/${type}/${key}`); + await user.sync(); + + expect(user.items[type][key]).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_purchase_hourglass.test.js b/test/api/v3/integration/user/POST-user_purchase_hourglass.test.js new file mode 100644 index 0000000000..cd43334d00 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_purchase_hourglass.test.js @@ -0,0 +1,25 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/purchase-hourglass/:type/:key', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'purchased.plan.consecutive.trinkets': 2, + }); + }); + + // More tests in common code unit tests + + it('buys a hourglass pet', async () => { + let response = await user.post('/user/purchase-hourglass/pets/MantisShrimp-Base'); + await user.sync(); + + expect(response.message).to.eql(t('hourglassPurchase')); + expect(user.purchased.plan.consecutive.trinkets).to.eql(1); + expect(user.items.pets).to.eql({'MantisShrimp-Base': 5}); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_read_card.test.js b/test/api/v3/integration/user/POST-user_read_card.test.js new file mode 100644 index 0000000000..3b3573b6cc --- /dev/null +++ b/test/api/v3/integration/user/POST-user_read_card.test.js @@ -0,0 +1,38 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/read-card/:cardType', () => { + let user; + let cardType = 'greeting'; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns an error when unknown cardType is provded', async () => { + await expect(user.post('/user/read-card/randomCardType')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cardTypeNotAllowed'), + }); + }); + + // More tests in common code unit tests + + it('reads a card', async () => { + await user.update({ + 'items.special.greetingReceived': [true], + 'flags.cardReceived': true, + }); + + let response = await user.post(`/user/read-card/${cardType}`); + await user.sync(); + + expect(response.message).to.equal(t('readCard', {cardType})); + expect(user.items.special[`${cardType}Received`]).to.be.empty; + expect(user.flags.cardReceived).to.be.false; + }); +}); diff --git a/test/api/v3/integration/user/POST-user_rebirth.test.js b/test/api/v3/integration/user/POST-user_rebirth.test.js new file mode 100644 index 0000000000..21fbed0b8d --- /dev/null +++ b/test/api/v3/integration/user/POST-user_rebirth.test.js @@ -0,0 +1,57 @@ +import { + generateUser, + generateDaily, + generateReward, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/rebirth', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns an error when user balance is too low', async () => { + await expect(user.post('/user/rebirth')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughGems'), + }); + }); + + // More tests in common code unit tests + + it('resets user\'s tasks', async () => { + await user.update({ + balance: 2, + }); + + let daily = await generateDaily({ + text: 'test habit', + type: 'daily', + value: 1, + streak: 1, + userId: user._id, + }); + + let reward = await generateReward({ + text: 'test reward', + type: 'reward', + value: 1, + userId: user._id, + }); + + let response = await user.post('/user/rebirth'); + await user.sync(); + + let updatedDaily = await user.get(`/tasks/${daily._id}`); + let updatedReward = await user.get(`/tasks/${reward._id}`); + + expect(response.message).to.equal(t('rebirthComplete')); + expect(updatedDaily.streak).to.equal(0); + expect(updatedDaily.value).to.equal(0); + expect(updatedReward.value).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_release_both.test.js b/test/api/v3/integration/user/POST-user_release_both.test.js new file mode 100644 index 0000000000..8c47d95dfe --- /dev/null +++ b/test/api/v3/integration/user/POST-user_release_both.test.js @@ -0,0 +1,48 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/release-both', () => { + let user; + let animal = 'Wolf-Base'; + + beforeEach(async () => { + user = await generateUser({ + 'items.currentMount': animal, + 'items.currentPet': animal, + 'items.pets': {animal: 5}, + 'items.mounts': {animal: true}, + }); + }); + + it('returns an error when user balance is too low and user does not have triadBingo', async () => { + await expect(user.post('/user/release-both')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughGems'), + }); + }); + + // More tests in common code unit tests + + it('grants triad bingo with gems', async () => { + await user.update({ + balance: 1.5, + }); + + let response = await user.post('/user/release-both'); + await user.sync(); + + expect(response.message).to.equal(t('mountsAndPetsReleased')); + expect(user.balance).to.equal(0); + expect(user.items.currentMount).to.be.empty; + expect(user.items.currentPet).to.be.empty; + expect(user.items.pets[animal]).to.be.empty; + expect(user.items.mounts[animal]).to.equal(null); + expect(user.achievements.beastMasterCount).to.equal(1); + expect(user.achievements.mountMasterCount).to.equal(1); + expect(user.achievements.triadBingoCount).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_release_mounts.test.js b/test/api/v3/integration/user/POST-user_release_mounts.test.js new file mode 100644 index 0000000000..86391599f0 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_release_mounts.test.js @@ -0,0 +1,42 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/release-mounts', () => { + let user; + let animal = 'Wolf-Base'; + + beforeEach(async () => { + user = await generateUser({ + 'items.currentMount': animal, + 'items.mounts': {animal: true}, + }); + }); + + it('returns an error when user balance is too low', async () => { + await expect(user.post('/user/release-mounts')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughGems'), + }); + }); + + // More tests in common code unit tests + + it('releases mounts', async () => { + await user.update({ + balance: 1, + }); + + let response = await user.post('/user/release-mounts'); + await user.sync(); + + expect(response.message).to.equal(t('mountsReleased')); + expect(user.balance).to.equal(0); + expect(user.items.currentMount).to.be.empty; + expect(user.items.mounts[animal]).to.equal(null); + expect(user.achievements.mountMasterCount).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_release_pets.test.js b/test/api/v3/integration/user/POST-user_release_pets.test.js new file mode 100644 index 0000000000..a7f7b9b66f --- /dev/null +++ b/test/api/v3/integration/user/POST-user_release_pets.test.js @@ -0,0 +1,42 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/release-pets', () => { + let user; + let animal = 'Wolf-Base'; + + beforeEach(async () => { + user = await generateUser({ + 'items.currentPet': animal, + 'items.pets': {animal: 5}, + }); + }); + + it('returns an error when user balance is too low', async () => { + await expect(user.post('/user/release-pets')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughGems'), + }); + }); + + // More tests in common code unit tests + + it('releases pets', async () => { + await user.update({ + balance: 1, + }); + + let response = await user.post('/user/release-pets'); + await user.sync(); + + expect(response.message).to.equal(t('petsReleased')); + expect(user.balance).to.equal(0); + expect(user.items.currentPet).to.be.empty; + expect(user.items.pets[animal]).to.equal(0); + expect(user.achievements.beastMasterCount).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_reroll.test.js b/test/api/v3/integration/user/POST-user_reroll.test.js new file mode 100644 index 0000000000..29774d1239 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_reroll.test.js @@ -0,0 +1,54 @@ +import { + generateUser, + generateDaily, + generateReward, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/reroll', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns an error when user balance is too low', async () => { + await expect(user.post('/user/reroll')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughGems'), + }); + }); + + // More tests in common code unit tests + + it('resets user\'s tasks', async () => { + await user.update({ + balance: 2, + }); + + let daily = await generateDaily({ + text: 'test habit', + type: 'daily', + userId: user._id, + }); + + let reward = await generateReward({ + text: 'test reward', + type: 'reward', + value: 1, + userId: user._id, + }); + + let response = await user.post('/user/reroll'); + await user.sync(); + + let updatedDaily = await user.get(`/tasks/${daily._id}`); + let updatedReward = await user.get(`/tasks/${reward._id}`); + + expect(response.message).to.equal(t('fortifyComplete')); + expect(updatedDaily.value).to.equal(0); + expect(updatedReward.value).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_reset.test.js b/test/api/v3/integration/user/POST-user_reset.test.js new file mode 100644 index 0000000000..2baf7bd083 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_reset.test.js @@ -0,0 +1,104 @@ +import { + generateUser, + generateGroup, + generateChallenge, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/reset', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('resets user\'s habits', async () => { + let task = await user.post('/tasks/user', { + text: 'test habit', + type: 'habit', + }); + + await user.post('/user/reset'); + await user.sync(); + + await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + + expect(user.tasksOrder.habits).to.be.empty; + }); + + it('resets user\'s dailys', async () => { + let task = await user.post('/tasks/user', { + text: 'test daily', + type: 'daily', + }); + + await user.post('/user/reset'); + await user.sync(); + + await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + + expect(user.tasksOrder.dailys).to.be.empty; + }); + + it('resets user\'s todos', async () => { + let task = await user.post('/tasks/user', { + text: 'test todo', + type: 'todo', + }); + + await user.post('/user/reset'); + await user.sync(); + + await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + + expect(user.tasksOrder.todos).to.be.empty; + }); + + it('resets user\'s rewards', async () => { + let task = await user.post('/tasks/user', { + text: 'test reward', + type: 'reward', + }); + + await user.post('/user/reset'); + await user.sync(); + + await expect(user.get(`/tasks/${task._id}`)).to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('taskNotFound'), + }); + + expect(user.tasksOrder.rewards).to.be.empty; + }); + + it('does not delete challenge tasks', async () => { + let guild = await generateGroup(user); + let challenge = await generateChallenge(user, guild); + let task = await user.post(`/tasks/challenge/${challenge._id}`, { + text: 'test challenge habit', + type: 'habit', + }); + + await user.post('/user/reset'); + await user.sync(); + + let userChallengeTask = await user.get(`/tasks/${task._id}`); + + expect(userChallengeTask).to.eql(task); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_revive.test.js b/test/api/v3/integration/user/POST-user_revive.test.js new file mode 100644 index 0000000000..6ba85ac87f --- /dev/null +++ b/test/api/v3/integration/user/POST-user_revive.test.js @@ -0,0 +1,37 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/revive', () => { + let user; + + beforeEach(async () => { + user = await generateUser({ + 'user.items.gear.owned': {weaponKey: true}, + }); + }); + + it('returns an error when user is not dead', async () => { + await expect(user.post('/user/revive')) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cannotRevive'), + }); + }); + + // More tests in common code unit tests + + it('decreases a stat', async () => { + await user.update({ + 'stats.str': 2, + 'stats.hp': 0, + }); + + await user.post('/user/revive'); + await user.sync(); + + expect(user.stats.str).to.equal(1); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_sell.test.js b/test/api/v3/integration/user/POST-user_sell.test.js new file mode 100644 index 0000000000..1914336175 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_sell.test.js @@ -0,0 +1,41 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; +import content from '../../../../../common/script/content'; + +describe('POST /user/sell/:type/:key', () => { + let user; + let type = 'eggs'; + let key = 'Wolf'; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('returns an error when user does not have item', async () => { + await expect(user.post(`/user/sell/${type}/${key}`)) + .to.eventually.be.rejected.and.eql({ + code: 404, + error: 'NotFound', + message: t('userItemsKeyNotFound', {type}), + }); + }); + + it('sells an item', async () => { + await user.update({ + items: { + eggs: { + Wolf: 1, + }, + }, + }); + + await user.post(`/user/sell/${type}/${key}`); + await user.sync(); + + expect(user.stats.gp).to.equal(content[type][key].value); + }); +}); diff --git a/test/api/v3/integration/user/POST-user_sleep.test.js b/test/api/v3/integration/user/POST-user_sleep.test.js new file mode 100644 index 0000000000..0e9773150e --- /dev/null +++ b/test/api/v3/integration/user/POST-user_sleep.test.js @@ -0,0 +1,25 @@ +import { + generateUser, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/sleep', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + // More tests in common code unit tests + + it('toggles sleep status', async () => { + let res = await user.post('/user/sleep'); + expect(res).to.eql(true); + await user.sync(); + expect(user.preferences.sleep).to.be.true; + + let res2 = await user.post('/user/sleep'); + expect(res2).to.eql(false); + await user.sync(); + expect(user.preferences.sleep).to.be.false; + }); +}); diff --git a/test/api/v3/integration/user/POST-user_unlock.js b/test/api/v3/integration/user/POST-user_unlock.js new file mode 100644 index 0000000000..6dbdb3c1b1 --- /dev/null +++ b/test/api/v3/integration/user/POST-user_unlock.js @@ -0,0 +1,37 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +describe('POST /user/unlock', () => { + let user; + let unlockPath = 'shirt.convict,shirt.cross,shirt.fire,shirt.horizon,shirt.ocean,shirt.purple,shirt.rainbow,shirt.redblue,shirt.thunder,shirt.tropical,shirt.zombie'; + let unlockCost = 1.25; + let usersStartingGems = 5; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('returns an error when user balance is too low', async () => { + await expect(user.post(`/user/unlock?path=${unlockPath}`)) + .to.eventually.be.rejected.and.to.eql({ + code: 401, + error: 'NotAuthorized', + message: t('notEnoughGems'), + }); + }); + + // More tests in common code unit tests + + it('reduces a user\'s balance', async () => { + await user.update({ + balance: usersStartingGems, + }); + let response = await user.post(`/user/unlock?path=${unlockPath}`); + await user.sync(); + + expect(response.message).to.equal(t('unlocked')); + expect(user.balance).to.equal(usersStartingGems - unlockCost); + }); +}); diff --git a/test/api/v3/integration/user/PUT-user.test.js b/test/api/v3/integration/user/PUT-user.test.js new file mode 100644 index 0000000000..f606c95c2c --- /dev/null +++ b/test/api/v3/integration/user/PUT-user.test.js @@ -0,0 +1,201 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +import { each, get } from 'lodash'; + +describe('PUT /user', () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + context('Allowed Operations', () => { + it('updates the user', async () => { + await user.put('/user', { + 'profile.name': 'Frodo', + 'preferences.costume': true, + 'stats.hp': 14, + }); + + await user.sync(); + + expect(user.profile.name).to.eql('Frodo'); + expect(user.preferences.costume).to.eql(true); + expect(user.stats.hp).to.eql(14); + }); + }); + + context('Top Level Protected Operations', () => { + let protectedOperations = { + 'gem balance': {balance: 100}, + auth: {'auth.blocked': true, 'auth.timestamps.created': new Date()}, + contributor: {'contributor.level': 9, 'contributor.admin': true, 'contributor.text': 'some text'}, + backer: {'backer.tier': 10, 'backer.npc': 'Bilbo'}, + subscriptions: {'purchased.plan.extraMonths': 500, 'purchased.plan.consecutive.trinkets': 1000}, + 'customization gem purchases': {'purchased.background.tavern': true, 'purchased.skin.bear': true}, + }; + + each(protectedOperations, (data, testName) => { + it(`does not allow updating ${testName}`, async () => { + let errorText = t('messageUserOperationProtected', { operation: Object.keys(data)[0] }); + + await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: errorText, + }); + }); + }); + }); + + context('Sub-Level Protected Operations', () => { + let protectedOperations = { + 'class stat': {'stats.class': 'wizard'}, + 'flags unless whitelisted': {'flags.dropsEnabled': true}, + webhooks: {'preferences.webhooks': [1, 2, 3]}, + sleep: {'preferences.sleep': true}, + 'disable classes': {'preferences.disableClasses': true}, + }; + + each(protectedOperations, (data, testName) => { + it(`does not allow updating ${testName}`, async () => { + let errorText = t('messageUserOperationProtected', { operation: Object.keys(data)[0] }); + + await expect(user.put('/user', data)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: errorText, + }); + }); + }); + }); + + context('Default Appearance Preferences', () => { + let testCases = { + shirt: 'yellow', + skin: 'ddc994', + 'hair.color': 'blond', + 'hair.bangs': 2, + 'hair.base': 1, + 'hair.flower': 4, + size: 'broad', + }; + + each(testCases, (item, type) => { + const update = {}; + update[`preferences.${type}`] = item; + + it(`updates user with ${type} that is a default`, async () => { + let dbUpdate = {}; + dbUpdate[`purchased.${type}.${item}`] = true; + await user.update(dbUpdate); + + // Sanity checks to make sure user is not already equipped with item + expect(get(user.preferences, type)).to.not.eql(item); + + let updatedUser = await user.put('/user', update); + + expect(get(updatedUser.preferences, type)).to.eql(item); + }); + }); + + it('returns an error if user tries to update body size with invalid type', async () => { + await expect(user.put('/user', { + 'preferences.size': 'round', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('mustPurchaseToSet', { val: 'round', key: 'preferences.size' }), + }); + }); + + it('can set beard to default', async () => { + await user.update({ + 'purchased.hair.beard': 3, + 'preferences.hair.beard': 3, + }); + + let updatedUser = await user.put('/user', { + 'preferences.hair.beard': 0, + }); + + expect(updatedUser.preferences.hair.beard).to.eql(0); + }); + + it('can set mustache to default', async () => { + await user.update({ + 'purchased.hair.mustache': 2, + 'preferences.hair.mustache': 2, + }); + + let updatedUser = await user.put('/user', { + 'preferences.hair.mustache': 0, + }); + + expect(updatedUser.preferences.hair.mustache).to.eql(0); + }); + }); + + context('Purchasable Appearance Preferences', () => { + let testCases = { + background: 'volcano', + shirt: 'convict', + skin: 'cactus', + 'hair.base': 7, + 'hair.beard': 2, + 'hair.color': 'rainbow', + 'hair.mustache': 2, + }; + + each(testCases, (item, type) => { + const update = {}; + update[`preferences.${type}`] = item; + + it(`returns an error if user tries to update ${type} with ${type} the user does not own`, async () => { + await expect(user.put('/user', update)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('mustPurchaseToSet', {val: item, key: `preferences.${type}`}), + }); + }); + + it(`updates user with ${type} user does own`, async () => { + let dbUpdate = {}; + dbUpdate[`purchased.${type}.${item}`] = true; + await user.update(dbUpdate); + + // Sanity check to make sure user is not already equipped with item + expect(get(user.preferences, type)).to.not.eql(item); + + let updatedUser = await user.put('/user', update); + + expect(get(updatedUser.preferences, type)).to.eql(item); + }); + }); + }); + + context('Improvement Categories', () => { + it('sets valid categories', async () => { + await user.put('/user', { + 'preferences.improvementCategories': ['work', 'school'], + }); + + await user.sync(); + + expect(user.preferences.improvementCategories).to.eql(['work', 'school']); + }); + + it('discards invalid categories', async () => { + await expect(user.put('/user', { + 'preferences.improvementCategories': ['work', 'procrastination', 'school'], + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: 'User validation failed', + }); + }); + }); +}); diff --git a/test/api/v3/integration/user/PUT-user_update_webhook.test.js b/test/api/v3/integration/user/PUT-user_update_webhook.test.js new file mode 100644 index 0000000000..13ca9ff00c --- /dev/null +++ b/test/api/v3/integration/user/PUT-user_update_webhook.test.js @@ -0,0 +1,32 @@ +import { + generateUser, + translate as t, +} from '../../../../helpers/api-integration/v3'; + +let user; +let url = 'http://new-url.com'; +let enabled = true; + +describe('PUT /user/webhook/:id', () => { + beforeEach(async () => { + user = await generateUser(); + }); + + it('validation fails', async () => { + await expect(user.put('/user/webhook/some-id'), { enabled: true }).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidUrl'), + }); + }); + + it('succeeds', async () => { + let response = await user.post('/user/webhook', { enabled: true, url: 'http://some-url.com'}); + await user.sync(); + expect(user.preferences.webhooks[response.id].url).to.not.eql(url); + let response2 = await user.put(`/user/webhook/${response.id}`, {url, enabled}); + expect(response2.url).to.eql(url); + await user.sync(); + expect(user.preferences.webhooks[response.id].url).to.eql(url); + }); +}); diff --git a/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js b/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js new file mode 100644 index 0000000000..cf1354b095 --- /dev/null +++ b/test/api/v3/integration/user/auth/DELETE-user_auth_social_network.test.js @@ -0,0 +1,40 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; + +describe('DELETE social registration', () => { + let user; + let endpoint = '/user/auth/social/facebook'; + beforeEach(async () => { + user = await generateUser(); + await user.update({ 'auth.facebook.id': 'some-fb-id' }); + expect(user.auth.local.username).to.not.be.empty; + expect(user.auth.facebook).to.not.be.empty; + }); + context('of NOT-FACEBOOK', () => { + it('is not supported', async () => { + await expect(user.del('/user/auth/social/SOME-OTHER-NETWORK')).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlyFbSupported'), + }); + }); + }); + context('of facebook', () => { + it('fails if local registration does not exist for this user', async () => { + await user.update({ 'auth.local': { ok: true } }); + await expect(user.del(endpoint)).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('cantDetachFb'), + }); + }); + it('succeeds', async () => { + let response = await user.del(endpoint); + expect(response).to.eql({}); + await user.sync(); + expect(user.auth.facebook).to.be.empty; + }); + }); +}); diff --git a/test/api/v3/integration/user/auth/GET-logout.test.js b/test/api/v3/integration/user/auth/GET-logout.test.js new file mode 100644 index 0000000000..731c523bde --- /dev/null +++ b/test/api/v3/integration/user/auth/GET-logout.test.js @@ -0,0 +1,3 @@ +describe('GET /user/auth/logout', () => { + // TODO Test manually +}); diff --git a/test/api/v3/integration/user/auth/POST-firebase.test.js b/test/api/v3/integration/user/auth/POST-firebase.test.js new file mode 100644 index 0000000000..7ebd5a20cb --- /dev/null +++ b/test/api/v3/integration/user/auth/POST-firebase.test.js @@ -0,0 +1,18 @@ +import { + generateUser, +} from '../../../../../helpers/api-integration/v3'; +import moment from 'moment'; + +describe('POST /user/auth/firebase', () => { + let user; + + before(async () => { + user = await generateUser(); + }); + + it('returns a Firebase token', async () => { + let {token, expires} = await user.post('/user/auth/firebase'); + expect(moment(expires).isValid()).to.be.true; + expect(token).to.be.a('string'); + }); +}); diff --git a/test/api/v3/integration/user/auth/POST-login-local.test.js b/test/api/v3/integration/user/auth/POST-login-local.test.js new file mode 100644 index 0000000000..571b23c3ea --- /dev/null +++ b/test/api/v3/integration/user/auth/POST-login-local.test.js @@ -0,0 +1,69 @@ +import { + generateUser, + requester, + translate as t, +} from '../../../../../helpers/api-integration/v3'; + +describe('POST /user/auth/local/login', () => { + let api; + let user; + let endpoint = '/user/auth/local/login'; + let password = 'password'; + beforeEach(async () => { + api = requester(); + user = await generateUser(); + }); + it('success with username', async () => { + let response = await api.post(endpoint, { + username: user.auth.local.username, + password, + }); + expect(response.apiToken).to.eql(user.apiToken); + }); + it('success with email', async () => { + let response = await api.post(endpoint, { + username: user.auth.local.email, + password, + }); + expect(response.apiToken).to.eql(user.apiToken); + }); + it('user is blocked', async () => { + await user.update({ 'auth.blocked': 1 }); + await expect(api.post(endpoint, { + username: user.auth.local.username, + password, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('accountSuspended', { userId: user._id }), + }); + }); + it('wrong password', async () => { + await expect(api.post(endpoint, { + username: user.auth.local.username, + password: 'wrong-password', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('invalidLoginCredentialsLong'), + }); + }); + it('missing username', async () => { + await expect(api.post(endpoint, { + password: 'wrong-password', + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + it('missing password', async () => { + await expect(api.post(endpoint, { + username: user.auth.local.username, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); +}); diff --git a/test/api/v3/integration/user/auth/POST-register_local.test.js b/test/api/v3/integration/user/auth/POST-register_local.test.js new file mode 100644 index 0000000000..63d8f755a5 --- /dev/null +++ b/test/api/v3/integration/user/auth/POST-register_local.test.js @@ -0,0 +1,349 @@ +import { + generateUser, + requester, + translate as t, + createAndPopulateGroup, +} from '../../../../../helpers/api-integration/v3'; +import { v4 as generateRandomUserName } from 'uuid'; +import { each } from 'lodash'; +import { encrypt } from '../../../../../../website/server/libs/api-v3/encryption'; + +describe('POST /user/auth/local/register', () => { + context('username and email are free', () => { + let api; + + beforeEach(async () => { + api = requester(); + }); + + it('registers a new user', async () => { + let username = generateRandomUserName(); + let email = `${username}@example.com`; + let password = 'password'; + + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user._id).to.exist; + expect(user.apiToken).to.exist; + expect(user.auth.local.username).to.eql(username); + }); + + it('requires password and confirmPassword to match', async () => { + let username = generateRandomUserName(); + let email = `${username}@example.com`; + let password = 'password'; + let confirmPassword = 'not password'; + + await expect(api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('requires a username', async () => { + let email = `${generateRandomUserName()}@example.com`; + let password = 'password'; + let confirmPassword = 'password'; + + await expect(api.post('/user/auth/local/register', { + email, + password, + confirmPassword, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('requires an email', async () => { + let username = generateRandomUserName(); + let password = 'password'; + + await expect(api.post('/user/auth/local/register', { + username, + password, + confirmPassword: password, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('requires a valid email', async () => { + let username = generateRandomUserName(); + let email = 'notanemail@sdf'; + let password = 'password'; + + await expect(api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('requires a password', async () => { + let username = generateRandomUserName(); + let email = `${username}@example.com`; + let confirmPassword = 'password'; + + await expect(api.post('/user/auth/local/register', { + username, + email, + confirmPassword, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + }); + + context('attach to facebook user', () => { + let user; + let email = 'some@email.net'; + let username = 'some-username'; + let password = 'some-password'; + beforeEach(async () => { + user = await generateUser(); + }); + it('checks onlySocialAttachLocal', async () => { + await expect(user.post('/user/auth/local/register', { + email, + username, + password, + confirmPassword: password, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('onlySocialAttachLocal'), + }); + }); + it('succeeds', async () => { + await user.update({ 'auth.facebook.id': 'some-fb-id', 'auth.local': { ok: true } }); + await user.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + await user.sync(); + expect(user.auth.local.username).to.eql(username); + expect(user.auth.local.email).to.eql(email); + }); + }); + + context('login is already taken', () => { + let username, email, api; + + beforeEach(async () => { + api = requester(); + username = generateRandomUserName(); + email = `${username}@example.com`; + + return generateUser({ + 'auth.local.username': username, + 'auth.local.lowerCaseUsername': username, + 'auth.local.email': email, + }); + }); + + it('rejects if username is already taken', async () => { + let uniqueEmail = `${generateRandomUserName()}@exampe.com`; + let password = 'password'; + + await expect(api.post('/user/auth/local/register', { + username, + email: uniqueEmail, + password, + confirmPassword: password, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('usernameTaken'), + }); + }); + + it('rejects if email is already taken', async () => { + let uniqueUsername = generateRandomUserName(); + let password = 'password'; + + await expect(api.post('/user/auth/local/register', { + username: uniqueUsername, + email, + password, + confirmPassword: password, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('emailTaken'), + }); + }); + }); + + context('req.query.groupInvite', () => { + let api, username, email, password; + + beforeEach(() => { + api = requester(); + username = generateRandomUserName(); + email = `${username}@example.com`; + password = 'password'; + }); + + it('does not crash the signup process when it\'s invalid', async () => { + let user = await api.post('/user/auth/local/register?groupInvite=aaaaInvalid', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user._id).to.be.a('string'); + }); + + it('supports invite using req.query.groupInvite', async () => { + let { group, groupLeader } = await createAndPopulateGroup({ + groupDetails: { type: 'party', privacy: 'private' }, + }); + + let invite = encrypt(JSON.stringify({ + id: group._id, + inviter: groupLeader._id, + sentAt: Date.now(), // so we can let it expire + })); + + let user = await api.post(`/user/auth/local/register?groupInvite=${invite}`, { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.invitations.party).to.eql({ + id: group._id, + name: group.name, + inviter: groupLeader._id, + }); + }); + }); + + context('successful login via api', () => { + let api, username, email, password; + + beforeEach(() => { + api = requester(); + username = generateRandomUserName(); + email = `${username}@example.com`; + password = 'password'; + }); + + it('sets all site tour values to -2 (already seen)', async () => { + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.flags.tour).to.not.be.empty; + + each(user.flags.tour, (value) => { + expect(value).to.eql(-2); + }); + }); + + it('populates user with default todos, not no other task types', async () => { + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.tasksOrder.todos).to.not.be.empty; + expect(user.tasksOrder.dailys).to.be.empty; + expect(user.tasksOrder.habits).to.be.empty; + expect(user.tasksOrder.rewards).to.be.empty; + }); + + it('populates user with default tags', async () => { + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.tags).to.not.be.empty; + }); + }); + + context('successful login with habitica-web header', () => { + let api, username, email, password; + + beforeEach(() => { + api = requester({}, {'x-client': 'habitica-web'}); + username = generateRandomUserName(); + email = `${username}@example.com`; + password = 'password'; + }); + + it('sets all common tutorial flags to true', async () => { + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.flags.tour).to.not.be.empty; + + each(user.flags.tutorial.common, (value) => { + expect(value).to.eql(true); + }); + }); + + it('populates user with default todos, habits, and rewards', async () => { + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.tasksOrder.todos).to.not.be.empty; + expect(user.tasksOrder.dailys).to.be.empty; + expect(user.tasksOrder.habits).to.not.be.empty; + expect(user.tasksOrder.rewards).to.not.be.empty; + }); + + it('populates user with default tags', async () => { + let user = await api.post('/user/auth/local/register', { + username, + email, + password, + confirmPassword: password, + }); + + expect(user.tags).to.not.be.empty; + }); + }); +}); diff --git a/test/api/v3/integration/user/auth/POST-user_reset_password.test.js b/test/api/v3/integration/user/auth/POST-user_reset_password.test.js new file mode 100644 index 0000000000..773d199db6 --- /dev/null +++ b/test/api/v3/integration/user/auth/POST-user_reset_password.test.js @@ -0,0 +1,38 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-integration/v3'; + +describe('POST /user/reset-password', async () => { + let endpoint = '/user/reset-password'; + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('resets password', async () => { + let previousPassword = user.auth.local.hashed_password; + let response = await user.post(endpoint, { + email: user.auth.local.email, + }); + expect(response).to.eql({ data: {}, message: t('passwordReset') }); + await user.sync(); + expect(user.auth.local.hashed_password).to.not.eql(previousPassword); + }); + + it('same message on error as on success', async () => { + let response = await user.post(endpoint, { + email: 'nonExistent@email.com', + }); + expect(response).to.eql({ data: {}, message: t('passwordReset') }); + }); + + it('errors if email is not provided', async () => { + await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); +}); diff --git a/test/api/v3/integration/user/auth/PUT-user_update_email.test.js b/test/api/v3/integration/user/auth/PUT-user_update_email.test.js new file mode 100644 index 0000000000..47357d3c85 --- /dev/null +++ b/test/api/v3/integration/user/auth/PUT-user_update_email.test.js @@ -0,0 +1,79 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-v3-integration.helper'; + +const ENDPOINT = '/user/auth/update-email'; + +describe('PUT /user/auth/update-email', () => { + let newEmail = 'some-new-email_2@example.net'; + let oldPassword = 'password'; // from habitrpg/test/helpers/api-integration/v3/object-generators.js + + context('Local Authenticaion User', async () => { + let user; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('does not change email if email is not provided', async () => { + await expect(user.put(ENDPOINT)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('does not change email if password is not provided', async () => { + await expect(user.put(ENDPOINT, { + newEmail, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('does not change email if wrong password is provided', async () => { + await expect(user.put(ENDPOINT, { + newEmail, + password: 'wrong password', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('wrongPassword'), + }); + }); + + it('changes email if new email and existing password are provided', async () => { + let response = await user.put(ENDPOINT, { + newEmail, + password: oldPassword, + }); + expect(response).to.eql({ email: 'some-new-email_2@example.net' }); + + await user.sync(); + expect(user.auth.local.email).to.eql(newEmail); + }); + }); + + context('Social Login User', async () => { + let socialUser; + + beforeEach(async () => { + socialUser = await generateUser(); + await socialUser.update({ 'auth.local': { ok: true } }); + }); + + it('does not change email if user.auth.local.email does not exist for this user', async () => { + await expect(socialUser.put(ENDPOINT, { + newEmail, + password: oldPassword, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('userHasNoLocalRegistration'), + }); + }); + }); +}); diff --git a/test/api/v3/integration/user/auth/PUT-user_update_password.test.js b/test/api/v3/integration/user/auth/PUT-user_update_password.test.js new file mode 100644 index 0000000000..6821e18d3e --- /dev/null +++ b/test/api/v3/integration/user/auth/PUT-user_update_password.test.js @@ -0,0 +1,92 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-v3-integration.helper'; + +const ENDPOINT = '/user/auth/update-password'; + +describe('PUT /user/auth/update-password', async () => { + let user; + let password = 'password'; // from habitrpg/test/helpers/api-integration/v3/object-generators.js + let wrongPassword = 'wrong-password'; + let newPassword = 'new-password'; + + beforeEach(async () => { + user = await generateUser(); + }); + + it('successfully changes the password', async () => { + let previousHashedPassword = user.auth.local.hashed_password; + let response = await user.put(ENDPOINT, { + password, + newPassword, + confirmPassword: newPassword, + }); + expect(response).to.eql({}); + await user.sync(); + expect(user.auth.local.hashed_password).to.not.eql(previousHashedPassword); + }); + + it('returns an error when confirmPassword does not match newPassword', async () => { + await expect(user.put(ENDPOINT, { + password, + newPassword, + confirmPassword: `${newPassword}-wrong-confirmation`, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('passwordConfirmationMatch'), + }); + }); + + it('returns an error when existing password is wrong', async () => { + await expect(user.put(ENDPOINT, { + password: wrongPassword, + newPassword, + confirmPassword: newPassword, + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('wrongPassword'), + }); + }); + + it('returns an error when password is missing', async () => { + let body = { + newPassword, + confirmPassword: newPassword, + }; + + await expect(user.put(ENDPOINT, body)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns an error when newPassword is missing', async () => { + let body = { + password, + confirmPassword: newPassword, + }; + + await expect(user.put(ENDPOINT, body)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + + it('returns an error when confirmPassword is missing', async () => { + let body = { + password, + newPassword, + }; + + await expect(user.put(ENDPOINT, body)).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); +}); diff --git a/test/api/v3/integration/user/auth/PUT-user_update_username.test.js b/test/api/v3/integration/user/auth/PUT-user_update_username.test.js new file mode 100644 index 0000000000..372248db84 --- /dev/null +++ b/test/api/v3/integration/user/auth/PUT-user_update_username.test.js @@ -0,0 +1,76 @@ +import { + generateUser, + translate as t, +} from '../../../../../helpers/api-v3-integration.helper'; + +const ENDPOINT = '/user/auth/update-username'; + +describe('PUT /user/auth/update-username', async () => { + let user; + let newUsername = 'new-username'; + let password = 'password'; // from habitrpg/test/helpers/api-integration/v3/object-generators.js + + beforeEach(async () => { + user = await generateUser(); + }); + + it('successfully changes username', async () => { + let response = await user.put(ENDPOINT, { + username: newUsername, + password, + }); + expect(response).to.eql({ username: newUsername }); + await user.sync(); + expect(user.auth.local.username).to.eql(newUsername); + }); + + context('errors', async () => { + it('prevents username update if new username is already taken', async () => { + let existingUsername = 'existing-username'; + await generateUser({'auth.local.username': existingUsername, 'auth.local.lowerCaseUsername': existingUsername }); + + await expect(user.put(ENDPOINT, { + username: existingUsername, + password, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('usernameTaken'), + }); + }); + + it('errors if password is wrong', async () => { + await expect(user.put(ENDPOINT, { + username: newUsername, + password: 'wrong-password', + })).to.eventually.be.rejected.and.eql({ + code: 401, + error: 'NotAuthorized', + message: t('wrongPassword'), + }); + }); + + it('prevents social-only user from changing username', async () => { + let socialUser = await generateUser({ 'auth.local': { ok: true } }); + + await expect(socialUser.put(ENDPOINT, { + username: newUsername, + password, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('userHasNoLocalRegistration'), + }); + }); + + it('errors if new username is not provided', async () => { + await expect(user.put(ENDPOINT, { + password, + })).to.eventually.be.rejected.and.eql({ + code: 400, + error: 'BadRequest', + message: t('invalidReqParams'), + }); + }); + }); +}); diff --git a/test/api/v3/unit/libs/analyticsService.test.js b/test/api/v3/unit/libs/analyticsService.test.js new file mode 100644 index 0000000000..553dfb676c --- /dev/null +++ b/test/api/v3/unit/libs/analyticsService.test.js @@ -0,0 +1,312 @@ +// TODO These tests are pretty brittle +// rewrite them to not depend on nock +// Trust that the amplitude module works as intended and sends the requests +import analyticsService from '../../../../../website/server/libs/api-v3/analyticsService'; + +import nock from 'nock'; + +describe('analyticsService', () => { + let amplitudeNock, gaNock; + + beforeEach(() => { + amplitudeNock = nock('https://api.amplitude.com') + .filteringPath(/httpapi.*/g, '') + .post('/') + .reply(200, {status: 'OK'}); + + gaNock = nock('http://www.google-analytics.com'); + }); + + describe('#track', () => { + let eventType, data; + + beforeEach(() => { + eventType = 'Cron'; + data = { + category: 'behavior', + uuid: 'unique-user-id', + resting: true, + cronCount: 5, + }; + }); + + context('Amplitude', () => { + it('calls out to amplitude', () => { + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('uses a dummy user id if none is provided', () => { + delete data.uuid; + + amplitudeNock + .filteringPath(/httpapi.*user_id.*no-user-id-was-provided.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sets platform as server', () => { + amplitudeNock + .filteringPath(/httpapi.*platform.*server.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends details about event', () => { + amplitudeNock + .filteringPath(/httpapi.*event_properties%22%3A%7B%22category%22%3A%22behavior%22%2C%22resting%22%3Atrue%2C%22cronCount%22%3A5%7D%2C%22.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends english item name for gear if itemKey is provided', () => { + data.itemKey = 'headAccessory_special_foxEars'; + + amplitudeNock + .filteringPath(/httpapi.*itemName.*Fox%20Ears.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends english item name for egg if itemKey is provided', () => { + data.itemKey = 'Wolf'; + + amplitudeNock + .filteringPath(/httpapi.*itemName.*Wolf%20Egg.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends english item name for food if itemKey is provided', () => { + data.itemKey = 'Cake_Skeleton'; + + amplitudeNock + .filteringPath(/httpapi.*itemName.*Bare%20Bones%20Cake.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends english item name for hatching potion if itemKey is provided', () => { + data.itemKey = 'Golden'; + + amplitudeNock + .filteringPath(/httpapi.*itemName.*Golden%20Hatching%20Potion.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + xit('sends english item name for quest if itemKey is provided', () => { + data.itemKey = 'atom1'; + + amplitudeNock + .filteringPath(/httpapi.*itemName.*Attack%20of%20the%20Mundane%2C%20Part%201%3A%20Dish%20Disaster!.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends english item name for purchased spell if itemKey is provided', () => { + data.itemKey = 'seafoam'; + + amplitudeNock + .filteringPath(/httpapi.*itemName.*Seafoam.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends user data if provided', () => { + let stats = { class: 'wizard', exp: 5, gp: 23, hp: 10, lvl: 4, mp: 30 }; + let user = { + stats, + contributor: { level: 1 }, + purchased: { plan: { planId: 'foo-plan' } }, + flags: {tour: {intro: -2}}, + habits: [{_id: 'habit'}], + dailys: [{_id: 'daily'}], + todos: [{_id: 'todo'}], + rewards: [{_id: 'reward'}], + }; + + data.user = user; + + amplitudeNock + .filteringPath(/httpapi.*user_properties%22%3A%7B%22Class%22%3A%22wizard%22%2C%22Experience%22%3A5%2C%22Gold%22%3A23%2C%22Health%22%3A10%2C%22Level%22%3A4%2C%22Mana%22%3A30%2C%22tutorialComplete%22%3Atrue%2C%22Number%20Of%20Tasks%22%3A%7B%22habits%22%3A1%2C%22dailys%22%3A1%2C%22todos%22%3A1%2C%22rewards%22%3A1%7D%2C%22contributorLevel%22%3A1%2C%22subscription%22%3A%22foo-plan%22%7D%2C%22.*/g, ''); + + return analyticsService.track(eventType, data) + .then(() => { + amplitudeNock.done(); + }); + }); + }); + + context('GA', () => { + it('calls out to GA', () => { + gaNock + .post('/collect') + .reply(200, {status: 'OK'}); + + return analyticsService.track(eventType, data) + .then(() => { + gaNock.done(); + }); + }); + + it('sends details about event', () => { + gaNock + .post('/collect', /ec=behavior&ea=Cron&v=1&tid=GA_ID&cid=.*&t=event/) + .reply(200, {status: 'OK'}); + + return analyticsService.track(eventType, data) + .then(() => { + gaNock.done(); + }); + }); + }); + }); + + describe('#trackPurchase', () => { + let data; + + beforeEach(() => { + data = { + uuid: 'user-id', + sku: 'paypal-checkout', + paymentMethod: 'PayPal', + itemPurchased: 'Gems', + purchaseValue: 8, + purchaseType: 'checkout', + gift: false, + quantity: 1, + }; + }); + + context('Amplitude', () => { + it('calls out to amplitude', () => { + return analyticsService.trackPurchase(data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('uses a dummy user id if none is provided', () => { + delete data.uuid; + + amplitudeNock + .filteringPath(/httpapi.*user_id.*no-user-id-was-provided.*/g, ''); + + return analyticsService.trackPurchase(data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sets platform as server', () => { + amplitudeNock + .filteringPath(/httpapi.*platform.*server.*/g, ''); + + return analyticsService.trackPurchase(data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends details about purchase', () => { + amplitudeNock + .filteringPath(/httpapi.*aypal-checkout%22%2C%22paymentMethod%22%3A%22PayPal%22%2C%22itemPurchased%22%3A%22Gems%22%2C%22purchaseType%22%3A%22checkout%22%2C%22gift%22%3Afalse%2C%22quantity%22%3A1%7D%2C%22event_type%22%3A%22purchase%22%2C%22revenue.*/g, ''); + + return analyticsService.trackPurchase(data) + .then(() => { + amplitudeNock.done(); + }); + }); + + it('sends user data if provided', () => { + let stats = { class: 'wizard', exp: 5, gp: 23, hp: 10, lvl: 4, mp: 30 }; + let user = { + stats, + contributor: { level: 1 }, + purchased: { plan: { planId: 'foo-plan' } }, + flags: {tour: {intro: -2}}, + habits: [{_id: 'habit'}], + dailys: [{_id: 'daily'}], + todos: [{_id: 'todo'}], + rewards: [{_id: 'reward'}], + }; + + data.user = user; + + amplitudeNock + .filteringPath(/httpapi.*user_properties%22%3A%7B%22Class%22%3A%22wizard%22%2C%22Experience%22%3A5%2C%22Gold%22%3A23%2C%22Health%22%3A10%2C%22Level%22%3A4%2C%22Mana%22%3A30%2C%22tutorialComplete%22%3Atrue%2C%22Number%20Of%20Tasks%22%3A%7B%22habits%22%3A1%2C%22dailys%22%3A1%2C%22todos%22%3A1%2C%22rewards%22%3A1%7D%2C%22contributorLevel%22%3A1%2C%22subscription%22%3A%22foo-plan%22%7D%2C%22.*/g, ''); + + return analyticsService.trackPurchase(data) + .then(() => { + amplitudeNock.done(); + }); + }); + }); + + context('GA', () => { + it('calls out to GA', () => { + gaNock + .post('/collect') + .reply(200, {status: 'OK'}); + + return analyticsService.trackPurchase(data) + .then(() => { + gaNock.done(); + }); + }); + + it('sends details about purchase', () => { + gaNock + .post('/collect', /ti=user-id&tr=8&v=1&tid=GA_ID&cid=.*&t=transaction/) + .reply(200, {status: 'OK'}) + .post('/collect', /ec=commerce&ea=checkout&el=PayPal&ev=8&v=1&tid=GA_ID&cid=.*&t=event/) + .reply(200, {status: 'OK'}); + + return analyticsService.trackPurchase(data) + .then(() => { + gaNock.done(); + }); + }); + }); + }); + + describe('mockAnalyticsService', () => { + it('has stubbed track method', () => { + expect(analyticsService.mockAnalyticsService).to.respondTo('track'); + }); + + it('has stubbed trackPurchase method', () => { + expect(analyticsService.mockAnalyticsService).to.respondTo('trackPurchase'); + }); + }); +}); diff --git a/test/api/v3/unit/libs/baseModel.test.js b/test/api/v3/unit/libs/baseModel.test.js new file mode 100644 index 0000000000..39bf7df047 --- /dev/null +++ b/test/api/v3/unit/libs/baseModel.test.js @@ -0,0 +1,97 @@ +import baseModel from '../../../../../website/server/libs/api-v3/baseModel'; +import mongoose from 'mongoose'; + +describe('Base model plugin', () => { + let schema; + + beforeEach(() => { + schema = new mongoose.Schema(); + sandbox.stub(schema, 'add'); + }); + + it('adds a _id field to the schema', () => { + schema.plugin(baseModel); + + expect(schema.add).to.be.calledWith(sinon.match({ + _id: sinon.match.object, + })); + }); + + it('can add timestamps fields', () => { + schema.plugin(baseModel, {timestamps: true}); + + expect(schema.add).to.be.calledTwice; + }); + + it('can sanitize input objects', () => { + schema.plugin(baseModel, { + noSet: ['noUpdateForMe'], + }); + + expect(schema.statics.sanitize).to.exist; + let sanitized = schema.statics.sanitize({ok: true, noUpdateForMe: true}); + + expect(sanitized).to.have.property('ok'); + expect(sanitized).not.to.have.property('noUpdateForMe'); + expect(sanitized.noUpdateForMe).to.equal(undefined); + }); + + it('accepts an array of additional fields to sanitize at runtime', () => { + schema.plugin(baseModel, { + noSet: ['noUpdateForMe'], + }); + + expect(schema.statics.sanitize).to.exist; + let sanitized = schema.statics.sanitize({ok: true, noUpdateForMe: true, usuallySettable: true}, ['usuallySettable']); + + expect(sanitized).to.have.property('ok'); + expect(sanitized).not.to.have.property('noUpdateForMe'); + expect(sanitized).not.to.have.property('usuallySettable'); + }); + + + it('can make fields private', () => { + schema.plugin(baseModel, { + private: ['amPrivate'], + }); + + expect(schema.options.toJSON.transform).to.exist; + let objToTransform = {ok: true, amPrivate: true}; + let privatized = schema.options.toJSON.transform({}, objToTransform); + + expect(privatized).to.have.property('ok'); + expect(privatized).not.to.have.property('amPrivate'); + }); + + it('accepts a further transform function for toJSON', () => { + let options = { + private: ['amPrivate'], + toJSONTransform: sandbox.stub().returns(true), + }; + + schema.plugin(baseModel, options); + + let objToTransform = {ok: true, amPrivate: true}; + let doc = {doc: true}; + let privatized = schema.options.toJSON.transform(doc, objToTransform); + + expect(privatized).to.equals(true); + expect(options.toJSONTransform).to.be.calledWith(objToTransform, doc); + }); + + it('accepts a transform function for sanitize', () => { + let options = { + private: ['amPrivate'], + sanitizeTransform: sandbox.stub().returns(true), + }; + + schema.plugin(baseModel, options); + + expect(schema.options.toJSON.transform).to.exist; + let objToSanitize = {ok: true, noUpdateForMe: true}; + let sanitized = schema.statics.sanitize(objToSanitize); + + expect(sanitized).to.equals(true); + expect(options.sanitizeTransform).to.be.calledWith(objToSanitize); + }); +}); diff --git a/test/api/v3/unit/libs/buildManifest.test.js b/test/api/v3/unit/libs/buildManifest.test.js new file mode 100644 index 0000000000..1444738f10 --- /dev/null +++ b/test/api/v3/unit/libs/buildManifest.test.js @@ -0,0 +1,19 @@ +import { + getManifestFiles, +} from '../../../../../website/server/libs/api-v3/buildManifest'; + +describe('Build Manifest', () => { + describe('getManifestFiles', () => { + it('returns an html string', () => { + let htmlCode = getManifestFiles('app'); + + expect(htmlCode.startsWith(':smile: - task name
\n'); + expect(arg.text).to.eql('
- task name
')($scope);
+ $scope.popoverEl.popover('destroy').popover({
+ html: true,
+ placement: 'right',
+ trigger: 'manual',
+ title: window.env.t('closeCha'),
+ content: html
+ }).popover('show');
+ };
+
+ $scope.toggle = function(id){
+ if($state.includes('options.social.challenges.detail', {cid: id})){
+ $state.go('options.social.challenges')
+ }else{
+ $state.go('options.social.challenges.detail', {cid: id});
+ }
+ };
+
+ $scope.toggleMember = function(cid, uid){
+ if($state.includes('options.social.challenges.detail.member', {cid: cid, uid: uid})){
+ $state.go('options.social.challenges.detail')
+ }else{
+ $state.go('options.social.challenges.detail.member', {cid: cid, uid: uid});
+ }
+ };
+
+ //------------------------------------------------------------
+ // Tasks
+ //------------------------------------------------------------
+ function addTask (addTo, listDef, challenge) {
+ var task = Shared.taskDefaults({text: listDef.newTask, type: listDef.type});
+ //If the challenge has not been created, we bulk add tasks on save
+ if (challenge._id) Tasks.createChallengeTasks(challenge._id, task);
+ if (!challenge[task.type + 's']) challenge[task.type + 's'] = [];
+ challenge[task.type + 's'].unshift(task);
+ delete listDef.newTask;
+ };
+
+ $scope.addTask = function(addTo, listDef, challenge) {
+ if (listDef.bulk) {
+ var tasks = listDef.newTask.split(/[\n\r]+/);
+ //Reverse the order of tasks so the tasks will appear in the order the user entered them
+ tasks.reverse();
+ _.each(tasks, function(t) {
+ listDef.newTask = t;
+ addTask(addTo, listDef, challenge);
+ });
+ listDef.bulk = false;
+ } else {
+ addTask(addTo, listDef, challenge);
+ }
+ }
+
+ $scope.removeTask = function(task, challenge) {
+ if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return;
+ //We only pass to the api if the challenge exists, otherwise, the tasks only exist on the client
+ if (challenge._id) Tasks.deleteTask(task._id);
+ var index = challenge[task.type + 's'].indexOf(task);
+ challenge[task.type + 's'].splice(index, 1);
+ };
+
+ $scope.saveTask = function(task){
+ task._editing = false;
+ // TODO persist
+ }
+
+ $scope.toggleBulk = function(list) {
+ if (typeof list.bulk === 'undefined') {
+ list.bulk = false;
+ }
+ list.bulk = !list.bulk;
+ list.focus = true;
+ };
+
+ /*
+ --------------------------
+ Subscription
+ --------------------------
+ */
+
+ $scope.join = function (challenge) {
+ Challenges.joinChallenge(challenge._id)
+ .then(function (response) {
+ User.user.challenges.push(challenge._id);
+ _getChallenges();
+ return Tasks.getUserTasks();
+ })
+ .then(function (response) {
+ var tasks = response.data.data;
+ User.syncUserTasks(tasks);
+ });
+ }
+
+ $scope.leave = function(keep, challenge) {
+ if (keep == 'cancel') {
+ $scope.selectedChal = undefined;
+ } else {
+ Challenges.leaveChallenge($scope.selectedChal._id, keep)
+ .then(function (response) {
+ var index = User.user.challenges.indexOf($scope.selectedChal._id);
+ delete User.user.challenges[index];
+ _getChallenges();
+ return Tasks.getUserTasks();
+ })
+ .then(function (response) {
+ var tasks = response.data.data;
+ User.syncUserTasks(tasks);
+ });
+ }
+ $scope.popoverEl.popover('destroy');
+ }
+
+ /**
+ * Named "clickLeave" to distinguish between "actual" leave above, since this triggers the
+ * "are you sure?" dialog.
+ */
+ $scope.clickLeave = function(chal, $event) {
+ $scope.selectedChal = chal;
+ $scope.popoverEl = $($event.target);
+ var html = $compile(
+ '' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
' + )($scope); + $scope.popoverEl.popover('destroy').popover({ + html: true, + placement: 'top', + trigger: 'manual', + title: window.env.t('leaveCha'), + content: html + }).popover('show'); + } + + //------------------------------------------------------------ + // Filtering + //------------------------------------------------------------ + + $scope.filterChallenges = function(chal){ + if (!$scope.search) return true; + + return _shouldShowChallenge(chal); + } + + $scope.$watch('newChallenge.group', function(gid){ + if (!gid) return; + + _calculateMaxPrize(gid); + + if (gid == TAVERN_ID) { + $scope.newChallenge.prize = 1; + } + }) + + $scope.selectAll = function(){ + $scope.search.group = _.transform($scope.groups, function(searchPool, group){ + searchPool[group._id] = true; + }); + } + + $scope.selectNone = function(){ + $scope.search.group = _.transform($scope.groups, function(searchPool, group){ + searchPool[group._id] = false; + }); + } + + $scope.shouldShow = function(task, list, prefs){ + return true; + }; + + $scope.insufficientGemsForTavernChallenge = function() { + var balance = User.user.balance || 0; + var isForTavern = $scope.newChallenge.group == TAVERN_ID; + + if (isForTavern) { + return balance <= 0; + } else { + return false; + } + } + + $scope.sendMessageToChallengeParticipant = function(uid) { + Members.selectMember(uid) + .then(function () { + $rootScope.openModal('private-message', {controller:'MemberModalCtrl'}); + }); + }; + + $scope.sendGiftToChallengeParticipant = function(uid) { + Members.selectMember(uid) + .then(function () { + $rootScope.openModal('send-gift', {controller:'MemberModalCtrl'}); + }); + }; + + $scope.filterInitialChallenges = function() { + $scope.groupsFilter = _.uniq(_.compact(_.pluck($scope.challenges, 'group')), function(g) {return g._id}); + + $scope.search = { + group: _.transform($scope.groups, function(m,g) { m[g._id] = true;}), + _isMember: "either", + _isOwner: "either" + }; + //If we game from a group, then override the filter to that group + + if ($scope.groupIdFilter) { + $scope.search.group = {}; + $scope.search.group[$scope.groupIdFilter] = true ; + } + } + + function _calculateMaxPrize(gid) { + + var userBalance = User.getBalanceInGems() || 0; + var availableGroupBalance = _calculateAvailableGroupBalance(gid); + + $scope.maxPrize = userBalance + availableGroupBalance; + } + + function _calculateAvailableGroupBalance(gid) { + var groupBalance = 0; + var group = _.find($scope.groups, { _id: gid }); + + if (group && group.balance && group.leader === User.user._id) { + groupBalance = group.balance * 4; + } + + return groupBalance; + } + + function _shouldShowChallenge (chal) { + // Have to check that the leader object exists first in the + // case where a challenge's leader deletes their account + var userIsOwner = (chal.leader && chal.leader._id) === User.user.id; + + var groupSelected = $scope.search.group[chal.group ? chal.group._id : null]; + var checkOwner = $scope.search._isOwner === 'either' || (userIsOwner === $scope.search._isOwner); + var checkMember = $scope.search._isMember === 'either' || ($scope.isUserMemberOf(chal) === $scope.search._isMember); + + return groupSelected && checkOwner && checkMember; + } + + function _backToChallenges(){ + $scope.popoverEl.popover('destroy'); + $scope.cid = null; + $state.go('options.social.challenges'); + _getChallenges(); + } + + // Fetch single challenge if a cid is present; fetch multiple challenges + // otherwise + function _getChallenges() { + if ($scope.cid) { + Challenges.getChallenge($scope.cid) + .then(function (response) { + var challenge = response.data.data; + $scope.challenges = [challenge]; + }); + } else { + Challenges.getUserChallenges() + .then(function(response){ + $scope.challenges = response.data.data; + $scope.filterInitialChallenges(); + }); + } + }; +}]); diff --git a/website/client/js/controllers/chatCtrl.js b/website/client/js/controllers/chatCtrl.js new file mode 100644 index 0000000000..c7c29d6502 --- /dev/null +++ b/website/client/js/controllers/chatCtrl.js @@ -0,0 +1,151 @@ +'use strict'; + +habitrpg.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', 'Analytics', + function($scope, Groups, Chat, User, $http, ApiUrl, Notification, Members, $rootScope, Analytics){ + $scope.message = {content:''}; + $scope._sending = false; + + $scope.isUserMentioned = function(user, message) { + if(message.hasOwnProperty("highlight")) + return message.highlight; + message.highlight = false; + var messagetext = message.text.toLowerCase(); + var username = user.profile.name; + var mentioned = messagetext.indexOf(username.toLowerCase()); + var pattern = username+"([^\w]|$){1}"; + if(mentioned > -1) { + var preceedingchar = messagetext.substring(mentioned-1,mentioned); + if(mentioned == 0 || preceedingchar.trim() == '' || preceedingchar == '@'){ + var regex = new RegExp(pattern,'i'); + message.highlight = regex.test(messagetext); + } + } + return message.highlight; + } + + $scope.postChat = function(group, message){ + if (_.isEmpty(message) || $scope._sending) return; + $scope._sending = true; + var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false; + Chat.postChat(group._id, message, previousMsg) + .then(function(response) { + var message = response.data.data.message; + + group.chat.unshift(message); + + $scope.message.content = ''; + $scope._sending = false; + + if (group.type == 'party') { + Analytics.updateUser({'partyID': group.id, 'partySize': group.memberCount}); + } + + if (group.privacy == 'public'){ + Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy,'groupName':group.name}); + } else { + Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy}); + } + }, function(err){ + $scope._sending = false; + }); + } + + $scope.deleteChatMessage = function(group, message){ + if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){ + var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false; + if (confirm('Are you sure you want to delete this message?')) { + Chat.deleteChat(group._id, message.id, previousMsg) + .then(function (response) { + var i = _.findIndex(group.chat, {id: message.id}); + if(i !== -1) group.chat.splice(i, 1); + }); + } + } + } + + $scope.likeChatMessage = function(group, message) { + if (message.uuid == User.user._id) + return Notification.text(window.env.t('foreverAlone')); + + if (!message.likes) message.likes = {}; + + if (message.likes[User.user._id]) { + delete message.likes[User.user._id]; + } else { + message.likes[User.user._id] = true; + } + + Chat.like(group._id, message.id); + } + + $scope.flagChatMessage = function(groupId,message) { + if(!message.flags) message.flags = {}; + + if (message.flags[User.user._id]) { + Notification.text(window.env.t('abuseAlreadyReported')); + } else { + $scope.abuseObject = message; + $scope.groupId = groupId; + Members.selectMember(message.uuid) + .then(function () { + $rootScope.openModal('abuse-flag',{ + controller:'MemberModalCtrl', + scope: $scope + }); + }); + } + }; + + $scope.copyToDo = function(message) { + var taskNotes = env.t("messageWroteIn", { + user: message.uuid == 'system' + ? 'system' + : '[' + message.user + '](' + env.BASE_URL + '/static/front/#?memberId=' + message.uuid + ')', + group: '[' + $scope.group.name + '](' + window.location.href + ')' + }); + + var newScope = $scope.$new(); + newScope.text = message.text; + newScope.notes = taskNotes; + + $rootScope.openModal('copyChatToDo',{ + controller:'CopyMessageModalCtrl', + scope: newScope + }); + }; + + function handleGroupResponse (response) { + $scope.group = response; + if (!$scope.group._id) $scope.group = response.data.data; + }; + + $scope.sync = function(group) { + if (group.name === Groups.TAVERN_NAME) { + Groups.tavern(true).then(handleGroupResponse); + } else if (group._id === User.user.party._id) { + Groups.party(true).then(handleGroupResponse); + } else { + Groups.Group.get(group._id).then(handleGroupResponse); + } + + Chat.markChatSeen(group._id); + } + + // List of Ordering options for the party members list + $scope.partyOrderChoices = { + 'level': window.env.t('sortLevel'), + 'random': window.env.t('sortRandom'), + 'pets': window.env.t('sortPets'), + 'habitrpg_date_joined' : window.env.t('sortHabitrpgJoined'), + 'party_date_joined': window.env.t('sortJoined'), + 'habitrpg_last_logged_in': window.env.t('sortHabitrpgLastLoggedIn'), + 'name': window.env.t('sortName'), + 'backgrounds': window.env.t('sortBackgrounds'), + }; + + $scope.partyOrderAscendingChoices = { + 'ascending': window.env.t('ascendingSort'), + 'descending': window.env.t('descendingSort') + } + + }]); diff --git a/website/public/js/controllers/copyMessageModalCtrl.js b/website/client/js/controllers/copyMessageModalCtrl.js similarity index 89% rename from website/public/js/controllers/copyMessageModalCtrl.js rename to website/client/js/controllers/copyMessageModalCtrl.js index 60d07ec152..1e58237454 100644 --- a/website/public/js/controllers/copyMessageModalCtrl.js +++ b/website/client/js/controllers/copyMessageModalCtrl.js @@ -9,7 +9,7 @@ habitrpg.controller("CopyMessageModalCtrl", ['$scope', 'User', 'Notification', notes: $scope.notes }; - User.user.ops.addTask({body:newTask}); + User.addTask({body:newTask}); Notification.text(window.env.t('messageAddedAsToDo')); $scope.$close(); diff --git a/website/public/js/controllers/filtersCtrl.js b/website/client/js/controllers/filtersCtrl.js similarity index 82% rename from website/public/js/controllers/filtersCtrl.js rename to website/client/js/controllers/filtersCtrl.js index cfdc45658d..0020a17eee 100644 --- a/website/public/js/controllers/filtersCtrl.js +++ b/website/client/js/controllers/filtersCtrl.js @@ -14,7 +14,7 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', _.each(User.user.tags, function(tag){ // Send an update op for each changed tag (excluding new tags & deleted tags, this if() packs a punch) if (tagsSnap[tag.id] && tagsSnap[tag.id].name != tag.name) - User.user.ops.updateTag({params:{id:tag.id},body:{name:tag.name}}); + User.updateTag({params:{id:tag.id}, body:{name:tag.name}}); }) $scope._editing = false; } else { @@ -25,7 +25,12 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', }; $scope.toggleFilter = function(tag) { - user.filters[tag.id] = !user.filters[tag.id]; + if (!user.filters[tag.id]) { + user.filters[tag.id] = true; + } else { + delete user.filters[tag.id]; + } + // no longer persisting this, it was causing a lot of confusion - users thought they'd permanently lost tasks // Note: if we want to persist for just this computer, easy method is: // User.save(); @@ -37,7 +42,7 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared', $scope.updateTaskFilter(); $scope.createTag = function() { - User.user.ops.addTag({body:{name:$scope._newTag.name, id:Shared.uuid()}}); + User.addTag({body:{name: $scope._newTag.name, id: Shared.uuid()}}); $scope._newTag.name = ''; }; }]); diff --git a/website/client/js/controllers/footerCtrl.js b/website/client/js/controllers/footerCtrl.js new file mode 100644 index 0000000000..2d07aff430 --- /dev/null +++ b/website/client/js/controllers/footerCtrl.js @@ -0,0 +1,180 @@ +"use strict"; + +angular.module('habitrpg').controller("FooterCtrl", +['$scope', '$rootScope', 'User', '$http', 'Notification', 'ApiUrl', 'Social', +function($scope, $rootScope, User, $http, Notification, ApiUrl, Social) { + + $scope.loadWidgets = Social.loadWidgets; + + if(env.isStaticPage){ + $scope.languages = env.availableLanguages; + $scope.selectedLanguage = _.find(env.availableLanguages, {code: env.language.code}); + + $rootScope.selectedLanguage = $scope.selectedLanguage; + + $scope.changeLang = function(){ + window.location = '?lang='+$scope.selectedLanguage.code; + } + } + + /** + External Scripts + JS files not needed right away (google charts) or entirely optional (analytics) + Each file gets loaded async via $.getScript, so it doesn't bog page-load + */ + + $scope.deferredScripts = function(){ + + // Amazon Payments + var amazonPaymentsUrl = 'https://static-na.payments-amazon.com/OffAmazonPayments/us/' + + (window.env.NODE_ENV === 'production' ? '' : 'sandbox/') + 'js/Widgets.js'; + $.getScript(amazonPaymentsUrl); + + // Stripe + $.getScript('//checkout.stripe.com/v2/checkout.js'); + + /* Google Content Experiments + if (window.env.NODE_ENV === 'production') { + $.getScript('//www.google-analytics.com/cx/api.js?experiment=boVO4eEyRfysNE5D53nCMQ', function(){ + $rootScope.variant = cxApi.chooseVariation(); + $rootScope.$apply(); + }) + } */ + + // Scripts only for desktop + if (!window.env.IS_MOBILE) { + // Add This + //$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4"); //FIXME why isn't this working when here? instead it's now in + var addthisServices = 'facebook,twitter,googleplus,tumblr,'+window.env.BASE_URL.replace('https://','').replace('http://',''); + window.addthis_config = { + ui_click: true, + services_custom:{ + name: "Download", + url: window.env.BASE_URL+"/export/avatar-"+User.user._id+".png", + icon: window.env.BASE_URL+"/favicon.ico" + }, + services_expanded:addthisServices, + services_compact:addthisServices + }; + + // Google Charts + $.getScript("//www.google.com/jsapi", function() { + google.load("visualization", "1", { + packages: ["corechart"], + callback: function() {} + }); + }); + } + } + + /** + * Debug functions. Note that the server route for gems is only available if process.env.DEBUG=true + */ + if (_.contains(['development','test'],window.env.NODE_ENV)) { + + $scope.setHealthLow = function(){ + User.set({ + 'stats.hp': 1 + }); + }; + + $scope.addMissedDay = function(numberOfDays){ + if (!confirm("Are you sure you want to reset the day by " + numberOfDays + " day(s)?")) return; + + User.setCron(numberOfDays); + }; + + $scope.addTenGems = function(){ + User.addTenGems(); + }; + + $scope.addHourglass = function(){ + User.addHourglass(); + }; + + $scope.addGold = function(){ + User.set({ + 'stats.gp': User.user.stats.gp + 500, + }); + }; + + $scope.addMana = function(){ + User.set({ + 'stats.mp': User.user.stats.mp + 500, + }); + }; + + $scope.addLevelsAndGold = function(){ + User.set({ + 'stats.exp': User.user.stats.exp + 10000, + 'stats.gp': User.user.stats.gp + 10000, + 'stats.mp': User.user.stats.mp + 10000 + }); + }; + + $scope.addOneLevel = function(){ + User.set({ + 'stats.exp': User.user.stats.exp + (Math.round(((Math.pow(User.user.stats.lvl, 2) * 0.25) + (10 * User.user.stats.lvl) + 139.75) / 10) * 10) + }); + }; + + $scope.addQuestProgress = function(){ + $http({ + method: "POST", + url: 'api/v3/debug/quest-progress' + }) + .then(function (response) { + Notification.text('Quest progress increased'); + User.sync(); + }) + }; + + $scope.makeAdmin = function () { + User.makeAdmin(); + }; + + $scope.openModifyInventoryModal = function () { + $rootScope.openModal('modify-inventory', {controller: 'FooterCtrl', scope: $scope }); + $scope.showInv = { }; + $scope.inv = { + gear: {}, + special: {}, + pets: {}, + mounts: {}, + eggs: {}, + hatchingPotions: {}, + food: {}, + quests: {}, + }; + $scope.setAllItems = function (type, value) { + var set = $scope.inv[type]; + + for (var item in set) { + if (set.hasOwnProperty(item)) { + set[item] = value; + } + } + }; + }; + + $scope.modifyInventory = function () { + $http({ + method: "POST", + url: 'api/v3/debug/modify-inventory', + data: { + gear: $scope.showInv.gear ? $scope.inv.gear : null, + special: $scope.showInv.special ? $scope.inv.special : null, + pets: $scope.showInv.pets ? $scope.inv.pets : null, + mounts: $scope.showInv.mounts ? $scope.inv.mounts : null, + eggs: $scope.showInv.eggs ? $scope.inv.eggs : null, + hatchingPotions: $scope.showInv.hatchingPotions ? $scope.inv.hatchingPotions : null, + food: $scope.showInv.food ? $scope.inv.food : null, + quests: $scope.showInv.quests ? $scope.inv.quests : null, + } + }) + .then(function (response) { + Notification.text('Inventory updated. Refresh or sync.'); + }) + }; + } +}]) diff --git a/website/client/js/controllers/groupsCtrl.js b/website/client/js/controllers/groupsCtrl.js new file mode 100644 index 0000000000..cafbe3b158 --- /dev/null +++ b/website/client/js/controllers/groupsCtrl.js @@ -0,0 +1,144 @@ +"use strict"; + +habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '$http', '$q', 'User', 'Members', '$state', 'Notification', + function($scope, $rootScope, Shared, Groups, $http, $q, User, Members, $state, Notification) { + $scope.isMemberOfPendingQuest = function (userid, group) { + if (!group.quest || !group.quest.members) return false; + if (group.quest.active) return false; // quest is started, not pending + return userid in group.quest.members && group.quest.members[userid] != false; + }; + + $scope.isMemberOfRunningQuest = function (userid, group) { + if (!group.quest || !group.quest.members) return false; + if (!group.quest.active) return false; // quest is pending, not started + return group.quest.members[userid]; + }; + + $scope.isMemberOfGroup = function (userid, group) { + // If the group is a guild, just check for an intersection with the + // current user's guilds, rather than checking the members of the group. + if(group.type === 'guild') { + return _.detect(User.user.guilds, function(guildId) { return guildId === group._id }); + } + + // Similarly, if we're dealing with the user's current party, return true. + if(group.type === 'party') { + var currentParty = group; + if(currentParty._id && currentParty._id === group._id) return true; + } + + if (!group.members) return false; + var memberIds = _.map(group.members, function(x){return x._id}); + return ~(memberIds.indexOf(userid)); + }; + + $scope.isMember = function (user, group) { + return ~(group.members.indexOf(user._id)); + }; + + $scope.Members = Members; + + $scope._editing = {group: false}; + $scope.groupCopy = {}; + + $scope.editGroup = function (group) { + angular.copy(group, $scope.groupCopy); + group._editing = true; + }; + + $scope.saveEdit = function (group) { + var newLeader = $scope.groupCopy._newLeader && $scope.groupCopy._newLeader._id; + + if (newLeader) { + $scope.groupCopy.leader = newLeader; + } + + angular.copy($scope.groupCopy, group); + + Groups.Group.update(group); + + $scope.cancelEdit(group); + }; + + $scope.cancelEdit = function (group) { + group._editing = false; + $scope.groupCopy = {}; + }; + + $scope.deleteAllMessages = function() { + if (confirm(window.env.t('confirmDeleteAllMessages'))) { + User.clearPMs(); + } + }; + + // ------ Modals ------ + + $scope.clickMember = function (uid, forceShow) { + if (User.user._id == uid && !forceShow) { + if ($state.is('tasks')) { + $state.go('options.profile.avatar'); + } else { + $state.go('tasks'); + } + } else { + // We need the member information up top here, but then we pass it down to the modal controller + // down below. Better way of handling this? + Members.selectMember(uid) + .then(function () { + $rootScope.openModal('member', {controller: 'MemberModalCtrl', windowClass: 'profile-modal', size: 'lg'}); + }); + } + }; + + $scope.removeMember = function (group, member, isMember) { + // TODO find a better way to do this (share data with remove member modal) + $scope.removeMemberData = { + group: group, + member: member, + isMember: isMember + }; + $rootScope.openModal('remove-member', {scope: $scope}); + }; + + $scope.confirmRemoveMember = function (confirm) { + if (confirm) { + Groups.Group.removeMember( + $scope.removeMemberData.group._id, + $scope.removeMemberData.member._id, + $scope.removeMemberData.message + ).then(function (response) { + if($scope.removeMemberData.isMember){ + _.pull($scope.removeMemberData.group.members, $scope.removeMemberData.member); + }else{ + _.pull($scope.removeMemberData.group.invites, $scope.removeMemberData.member); + } + + $scope.removeMemberData = undefined; + }); + } else { + $scope.removeMemberData = undefined; + } + }; + + $scope.openInviteModal = function (group) { + if (group.type !== 'party' && group.type !== 'guild') { + return console.log('Invalid group type.') + } + + $rootScope.openModal('invite-' + group.type, { + controller:'InviteToGroupCtrl', + resolve: { + injectedGroup: function(){ + return group; + } + } + }); + }; + + $scope.quickReply = function (uid) { + Members.selectMember(uid) + .then(function (response) { + $rootScope.openModal('private-message', {controller: 'MemberModalCtrl'}); + }); + } + }]); diff --git a/website/client/js/controllers/guildsCtrl.js b/website/client/js/controllers/guildsCtrl.js new file mode 100644 index 0000000000..821b9aebba --- /dev/null +++ b/website/client/js/controllers/guildsCtrl.js @@ -0,0 +1,127 @@ +'use strict'; + +habitrpg.controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile', 'Analytics', + function($scope, Groups, User, Challenges, $rootScope, $state, $location, $compile, Analytics) { + $scope.groups = { + guilds: [], + public: [], + }; + + Groups.myGuilds() + .then(function (guilds) { + $scope.groups.guilds = guilds; + }); + + Groups.publicGuilds() + .then(function (guilds) { + $scope.groups.public = guilds; + }); + + $scope.type = 'guild'; + $scope.text = window.env.t('guild'); + + var newGroup = function(){ + return {type:'guild', privacy:'private'}; + } + $scope.newGroup = newGroup() + + $scope.create = function(group){ + if (User.user.balance < 1) { + return $rootScope.openModal('buyGems', {track:"Gems > Create Group"}); + } + + if (confirm(window.env.t('confirmGuild'))) { + Groups.Group.create(group) + .then(function (response) { + var createdGroup = response.data.data; + if (createdGroup.privacy == 'public') { + Analytics.track({'hitType':'event', 'eventCategory':'behavior', 'eventAction':'join group', 'owner':true, 'groupType':'guild', 'privacy': createdGroup.privacy, 'groupName':createdGroup.name}) + } else { + Analytics.track({'hitType':'event', 'eventCategory':'behavior', 'eventAction':'join group', 'owner':true, 'groupType':'guild', 'privacy': createdGroup.privacy}) + } + $rootScope.hardRedirect('/#/options/groups/guilds/' + createdGroup._id); + }); + } + } + + $scope.join = function (group) { + var groupId = group._id; + + // If we don't have the _id property, we are joining from an invitation + // which contains a id property of the group + if (group.id && !group._id) { + groupId = group.id; + } + + Groups.Group.join(groupId) + .then(function (response) { + var joinedGroup = response.data.data; + + User.user.guilds.push(joinedGroup._id); + + if (joinedGroup.privacy == 'public') { + Analytics.track({'hitType':'event', 'eventCategory':'behavior', 'eventAction':'join group', 'owner':false, 'groupType':'guild','privacy': joinedGroup.privacy, 'groupName': joinedGroup.name}) + } else { + Analytics.track({'hitType':'event', 'eventCategory':'behavior', 'eventAction':'join group', 'owner':false, 'groupType':'guild','privacy': joinedGroup.privacy}) + } + + $location.path('/options/groups/guilds/' + joinedGroup._id); + }); + } + + $scope.reject = function(invitationToReject) { + var index = _.findIndex(User.user.invitations.guilds, function(invite) { return invite.id === invitationToReject.id; }); + User.user.invitations.guilds = User.user.invitations.guilds.splice(0, index); + Groups.Group.rejectInvite(invitationToReject.id); + } + + $scope.leave = function(keep) { + if (keep == 'cancel') { + $scope.selectedGroup = undefined; + $scope.popoverEl.popover('destroy'); + } else { + Groups.Group.leave($scope.selectedGroup._id, keep) + .success(function (data) { + var index = User.user.guilds.indexOf($scope.selectedGroup._id); + delete User.user.guilds[index]; + $scope.selectedGroup = undefined; + $location.path('/options/groups/guilds'); + }); + } + } + + $scope.clickLeave = function(group, $event){ + $scope.selectedGroup = group; + $scope.popoverEl = $($event.target).closest('.btn'); + + var html, title; + + Challenges.getGroupChallenges(group._id) + .then(function(response) { + var challenges = _.pluck(_.filter(response.data.data, function(c) { + return c.group._id == group._id; + }), '_id'); + + if (_.intersection(challenges, User.user.challenges).length > 0) { + html = $compile( + '' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
' + )($scope); + title = window.env.t('leaveGroupCha'); + } else { + html = $compile( + '' + window.env.t('confirm') + '
\n' + window.env.t('cancel') + '
' + )($scope); + title = window.env.t('leaveGroup') + } + + $scope.popoverEl.popover('destroy').popover({ + html: true, + placement: 'top', + trigger: 'manual', + title: title, + content: html + }).popover('show'); + }); + } + } + ]); diff --git a/website/client/js/controllers/hallCtrl.js b/website/client/js/controllers/hallCtrl.js new file mode 100644 index 0000000000..8d9d385546 --- /dev/null +++ b/website/client/js/controllers/hallCtrl.js @@ -0,0 +1,54 @@ +"use strict"; + +habitrpg.controller("HallHeroesCtrl", ['$scope', '$rootScope', 'User', 'Notification', 'ApiUrl', 'Hall', + function($scope, $rootScope, User, Notification, ApiUrl, Hall) { + $scope.hero = undefined; + $scope.currentHeroIndex = undefined; + $scope.heroes = []; + + Hall.getHeroes() + .then(function (response) { + $scope.heroes = response.data.data; + }); + + $scope.loadHero = function(uuid, heroIndex) { + $scope.currentHeroIndex = heroIndex; + Hall.getHero(uuid) + .then(function (response) { + $scope.hero = response.data.data; + }); + } + + $scope.saveHero = function(hero) { + $scope.hero.contributor.admin = ($scope.hero.contributor.level > 7) ? true : false; + Hall.updateHero($scope.hero) + .then(function (response) { + Notification.text("User updated"); + $scope.hero = undefined; + $scope._heroID = undefined; + $scope.heroes[$scope.currentHeroIndex] = response.data.data; + $scope.currentHeroIndex = undefined; + }); + } + + $scope.populateContributorInput = function(id, index) { + $scope._heroID = id; + window.scrollTo(0, 200); + $scope.loadHero(id, index); + }; + }]); + +habitrpg.controller("HallPatronsCtrl", ['$scope', '$rootScope', 'User', 'Notification', 'ApiUrl', 'Hall', + function($scope, $rootScope, User, Notification, ApiUrl, Hall) { + var page = 0; + $scope.patrons = []; + + $scope.loadMore = function() { + Hall.getPatrons(page++) + .then(function (response) { + $scope.patrons = $scope.patrons.concat(response.data.data); + }); + } + $scope.loadMore(); + + }]); diff --git a/website/public/js/controllers/headerCtrl.js b/website/client/js/controllers/headerCtrl.js similarity index 79% rename from website/public/js/controllers/headerCtrl.js rename to website/client/js/controllers/headerCtrl.js index 68000da3b9..390d2c92a9 100644 --- a/website/public/js/controllers/headerCtrl.js +++ b/website/client/js/controllers/headerCtrl.js @@ -8,15 +8,19 @@ habitrpg.controller("HeaderCtrl", ['$scope', 'Groups', 'User', $scope.inviteOrStartParty = Groups.inviteOrStartParty; - $scope.party = Groups.party(function(){ - var triggerResort = function() { - $scope.partyMinusSelf = resortParty(); - }; + function handlePartyResponse (party) { + $scope.party = party; - triggerResort(); - $scope.$watch('user.party.order', triggerResort); - $scope.$watch('user.party.orderAscending', triggerResort); - }); + var triggerResort = function() { + $scope.partyMinusSelf = resortParty(); + }; + + triggerResort(); + $scope.$watch('user.party.order', triggerResort); + $scope.$watch('user.party.orderAscending', triggerResort); + } + + Groups.party().then(handlePartyResponse, handlePartyResponse); function resortParty() { var result = _.sortBy( diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/client/js/controllers/inventoryCtrl.js similarity index 92% rename from website/public/js/controllers/inventoryCtrl.js rename to website/client/js/controllers/inventoryCtrl.js index 80c80bf3d4..41fa416abf 100644 --- a/website/public/js/controllers/inventoryCtrl.js +++ b/website/client/js/controllers/inventoryCtrl.js @@ -99,7 +99,7 @@ habitrpg.controller("InventoryCtrl", var selected = $scope.selectedEgg ? 'selectedEgg' : $scope.selectedPotion ? 'selectedPotion' : $scope.selectedFood ? 'selectedFood' : undefined; if (selected) { var type = $scope.selectedEgg ? 'eggs' : $scope.selectedPotion ? 'hatchingPotions' : $scope.selectedFood ? 'food' : undefined; - user.ops.sell({params:{type:type, key: $scope[selected].key}}); + User.sell({params:{type:type, key: $scope[selected].key}}); if (user.items[type][$scope[selected].key] < 1) { $scope[selected] = null; } @@ -118,7 +118,7 @@ habitrpg.controller("InventoryCtrl", var userHasPet = user.items.pets[egg.key + '-' + potion.key] > 0; var isPremiumPet = Content.hatchingPotions[potion.key].premium && !Content.dropEggs[egg.key]; - user.ops.hatch({params:{egg:egg.key, hatchingPotion:potion.key}}); + User.hatch({params:{egg:egg.key, hatchingPotion:potion.key}}); if (!user.preferences.suppressModals.hatchPet && !userHasPet && !isPremiumPet) { $scope.hatchedPet = { @@ -128,11 +128,13 @@ habitrpg.controller("InventoryCtrl", eggKey: egg.key, pet: 'Pet-' + egg.key + '-' + potion.key }; + $rootScope.openModal('hatchPet', { scope: $scope, size: 'sm' }); } + $scope.selectedEgg = null; $scope.selectedPotion = null; @@ -170,7 +172,7 @@ habitrpg.controller("InventoryCtrl", } else if (!$window.confirm(window.env.t('feedPet', {name: petDisplayName, article: food.article, text: food.text()}))) { return; } - User.user.ops.feed({params:{pet: pet, food: food.key}}); + User.feed({params:{pet: pet, food: food.key}}); $scope.selectedFood = null; _updateDropAnimalCount(user.items); @@ -196,12 +198,12 @@ habitrpg.controller("InventoryCtrl", // Selecting Pet } else { - User.user.ops.equip({params:{type: 'pet', key: pet}}); + User.equip({params:{type: 'pet', key: pet}}); } } $scope.chooseMount = function(egg, potion) { - User.user.ops.equip({params:{type: 'mount', key: egg + '-' + potion}}); + User.equip({params:{type: 'mount', key: egg + '-' + potion}}); } $scope.getSeasonalShopArray = function(set){ @@ -228,7 +230,7 @@ habitrpg.controller("InventoryCtrl", for (item in user.items.gear.equipped){ var itemKey = user.items.gear.equipped[item]; if (user.items.gear.owned[itemKey]) { - user.ops.equip({params: {key: itemKey}}); + User.equip({params: {type: 'equipped', key: itemKey}}); } } break; @@ -237,7 +239,7 @@ habitrpg.controller("InventoryCtrl", for (item in user.items.gear.costume){ var itemKey = user.items.gear.costume[item]; if (user.items.gear.owned[itemKey]) { - user.ops.equip({params: {type:"costume", key: itemKey}}); + User.equip({params: {type:"costume", key: itemKey}}); } } break; @@ -245,17 +247,17 @@ habitrpg.controller("InventoryCtrl", case "petMountBackground": var pet = user.items.currentPet; if (pet) { - user.ops.equip({params:{type: 'pet', key: pet}}); + User.equip({params:{type: 'pet', key: pet}}); } var mount = user.items.currentMount; if (mount) { - user.ops.equip({params:{type: 'mount', key: mount}}); + User.equip({params:{type: 'mount', key: mount}}); } var background = user.preferences.background; if (background) { - User.user.ops.unlock({query:{path:"background."+background}}); + User.unlock({query:{path:"background."+background}}); } break; @@ -308,9 +310,9 @@ habitrpg.controller("InventoryCtrl", }; $scope.clickTimeTravelItem = function(type,key) { - if (user.purchased.plan.consecutive.trinkets < 1) return user.ops.hourglassPurchase({params:{type:type,key:key}}); + if (user.purchased.plan.consecutive.trinkets < 1) return User.hourglassPurchase({params:{type:type,key:key}}); if (!window.confirm(window.env.t('hourglassBuyItemConfirm'))) return; - user.ops.hourglassPurchase({params:{type:type,key:key}}); + User.hourglassPurchase({params:{type:type,key:key}}); }; function _updateDropAnimalCount(items) { diff --git a/website/client/js/controllers/inviteToGroupCtrl.js b/website/client/js/controllers/inviteToGroupCtrl.js new file mode 100644 index 0000000000..a986cd768c --- /dev/null +++ b/website/client/js/controllers/inviteToGroupCtrl.js @@ -0,0 +1,85 @@ +'use strict'; + +habitrpg.controller('InviteToGroupCtrl', ['$scope', '$rootScope', 'User', 'Groups', 'injectedGroup', '$http', 'Notification', + function($scope, $rootScope, User, Groups, injectedGroup, $http, Notification) { + $scope.group = injectedGroup; + + $scope.inviter = User.user.profile.name; + _resetInvitees(); + + $scope.addUuid = function() { + $scope.invitees.push({uuid: ''}); + }; + + $scope.addEmail = function() { + $scope.emails.push({name: '', email: ''}); + }; + + $scope.inviteNewUsers = function(inviteMethod) { + if (!$scope.group._id) { + $scope.group.name = $scope.group.name || env.t('possessiveParty', {name: User.user.profile.name}); + + return Groups.Group.create($scope.group) + .then(function(response) { + $scope.group = response.data.data; + User.sync(); + Groups.data.party = $scope.group; + _inviteByMethod(inviteMethod); + }); + } + + _inviteByMethod(inviteMethod); + }; + + function _inviteByMethod(inviteMethod) { + var invitationDetails; + + if (inviteMethod === 'email') { + var emails = _getEmails(); + invitationDetails = {inviter: $scope.inviter, emails: emails}; + } else if (inviteMethod === 'uuid') { + var uuids = _getOnlyUuids(); + invitationDetails = {uuids: uuids}; + } else { + return console.log('Invalid invite method.') + } + + Groups.Group.invite($scope.group._id, invitationDetails) + .then(function() { + Notification.text(window.env.t('invitationsSent')); + _resetInvitees(); + var redirectTo = '/#/options/groups/' + if ($scope.group.type === 'party') { + redirectTo += 'party'; + } else { + redirectTo += ('guilds/' + $scope.group._id); + } + + $rootScope.hardRedirect(redirectTo); + }, function(){ + _resetInvitees(); + }); + } + + function _getOnlyUuids() { + var uuids = _.pluck($scope.invitees, 'uuid'); + var filteredUuids = _.filter(uuids, function(id) { + return id != ''; + }); + return filteredUuids; + } + + function _getEmails() { + var emails = _.filter($scope.emails, function(obj) { + return obj.email != ''; + }); + return emails; + } + + function _resetInvitees() { + var emptyEmails = [{name:"",email:""},{name:"",email:""}]; + var emptyInvitees = [{uuid: ''}]; + $scope.emails = emptyEmails; + $scope.invitees = emptyInvitees; + } + }]); diff --git a/website/client/js/controllers/memberModalCtrl.js b/website/client/js/controllers/memberModalCtrl.js new file mode 100644 index 0000000000..6e8b96d0ae --- /dev/null +++ b/website/client/js/controllers/memberModalCtrl.js @@ -0,0 +1,68 @@ +"use strict"; + +habitrpg + .controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members', 'Shared', '$http', 'Notification', 'Groups', 'Chat', '$controller', 'Stats', + function($scope, $rootScope, Members, Shared, $http, Notification, Groups, Chat, $controller, Stats) { + + $controller('RootCtrl', {$scope: $scope}); + + $scope.timestamp = function(timestamp){ + return moment(timestamp).format($rootScope.User.user.preferences.dateFormat.toUpperCase()); + } + + $scope.statCalc = Stats; + + // We watch Members.selectedMember because it's asynchronously set, so would be a hassle to handle updates here + $scope.$watch( function() { return Members.selectedMember; }, function (member) { + if(member) { + $scope.profile = member; + } + }); + + $scope.sendPrivateMessage = function(uuid, message){ + if (!message) return; + + Members.sendPrivateMessage(message, uuid) + .then(function (response) { + Notification.text(window.env.t('messageSentAlert')); + $rootScope.User.sync(); + $scope.$close(); + }); + }; + + //@TODO: We don't send subscriptions so the structure has changed in the back. Update this when we update the views. + $scope.gift = { + type: 'gems', + gems: {amount: 0, fromBalance: true}, + subscription: {key: ''}, + message: '' + }; + + $scope.sendGift = function (uuid) { + Members.transferGems($scope.gift.message, uuid, $scope.gift.gems.amount) + .then(function (response) { + Notification.text(window.env.t('sentGems')); + $rootScope.User.sync(); + $scope.$close(); + }); + }; + + $scope.reportAbuse = function(reporter, message, groupId) { + message.flags[reporter._id] = true; + Chat.flagChatMessage(groupId, message.id) + .then(function(data){ + Notification.text(window.env.t('abuseReported')); + $scope.$close(); + }); + }; + + $scope.clearFlagCount = function(message, groupId) { + Chat.clearFlagCount(groupId, message.id) + .then(function(data){ + message.flagCount = 0; + Notification.text("Flags cleared"); + $scope.$close(); + }); + } + } + ]); diff --git a/website/public/js/controllers/menuCtrl.js b/website/client/js/controllers/menuCtrl.js similarity index 97% rename from website/public/js/controllers/menuCtrl.js rename to website/client/js/controllers/menuCtrl.js index 5549c527dd..761c118986 100644 --- a/website/public/js/controllers/menuCtrl.js +++ b/website/client/js/controllers/menuCtrl.js @@ -26,7 +26,7 @@ angular.module('habitrpg') } } - $scope.clearMessages = Chat.seenMessage; + $scope.clearMessages = Chat.markChatSeen; $scope.clearCards = Chat.clearCards; $scope.iconClasses = function() { diff --git a/website/client/js/controllers/notificationCtrl.js b/website/client/js/controllers/notificationCtrl.js new file mode 100644 index 0000000000..738af5bd8a --- /dev/null +++ b/website/client/js/controllers/notificationCtrl.js @@ -0,0 +1,141 @@ +'use strict'; + +habitrpg.controller('NotificationCtrl', + ['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', + function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics) { + + $rootScope.$watch('user.stats.hp', function (after, before) { + if (after <= 0){ + $rootScope.playSound('Death'); + $rootScope.openModal('death', {keyboard:false, backdrop:'static'}); + } else if (after <= 30 && !User.user.flags.warnedLowHealth) { + $rootScope.openModal('lowHealth', {keyboard:false, backdrop:'static', controller:'UserCtrl', track:'Health Warning'}); + } + if (after == before) return; + if (User.user.stats.lvl == 0) return; + Notification.hp(after - before, 'hp'); + if (after < 0) $rootScope.playSound('Minus_Habit'); + }); + + $rootScope.$watch('user.stats.exp', function(after, before) { + if (after == before) return; + if (User.user.stats.lvl == 0) return; + Notification.exp(after - before); + }); + + $rootScope.$watch('user.achievements', function(){ + $rootScope.playSound('Achievement_Unlocked'); + }, true); + + $rootScope.$watch('user.achievements.challenges.length', function(after, before) { + if (after === before) return; + if (after > before) { + $rootScope.openModal('wonChallenge', {controller: 'UserCtrl', size: 'sm'}); + } + }); + + $rootScope.$watch('user.stats.gp', function(after, before) { + if (after == before) return; + if (User.user.stats.lvl == 0) return; + var money = after - before; + var bonus; + if (User.user._tmp) { + bonus = User.user._tmp.streakBonus || 0; + } + Notification.gp(money, bonus || 0); + + //Append Bonus + + if ((money > 0) && !!bonus) { + if (bonus < 0.01) bonus = 0.01; + Notification.text("+ " + Notification.coins(bonus) + ' ' + window.env.t('streakCoins')); + delete User.user._tmp.streakBonus; + } + }); + + $rootScope.$watch('user.stats.mp', function(after,before) { + if (after == before) return; + if (!User.user.flags.classSelected || User.user.preferences.disableClasses) return; + var mana = after - before; + Notification.mp(mana); + }); + + // Levels that already display modals and should not trigger generic Level Up + var unlockLevels = { + '3': 'drop system', + '10': 'class system', + '50': 'Orb of Rebirth' + } + + $rootScope.$watch('user.stats.lvl', function(after, before) { + if (after <= before) return; + Notification.lvl(); + $rootScope.playSound('Level_Up'); + if (User.user._tmp && User.user._tmp.drop && (User.user._tmp.drop.type === 'Quest')) return; + if (unlockLevels['' + after]) return; + if (!User.user.preferences.suppressModals.levelUp) $rootScope.openModal('levelUp', {controller:'UserCtrl', size:'sm'}); + }); + + $rootScope.$watch('!user.flags.classSelected && user.stats.lvl >= 10', function(after, before){ + if(after){ + $rootScope.openModal('chooseClass', {controller:'UserCtrl', keyboard:false, backdrop:'static'}); + } + }); + + $rootScope.$watch('user.achievements.streak', function(after, before){ + if(before == undefined || after <= before) return; + Notification.streak(User.user.achievements.streak); + $rootScope.playSound('Achievement_Unlocked'); + if (!User.user.preferences.suppressModals.streak) { + $rootScope.openModal('achievements/streak', {controller:'UserCtrl'}); + } + }); + + $rootScope.$watch('user.achievements.ultimateGearSets', function(after, before){ + if (_.isEqual(after,before) || !_.contains(User.user.achievements.ultimateGearSets, true)) return; + $rootScope.openModal('achievements/ultimateGear', {controller:'UserCtrl'}); + }, true); + + $rootScope.$watch('user.flags.armoireEmpty', function(after,before){ + if (before == undefined || after == before || after == false) return; + $rootScope.openModal('armoireEmpty'); + }); + + $rootScope.$watch('user.achievements.rebirths', function(after, before){ + if(after === before) return; + $rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'}); + }); + + $rootScope.$watch('user.contributor.level', function(after, before){ + if (after === before || after < before || after == null) return; + $rootScope.openModal('achievements/contributor',{controller:'UserCtrl'}); + }); + + // Completed quest modal + $scope.$watch('user.party.quest.completed', function(after, before){ + if (!after) return; + $rootScope.openModal('questCompleted', {controller:'InventoryCtrl'}); + }); + + // Quest invitation modal + $scope.$watch('user.party.quest.RSVPNeeded && !user.party.quest.completed', function(after, before){ + if (after != true) return; + $rootScope.openModal('questInvitation', {controller:'PartyCtrl'}); + }); + + $rootScope.$on('responseError500', function(ev, error){ + Notification.error(error); + }); + $rootScope.$on('responseError', function(ev, error){ + Notification.error(error, true); + }); + + $rootScope.$on('responseText', function(ev, error){ + Notification.text(error); + }); + + // Show new-stuff modal on load + if (User.user.flags.newStuff) + $rootScope.openModal('newStuff', {size:'lg'}); + } +]); diff --git a/website/client/js/controllers/partyCtrl.js b/website/client/js/controllers/partyCtrl.js new file mode 100644 index 0000000000..64070734bf --- /dev/null +++ b/website/client/js/controllers/partyCtrl.js @@ -0,0 +1,213 @@ +'use strict'; + +habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests','Social', + function($rootScope, $scope, Groups, Chat, User, Challenges, $state, $compile, Analytics, Quests, Social) { + + var user = User.user; + + $scope.type = 'party'; + $scope.text = window.env.t('party'); + + $scope.inviteOrStartParty = Groups.inviteOrStartParty; + $scope.loadWidgets = Social.loadWidgets; + + Groups.Group.syncParty() + .then(function successCallback(group) { + $rootScope.party = $scope.group = group; + checkForNotifications(); + }, function errorCallback(response) { + $rootScope.party = $scope.group = $scope.newGroup = { type: 'party' }; + }); + + function checkForNotifications () { + // Checks if user's party has reached 2 players for the first time. + if(!user.achievements.partyUp + && $scope.group.memberCount >= 2) { + User.set({'achievements.partyUp':true}); + $rootScope.openModal('achievements/partyUp', {controller:'UserCtrl', size:'sm'}); + } + + // Checks if user's party has reached 4 players for the first time. + if(!user.achievements.partyOn + && $scope.group.memberCount >= 4) { + User.set({'achievements.partyOn':true}); + $rootScope.openModal('achievements/partyOn', {controller:'UserCtrl', size:'sm'}); + } + } + + if ($scope.group && $scope.group._id) { + Chat.markChatSeen($scope.group._id); + } + + $scope.create = function(group) { + if (!group.name) group.name = env.t('possessiveParty', {name: User.user.profile.name}); + Groups.Group.create(group) + .then(function(response) { + $rootScope.party = $scope.group = response.data.data; + User.sync(); + Groups.data.party = $scope.group; + Analytics.track({'hitType':'event', 'eventCategory':'behavior', 'eventAction':'join group', 'owner':true, 'groupType':'party', 'privacy':'private'}); + Analytics.updateUser({'party.id': $scope.group ._id, 'partySize': 1}); + }); + }; + + $scope.join = function (party) { + Groups.Group.join(party.id) + .then(function (response) { + $rootScope.party = $scope.group = response.data.data; + User.sync(); + Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'party','privacy':'private'}); + Analytics.updateUser({'partyID': party.id}); + $rootScope.hardRedirect('/#/options/groups/party'); + }); + }; + + // TODO: refactor guild and party leave into one function + $scope.leave = function (keep) { + if (keep == 'cancel') { + $scope.selectedGroup = undefined; + $scope.popoverEl.popover('destroy'); + } else { + Groups.Group.leave($scope.selectedGroup._id, keep) + .then(function (response) { + Analytics.updateUser({'partySize':null,'partyID':null}); + User.sync().then(function () { + $rootScope.hardRedirect('/#/options/groups/party'); + }); + }); + } + }; + + // TODO: refactor guild and party clickLeave into one function + $scope.clickLeave = function(group, $event){ + Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Leave Party'}); + $scope.selectedGroup = group; + $scope.popoverEl = $($event.target).closest('.btn'); + var html, title; + html = $compile('' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
')($scope); + title = window.env.t('leavePartyCha'); + + //TODO: Move this to challenge service + Challenges.getGroupChallenges(group._id) + .then(function(response) { + var challenges = _.pluck(_.filter(response.data.data, function(c) { + return c.group._id == group._id; + }), '_id'); + + if (_.intersection(challenges, User.user.challenges).length > 0) { + html = $compile( + '' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
' + )($scope); + title = window.env.t('leavePartyCha'); + } else { + html = $compile( + '' + window.env.t('confirm') + '
\n' + window.env.t('cancel') + '
' + )($scope); + title = window.env.t('leaveParty'); + } + + $scope.popoverEl.popover('destroy').popover({ + html: true, + placement: 'top', + trigger: 'manual', + title: title, + content: html + }).popover('show'); + }); + }; + + $scope.clickStartQuest = function () { + Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Start a Quest'}); + var hasQuests = _.find(User.user.items.quests, function(quest) { + return quest > 0; + }); + + if (hasQuests){ + $rootScope.openModal("ownedQuests", { controller:"InventoryCtrl" }); + } else { + $rootScope.$state.go('options.inventory.quests'); + } + }; + + $scope.leaveOldPartyAndJoinNewParty = function(newPartyId, newPartyName) { + if (confirm('Are you sure you want to delete your party and join ' + newPartyName + '?')) { + Groups.Group.leave(Groups.data.party._id, false) + .then(function() { + $rootScope.party = $scope.group = { + loadingNewParty: true + }; + $scope.join({ id: newPartyId, name: newPartyName }); + }); + } + } + + $scope.reject = function(party) { + Groups.Group.rejectInvite(party.id); + User.set({'invitations.party':{}}); + } + + $scope.questInit = function() { + var key = $rootScope.selectedQuest.key; + + Quests.initQuest(key).then(function() { + $rootScope.selectedQuest = undefined; + $scope.$close(); + }); + }; + + $scope.questCancel = function(){ + if (!confirm(window.env.t('sureCancel'))) return; + + Quests.sendAction('quests/cancel') + .then(function(quest) { + $scope.group.quest = quest; + }); + } + + $scope.questAbort = function(){ + if (!confirm(window.env.t('sureAbort'))) return; + if (!confirm(window.env.t('doubleSureAbort'))) return; + + Quests.sendAction('quests/abort') + .then(function(quest) { + $scope.group.quest = quest; + }); + } + + $scope.questLeave = function(){ + if (!confirm(window.env.t('sureLeave'))) return; + + Quests.sendAction('quests/leave') + .then(function(quest) { + $scope.group.quest = quest; + }); + } + + $scope.questAccept = function(){ + Quests.sendAction('quests/accept') + .then(function(quest) { + $scope.group.quest = quest; + }); + }; + + $scope.questForceStart = function(){ + Quests.sendAction('quests/force-start') + .then(function(quest) { + $scope.group.quest = quest; + }); + }; + + $scope.questReject = function(){ + Quests.sendAction('quests/reject') + .then(function(quest) { + $scope.group.quest = quest; + }); + }; + + $scope.canEditQuest = function() { + var isQuestLeader = $scope.group.quest && $scope.group.quest.leader === User.user._id; + + return isQuestLeader; + }; + } + ]); diff --git a/website/public/js/controllers/rootCtrl.js b/website/client/js/controllers/rootCtrl.js similarity index 84% rename from website/public/js/controllers/rootCtrl.js rename to website/client/js/controllers/rootCtrl.js index d9d42d6a22..b4fee4076a 100644 --- a/website/public/js/controllers/rootCtrl.js +++ b/website/client/js/controllers/rootCtrl.js @@ -3,8 +3,8 @@ /* Make user and settings available for everyone through root scope. */ -habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$http', '$state', '$stateParams', 'Notification', 'Groups', 'Shared', 'Content', '$modal', '$timeout', 'ApiUrl', 'Payments','$sce','$window','Analytics', - function($scope, $rootScope, $location, User, $http, $state, $stateParams, Notification, Groups, Shared, Content, $modal, $timeout, ApiUrl, Payments, $sce, $window, Analytics) { +habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$http', '$state', '$stateParams', 'Notification', 'Groups', 'Shared', 'Content', '$modal', '$timeout', 'ApiUrl', 'Payments','$sce','$window','Analytics','TAVERN_ID', + function($scope, $rootScope, $location, User, $http, $state, $stateParams, Notification, Groups, Shared, Content, $modal, $timeout, ApiUrl, Payments, $sce, $window, Analytics, TAVERN_ID) { var user = User.user; var initSticky = _.once(function(){ @@ -21,10 +21,11 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ if (!!fromState.name) Analytics.track({'hitType':'pageview','eventCategory':'navigation','eventAction':'navigate','page':'/#/'+toState.name}); // clear inbox when entering or exiting inbox tab if (fromState.name=='options.social.inbox' || toState.name=='options.social.inbox') { - User.user.ops.update && User.set({'inbox.newMessages':0}); + User.clearNewMessages(); } }); + $rootScope.TAVERN_ID = TAVERN_ID; $rootScope.User = User; $rootScope.user = user; $rootScope.moment = window.moment; @@ -218,11 +219,11 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ key: itemKey }; - user.ops.equip({ params: equipParams }); + User.equip({ params: equipParams }); } $rootScope.purchase = function(type, item){ - if (type == 'special') return user.ops.buySpecialSpell({params:{key:item.key}}); + if (type == 'special') return User.buySpecialSpell({params:{key:item.key}}); var gems = user.balance * 4; var price = item.value; @@ -248,7 +249,7 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ message += window.env.t('buyThis', {text: itemName, price: price, gems: gems}); if ($window.confirm(message)) - user.ops.purchase({params:{type:type,key:item.key}}); + User.purchase({params:{type:type,key:item.key}}); }; function _canBuyEquipment(itemKey) { @@ -277,31 +278,51 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ if (spell.target == 'self') { $scope.castEnd(null, 'self'); } else if (spell.target == 'party') { - var party = Groups.party(); - party = (_.isArray(party) ? party : []).concat(User.user); - $scope.castEnd(party, 'party'); + Groups.party() + .then(function (party) { + party = (_.isArray(party) ? party : []).concat(User.user); + $scope.castEnd(party, 'party'); + }) + .catch(function (party) { // not in a party, act as a solo party + if (party && party.type === 'party') { + party = [User.user]; + $scope.castEnd(party, 'party'); + } + }); + } else if (spell.target == 'tasks') { + var tasks = User.user.habits.concat(User.user.dailys).concat(User.user.rewards).concat(User.user.todos); + // exclude challenge tasks + tasks = tasks.filter(function (task) { + if (!task.challenge) return true; + return (!task.challenge.id || task.challenge.broken); + }); + $scope.castEnd(tasks, 'tasks'); } } $scope.castEnd = function(target, type, $event){ if (!$rootScope.applyingAction) return 'No applying action'; $event && ($event.stopPropagation(),$event.preventDefault()); + if ($scope.spell.target != type) return Notification.text(window.env.t('invalidTarget')); $scope.spell.cast(User.user, target); User.save(); var spell = $scope.spell; - var targetId = (type == 'party' || type == 'self') ? '' : type == 'task' ? target.id : target._id; + var targetId = target ? target._id : null; $scope.spell = null; $rootScope.applyingAction = false; - $http.post(ApiUrl.get() + '/api/v2/user/class/cast/'+spell.key+'?targetType='+type+'&targetId='+targetId) - .success(function(){ + var spellUrl = ApiUrl.get() + '/api/v3/user/class/cast/' + spell.key; + if (targetId) spellUrl += '?targetId=' + targetId; + + $http.post(spellUrl) + .success(function(){ // TODO response will always include the modified data, no need to sync! var msg = window.env.t('youCast', {spell: spell.text()}); switch (type) { - case 'task': msg = window.env.t('youCastTarget', {spell: spell.text(), target: target.text});break; - case 'user': msg = window.env.t('youCastTarget', {spell: spell.text(), target: target.profile.name});break; - case 'party': msg = window.env.t('youCastParty', {spell: spell.text()});break; + case 'task': msg = window.env.t('youCastTarget', {spell: spell.text(), target: target.text});break; + case 'user': msg = window.env.t('youCastTarget', {spell: spell.text(), target: target.profile.name});break; + case 'party': msg = window.env.t('youCastParty', {spell: spell.text()});break; } Notification.markdown(msg); User.sync(); @@ -330,5 +351,19 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ }); // error will be handled via $http interceptor } + + // Global Keyevents + var ctrlKeys = [17, 224, 91]; + $scope.$on("habit:keydown", function (e, keyEvent) { + if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) { + $scope.ctrlPressed = true; + } + }); + + $scope.$on("habit:keyup", function (e, keyEvent) { + if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) { + $scope.ctrlPressed = false; + } + }); } ]); diff --git a/website/public/js/controllers/settingsCtrl.js b/website/client/js/controllers/settingsCtrl.js similarity index 89% rename from website/public/js/controllers/settingsCtrl.js rename to website/client/js/controllers/settingsCtrl.js index 3672a4d703..7e78a8b095 100644 --- a/website/public/js/controllers/settingsCtrl.js +++ b/website/client/js/controllers/settingsCtrl.js @@ -77,14 +77,11 @@ habitrpg.controller('SettingsCtrl', }; $scope.saveDayStart = function() { - User.set({ - 'preferences.dayStart': Math.floor($scope.dayStart), - 'lastCron': +new Date - }); + User.setCustomDayStart(Math.floor($scope.dayStart)); }; $scope.language = window.env.language; - $scope.avalaibleLanguages = window.env.avalaibleLanguages; + $scope.availableLanguages = window.env.availableLanguages; $scope.changeLanguage = function(){ $rootScope.$on('userSynced', function(){ @@ -99,7 +96,7 @@ habitrpg.controller('SettingsCtrl', $scope.popoverEl.popover('destroy'); if (confirm) { - User.user.ops.reroll({}); + User.reroll({}); $rootScope.$state.go('tasks'); } } @@ -124,7 +121,7 @@ habitrpg.controller('SettingsCtrl', $scope.popoverEl.popover('destroy'); if (confirm) { - User.user.ops.rebirth({}); + User.rebirth({}); $rootScope.$state.go('tasks'); } } @@ -146,7 +143,7 @@ habitrpg.controller('SettingsCtrl', } $scope.changeUser = function(attr, updates){ - $http.post(ApiUrl.get() + '/api/v2/user/change-'+attr, updates) + $http.put(ApiUrl.get() + '/api/v3/user/auth/update-'+attr, updates) .success(function(){ alert(window.env.t(attr+'Success')); _.each(updates, function(v,k){updates[k]=null;}); @@ -175,21 +172,25 @@ habitrpg.controller('SettingsCtrl', } $scope.reset = function(){ - User.user.ops.reset({}); + User.reset({}); + User.sync(); $rootScope.$state.go('tasks'); } - $scope['delete'] = function(){ - $http['delete'](ApiUrl.get() + '/api/v2/user') - .success(function(res, code){ - if (res.err) return alert(res.err); - localStorage.clear(); - window.location.href = '/logout'; - }); + $scope['delete'] = function(password) { + $http({ + url: ApiUrl.get() + '/api/v3/user', + method: 'DELETE', + data: {password: password}, + }) + .then(function(res, code) { + localStorage.clear(); + window.location.href = '/logout'; + }); } $scope.enterCoupon = function(code) { - $http.post(ApiUrl.get() + '/api/v2/user/coupon/' + code).success(function(res,code){ + $http.post(ApiUrl.get() + '/api/v3/coupons/enter/' + code).success(function(res,code){ if (code!==200) return; User.sync(); Notification.text(env.t('promoCodeApplied')); @@ -201,7 +202,7 @@ habitrpg.controller('SettingsCtrl', .success(function(res,code){ $scope._codes = {}; if (code!==200) return; - window.location.href = '/api/v2/coupons?limit='+codes.count+'&_id='+User.user._id+'&apiToken='+User.user.apiToken; + window.location.href = '/api/v2/coupons?limit='+codes.count+'&_id='+User.user._id+'&apiToken='+User.settings.auth.apiToken; }) } @@ -235,7 +236,7 @@ habitrpg.controller('SettingsCtrl', var releaseFunction = RELEASE_ANIMAL_TYPES[type]; if (releaseFunction) { - User.user.ops[releaseFunction]({}); + User[releaseFunction]({}); $rootScope.$state.go('tasks'); } } @@ -246,19 +247,19 @@ habitrpg.controller('SettingsCtrl', $scope.hasWebhooks = _.size(webhooks); }) $scope.addWebhook = function(url) { - User.user.ops.addWebhook({body:{url:url, id:Shared.uuid()}}); + User.addWebhook({body:{url:url, id:Shared.uuid()}}); $scope._newWebhook.url = ''; } $scope.saveWebhook = function(id,webhook) { delete webhook._editing; - User.user.ops.updateWebhook({params:{id:id}, body:webhook}); + User.updateWebhook({params:{id:id}, body:webhook}); } $scope.deleteWebhook = function(id) { - User.user.ops.deleteWebhook({params:{id:id}}); + User.deleteWebhook({params:{id:id}}); } $scope.applyCoupon = function(coupon){ - $http.get(ApiUrl.get() + '/api/v2/coupons/valid-discount/'+coupon) + $http.get(ApiUrl.get() + '/api/v3/coupons/validate/'+coupon) .success(function(){ Notification.text("Coupon applied!"); var subs = Content.subscriptionBlocks; diff --git a/website/public/js/controllers/sortableInventoryCtrl.js b/website/client/js/controllers/sortableInventoryCtrl.js similarity index 100% rename from website/public/js/controllers/sortableInventoryCtrl.js rename to website/client/js/controllers/sortableInventoryCtrl.js diff --git a/website/client/js/controllers/tasksCtrl.js b/website/client/js/controllers/tasksCtrl.js new file mode 100644 index 0000000000..4e2bae7fad --- /dev/null +++ b/website/client/js/controllers/tasksCtrl.js @@ -0,0 +1,338 @@ +"use strict"; + +habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','Notification', '$http', 'ApiUrl', '$timeout', 'Content', 'Shared', 'Guide', 'Tasks', 'Analytics', + function($scope, $rootScope, $location, User, Notification, $http, ApiUrl, $timeout, Content, Shared, Guide, Tasks, Analytics) { + $scope.obj = User.user; // used for task-lists + $scope.user = User.user; + + var CTRL_KEYS = [17, 224, 91]; + + $scope.armoireCount = function(gear) { + return Shared.count.remainingGearInSet(gear, 'armoire'); + }; + + $scope.score = function(task, direction) { + switch (task.type) { + case 'reward': + playRewardSound(task); + break; + case 'daily': + $rootScope.playSound('Daily'); + break; + case 'todo': + $rootScope.playSound('ToDo'); + break; + default: + if (direction === 'down') $rootScope.playSound('Minus_Habit'); + else if (direction === 'up') $rootScope.playSound('Plus_Habit'); + } + User.score({params:{task: task, direction:direction}}); + Analytics.updateUser(); + Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'score task','taskType':task.type,'direction':direction}); + }; + + function addTask(addTo, listDef, tasks) { + tasks = _.isArray(tasks) ? tasks : [tasks]; + + User.addTask({ + body: tasks.map(function (task) { + return { + text: task, + type: listDef.type, + tags: _.keys(User.user.filters), + } + }), + }); + } + + $scope.addTask = function(addTo, listDef) { + if (listDef.bulk) { + var tasks = listDef.newTask.split(/[\n\r]+/); + //Reverse the order of tasks so the tasks will appear in the order the user entered them + tasks.reverse(); + addTask(addTo, listDef, tasks); + listDef.bulk = false; + } else { + addTask(addTo, listDef, listDef.newTask); + } + delete listDef.newTask; + delete listDef.focus; + if (listDef.type=='daily') Guide.goto('intro', 2); + }; + + $scope.toggleBulk = function(list) { + if (typeof list.bulk === 'undefined') { + list.bulk = false; + } + list.bulk = !list.bulk; + list.focus = true; + }; + + $scope.editTask = Tasks.editTask; + + /** + * Add the new task to the actions log + */ + $scope.clearDoneTodos = function() { + Tasks.clearCompletedTodos(); + }; + + /** + * Pushes task to top or bottom of list + */ + $scope.pushTask = function(task, index, location) { + var to = (location === 'bottom' || $scope.ctrlPressed) ? -1 : 0; + User.sortTask({params:{id: task._id, taskType: task.type}, query:{from:index, to:to}}) + }; + + /** + * This is calculated post-change, so task.completed=true if they just checked it + */ + $scope.changeCheck = function(task) { + if (task.completed) { + $scope.score(task, "up"); + } else { + $scope.score(task, "down"); + } + }; + + $scope.removeTask = function(task) { + if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return; + User.deleteTask({params:{id: task._id, taskType: task.type}}) + }; + + $scope.saveTask = function(task, stayOpen, isSaveAndClose) { + if (task.checklist) { + task.checklist = _.filter(task.checklist, function (i) { + return !!i.text + }); + } + User.updateTask(task, {body: task}); + if (!stayOpen) task._editing = false; + + if (isSaveAndClose) { + $("#task-" + task._id).parent().children('.popover').removeClass('in'); + } + + if (task.type == 'habit') Guide.goto('intro', 3); + }; + + /** + * Reset $scope.task to $scope.originalTask + */ + $scope.cancel = function() { + var key; + for (key in $scope.task) { + $scope.task[key] = $scope.originalTask[key]; + } + $scope.originalTask = null; + $scope.editedTask = null; + $scope.editing = false; + }; + + $scope.unlink = function(task, keep) { + if (keep.search('-all') !== -1) { // unlink all tasks + Tasks.unlinkAllTasks(task.challenge.id, keep) + .success(function () { + User.sync({}); + }); + } else { // unlink a task + Tasks.unlinkOneTask(task._id, keep) + .success(function () { + User.sync({}); + }); + } + }; + + /* + ------------------------ + To-Dos + ------------------------ + */ + $scope._today = moment().add({days: 1}); + + $scope.loadedCompletedTodos = function () { + if (Tasks.loadedCompletedTodos === true) return; + + Tasks.getUserTasks(true) + .then(function (response) { + User.user.todos = User.user.todos.concat(response.data.data); + Tasks.loadedCompletedTodos = true; + }); + } + + /* + ------------------------ + Dailies + ------------------------ + */ + + $scope.openDatePicker = function($event, task) { + $event.preventDefault(); + $event.stopPropagation(); + + task._isDatePickerOpen = !task._isDatePickerOpen; + } + + /* + ------------------------ + Checklists + ------------------------ + */ + function focusChecklist(task,index) { + window.setTimeout(function(){ + $('#task-'+task._id+' .checklist-form input[type="text"]')[index].focus(); + }); + } + + $scope.addChecklist = function(task) { + task.checklist = [{completed:false, text:""}]; + focusChecklist(task,0); + } + + $scope.addChecklistItem = function(task, $event, $index) { + if (task.checklist[$index].text) { + $scope.saveTask(task, true); + if ($index === task.checklist.length - 1) + task.checklist.push({ completed: false, text: '' }); + focusChecklist(task, $index + 1); + } else { + // TODO Provide UI feedback that this item is still blank + } + } + + $scope.removeChecklistItem = function(task, $event, $index, force) { + // Remove item if clicked on trash icon + if (force) { + if (task.checklist[$index].id) Tasks.removeChecklistItem(task._id, task.checklist[$index].id); + task.checklist.splice($index, 1); + } else if (!task.checklist[$index].text) { + // User deleted all the text and is now wishing to delete the item + // saveTask will prune the empty item + if (task.checklist[$index].id) Tasks.removeChecklistItem(task._id, task.checklist[$index].id); + // Move focus if the list is still non-empty + if ($index > 0) + focusChecklist(task, $index-1); + // Don't allow the backspace key to navigate back now that the field is gone + $event.preventDefault(); + } + } + + $scope.swapChecklistItems = function(task, oldIndex, newIndex) { + var toSwap = task.checklist.splice(oldIndex, 1)[0]; + task.checklist.splice(newIndex, 0, toSwap); + $scope.saveTask(task, true); + } + + $scope.navigateChecklist = function(task,$index,$event){ + focusChecklist(task, $event.keyCode == '40' ? $index+1 : $index-1); + } + + $scope.checklistCompletion = function(checklist){ + return _.reduce(checklist,function(m,i){return m+(i.completed ? 1 : 0);},0) + } + + $scope.collapseChecklist = function(task) { + task.collapseChecklist = !task.collapseChecklist; + $scope.saveTask(task,true); + } + + /* + ------------------------ + Items + ------------------------ + */ + + $scope.$watch('user.items.gear.owned', function(){ + $scope.itemStore = Shared.updateStore(User.user); + },true); + + $scope.healthPotion = Content.potion; + $scope.armoire = Content.armoire; + + $scope.buy = function(item) { + playRewardSound(item); + User.buy({params:{key:item.key}}); + }; + + $scope.buyArmoire = function () { + playRewardSound($scope.armoire); + User.buyArmoire(); + } + + /* + ------------------------ + Hiding Tasks + ------------------------ + */ + + $scope.shouldShow = function(task, list, prefs){ + if (task._editing) // never hide a task while being edited + return true; + var shouldDo = task.type == 'daily' ? habitrpgShared.shouldDo(new Date, task, prefs) : true; + switch (list.view) { + case "yellowred": // Habits + return task.value < 1; + case "greenblue": // Habits + return task.value >= 1; + case "remaining": // Dailies and To-Dos + return !task.completed && shouldDo; + case "complete": // Dailies and To-Dos + return task.completed || !shouldDo; + case "dated": // To-Dos + return !task.completed && task.date; + case "ingamerewards": // All skills/rewards except the user's own + return false; // Because "rewards" list includes only the user's own + case "all": + return true; + } + } + + function playRewardSound (task) { + if (task.value <= User.user.stats.gp){ + $rootScope.playSound('Reward'); + } + } + + var isCtrlPressed = function (keyEvent) { + if (CTRL_KEYS.indexOf(keyEvent.keyCode) > -1) { + $scope.ctrlPressed = true; + $scope.$apply(); + } + } + + var isCtrlLetGo = function (keyEvent) { + if (CTRL_KEYS.indexOf(keyEvent.keyCode) > -1) { + $scope.ctrlPressed = false; + $scope.$apply(); + } + } + + $scope.hoverIn = function () { + document.addEventListener('keydown', isCtrlPressed); + document.addEventListener('keyup', isCtrlLetGo); + } + + $scope.hoverOut = function () { + $scope.ctrlPressed = false; + document.removeEventListener('keydown', isCtrlPressed); + document.removeEventListener('keyup', isCtrlLetGo); + } + + /* + ------------------------ + Tags + ------------------------ + */ + + $scope.updateTaskTags = function (tagId, task) { + var tagIndex = task.tags.indexOf(tagId); + if (tagIndex === -1) { + Tasks.addTagToTask(task._id, tagId); + task.tags.push(tagId); + } else { + Tasks.removeTagFromTask(task._id, tagId); + task.tags.splice(tagIndex, 1); + } + } + }]); diff --git a/website/client/js/controllers/tavernCtrl.js b/website/client/js/controllers/tavernCtrl.js new file mode 100644 index 0000000000..77056e07a2 --- /dev/null +++ b/website/client/js/controllers/tavernCtrl.js @@ -0,0 +1,18 @@ +'use strict'; + +habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User', 'Challenges', + function($scope, Groups, User, Challenges) { + Groups.tavern() + .then(function (tavern) { + $scope.group = tavern; + Challenges.getGroupChallenges($scope.group._id) + .then(function (response) { + $scope.group.challenges = response.data.data; + }); + }) + + $scope.toggleUserTier = function($event) { + $($event.target).next().toggle(); + } + } + ]); diff --git a/website/public/js/controllers/userCtrl.js b/website/client/js/controllers/userCtrl.js similarity index 90% rename from website/public/js/controllers/userCtrl.js rename to website/client/js/controllers/userCtrl.js index e345d8ba2e..b62207b945 100644 --- a/website/public/js/controllers/userCtrl.js +++ b/website/client/js/controllers/userCtrl.js @@ -17,17 +17,17 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ }); $scope.allocate = function(stat){ - User.user.ops.allocate({query:{stat:stat}}); + User.allocate({query:{stat:stat}}); } $scope.changeClass = function(klass){ if (!klass) { if (!confirm(window.env.t('sureReset'))) return; - return User.user.ops.changeClass({}); + return User.changeClass({}); } - User.user.ops.changeClass({query:{class:klass}}); + User.changeClass({query:{class:klass}}); $scope.selectedClass = undefined; Shared.updateStore(User.user); Guide.goto('classes', 0,true); @@ -46,7 +46,7 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ } $scope.acknowledgeHealthWarning = function(){ - User.user.ops.update && User.set({'flags.warnedLowHealth':true}); + User.set({'flags.warnedLowHealth':true}); } /** @@ -69,7 +69,7 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$ if (confirm(window.env.t('purchaseFor',{cost:cost*4})) !== true) return; if (User.user.balance < cost) return $rootScope.openModal('buyGems'); } - User.user.ops.unlock({query:{path:path}}) + User.unlock({query:{path:path}}) } $scope.ownsSet = function(type,_set) { diff --git a/website/public/js/directives/close-menu.directive.js b/website/client/js/directives/close-menu.directive.js similarity index 100% rename from website/public/js/directives/close-menu.directive.js rename to website/client/js/directives/close-menu.directive.js diff --git a/website/public/js/directives/expand-menu.directive.js b/website/client/js/directives/expand-menu.directive.js similarity index 100% rename from website/public/js/directives/expand-menu.directive.js rename to website/client/js/directives/expand-menu.directive.js diff --git a/website/public/js/directives/focus-element.directive.js b/website/client/js/directives/focus-element.directive.js similarity index 100% rename from website/public/js/directives/focus-element.directive.js rename to website/client/js/directives/focus-element.directive.js diff --git a/website/public/js/directives/from-now.directive.js b/website/client/js/directives/from-now.directive.js similarity index 100% rename from website/public/js/directives/from-now.directive.js rename to website/client/js/directives/from-now.directive.js diff --git a/website/public/js/directives/habitrpg-tasks.directive.js b/website/client/js/directives/habitrpg-tasks.directive.js similarity index 100% rename from website/public/js/directives/habitrpg-tasks.directive.js rename to website/client/js/directives/habitrpg-tasks.directive.js diff --git a/website/public/js/directives/hrpg-sort-checklist.directive.js b/website/client/js/directives/hrpg-sort-checklist.directive.js similarity index 100% rename from website/public/js/directives/hrpg-sort-checklist.directive.js rename to website/client/js/directives/hrpg-sort-checklist.directive.js diff --git a/website/public/js/directives/hrpg-sort-tags.directive.js b/website/client/js/directives/hrpg-sort-tags.directive.js similarity index 88% rename from website/public/js/directives/hrpg-sort-tags.directive.js rename to website/client/js/directives/hrpg-sort-tags.directive.js index 5b42bc778f..9a9e3d49bb 100644 --- a/website/public/js/directives/hrpg-sort-tags.directive.js +++ b/website/client/js/directives/hrpg-sort-tags.directive.js @@ -16,10 +16,10 @@ ui.item.data('startIndex', ui.item.index()); }, stop: function (event, ui) { - User.user.ops.sortTag({ + User.sortTag({ query: { from: ui.item.data('startIndex'), - to:ui.item.index() + to: ui.item.index() } }); } diff --git a/website/public/js/directives/hrpg-sort-tasks.directive.js b/website/client/js/directives/hrpg-sort-tasks.directive.js similarity index 89% rename from website/public/js/directives/hrpg-sort-tasks.directive.js rename to website/client/js/directives/hrpg-sort-tasks.directive.js index 820fccfbe8..0ce42d82eb 100644 --- a/website/public/js/directives/hrpg-sort-tasks.directive.js +++ b/website/client/js/directives/hrpg-sort-tasks.directive.js @@ -20,8 +20,8 @@ stop: function (event, ui) { var task = angular.element(ui.item[0]).scope().task; var startIndex = ui.item.data('startIndex'); - User.user.ops.sortTask({ - params: { id: task.id }, + User.sortTask({ + params: { id: task._id, taskType: task.type }, query: { from: startIndex, to: ui.item.index() diff --git a/website/public/js/directives/popover-html-popup.directive.js b/website/client/js/directives/popover-html-popup.directive.js similarity index 100% rename from website/public/js/directives/popover-html-popup.directive.js rename to website/client/js/directives/popover-html-popup.directive.js diff --git a/website/public/js/directives/popover-html.directive.js b/website/client/js/directives/popover-html.directive.js similarity index 100% rename from website/public/js/directives/popover-html.directive.js rename to website/client/js/directives/popover-html.directive.js diff --git a/website/public/js/directives/when-scrolled.directive.js b/website/client/js/directives/when-scrolled.directive.js similarity index 100% rename from website/public/js/directives/when-scrolled.directive.js rename to website/client/js/directives/when-scrolled.directive.js diff --git a/website/public/js/env.js b/website/client/js/env.js similarity index 100% rename from website/public/js/env.js rename to website/client/js/env.js diff --git a/website/public/js/filters/money.js b/website/client/js/filters/money.js similarity index 100% rename from website/public/js/filters/money.js rename to website/client/js/filters/money.js diff --git a/website/public/js/filters/roundLargeNumbers.js b/website/client/js/filters/roundLargeNumbers.js similarity index 100% rename from website/public/js/filters/roundLargeNumbers.js rename to website/client/js/filters/roundLargeNumbers.js diff --git a/website/public/js/filters/taskOrdering.js b/website/client/js/filters/taskOrdering.js similarity index 100% rename from website/public/js/filters/taskOrdering.js rename to website/client/js/filters/taskOrdering.js diff --git a/website/public/js/filters/timezoneOffsetToUtc.js b/website/client/js/filters/timezoneOffsetToUtc.js similarity index 100% rename from website/public/js/filters/timezoneOffsetToUtc.js rename to website/client/js/filters/timezoneOffsetToUtc.js diff --git a/website/public/js/services/analyticsServices.js b/website/client/js/services/analyticsServices.js similarity index 100% rename from website/public/js/services/analyticsServices.js rename to website/client/js/services/analyticsServices.js diff --git a/website/client/js/services/challengeServices.js b/website/client/js/services/challengeServices.js new file mode 100644 index 0000000000..e5f4cfa2b8 --- /dev/null +++ b/website/client/js/services/challengeServices.js @@ -0,0 +1,99 @@ +'use strict'; + +angular.module('habitrpg') +.factory('Challenges', ['ApiUrl', '$resource', '$http', + function(ApiUrl, $resource, $http) { + var apiV3Prefix = '/api/v3'; + + function createChallenge (challengeData) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/challenges', + data: challengeData, + }); + } + + function joinChallenge (challengeId) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/challenges/' + challengeId + '/join', + }); + } + + function leaveChallenge (challengeId, keep) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/challenges/' + challengeId + '/leave', + data: { + keep: keep, + } + }); + } + + function getUserChallenges () { + return $http({ + method: 'GET', + url: apiV3Prefix + '/challenges/user', + }); + } + + function getGroupChallenges (groupId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/challenges/groups/' + groupId, + }); + } + + function getChallenge (challengeId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/challenges/' + challengeId, + }); + } + + function exportChallengeCsv (challengeId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/challenges/' + challengeId + '/export/csv', + }); + } + + function updateChallenge (challengeId, updateData) { + + var challengeDataToSend = _.omit(updateData, ['tasks', 'habits', 'todos', 'rewards', 'group']); + if (challengeDataToSend.leader && challengeDataToSend.leader._id) challengeDataToSend.leader = challengeDataToSend.leader._id; + + return $http({ + method: 'PUT', + url: apiV3Prefix + '/challenges/' + challengeId, + data: challengeDataToSend, + }); + } + + function deleteChallenge (challengeId) { + return $http({ + method: 'DELETE', + url: apiV3Prefix + '/challenges/' + challengeId, + }); + } + + function selectChallengeWinner (challengeId, winnerId) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/challenges/' + challengeId + '/selectWinner/' + winnerId, + }); + } + + return { + createChallenge: createChallenge, + joinChallenge: joinChallenge, + leaveChallenge: leaveChallenge, + getUserChallenges: getUserChallenges, + getGroupChallenges: getGroupChallenges, + getChallenge: getChallenge, + exportChallengeCsv: exportChallengeCsv, + updateChallenge: updateChallenge, + deleteChallenge: deleteChallenge, + selectChallengeWinner: selectChallengeWinner, + } + }]); diff --git a/website/client/js/services/chatServices.js b/website/client/js/services/chatServices.js new file mode 100644 index 0000000000..4020c9dd92 --- /dev/null +++ b/website/client/js/services/chatServices.js @@ -0,0 +1,87 @@ +'use strict'; + +angular.module('habitrpg') +.factory('Chat', ['$http', 'ApiUrl', 'User', + function($http, ApiUrl, User) { + var apiV3Prefix = '/api/v3'; + + function getChat (groupId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/groups/' + groupId + '/chat', + }); + } + + function postChat (groupId, message, previousMsg) { + var url = apiV3Prefix + '/groups/' + groupId + '/chat'; + + if (previousMsg) { + url += '?previousMsg=' + previousMsg; + } + + return $http({ + method: 'POST', + url: url, + data: { + message: message, + } + }); + } + + function deleteChat (groupId, chatId, previousMsg) { + var url = apiV3Prefix + '/groups/' + groupId + '/chat/' + chatId; + + if (previousMsg) { + url += '?previousMsg=' + previousMsg; + } + + return $http({ + method: 'DELETE', + url: url, + }); + } + + function like (groupId, chatId) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/groups/' + groupId + '/chat/' + chatId + '/like', + }); + } + + function flagChatMessage (groupId, chatId) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/groups/' + groupId + '/chat/' + chatId + '/flag', + }); + } + + function clearFlagCount (groupId, chatId) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/groups/' + groupId + '/chat/' + chatId + '/clearflags', + }); + } + + function markChatSeen (groupId) { + if (User.user.newMessages) delete User.user.newMessages[groupId]; + return $http({ + method: 'POST', + url: apiV3Prefix + '/groups/' + groupId + '/chat/seen', + }); + } + + function clearCards () { + User.user._wrapped && User.set({'flags.cardReceived':false}); + } + + return { + getChat: getChat, + postChat: postChat, + deleteChat: deleteChat, + like: like, + flagChatMessage: flagChatMessage, + clearFlagCount: clearFlagCount, + markChatSeen: markChatSeen, + clearCards: clearCards, + } + }]); diff --git a/website/client/js/services/groupServices.js b/website/client/js/services/groupServices.js new file mode 100644 index 0000000000..1411e5e2cb --- /dev/null +++ b/website/client/js/services/groupServices.js @@ -0,0 +1,234 @@ +'use strict'; + +angular.module('habitrpg') +.factory('Groups', [ '$location', '$rootScope', '$http', 'Analytics', 'ApiUrl', 'Challenges', '$q', 'User', 'Members', + function($location, $rootScope, $http, Analytics, ApiUrl, Challenges, $q, User, Members) { + var data = {party: undefined, myGuilds: undefined, publicGuilds: undefined, tavern: undefined }; + var groupApiURLPrefix = "/api/v3/groups"; + var TAVERN_NAME = 'HabitRPG'; + + var Group = {}; + + //@TODO: Add paging + Group.getGroups = function(type) { + var url = groupApiURLPrefix; + if (type) { + url += '?type=' + type; + } + + return $http({ + method: 'GET', + url: url, + }); + }; + + Group.get = function(gid) { + return $http({ + method: 'GET', + url: groupApiURLPrefix + '/' + gid, + }); + }; + + Group.syncParty = function() { + return party(); + }; + + Group.create = function(groupDetails) { + return $http({ + method: "POST", + url: groupApiURLPrefix, + data: groupDetails, + }); + }; + + Group.update = function(groupDetails) { + //@TODO: Check for what has changed? + + //Remove populated fields + var groupDetailsToSend = _.omit(groupDetails, ['chat', 'challenges', 'members', 'invites']); + if (groupDetailsToSend.leader && groupDetailsToSend.leader._id) groupDetailsToSend.leader = groupDetailsToSend.leader._id; + + return $http({ + method: "PUT", + url: groupApiURLPrefix + '/' + groupDetailsToSend._id, + data: groupDetailsToSend, + }); + }; + + Group.join = function(gid) { + return $http({ + method: "POST", + url: groupApiURLPrefix + '/' + gid + '/join', + }); + }; + + Group.rejectInvite = function(gid) { + return $http({ + method: "POST", + url: groupApiURLPrefix + '/' + gid + '/reject-invite', + }); + }; + + Group.leave = function(gid, keep) { + return $http({ + method: "POST", + url: groupApiURLPrefix + '/' + gid + '/leave', + data: { + keep: keep, + } + }); + }; + + Group.removeMember = function(gid, memberId, message) { + return $http({ + method: "POST", + url: groupApiURLPrefix + '/' + gid + '/removeMember/' + memberId, + data: { + message: message, + }, + }); + }; + + Group.invite = function(gid, invitationDetails) { + return $http({ + method: "POST", + url: groupApiURLPrefix + '/' + gid + '/invite', + data: { + uuids: invitationDetails.uuids, + emails: invitationDetails.emails, + }, + }); + }; + + Group.inviteToQuest = function(gid, key) { + return $http({ + method: "POST", + url: groupApiURLPrefix + '/' + gid + '/quests/invite/' + key, + }); + }; + + //On page load, multiple controller request the party. + //So, we cache the promise until the first result is returned + var _cachedPartyPromise; + function party (forceUpdate) { + if (_cachedPartyPromise && !forceUpdate) return _cachedPartyPromise.promise; + _cachedPartyPromise = $q.defer(); + + if (!User.user.party._id) { + data.party = { type: 'party' }; + _cachedPartyPromise.reject(data.party); + } + + if (!data.party || forceUpdate) { + Group.get('party') + .then(function (response) { + data.party = response.data.data; + Members.getGroupMembers(data.party._id, true) + .then(function (response) { + data.party.members = response.data.data; + return Members.getGroupInvites(data.party._id); + }) + .then(function (response) { + data.party.invites = response.data.data; + return Challenges.getGroupChallenges(data.party._id) + }) + .then(function (response) { + data.party.challenges = response.data.data; + _cachedPartyPromise.resolve(data.party); + }); + }, function (response) { + data.party = { type: 'party' }; + _cachedPartyPromise.reject(data.party); + }) + .finally(function() { + _cachePartyPromise = null; + }); + } else { + _cachedPartyPromise.resolve(data.party); + } + + return _cachedPartyPromise.promise; + } + + function publicGuilds () { + var deferred = $q.defer(); + + if (!data.publicGuilds) { + Group.getGroups('publicGuilds') + .then(function (response) { + data.publicGuilds = response.data.data; + deferred.resolve(data.publicGuilds); + }, function (response) { + deferred.reject(response); + }); + } else { + deferred.resolve(data.publicGuilds); + } + + return deferred.promise; + //TODO combine these as {type:'guilds,public'} and create a $filter() to separate them + } + + function myGuilds () { + var deferred = $q.defer(); + + if (!data.myGuilds) { + Group.getGroups('guilds') + .then(function (response) { + data.myGuilds = response.data.data; + deferred.resolve(data.myGuilds); + }, function (response) { + deferred.reject(response); + }); + } else { + deferred.resolve(data.myGuilds); + } + + return deferred.promise; + } + + function tavern (forceUpdate) { + var deferred = $q.defer(); + + if (!data.tavern || forceUpdate) { + Group.get('habitrpg') + .then(function (response) { + data.tavern = response.data.data; + deferred.resolve(data.tavern); + }, function (response) { + deferred.reject(response); + }); + } else { + deferred.resolve(data.tavern); + } + + return deferred.promise; + } + + function inviteOrStartParty (group) { + Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Invite Friends'}); + if (group.type === "party" || $location.$$path === "/options/groups/party") { + group.type = 'party'; + $rootScope.openModal('invite-party', { + controller:'InviteToGroupCtrl', + resolve: { + injectedGroup: function(){ return group; } + } + }); + } else { + $location.path("/options/groups/party"); + } + } + + return { + TAVERN_NAME: TAVERN_NAME, + party: party, + publicGuilds: publicGuilds, + myGuilds: myGuilds, + tavern: tavern, + inviteOrStartParty: inviteOrStartParty, + + data: data, + Group: Group, + }; + }]); diff --git a/website/public/js/services/guideServices.js b/website/client/js/services/guideServices.js similarity index 97% rename from website/public/js/services/guideServices.js rename to website/client/js/services/guideServices.js index ee0be9d2c8..7f3ce9e499 100644 --- a/website/public/js/services/guideServices.js +++ b/website/client/js/services/guideServices.js @@ -241,7 +241,7 @@ function($rootScope, User, $timeout, $state, Analytics) { }); var goto = function(chapter, page, force) { - if (chapter == 'intro') User.set({'flags.welcomed': true}); + if (chapter == 'intro' && User.user.flags.welcomed != true) User.set({'flags.welcomed': true}); if (page === -1) page = 0; var curr = User.user.flags.tour[chapter]; if (page != curr+1 && !force) return; @@ -264,8 +264,8 @@ function($rootScope, User, $timeout, $state, Analytics) { } //Init and show the welcome tour (only after user is pulled from server & wrapped). - var watcher = $rootScope.$watch('User.user.ops.update', function(updateFn){ - if (!updateFn) return; // only run after user has been wrapped + var watcher = $rootScope.$watch('User.user._wrapped', function(wrapped){ + if (!wrapped) return; // only run after user has been wrapped watcher(); // deregister watcher if (window.env.IS_MOBILE) return; // Don't show tour immediately on mobile devices if (User.user.flags.welcomed == false) { diff --git a/website/client/js/services/hallServices.js b/website/client/js/services/hallServices.js new file mode 100644 index 0000000000..a3b7e49751 --- /dev/null +++ b/website/client/js/services/hallServices.js @@ -0,0 +1,41 @@ +'use strict'; + +angular.module('habitrpg') +.factory('Hall', [ '$rootScope', 'ApiUrl', '$http', + function($rootScope, ApiUrl, $http) { + var apiV3Prefix = '/api/v3'; + var Hall = {}; + + Hall.getHeroes = function () { + return $http({ + method: 'GET', + url: apiV3Prefix + '/hall/heroes', + }); + } + + Hall.getHero = function (uuid) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/hall/heroes/' + uuid, + }); + } + + Hall.updateHero = function (heroDetails) { + return $http({ + method: 'PUT', + url: apiV3Prefix + '/hall/heroes/' + heroDetails._id, + data: heroDetails, + }); + } + + Hall.getPatrons = function (page) { + if (!page) page = 0; + + return $http({ + method: 'GET', + url: apiV3Prefix + '/hall/patrons?page=' + page, + }); + } + + return Hall; + }]); diff --git a/website/client/js/services/memberServices.js b/website/client/js/services/memberServices.js new file mode 100644 index 0000000000..cec77de9f6 --- /dev/null +++ b/website/client/js/services/memberServices.js @@ -0,0 +1,128 @@ +'use strict'; + +angular.module('habitrpg') +.factory('Members', [ '$rootScope', 'Shared', 'ApiUrl', '$http', '$q', + function($rootScope, Shared, ApiUrl, $http, $q) { + var members = {}; + var selectedMember = {}; + var apiV3Prefix = '/api/v3'; + + function fetchMember (memberId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/members/' + memberId, + }); + } + + //@TODO: Add paging + function getGroupMembers (groupId, includeAllPublicFields) { + var url = apiV3Prefix + '/groups/' + groupId + '/members'; + + if (includeAllPublicFields) { + url += '?includeAllPublicFields=true'; + } + + return $http({ + method: 'GET', + url: url, + }); + } + + function getGroupInvites (groupId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/groups/' + groupId + '/invites', + }); + } + + function getChallengeMembers (challengeId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/challenges/' + challengeId + '/members?includeAllMembers=true', + }); + } + + function getChallengeMemberProgress (challengeId, memberId) { + return $http({ + method: 'GET', + url: apiV3Prefix + '/challenges/' + challengeId + '/members/' + memberId, + }); + } + + function sendPrivateMessage (message, toUserId) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/members/send-private-message', + data: { + message: message, + toUserId: toUserId, + } + }); + } + + function transferGems (message, toUserId, gemAmount) { + return $http({ + method: 'POST', + url: apiV3Prefix + '/members/transfer-gems', + data: { + message: message, + toUserId: toUserId, + gemAmount: gemAmount, + } + }); + } + + function selectMember (uid) { + var self = this; + var deferred = $q.defer(); + var memberIsReady = _checkIfMemberIsReady(members[uid]); + + if (memberIsReady) { + _prepareMember(members[uid], self); + deferred.resolve(); + } else { + fetchMember(uid) + .then(function (response) { + var member = response.data.data; + addToMembersList(member); // lazy load for later + _prepareMember(member, self); + deferred.resolve(); + }); + } + + return deferred.promise; + } + + function addToMembersList (member) { + if (member._id) { + members[member._id] = member; + } + } + + function _checkIfMemberIsReady (member) { + return member && member.items && member.items.weapon; + } + + function _prepareMember(member, self) { + Shared.wrap(member, false); + self.selectedMember = members[member._id]; + } + + $rootScope.$on('userUpdated', function(event, user){ + addToMembersList(user); + }) + + return { + members: members, + addToMembersList: addToMembersList, + selectedMember: undefined, + selectMember: selectMember, + fetchMember: fetchMember, + getGroupMembers: getGroupMembers, + getGroupInvites: getGroupInvites, + getChallengeMembers: getChallengeMembers, + getChallengeMemberProgress: getChallengeMemberProgress, + sendPrivateMessage: sendPrivateMessage, + transferGems: transferGems, + } + }]); diff --git a/website/public/js/services/notificationServices.js b/website/client/js/services/notificationServices.js similarity index 91% rename from website/public/js/services/notificationServices.js rename to website/client/js/services/notificationServices.js index f4556f6989..b6b854cde1 100644 --- a/website/public/js/services/notificationServices.js +++ b/website/client/js/services/notificationServices.js @@ -39,7 +39,14 @@ angular.module("habitrpg").factory("Notification", case "Food": dropClass = 'Pet_Food_' + item.key; break; - case "Mystery": + case "armor": + case "back": + case "body": + case "eyewear": + case "head": + case "headAccessory": + case "shield": + case "weapon": dropClass = 'shop_' + item.key; break; default: @@ -54,8 +61,8 @@ angular.module("habitrpg").factory("Notification", _notify(_sign(val) + " " + _round(val) + " " + window.env.t('experience'), 'xp', 'glyphicon glyphicon-star'); } - function error(error){ - _notify(error, "danger", 'glyphicon glyphicon-exclamation-sign'); + function error(error, canHide){ + _notify(error, "danger", 'glyphicon glyphicon-exclamation-sign', canHide); } function gp(val, bonus) { @@ -107,14 +114,14 @@ angular.module("habitrpg").factory("Notification", // Used to stack notifications, must be outside of _notify var stack_topright = {"dir1": "down", "dir2": "left", "spacing1": 15, "spacing2": 15, "firstpos1": 60}; - function _notify(html, type, icon) { + function _notify(html, type, icon, canHide) { var notice = $.pnotify({ type: type || 'warning', //('info', 'text', 'warning', 'success', 'gp', 'xp', 'hp', 'lvl', 'death', 'mp', 'crit') text: html, opacity: 1, addclass: 'alert-' + type, delay: 7000, - hide: (type == 'error' || type == 'danger') ? false : true, + hide: ((type == 'error' || type == 'danger') && !canHide) ? false : true, mouse_reset: false, width: "250px", stack: stack_topright, diff --git a/website/public/js/services/paymentServices.js b/website/client/js/services/paymentServices.js similarity index 95% rename from website/public/js/services/paymentServices.js rename to website/client/js/services/paymentServices.js index a3fc832d24..6797da7bf9 100644 --- a/website/public/js/services/paymentServices.js +++ b/website/client/js/services/paymentServices.js @@ -37,7 +37,7 @@ function($rootScope, User, $http, Content) { $http.post(url, res).success(function() { window.location.reload(true); }).error(function(res) { - alert(res.err); + alert(res.message); }); } }); @@ -55,7 +55,7 @@ function($rootScope, User, $http, Content) { $http.post(url, data).success(function() { window.location.reload(true); }).error(function(data) { - alert(data.err); + alert(data.message); }); } }); @@ -127,12 +127,12 @@ function($rootScope, User, $http, Content) { var url = '/amazon/createOrderReferenceId' $http.post(url, { billingAgreementId: Payments.amazonPayments.billingAgreementId - }).success(function(data){ + }).success(function(res){ Payments.amazonPayments.loggedIn = true; - Payments.amazonPayments.orderReferenceId = data.orderReferenceId; + Payments.amazonPayments.orderReferenceId = res.data.orderReferenceId; Payments.amazonPayments.initWidgets(); }).error(function(res){ - alert(res.err); + alert(res.message); }); } }, @@ -146,7 +146,7 @@ function($rootScope, User, $http, Content) { var url = '/amazon/verifyAccessToken' $http.post(url, response).error(function(res){ - alert(res.err); + alert(res.message); }); }); }, @@ -232,7 +232,7 @@ function($rootScope, User, $http, Content) { Payments.amazonPayments.reset(); window.location.reload(true); }).error(function(res){ - alert(res.err); + alert(res.message); Payments.amazonPayments.reset(); }); }else if(Payments.amazonPayments.type === 'subscription'){ @@ -246,7 +246,7 @@ function($rootScope, User, $http, Content) { Payments.amazonPayments.reset(); window.location.reload(true); }).error(function(res){ - alert(res.err); + alert(res.message); Payments.amazonPayments.reset(); }); } @@ -262,7 +262,7 @@ function($rootScope, User, $http, Content) { paymentMethod = paymentMethod.toLowerCase(); } - window.location.href = '/' + paymentMethod + '/subscribe/cancel?_id=' + User.user._id + '&apiToken=' + User.user.apiToken; + window.location.href = '/' + paymentMethod + '/subscribe/cancel?_id=' + User.user._id + '&apiToken=' + User.settings.auth.apiToken; } Payments.encodeGift = function(uuid, gift){ diff --git a/website/public/js/services/questServices.js b/website/client/js/services/questServices.js similarity index 80% rename from website/public/js/services/questServices.js rename to website/client/js/services/questServices.js index a69ae800d8..5033bad33d 100644 --- a/website/public/js/services/questServices.js +++ b/website/client/js/services/questServices.js @@ -1,25 +1,16 @@ 'use strict'; -(function(){ - angular - .module('habitrpg') - .factory('Quests', questsFactory); - - questsFactory.$inject = [ - '$http', - '$state', - '$q', - 'ApiUrl', - 'Content', - 'Groups', - 'User', - 'Analytics' - ]; - +angular.module('habitrpg') +.factory('Quests', ['$http', '$state','$q', 'ApiUrl', 'Content', 'Groups', 'User', 'Analytics', function questsFactory($http, $state, $q, ApiUrl, Content, Groups, User, Analytics) { var user = User.user; - var party = Groups.party(); + var party; + + Groups.party() + .then(function (partyFound) { + party = partyFound; + }); function lockQuest(quest,ignoreLevel) { if (!ignoreLevel){ @@ -106,20 +97,21 @@ function initQuest(key) { return $q(function(resolve, reject) { - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'quest','owner':true,'response':'accept','questName': key}); - Analytics.updateUser({'partyID':party._id,'partySize':party.memberCount}); - party.$startQuest({key:key}, function(){ - party.$syncParty(); - $state.go('options.social.party'); - resolve(); - }); + Analytics.track({'hitType':'event', 'eventCategory':'behavior', 'eventAction':'quest', 'owner':true, 'response':'accept', 'questName': key}); + Analytics.updateUser({'partyID': party._id, 'partySize': party.memberCount}); + Groups.Group.inviteToQuest(party._id, key) + .then(function(response) { + party.quest = response.data.data; + Groups.data.party = party; + $state.go('options.social.party'); + resolve(); + }); }); } function sendAction(action) { return $q(function(resolve, reject) { - - $http.post(ApiUrl.get() + '/api/v2/groups/' + party._id + '/' + action) + $http.post(ApiUrl.get() + '/api/v3/groups/' + party._id + '/' + action) .then(function(response) { User.sync(); @@ -129,6 +121,7 @@ }); var quest = response.data.quest; + if (!quest) quest = response.data.data; resolve(quest); });; }); @@ -142,5 +135,4 @@ showQuest: showQuest, initQuest: initQuest } - } -}()); + }]); diff --git a/website/public/js/services/sharedServices.js b/website/client/js/services/sharedServices.js similarity index 100% rename from website/public/js/services/sharedServices.js rename to website/client/js/services/sharedServices.js diff --git a/website/public/js/services/socialServices.js b/website/client/js/services/socialServices.js similarity index 100% rename from website/public/js/services/socialServices.js rename to website/client/js/services/socialServices.js diff --git a/website/public/js/services/statServices.js b/website/client/js/services/statServices.js similarity index 94% rename from website/public/js/services/statServices.js rename to website/client/js/services/statServices.js index f2db805fb6..b716dbcaf7 100644 --- a/website/public/js/services/statServices.js +++ b/website/client/js/services/statServices.js @@ -22,7 +22,7 @@ } function classBonus(user, stat) { - var computedStats = user._statsComputed; + var computedStats = (user.fns && user.fns.statsComputed) ? user.fns.statsComputed() : null; if(computedStats) { var bonus = computedStats[stat] @@ -95,7 +95,7 @@ function mpDisplay(user) { var remainingMP = Math.floor(user.stats.mp); - var totalMP = user._statsComputed.maxMP; + var totalMP = (user.fns && user.fns.statsComputed) ? user.fns.statsComputed().maxMP : null; var display = _formatOutOfTotalDisplay(remainingMP, totalMP); return display; diff --git a/website/client/js/services/tagsServices.js b/website/client/js/services/tagsServices.js new file mode 100644 index 0000000000..2a430282b6 --- /dev/null +++ b/website/client/js/services/tagsServices.js @@ -0,0 +1,60 @@ +'use strict'; + +angular.module('habitrpg') +.factory('Tags', ['$rootScope', '$http', + function tagsFactory($rootScope, $http) { + + function getTags () { + return $http({ + method: 'GET', + url: 'api/v3/tags', + }); + }; + + function createTag (tagDetails) { + return $http({ + method: 'POST', + url: 'api/v3/tags', + data: tagDetails, + }); + }; + + function getTag (tagId) { + return $http({ + method: 'GET', + url: 'api/v3/tags/' + tagId, + }); + }; + + function updateTag (tagId, tagDetails) { + return $http({ + method: 'PUT', + url: 'api/v3/tags/' + tagId, + data: tagDetails, + }); + }; + + function sortTag (tagId, to) { + return $http({ + method: 'POST', + url: 'api/v3/reorder-tags', + data: {tagId: tagId, to: to}, + }); + }; + + function deleteTag (tagId) { + return $http({ + method: 'DELETE', + url: 'api/v3/tags/' + tagId, + }); + }; + + return { + getTags: getTags, + createTag: createTag, + getTag: getTag, + updateTag: updateTag, + sortTag: sortTag, + deleteTag: deleteTag, + }; + }]); diff --git a/website/client/js/services/taskServices.js b/website/client/js/services/taskServices.js new file mode 100644 index 0000000000..7a99cd748e --- /dev/null +++ b/website/client/js/services/taskServices.js @@ -0,0 +1,205 @@ +'use strict'; + +var TASK_KEYS_TO_REMOVE = ['_id', 'completed', 'date', 'dateCompleted', 'history', 'id', 'streak', 'createdAt', 'challenge']; + +angular.module('habitrpg') +.factory('Tasks', ['$rootScope', 'Shared', '$http', + function tasksFactory($rootScope, Shared, $http) { + + function getUserTasks (getCompletedTodos) { + var url = '/api/v3/tasks/user'; + + if (getCompletedTodos) url += '?type=completedTodos'; + + return $http({ + method: 'GET', + url: url, + }); + }; + + function createUserTasks (taskDetails) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/user', + data: taskDetails, + }); + }; + + function getChallengeTasks (challengeId) { + return $http({ + method: 'GET', + url: '/api/v3/tasks/challenge/' + challengeId, + }); + }; + + function createChallengeTasks (challengeId, taskDetails) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/challenge/' + challengeId, + data: taskDetails, + }); + }; + + function getTask (taskId) { + return $http({ + method: 'GET', + url: '/api/v3/tasks/' + taskId, + }); + }; + + function updateTask (taskId, taskDetails) { + return $http({ + method: 'PUT', + url: '/api/v3/tasks/' + taskId, + data: taskDetails, + }); + }; + + function deleteTask (taskId) { + return $http({ + method: 'DELETE', + url: '/api/v3/tasks/' + taskId, + }); + }; + + function scoreTask (taskId, direction) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/' + taskId + '/score/' + direction, + }); + }; + + function moveTask (taskId, position) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/' + taskId + '/move/to/' + position, + }); + }; + + function addChecklistItem (taskId, checkListItem) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/' + taskId + '/checklist', + data: checkListItem, + }); + }; + + function scoreCheckListItem (taskId, itemId) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/' + taskId + '/checklist/' + itemId + '/score', + }); + }; + + function updateChecklistItem (taskId, itemId, itemDetails) { + return $http({ + method: 'PUT', + url: '/api/v3/tasks/' + taskId + '/checklist/' + itemId, + data: itemDetails, + }); + }; + + function removeChecklistItem (taskId, itemId) { + return $http({ + method: 'DELETE', + url: '/api/v3/tasks/' + taskId + '/checklist/' + itemId, + }); + }; + + function addTagToTask (taskId, tagId) { + return $http({ + method: 'POST', + url: '/api/v3/tasks/' + taskId + '/tags/' + tagId, + }); + }; + + function removeTagFromTask (taskId, tagId) { + return $http({ + method: 'DELETE', + url: '/api/v3/tasks/' + taskId + '/tags/' + tagId, + }); + }; + + function unlinkOneTask (taskId, keep) { // single task + if (!keep) { + keep = "keep"; + } + + return $http({ + method: 'POST', + url: '/api/v3/tasks/unlink-one/' + taskId + '?keep=' + keep, + }); + }; + + function unlinkAllTasks (challengeId, keep) { // all tasks + if (!keep) { + keep = "keep-all"; + } + + return $http({ + method: 'POST', + url: '/api/v3/tasks/unlink-all/' + challengeId + '?keep=' + keep, + }); + }; + + function clearCompletedTodos () { + return $http({ + method: 'POST', + url: '/api/v3/tasks/clearCompletedTodos', + }); + }; + + function editTask(task, user) { + task._editing = !task._editing; + task._tags = !user.preferences.tagsCollapsed; + task._advanced = !user.preferences.advancedCollapsed; + if($rootScope.charts[task._id]) $rootScope.charts[task.id] = false; + } + + function cloneTask(task) { + var clonedTask = _.cloneDeep(task); + clonedTask = _cleanUpTask(clonedTask); + + return Shared.taskDefaults(clonedTask); + } + + function _cleanUpTask(task) { + var cleansedTask = _.omit(task, TASK_KEYS_TO_REMOVE); + + // Copy checklists but reset to uncomplete and assign new id + _(cleansedTask.checklist).forEach(function(item) { + item.completed = false; + item.id = Shared.uuid(); + }).value(); + + if (cleansedTask.type !== 'reward') { + delete cleansedTask.value; + } + + return cleansedTask; + } + + return { + getUserTasks: getUserTasks, + loadedCompletedTodos: false, + createUserTasks: createUserTasks, + getChallengeTasks: getChallengeTasks, + createChallengeTasks: createChallengeTasks, + getTask: getTask, + updateTask: updateTask, + deleteTask: deleteTask, + scoreTask: scoreTask, + moveTask: moveTask, + addChecklistItem: addChecklistItem, + scoreCheckListItem: scoreCheckListItem, + updateChecklistItem: updateChecklistItem, + removeChecklistItem: removeChecklistItem, + addTagToTask: addTagToTask, + removeTagFromTask: removeTagFromTask, + unlinkOneTask: unlinkOneTask, + unlinkAllTasks: unlinkAllTasks, + clearCompletedTodos: clearCompletedTodos, + editTask: editTask, + cloneTask: cloneTask + }; + }]); diff --git a/website/client/js/services/userServices.js b/website/client/js/services/userServices.js new file mode 100644 index 0000000000..e0282035c6 --- /dev/null +++ b/website/client/js/services/userServices.js @@ -0,0 +1,646 @@ +'use strict'; + +angular.module('habitrpg') + .service('ApiUrl', ['API_URL', function(currentApiUrl) { + this.setApiUrl = function(newUrl){ + currentApiUrl = newUrl; + }; + + this.get = function(){ + return currentApiUrl; + }; + }]) + +/** + * Services that persists and retrieves user from localStorage. + */ + .factory('User', ['$rootScope', '$http', '$location', '$window', 'STORAGE_USER_ID', 'STORAGE_SETTINGS_ID', 'Notification', 'ApiUrl', 'Tasks', 'Tags', 'Content', + function($rootScope, $http, $location, $window, STORAGE_USER_ID, STORAGE_SETTINGS_ID, Notification, ApiUrl, Tasks, Tags, Content) { + var authenticated = false; + var defaultSettings = { + auth: { apiId: '', apiToken: ''}, + sync: { + queue: [], //here OT will be queued up, this is NOT call-back queue! + sent: [] //here will be OT which have been sent, but we have not got reply from server yet. + }, + fetching: false, // whether fetch() was called or no. this is to avoid race conditions + online: false + }; + var settings = {}; //habit mobile settings (like auth etc.) to be stored here + var user = {}; // this is stored as a reference accessible to all controllers, that way updates propagate + + var userNotifications = { + // "party.order" : env.t("updatedParty"), + // "party.orderAscending" : env.t("updatedParty") + // party.order notifications are not currently needed because the party avatars are resorted immediately now + }; // this is a list of notifications to send to the user when changes are made, along with the message. + + //first we populate user with schema + user.apiToken = user._id = ''; // we use id / apitoken to determine if registered + + //than we try to load localStorage + if (localStorage.getItem(STORAGE_USER_ID)) { + _.extend(user, JSON.parse(localStorage.getItem(STORAGE_USER_ID))); + } + + user._wrapped = false; + + function syncUserTasks (tasks) { + user.habits = []; + user.todos = []; + user.dailys = []; + user.rewards = []; + + // Order tasks based on tasksOrder + var groupedTasks = _(tasks) + .groupBy('type') + .forEach(function (tasksOfType, type) { + var order = user.tasksOrder[type + 's']; + var orderedTasks = new Array(tasksOfType.length); + var unorderedTasks = []; // what we want to add later + + tasksOfType.forEach(function (task, index) { + var taskId = task._id; + var i = order[index] === taskId ? index : order.indexOf(taskId); + if (i === -1) { + unorderedTasks.push(task); + } else { + orderedTasks[i] = task; + } + }); + + // Remove empty values from the array and add any unordered task + user[type + 's'] = _.compact(orderedTasks).concat(unorderedTasks); + }).value(); + } + + function sync() { + return $http({ + method: "GET", + url: '/api/v3/user/', + }) + .then(function (response) { + if (response.data.message) Notification.text(response.data.message); + + _.extend(user, response.data.data); + + $rootScope.$emit('userUpdated', user); + + if (!user._wrapped) { + // This wraps user with `ops`, which are functions shared both on client and mobile. When performed on client, + // they update the user in the browser and then send the request to the server, where the same operation is + // replicated. We need to wrap each op to provide a callback to send that operation + $window.habitrpgShared.wrap(user); + _.each(user.ops, function(op,k){ + user.ops[k] = function(req){ + try { + op(req); + } catch (err) { + Notification.text(err.message); + return; + } + } + }); + } + + return Tasks.getUserTasks(); + }) + .then(function (response) { + var tasks = response.data.data; + syncUserTasks(tasks); + save(); + $rootScope.$emit('userSynced'); + }); + } + + var save = function () { + localStorage.setItem(STORAGE_USER_ID, JSON.stringify(user)); + localStorage.setItem(STORAGE_SETTINGS_ID, JSON.stringify(settings)); + }; + + function callOpsFunctionAndRequest (opName, endPoint, method, paramString, opData) { + if (!opData) opData = {}; + + var clientResponse; + + try { + var args = [user]; + if (opName === 'rebirth' || opName === 'reroll' || opName === 'reset') { + args.push(user.habits.concat(user.dailys).concat(user.rewards).concat(user.todos)); + } + + args.push(opData); + clientResponse = $window.habitrpgShared.ops[opName].apply(null, args); + } catch (err) { + Notification.text(err.message); + return; + } + + var clientMessage = clientResponse[1]; + + if (clientMessage) { + Notification.text(clientMessage); + } + + var url = '/api/v3/user/' + endPoint; + if (paramString) { + url += '/' + paramString + } + + var body = {}; + if (opData.body) body = opData.body; + + var queryString = ''; + if (opData.query) queryString = '?' + $.param(opData.query) + + $http({ + method: method, + url: url + queryString, + body: body, + }) + .then(function (response) { + if (response.data.message && response.data.message !== clientMessage) { + Notification.text(response.data.message); + } + if (opName === 'openMysteryItem') { + var openedItem = clientResponse[0]; + var text = Content.gear.flat[openedItem.key].text(); + Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), openedItem); + } + + save(); + }) + } + + function setUser(updates) { + for (var key in updates) { + _.set(user, key, updates[key]); + } + } + + var userServices = { + user: user, + + //@TODO: WE need a new way to set the user from tests + setUser: function (userInc) { + user = userInc; + }, + + allocate: function (data) { + callOpsFunctionAndRequest('allocate', 'allocate', "POST",'', data); + }, + + allocateNow: function () { + callOpsFunctionAndRequest('allocateNow', 'allocate-now', "POST"); + }, + + changeClass: function (data) { + callOpsFunctionAndRequest('changeClass', 'change-class', "POST",'', data); + }, + + disableClasses: function () { + callOpsFunctionAndRequest('disableClasses', 'disable-classes', "POST"); + }, + + revive: function (data) { + callOpsFunctionAndRequest('revive', 'revive', "POST"); + }, + + addTask: function (data) { + if (_.isArray(data.body)) { + data.body.forEach(function (task) { + user.ops.addTask({body: task}); + }); + } else { + user.ops.addTask(data); + } + save(); + Tasks.createUserTasks(data.body); + }, + + score: function (data) { + try { + $window.habitrpgShared.ops.scoreTask({user: user, task: data.params.task, direction: data.params.direction}, data.params); + } catch (err) { + Notification.text(err.message); + return; + } + save(); + + Tasks.scoreTask(data.params.task._id, data.params.direction).then(function (res) { + var tmp = res.data.data._tmp || {}; // used to notify drops, critical hits and other bonuses + var crit = tmp.crit; + var drop = tmp.drop; + + if (crit) { + var critBonus = crit * 100 - 100; + Notification.crit(critBonus); + } + if (drop) { + var text, notes, type; + $rootScope.playSound('Item_Drop'); + + // Note: For Mystery Item gear, drop.type will be 'head', 'armor', etc + // so we use drop.notificationType below. + + if (drop.type !== 'gear' && drop.type !== 'Quest' && drop.notificationType !== 'Mystery') { + if (drop.type === 'Food') { + type = 'food'; + } else if (drop.type === 'HatchingPotion') { + type = 'hatchingPotions'; + } else { + type = drop.type.toLowerCase() + 's'; + } + if(!user.items[type][drop.key]){ + user.items[type][drop.key] = 0; + } + user.items[type][drop.key]++; + } + + if (drop.type === 'HatchingPotion'){ + text = Content.hatchingPotions[drop.key].text(); + notes = Content.hatchingPotions[drop.key].notes(); + Notification.drop(env.t('messageDropPotion', {dropText: text, dropNotes: notes}), drop); + } else if (drop.type === 'Egg'){ + text = Content.eggs[drop.key].text(); + notes = Content.eggs[drop.key].notes(); + Notification.drop(env.t('messageDropEgg', {dropText: text, dropNotes: notes}), drop); + } else if (drop.type === 'Food'){ + text = Content.food[drop.key].text(); + notes = Content.food[drop.key].notes(); + Notification.drop(env.t('messageDropFood', {dropArticle: drop.article, dropText: text, dropNotes: notes}), drop); + } else if (drop.type === 'Quest') { + $rootScope.selectedQuest = Content.quests[drop.key]; + $rootScope.openModal('questDrop', {controller:'PartyCtrl', size:'sm'}); + } else { + // Keep support for another type of drops that might be added + Notification.drop(drop.dialog); + } + + // Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'acquire item','itemName':after.key,'acquireMethod':'Drop'}); + } + }); + }, + + sortTask: function (data) { + user.ops.sortTask(data); + save(); + Tasks.moveTask(data.params.id, data.query.to); + }, + + updateTask: function (task, data) { + $window.habitrpgShared.ops.updateTask(task, data); + save(); + Tasks.updateTask(task._id, data.body); + }, + + deleteTask: function (data) { + user.ops.deleteTask(data); + save(); + Tasks.deleteTask(data.params.id); + }, + + clearCompleted: function () { + user.ops.clearCompleted(user.todos); + save(); + Tasks.clearCompletedTodos(); + }, + + addTag: function(data) { + user.ops.addTag(data); + save(); + Tags.createTag(data.body); + }, + + updateTag: function(data) { + user.ops.updateTag(data); + save(); + Tags.updateTag(data.params.id, data.body); + }, + + sortTag: function (data) { + var fromId = user.tags[data.query.from].id; + user.ops.sortTag(data); + Tags.sortTag(fromId, data.query.to); + }, + + deleteTag: function(data) { + user.ops.deleteTag(data); + save(); + Tags.deleteTag(data.params.id); + }, + + addTenGems: function () { + $http({ + method: "POST", + url: 'api/v3/debug/add-ten-gems', + }) + .then(function (response) { + Notification.text('+10 Gems!'); + sync(); + }) + }, + + addHourglass: function () { + $http({ + method: "POST", + url: 'api/v3/debug/add-hourglass', + }) + .then(function (response) { + sync(); + }) + }, + + setCron: function (numberOfDays) { + var date = moment(user.lastCron).subtract(numberOfDays, 'days').toDate(); + + $http({ + method: "POST", + url: 'api/v3/debug/set-cron', + data: { + lastCron: date + } + }) + .then(function (response) { + Notification.text('-' + numberOfDays + ' day(s), remember to refresh'); + }); + }, + + setCustomDayStart: function (dayStart) { + $http({ + method: "POST", + url: 'api/v3/user/custom-day-start', + data: { + dayStart: dayStart + } + }) + .then(function (response) { + Notification.text(response.data.data.message); + sync(); + }); + }, + + makeAdmin: function () { + $http({ + method: "POST", + url: 'api/v3/debug/make-admin' + }) + .then(function (response) { + Notification.text('You are now an admin! Go to the Hall of Heroes to change your contributor level.'); + sync() + }); + }, + + clearNewMessages: function () { + callOpsFunctionAndRequest('markPmsRead', 'mark-pms-read', "POST"); + }, + + clearPMs: function () { + callOpsFunctionAndRequest('clearPMs', 'messages', "DELETE"); + }, + + deletePM: function (data) { + callOpsFunctionAndRequest('deletePM', 'messages', "DELETE", data.params.id, data); + }, + + buy: function (data) { + callOpsFunctionAndRequest('buy', 'buy', "POST", data.params.key, data); + }, + + buyArmoire: function () { + $http({ + method: "POST", + url: '/api/v3/user/buy-armoire', + }) + .then(function (response) { + Notification.text(response.data.message); + sync(); + }) + }, + + buyQuest: function (data) { + callOpsFunctionAndRequest('buyQuest', 'buy-quest', "POST", data.params.key, data); + }, + + purchase: function (data) { + var type = data.params.type; + var key = data.params.key; + callOpsFunctionAndRequest('purchase', 'purchase', "POST", type + '/' + key, data); + }, + + buySpecialSpell: function (data) { + $window.habitrpgShared.ops['buySpecialSpell'](user, data); + var key = data.params.key; + + $http({ + method: "POST", + url: '/api/v3/user/' + 'buy-special-spell/' + key, + }) + .then(function (response) { + Notification.text(response.data.message); + }) + }, + + buyMysterySet: function (data) { + callOpsFunctionAndRequest('buyMysterySet', 'buy-mystery-set', "POST", data.params.key, data); + }, + + readCard: function (data) { + callOpsFunctionAndRequest('readCard', 'read-card', "POST", data.params.cardType, data); + }, + + openMysteryItem: function (data) { + callOpsFunctionAndRequest('openMysteryItem', 'open-mystery-item', "POST"); + }, + + sell: function (data) { + var type = data.params.type; + var key = data.params.key; + callOpsFunctionAndRequest('sell', 'sell', "POST", type + '/' + key, data); + }, + + hatch: function (data) { + var egg = data.params.egg; + var hatchingPotion = data.params.hatchingPotion; + callOpsFunctionAndRequest('hatch', 'hatch', "POST", egg + '/' + hatchingPotion, data); + }, + + feed: function (data) { + var pet = data.params.pet; + var food = data.params.food; + callOpsFunctionAndRequest('feed', 'feed', "POST", pet + '/' + food, data); + }, + + equip: function (data) { + var type = data.params.type; + var key = data.params.key; + callOpsFunctionAndRequest('equip', 'equip', "POST", type + '/' + key, data); + }, + + hourglassPurchase: function (data) { + var type = data.params.type; + var key = data.params.key; + callOpsFunctionAndRequest('purchaseHourglass', 'purchase-hourglass', "POST", type + '/' + key, data); + }, + + unlock: function (data) { + callOpsFunctionAndRequest('unlock', 'unlock', "POST", '', data); + }, + + set: function(updates) { + setUser(updates); + $http({ + method: "PUT", + url: '/api/v3/user', + data: updates, + }) + .then(function () { + save(); + $rootScope.$emit('userSynced'); + }) + }, + + reroll: function () { + callOpsFunctionAndRequest('reroll', 'reroll', "POST"); + }, + + rebirth: function () { + callOpsFunctionAndRequest('rebirth', 'rebirth', "POST"); + }, + + reset: function () { + callOpsFunctionAndRequest('reset', 'reset', "POST"); + }, + + releaseBoth: function () { + callOpsFunctionAndRequest('releaseBoth', 'release-both', "POST"); + }, + + releaseMounts: function () { + callOpsFunctionAndRequest('releaseMounts', 'release-mounts', "POST"); + }, + + releasePets: function () { + callOpsFunctionAndRequest('releasePets', 'release-pets', "POST"); + }, + + addWebhook: function (data) { + callOpsFunctionAndRequest('addWebhook', 'webhook', "POST", '', data, data.body); + }, + + updateWebhook: function (data) { + callOpsFunctionAndRequest('updateWebhook', 'webhook', "PUT", data.params.id, data, data.body); + }, + + deleteWebhook: function (data) { + callOpsFunctionAndRequest('deleteWebhook', 'webhook', "DELETE", data.params.id, data, data.body); + }, + + sleep: function () { + callOpsFunctionAndRequest('sleep', 'sleep', "POST"); + }, + + blockUser: function (data) { + callOpsFunctionAndRequest('blockUser', 'block', "POST", data.params.uuid, data); + }, + + online: function (status) { + if (status===true) { + settings.online = true; + // syncQueue(); + } else { + settings.online = false; + }; + }, + + authenticate: function (uuid, token, cb) { + if (uuid && token) { + var offset = moment().zone(); // eg, 240 - this will be converted on server as -(offset/60) + $http.defaults.headers.common['x-api-user'] = uuid; + $http.defaults.headers.common['x-api-key'] = token; + $http.defaults.headers.common['x-user-timezoneOffset'] = offset; + authenticated = true; + settings.auth.apiId = uuid; + settings.auth.apiToken = token; + settings.online = true; + save(); + sync().then(function () { + if (user.preferences.timezoneOffset !== offset) + userServices.set({'preferences.timezoneOffset': offset}); + if (cb) cb(); + }); + } else { + alert('Please enter your ID and Token in settings.') + } + }, + + authenticated: function(){ + return this.settings.auth.apiId !== ""; + }, + + getBalanceInGems: function() { + var balance = user.balance || 0; + return balance * 4; + }, + + log: function (action, cb) { + //push by one buy one if an array passed in. + if (_.isArray(action)) { + action.forEach(function (a) { + settings.sync.queue.push(a); + }); + } else { + settings.sync.queue.push(action); + } + + save(); + }, + + sync: function(){ + userServices.log({}); + return sync(); + }, + + syncUserTasks: syncUserTasks, + + save: save, + + settings: settings + }; + + //load settings if we have them + if (localStorage.getItem(STORAGE_SETTINGS_ID)) { + //use extend here to make sure we keep object reference in other angular controllers + _.extend(settings, JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID))); + + //if settings were saved while fetch was in process reset the flag. + settings.fetching = false; + //create and load if not + } else { + localStorage.setItem(STORAGE_SETTINGS_ID, JSON.stringify(defaultSettings)); + _.extend(settings, defaultSettings); + } + + //If user does not have ApiID that forward him to settings. + if (!settings.auth.apiId || !settings.auth.apiToken) { + //var search = $location.search(); // FIXME this should be working, but it's returning an empty object when at a root url /?_id=... + var search = $location.search($window.location.search.substring(1)).$$search; // so we use this fugly hack instead + if (search.err) return alert(search.err); + if (search._id && search.apiToken) { + userServices.authenticate(search._id, search.apiToken, function(){ + $window.location.href = '/'; + }); + } else { + var isStaticOrSocial = $window.location.pathname.match(/^\/(static|social)/); + if (!isStaticOrSocial){ + localStorage.clear(); + $location.path('/logout'); + } + } + } else { + userServices.authenticate(settings.auth.apiId, settings.auth.apiToken) + } + + return userServices; + } +]); diff --git a/website/client/js/static.js b/website/client/js/static.js new file mode 100644 index 0000000000..c8af2adf27 --- /dev/null +++ b/website/client/js/static.js @@ -0,0 +1,64 @@ +"use strict"; + +window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.bootstrap']) + .constant("API_URL", "") + .constant("STORAGE_USER_ID", 'habitrpg-user') + .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') + .constant("MOBILE_APP", false) + +.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', 'Members', + function($scope, $location, $modal, $http, Stats, Members) { + var memberId = $location.search()['memberId']; + if (memberId) { + Members.fetchMember(memberId) + .success(function(response) { + $scope.profile = response.data; + + $scope.statCalc = Stats; + $scope.Content = window.habitrpgShared.content; + $modal.open({ + templateUrl: 'modals/member.html', + scope: $scope + }); + }); + } + + $http.defaults.headers.common['x-client'] = 'habitica-web'; + }]) + +.controller("PlansCtrl", ['$rootScope','Analytics', + function($rootScope,Analytics) { + $rootScope.clickContact = function(){ + Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Contact Us (Plans)'}) + } + } +]) + +.controller('AboutCtrl',[function(){ + $(document).ready(function(){ + $('a.gallery').colorbox({ + maxWidth: '90%', + maxHeight: '80%', + transition: 'none', + scalePhotos:true + //maxHeight: '70%' + }); + }); +}]) + +.controller('AccordionCtrl', function() { + function openHashAccordion() { + if (window.location.hash) { + var $target = $(window.location.hash.replace('/','')); + if ($target.hasClass('collapse')) { + $target.collapse('show'); + $('html, body').animate({ + scrollTop: $($target).offset().top - 100 + }); + } + } + } + $(document).ready(function(){ + openHashAccordion(); + }); +}) diff --git a/website/client/logo.png b/website/client/logo.png new file mode 100644 index 0000000000..136f50f52f Binary files /dev/null and b/website/client/logo.png differ diff --git a/website/public/logo/HABITRPG logo version 1.psd b/website/client/logo/HABITRPG logo version 1.psd similarity index 100% rename from website/public/logo/HABITRPG logo version 1.psd rename to website/client/logo/HABITRPG logo version 1.psd diff --git a/website/public/logo/HABITRPG-logo-version-1.gif b/website/client/logo/HABITRPG-logo-version-1.gif similarity index 100% rename from website/public/logo/HABITRPG-logo-version-1.gif rename to website/client/logo/HABITRPG-logo-version-1.gif diff --git a/website/public/logo/habitrpg.jpg b/website/client/logo/habitrpg.jpg similarity index 100% rename from website/public/logo/habitrpg.jpg rename to website/client/logo/habitrpg.jpg diff --git a/website/public/logo/habitrpg_bl.eps b/website/client/logo/habitrpg_bl.eps similarity index 100% rename from website/public/logo/habitrpg_bl.eps rename to website/client/logo/habitrpg_bl.eps diff --git a/website/public/logo/habitrpg_pixel.png b/website/client/logo/habitrpg_pixel.png similarity index 100% rename from website/public/logo/habitrpg_pixel.png rename to website/client/logo/habitrpg_pixel.png diff --git a/website/public/manifest.json b/website/client/manifest.json similarity index 88% rename from website/public/manifest.json rename to website/client/manifest.json index c4d107c03e..fb59224a34 100644 --- a/website/public/manifest.json +++ b/website/client/manifest.json @@ -8,7 +8,7 @@ "bower_components/bootstrap-tour/build/js/bootstrap-tour.js", "bower_components/angular/angular.js", "bower_components/angular-sanitize/angular-sanitize.js", - "bower_components/marked/lib/marked.js", + "bower_components/habitica-markdown/dist/habitica-markdown.min.js", "bower_components/angular-ui-router/release/angular-ui-router.js", "bower_components/angular-resource/angular-resource.min.js", "bower_components/angular-ui-utils/ui-utils.min.js", @@ -31,6 +31,7 @@ "bower_components/jquery-ui/ui/minified/jquery.ui.widget.min.js", "bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js", "bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js", + "bower_components/smart-app-banner/smart-app-banner.js", "common/dist/scripts/habitrpg-shared.js", @@ -41,7 +42,6 @@ "js/services/sharedServices.js", "js/services/notificationServices.js", - "common/script/public/userServices.js", "common/script/public/directives.js", "js/services/analyticsServices.js", "js/services/groupServices.js", @@ -49,11 +49,14 @@ "js/services/memberServices.js", "js/services/guideServices.js", "js/services/taskServices.js", + "js/services/tagsServices.js", "js/services/challengeServices.js", "js/services/paymentServices.js", "js/services/questServices.js", "js/services/socialServices.js", "js/services/statServices.js", + "js/services/userServices.js", + "js/services/hallServices.js", "js/filters/money.js", "js/filters/roundLargeNumbers.js", @@ -99,6 +102,7 @@ "css": [ "bower_components/bootstrap/dist/css/bootstrap.css", "bower_components/css-social-buttons/css/zocial.css", + "bower_components/smart-app-banner/smart-app-banner.css", "app.css", "bower_components/pnotify/jquery.pnotify.default.css", "bower_components/pnotify/jquery.pnotify.default.icons.css", @@ -120,14 +124,20 @@ "bower_components/hello/dist/hello.all.min.js", "bower_components/angular-loading-bar/build/loading-bar.js", + + "bower_components/smart-app-banner/smart-app-banner.js", + "js/env.js", "js/static.js", "js/services/analyticsServices.js", "js/services/notificationServices.js", + "js/services/userServices.js", "js/services/sharedServices.js", "js/services/socialServices.js", "js/services/statServices.js", - "common/script/public/userServices.js", + "js/services/taskServices.js", + "js/services/tagsServices.js", + "js/services/memberServices.js", "js/controllers/authCtrl.js", "js/controllers/footerCtrl.js" ], @@ -135,6 +145,7 @@ "bower_components/bootstrap/dist/css/bootstrap.css", "bower_components/css-social-buttons/css/zocial.css", "bower_components/jquery-colorbox/example1/colorbox.css", + "bower_components/smart-app-banner/smart-app-banner.css", "app.css", "common/dist/sprites/habitrpg-shared.css", "static.css" @@ -150,6 +161,9 @@ "bower_components/hello/dist/hello.all.min.js", "bower_components/angular-loading-bar/build/loading-bar.js", + + "bower_components/smart-app-banner/smart-app-banner.js", + "js/env.js", "js/static.js", "js/services/analyticsServices.js", @@ -157,12 +171,16 @@ "js/services/sharedServices.js", "js/services/socialServices.js", "js/services/statServices.js", - "common/script/public/userServices.js", + "js/services/taskServices.js", + "js/services/tagsServices.js", + "js/services/userServices.js", + "js/services/memberServices.js", "js/controllers/authCtrl.js", "js/controllers/footerCtrl.js" ], "css": [ "bower_components/css-social-buttons/css/zocial.css", + "bower_components/smart-app-banner/smart-app-banner.css", "front/staticstyle.css", "common/dist/sprites/habitrpg-shared.css", "app.css" diff --git a/website/public/marketing/android_iphone.png b/website/client/marketing/android_iphone.png similarity index 100% rename from website/public/marketing/android_iphone.png rename to website/client/marketing/android_iphone.png diff --git a/website/public/marketing/animals.png b/website/client/marketing/animals.png similarity index 100% rename from website/public/marketing/animals.png rename to website/client/marketing/animals.png diff --git a/website/public/marketing/challenge.png b/website/client/marketing/challenge.png similarity index 100% rename from website/public/marketing/challenge.png rename to website/client/marketing/challenge.png diff --git a/website/public/marketing/devices.png b/website/client/marketing/devices.png similarity index 100% rename from website/public/marketing/devices.png rename to website/client/marketing/devices.png diff --git a/website/public/marketing/drops.png b/website/client/marketing/drops.png similarity index 100% rename from website/public/marketing/drops.png rename to website/client/marketing/drops.png diff --git a/website/public/marketing/education.png b/website/client/marketing/education.png similarity index 100% rename from website/public/marketing/education.png rename to website/client/marketing/education.png diff --git a/website/public/marketing/gear.png b/website/client/marketing/gear.png similarity index 100% rename from website/public/marketing/gear.png rename to website/client/marketing/gear.png diff --git a/website/public/marketing/guild.png b/website/client/marketing/guild.png similarity index 100% rename from website/public/marketing/guild.png rename to website/client/marketing/guild.png diff --git a/website/public/marketing/guild_small.png b/website/client/marketing/guild_small.png similarity index 100% rename from website/public/marketing/guild_small.png rename to website/client/marketing/guild_small.png diff --git a/website/public/marketing/integration.png b/website/client/marketing/integration.png similarity index 100% rename from website/public/marketing/integration.png rename to website/client/marketing/integration.png diff --git a/website/public/marketing/lefnire.png b/website/client/marketing/lefnire.png similarity index 100% rename from website/public/marketing/lefnire.png rename to website/client/marketing/lefnire.png diff --git a/website/public/marketing/promos/201403_Forest_Walker.png b/website/client/marketing/promos/201403_Forest_Walker.png similarity index 100% rename from website/public/marketing/promos/201403_Forest_Walker.png rename to website/client/marketing/promos/201403_Forest_Walker.png diff --git a/website/public/marketing/promos/April14SAMPLE2.png b/website/client/marketing/promos/April14SAMPLE2.png similarity index 100% rename from website/public/marketing/promos/April14SAMPLE2.png rename to website/client/marketing/promos/April14SAMPLE2.png diff --git a/website/public/marketing/screenshot.png b/website/client/marketing/screenshot.png similarity index 100% rename from website/public/marketing/screenshot.png rename to website/client/marketing/screenshot.png diff --git a/website/public/marketing/social_competitve.png b/website/client/marketing/social_competitve.png similarity index 100% rename from website/public/marketing/social_competitve.png rename to website/client/marketing/social_competitve.png diff --git a/website/public/marketing/wellness.png b/website/client/marketing/wellness.png similarity index 100% rename from website/public/marketing/wellness.png rename to website/client/marketing/wellness.png diff --git a/website/public/merch/stickermule-logo.png b/website/client/merch/stickermule-logo.png similarity index 100% rename from website/public/merch/stickermule-logo.png rename to website/client/merch/stickermule-logo.png diff --git a/website/public/merch/stickermule-logo.svg b/website/client/merch/stickermule-logo.svg similarity index 100% rename from website/public/merch/stickermule-logo.svg rename to website/client/merch/stickermule-logo.svg diff --git a/website/public/merch/stickermule.png b/website/client/merch/stickermule.png similarity index 100% rename from website/public/merch/stickermule.png rename to website/client/merch/stickermule.png diff --git a/website/public/merch/teespring-eu-logo.png b/website/client/merch/teespring-eu-logo.png similarity index 100% rename from website/public/merch/teespring-eu-logo.png rename to website/client/merch/teespring-eu-logo.png diff --git a/website/public/merch/teespring-eu.png b/website/client/merch/teespring-eu.png similarity index 100% rename from website/public/merch/teespring-eu.png rename to website/client/merch/teespring-eu.png diff --git a/website/public/merch/teespring-logo.png b/website/client/merch/teespring-logo.png similarity index 100% rename from website/public/merch/teespring-logo.png rename to website/client/merch/teespring-logo.png diff --git a/website/public/merch/teespring-logo.svg b/website/client/merch/teespring-logo.svg similarity index 100% rename from website/public/merch/teespring-logo.svg rename to website/client/merch/teespring-logo.svg diff --git a/website/public/merch/teespring.png b/website/client/merch/teespring.png similarity index 100% rename from website/public/merch/teespring.png rename to website/client/merch/teespring.png diff --git a/website/public/page-loader.gif b/website/client/page-loader.gif similarity index 100% rename from website/public/page-loader.gif rename to website/client/page-loader.gif diff --git a/website/public/presskit/Boss - Basi-List.png b/website/client/presskit/Boss - Basi-List.png similarity index 100% rename from website/public/presskit/Boss - Basi-List.png rename to website/client/presskit/Boss - Basi-List.png diff --git a/website/public/presskit/Boss - Battling the Ghost Stag.png b/website/client/presskit/Boss - Battling the Ghost Stag.png similarity index 100% rename from website/public/presskit/Boss - Battling the Ghost Stag.png rename to website/client/presskit/Boss - Battling the Ghost Stag.png diff --git a/website/public/presskit/Boss - Laundromancer.png b/website/client/presskit/Boss - Laundromancer.png similarity index 100% rename from website/public/presskit/Boss - Laundromancer.png rename to website/client/presskit/Boss - Laundromancer.png diff --git a/website/public/presskit/Boss - Necro-Vice.png b/website/client/presskit/Boss - Necro-Vice.png similarity index 100% rename from website/public/presskit/Boss - Necro-Vice.png rename to website/client/presskit/Boss - Necro-Vice.png diff --git a/website/public/presskit/Boss - SnackLess Monster.png b/website/client/presskit/Boss - SnackLess Monster.png similarity index 100% rename from website/public/presskit/Boss - SnackLess Monster.png rename to website/client/presskit/Boss - SnackLess Monster.png diff --git a/website/public/presskit/Boss - Stagnant Dishes.png b/website/client/presskit/Boss - Stagnant Dishes.png similarity index 100% rename from website/public/presskit/Boss - Stagnant Dishes.png rename to website/client/presskit/Boss - Stagnant Dishes.png diff --git a/website/public/presskit/Habitica Gryphon.png b/website/client/presskit/Habitica Gryphon.png similarity index 100% rename from website/public/presskit/Habitica Gryphon.png rename to website/client/presskit/Habitica Gryphon.png diff --git a/website/public/presskit/Habitica Logo - Android.png b/website/client/presskit/Habitica Logo - Android.png similarity index 100% rename from website/public/presskit/Habitica Logo - Android.png rename to website/client/presskit/Habitica Logo - Android.png diff --git a/website/public/presskit/Habitica Logo - Icon with Text.png b/website/client/presskit/Habitica Logo - Icon with Text.png similarity index 100% rename from website/public/presskit/Habitica Logo - Icon with Text.png rename to website/client/presskit/Habitica Logo - Icon with Text.png diff --git a/website/public/presskit/Habitica Logo - Icon.png b/website/client/presskit/Habitica Logo - Icon.png similarity index 100% rename from website/public/presskit/Habitica Logo - Icon.png rename to website/client/presskit/Habitica Logo - Icon.png diff --git a/website/public/presskit/Habitica Logo - Text.png b/website/client/presskit/Habitica Logo - Text.png similarity index 100% rename from website/public/presskit/Habitica Logo - Text.png rename to website/client/presskit/Habitica Logo - Text.png diff --git a/website/public/presskit/Habitica Logo - iOS.png b/website/client/presskit/Habitica Logo - iOS.png similarity index 100% rename from website/public/presskit/Habitica Logo - iOS.png rename to website/client/presskit/Habitica Logo - iOS.png diff --git a/website/public/presskit/Habitica Promo - Thin.png b/website/client/presskit/Habitica Promo - Thin.png similarity index 100% rename from website/public/presskit/Habitica Promo - Thin.png rename to website/client/presskit/Habitica Promo - Thin.png diff --git a/website/public/presskit/Habitica Promo.png b/website/client/presskit/Habitica Promo.png similarity index 100% rename from website/public/presskit/Habitica Promo.png rename to website/client/presskit/Habitica Promo.png diff --git a/website/public/presskit/Sample Screen - Boss (iOS).png b/website/client/presskit/Sample Screen - Boss (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Boss (iOS).png rename to website/client/presskit/Sample Screen - Boss (iOS).png diff --git a/website/public/presskit/Sample Screen - Challenges.png b/website/client/presskit/Sample Screen - Challenges.png similarity index 100% rename from website/public/presskit/Sample Screen - Challenges.png rename to website/client/presskit/Sample Screen - Challenges.png diff --git a/website/public/presskit/Sample Screen - Equipment.png b/website/client/presskit/Sample Screen - Equipment.png similarity index 100% rename from website/public/presskit/Sample Screen - Equipment.png rename to website/client/presskit/Sample Screen - Equipment.png diff --git a/website/public/presskit/Sample Screen - Guilds.png b/website/client/presskit/Sample Screen - Guilds.png similarity index 100% rename from website/public/presskit/Sample Screen - Guilds.png rename to website/client/presskit/Sample Screen - Guilds.png diff --git a/website/public/presskit/Sample Screen - Level Up (iOS).png b/website/client/presskit/Sample Screen - Level Up (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Level Up (iOS).png rename to website/client/presskit/Sample Screen - Level Up (iOS).png diff --git a/website/public/presskit/Sample Screen - Market.png b/website/client/presskit/Sample Screen - Market.png similarity index 100% rename from website/public/presskit/Sample Screen - Market.png rename to website/client/presskit/Sample Screen - Market.png diff --git a/website/public/presskit/Sample Screen - Party (iOS).png b/website/client/presskit/Sample Screen - Party (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Party (iOS).png rename to website/client/presskit/Sample Screen - Party (iOS).png diff --git a/website/public/presskit/Sample Screen - Pets (iOS).png b/website/client/presskit/Sample Screen - Pets (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Pets (iOS).png rename to website/client/presskit/Sample Screen - Pets (iOS).png diff --git a/website/public/presskit/Sample Screen - Tasks Page (iOS).png b/website/client/presskit/Sample Screen - Tasks Page (iOS).png similarity index 100% rename from website/public/presskit/Sample Screen - Tasks Page (iOS).png rename to website/client/presskit/Sample Screen - Tasks Page (iOS).png diff --git a/website/public/presskit/Sample Screen - Tasks Page.png b/website/client/presskit/Sample Screen - Tasks Page.png similarity index 100% rename from website/public/presskit/Sample Screen - Tasks Page.png rename to website/client/presskit/Sample Screen - Tasks Page.png diff --git a/website/public/presskit/World Boss - Dread Drag'on of Dilatory.png b/website/client/presskit/World Boss - Dread Drag'on of Dilatory.png similarity index 100% rename from website/public/presskit/World Boss - Dread Drag'on of Dilatory.png rename to website/client/presskit/World Boss - Dread Drag'on of Dilatory.png diff --git a/website/public/presskit/presskit.zip b/website/client/presskit/presskit.zip similarity index 100% rename from website/public/presskit/presskit.zip rename to website/client/presskit/presskit.zip diff --git a/website/public/refresh.png b/website/client/refresh.png similarity index 100% rename from website/public/refresh.png rename to website/client/refresh.png diff --git a/website/public/js/app.js b/website/public/js/app.js deleted file mode 100644 index 6b39f45d63..0000000000 --- a/website/public/js/app.js +++ /dev/null @@ -1,291 +0,0 @@ -"use strict"; - -/* Refresh page if idle > 6h */ -var REFRESH_FREQUENCY = 21600000; -var refresh; -var refresher = function() { - window.location.reload(true); -}; - -var awaitIdle = function() { - if(refresh) clearTimeout(refresh); - refresh = setTimeout(refresher, REFRESH_FREQUENCY); -}; - -awaitIdle(); -$(document).on('mousemove keydown mousedown touchstart', awaitIdle); -/* Refresh page if idle > 6h */ - -window.habitrpg = angular.module('habitrpg', - ['ui.bootstrap', 'ui.keypress', 'ui.router', 'chieffancypants.loadingBar', 'At', 'infinite-scroll', 'ui.select2', 'angular.filter', 'ngResource', 'ngSanitize']) - - // @see https://github.com/angular-ui/ui-router/issues/110 and https://github.com/HabitRPG/habitrpg/issues/1705 - // temporary hack until they have a better solution - - .constant("API_URL", "") - .constant("STORAGE_USER_ID", 'habitrpg-user') - .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') - .constant("MOBILE_APP", false) - //.constant("STORAGE_GROUPS_ID", "") // if we decide to take groups offline - - .config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'STORAGE_SETTINGS_ID', - function($stateProvider, $urlRouterProvider, $httpProvider, STORAGE_SETTINGS_ID) { - - $urlRouterProvider - // Setup default selected tabs - .when('/options', '/options/profile/avatar') - .when('/options/profile', '/options/profile/avatar') - .when('/options/groups', '/options/groups/tavern') - .when('/options/groups/guilds', '/options/groups/guilds/public') - .when('/options/groups/hall', '/options/groups/hall/heroes') - .when('/options/inventory', '/options/inventory/drops') - .when('/options/settings', '/options/settings/settings') - - // redirect states that don't match - .otherwise("/tasks"); - - $stateProvider - - // Tasks - .state('tasks', { - url: "/tasks", - templateUrl: "partials/main.html", - title: env.t('titleTasks') - }) - - // Options - .state('options', { - url: "/options", - templateUrl: "partials/options.html", - controller: function(){} - }) - - // Options > Profile - .state('options.profile', { - url: "/profile", - templateUrl: "partials/options.profile.html", - controller: 'UserCtrl' - }) - .state('options.profile.avatar', { - url: "/avatar", - templateUrl: "partials/options.profile.avatar.html", - title: env.t('titleAvatar') - }) - .state('options.profile.backgrounds', { - url: '/backgrounds', - templateUrl: "partials/options.profile.backgrounds.html", - title: env.t('titleBackgrounds') - }) - .state('options.profile.stats', { - url: "/stats", - templateUrl: "partials/options.profile.stats.html", - title: env.t('titleStats') - }) - .state('options.profile.profile', { - url: "/profile", - templateUrl: "partials/options.profile.profile.html", - title: env.t('titleProfile') - }) - - // Options > Groups - .state('options.social', { - url: "/groups", - templateUrl: "partials/options.social.html" - }) - - .state('options.social.inbox', { - url: "/inbox", - templateUrl: "partials/options.social.inbox.html", - title: env.t('titleInbox') - }) - - .state('options.social.tavern', { - url: "/tavern", - templateUrl: "partials/options.social.tavern.html", - controller: 'TavernCtrl', - title: env.t('titleTavern') - }) - - .state('options.social.party', { - url: '/party', - templateUrl: "partials/options.social.party.html", - controller: 'PartyCtrl', - title: env.t('titleParty') - }) - - .state('options.social.hall', { - url: '/hall', - templateUrl: "partials/options.social.hall.html" - }) - .state('options.social.hall.heroes', { - url: '/heroes', - templateUrl: "partials/options.social.hall.heroes.html", - controller: 'HallHeroesCtrl', - title: env.t('titleHeroes') - }) - .state('options.social.hall.patrons', { - url: '/patrons', - templateUrl: "partials/options.social.hall.patrons.html", - controller: 'HallPatronsCtrl', - title: env.t('titlePatrons') - }) - - .state('options.social.guilds', { - url: '/guilds', - templateUrl: "partials/options.social.guilds.html", - controller: 'GuildsCtrl', - title: env.t('titleGuilds') - }) - .state('options.social.guilds.public', { - url: '/public', - templateUrl: "partials/options.social.guilds.public.html", - title: env.t('titleGuilds') - }) - .state('options.social.guilds.create', { - url: '/create', - templateUrl: "partials/options.social.guilds.create.html", - title: env.t('titleGuilds') - }) - .state('options.social.guilds.detail', { - url: '/:gid', - templateUrl: 'partials/options.social.guilds.detail.html', - title: env.t('titleGuilds'), - controller: ['$scope', 'Groups', 'Chat', '$stateParams', - function($scope, Groups, Chat, $stateParams){ - Groups.Group.get({gid:$stateParams.gid}, function(group){ - $scope.group = group; - Chat.seenMessage(group._id); - }); - }] - }) - - // Options > Social > Challenges - .state('options.social.challenges', { - url: "/challenges", - params: { groupIdFilter: null }, - controller: 'ChallengesCtrl', - templateUrl: "partials/options.social.challenges.html", - title: env.t('titleChallenges') - }) - .state('options.social.challenges.detail', { - url: '/:cid', - templateUrl: 'partials/options.social.challenges.detail.html', - title: env.t('titleChallenges'), - controller: ['$scope', 'Challenges', '$stateParams', - function($scope, Challenges, $stateParams){ - $scope.obj = $scope.challenge = Challenges.Challenge.get({cid:$stateParams.cid}, function(){ - $scope.challenge._locked = true; - }); - }] - }) - .state('options.social.challenges.edit', { - url: '/:cid/edit', - templateUrl: 'partials/options.social.challenges.detail.html', - title: env.t('titleChallenges'), - controller: ['$scope', 'Challenges', '$stateParams', - function($scope, Challenges, $stateParams){ - $scope.obj = $scope.challenge = Challenges.Challenge.get({cid:$stateParams.cid}, function(){ - $scope.challenge._locked = false; - }); - }] - }) - .state('options.social.challenges.detail.member', { - url: '/:uid', - templateUrl: 'partials/options.social.challenges.detail.member.html', - title: env.t('titleChallenges'), - controller: ['$scope', 'Challenges', '$stateParams', - function($scope, Challenges, $stateParams){ - $scope.obj = Challenges.Challenge.getMember({cid:$stateParams.cid, uid:$stateParams.uid}, function(){ - $scope.obj._locked = true; - }); - }] - }) - - // Options > Inventory - .state('options.inventory', { - url: '/inventory', - templateUrl: "partials/options.inventory.html", - controller: 'InventoryCtrl' - }) - .state('options.inventory.drops', { - url: '/drops', - templateUrl: "partials/options.inventory.drops.html", - title: env.t('titleDrops') - }) - .state('options.inventory.quests', { - url: '/quests', - templateUrl: "partials/options.inventory.quests.html", - title: env.t('titleQuests') - }) - .state('options.inventory.pets', { - url: '/pets', - templateUrl: "partials/options.inventory.pets.html", - title: env.t('titlePets') - }) - .state('options.inventory.mounts', { - url: '/mounts', - templateUrl: "partials/options.inventory.mounts.html", - title: env.t('titleMounts') - }) - .state('options.inventory.equipment', { - url: '/equipment', - templateUrl: "partials/options.inventory.equipment.html", - title: env.t('titleEquipment') - }) - .state('options.inventory.timetravelers', { - url: '/timetravelers', - templateUrl: "partials/options.inventory.timetravelers.html", - title: env.t('titleTimeTravelers') - }) - .state('options.inventory.seasonalshop', { - url: '/seasonalshop', - templateUrl: "partials/options.inventory.seasonalshop.html", - title: env.t('titleSeasonalShop') - }) - - // Options > Settings - .state('options.settings', { - url: "/settings", - controller: 'SettingsCtrl', - templateUrl: "partials/options.settings.html", - }) - .state('options.settings.settings', { - url: "/settings", - templateUrl: "partials/options.settings.settings.html", - title: env.t('titleSettings') - }) - .state('options.settings.api', { - url: "/api", - templateUrl: "partials/options.settings.api.html", - title: env.t('titleSettings') - }) - .state('options.settings.export', { - url: "/export", - templateUrl: "partials/options.settings.export.html", - title: env.t('titleSettings') - }) - .state('options.settings.promo', { - url: "/promo", - templateUrl: "partials/options.settings.promo.html", - title: env.t('titleSettings') - }) - .state('options.settings.subscription', { - url: "/subscription", - templateUrl: "partials/options.settings.subscription.html", - title: env.t('titleSettings') - }) - .state('options.settings.notifications', { - url: "/notifications", - templateUrl: "partials/options.settings.notifications.html", - title: env.t('titleSettings') - }); - - var settings = JSON.parse(localStorage.getItem(STORAGE_SETTINGS_ID)); - if (settings && settings.auth) { - $httpProvider.defaults.headers.common['Content-Type'] = 'application/json;charset=utf-8'; - $httpProvider.defaults.headers.common['x-api-user'] = settings.auth.apiId; - $httpProvider.defaults.headers.common['x-api-key'] = settings.auth.apiToken; - } - - $httpProvider.defaults.headers.common['x-client'] = 'habitica-web'; - }]); diff --git a/website/public/js/controllers/authCtrl.js b/website/public/js/controllers/authCtrl.js deleted file mode 100644 index 5b486677f5..0000000000 --- a/website/public/js/controllers/authCtrl.js +++ /dev/null @@ -1,127 +0,0 @@ -"use strict"; - -/* - The authentication controller (login & facebook) - */ - -angular.module('habitrpg') - .controller("AuthCtrl", ['$scope', '$rootScope', 'User', '$http', '$location', '$window','ApiUrl', '$modal', 'Analytics', - function($scope, $rootScope, User, $http, $location, $window, ApiUrl, $modal, Analytics) { - $scope.Analytics = Analytics; - - $scope.logout = function() { - localStorage.clear(); - $window.location.href = '/logout'; - }; - - var runAuth = function(id, token) { - User.authenticate(id, token, function(err) { - if(!err) $scope.registrationInProgress = false; - $window.location.href = ('/' + window.location.hash); - Analytics.login(); - Analytics.updateUser(); - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'login'}); - }); - }; - - function errorAlert(data, status, headers, config) { - $scope.registrationInProgress = false; - if (status === 0) { - $window.alert(window.env.t('noReachServer')); - } else if (!!data && !!data.err) { - $window.alert(data.err); - } else { - $window.alert(window.env.t('errorUpCase') + ' ' + status); - } - }; - - $scope.registrationInProgress = false; - - $scope.register = function() { - /*TODO highlight invalid inputs - we have this as a workaround for https://github.com/HabitRPG/habitrpg-mobile/issues/64 - */ - var scope = angular.element(document.getElementById('registrationForm')).scope(); - if (scope.registrationForm.$invalid) return; - - $scope.registrationInProgress = true; - - var url = ApiUrl.get() + "/api/v2/register"; - if($rootScope.selectedLanguage) url = url + '?lang=' + $rootScope.selectedLanguage.code; - $http.post(url, scope.registerVals).success(function(data, status, headers, config) { - runAuth(data.id, data.apiToken); - }).error(errorAlert); - }; - - $scope.auth = function() { - var data = { - username: $scope.loginUsername || $('#loginForm input[name="username"]').val(), - password: $scope.loginPassword || $('#loginForm input[name="password"]').val() - }; - $http.post(ApiUrl.get() + "/api/v2/user/auth/local", data) - .success(function(data, status, headers, config) { - runAuth(data.id, data.token); - }).error(errorAlert); - }; - - $scope.playButtonClick = function(){ - Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Play'}) - if (User.authenticated()) { - window.location.href = ('/' + window.location.hash); - } else { - $modal.open({ - templateUrl: 'modals/login.html' - // Using controller: 'AuthCtrl' it causes problems - }); - } - }; - - $scope.passwordReset = function(email){ - if(email == null || email.length == 0) { - alert(window.env.t('invalidEmail')); - } else { - $http.post(ApiUrl.get() + '/api/v2/user/reset-password', {email:email}) - .success(function(){ - alert(window.env.t('newPassSent')); - }) - .error(function(data){ - alert(data.err); - }); - } - }; - - // ------ Social ---------- - - hello.init({ - facebook : window.env.FACEBOOK_KEY - }); - - $scope.socialLogin = function(network){ - hello(network).login({scope:'email'}).then(function(auth){ - $http.post(ApiUrl.get() + "/api/v2/user/auth/social", auth) - .success(function(data, status, headers, config) { - runAuth(data.id, data.token); - }).error(errorAlert); - }, function( e ){ - alert("Signin error: " + e.error.message ); - }); - }; - - $scope.clearLocalStorage = function () { - $scope.messageModal = { - title: window.env.t('localStorageClearing'), - body: window.env.t('localStorageClearingExplanation'), - noFooter: true, - }; - - $modal.open({ - templateUrl: 'modals/message-modal.html', - scope: $scope - }); - - var threeSecondsForUsersToReadClearLocalStorageMessage = 3000; - - setTimeout($scope.logout, threeSecondsForUsersToReadClearLocalStorageMessage); - }; - } -]); diff --git a/website/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js deleted file mode 100644 index 30aac589d5..0000000000 --- a/website/public/js/controllers/challengesCtrl.js +++ /dev/null @@ -1,400 +0,0 @@ -habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', 'Challenges', 'Notification', '$compile', 'Groups', '$state', '$stateParams', 'Members', 'Tasks', - function($rootScope, $scope, Shared, User, Challenges, Notification, $compile, Groups, $state, $stateParams, Members, Tasks) { - - // Use presence of cid to determine whether to show a list or a single - // challenge - $scope.cid = $state.params.cid; - - $scope.groupIdFilter = $stateParams.groupIdFilter; - - _getChallenges(); - - // FIXME $scope.challenges needs to be resolved first (see app.js) - $scope.groups = Groups.Group.query({type:'party,guilds,tavern'}); - - // override score() for tasks listed in challenges-editing pages, so that nothing happens - $scope.score = function(){} - - //------------------------------------------------------------ - // Challenge - //------------------------------------------------------------ - - // Use this to force the top view to change, not just the nested view. - $scope.edit = function(challenge) { - $state.transitionTo('options.social.challenges.edit', {cid: challenge._id}, { - reload: true, inherit: false, notify: true - }); - }; - - $scope.editTask = Tasks.editTask; - - /** - * Create - */ - $scope.create = function() { - - //If the user has one filter selected, assume that the user wants to default to that group - var defaultGroup; - //Our filters contain all groups, but we only want groups that have atleast one challenge - var groupsWithChallenges = _.uniq(_.pluck($scope.groupsFilter, '_id')); - var len = groupsWithChallenges.length; - var filterCount = 0; - - for ( var i = 0; i < len; i += 1 ) { - if ( $scope.search.group[groupsWithChallenges[i]] == true ) { - filterCount += 1; - defaultGroup = groupsWithChallenges[i]; - } - if (filterCount > 1) { - defaultGroup = $scope.groups[0]._id - break; - } - } - - if(!defaultGroup) defaultGroup = 'habitrpg'; - - $scope.obj = $scope.newChallenge = new Challenges.Challenge({ - name: '', - description: '', - habits: [], - dailys: [], - todos: [], - rewards: [], - leader: User.user._id, - group: defaultGroup, - timestamp: +(new Date), - members: [], - official: false - }); - - _calculateMaxPrize(defaultGroup); - }; - - /** - * Clone - */ - $scope.clone = function(challenge) { - var clonedTasks = { - habit: [], - daily: [], - todo: [], - reward: [] - }; - - _(clonedTasks).each(function(val, type) { - challenge[type + 's'].forEach(_cloneTaskAndPush); - }).value(); - - $scope.obj = $scope.newChallenge = new Challenges.Challenge({ - name: challenge.name, - shortName: challenge.shortName, - description: challenge.description, - habits: clonedTasks.habit, - dailys: clonedTasks.daily, - todos: clonedTasks.todo, - rewards: clonedTasks.reward, - leader: User.user._id, - group: challenge.group._id, - official: challenge.official, - prize: challenge.prize - }); - - function _cloneTaskAndPush(taskToClone) { - var task = Tasks.cloneTask(taskToClone); - clonedTasks[task.type].push(task); - } - }; - - /** - * Save - */ - $scope.save = function(challenge) { - if (!challenge.group) return alert(window.env.t('selectGroup')); - - var isNew = !challenge._id; - - if(isNew && challenge.prize > $scope.maxPrize) { - return alert(window.env.t('challengeNotEnoughGems')); - } - - challenge.$save(function(_challenge){ - if (isNew) { - Notification.text(window.env.t('challengeCreated')); - User.sync(); - } - - $state.transitionTo('options.social.challenges.detail', { cid: _challenge._id }, { - reload: true, inherit: false, notify: true - }); - }); - }; - - /** - * Discard - */ - $scope.discard = function() { - $scope.newChallenge = null; - }; - - - /** - * Close Challenge - * ------------------ - */ - $scope.cancelClosing = function(challenge) { - $scope.popoverEl.popover('destroy'); - $scope.popoverEl = undefined; - $scope.closingChal = undefined; - challenge.winner = undefined; - }; - - $scope["delete"] = function(challenge) { - var warningMsg; - if(challenge.group._id == 'habitrpg') { - warningMsg = window.env.t('sureDelChaTavern'); - } else { - warningMsg = window.env.t('sureDelCha'); - } - if (!confirm(warningMsg)) return; - challenge.$delete(function(){ - $scope.popoverEl.popover('destroy'); - _backToChallenges(); - }); - }; - - $scope.selectWinner = function(challenge) { - if (!challenge.winner) return; - if (!confirm(window.env.t('youSure'))) return; - challenge.$close({uid:challenge.winner}, function(){ - $scope.popoverEl.popover('destroy'); - _backToChallenges(); - }) - } - - $scope.close = function(challenge, $event) { - $scope.closingChal = challenge; - $scope.popoverEl = $($event.target); - var html = $compile('
')($scope);
- $scope.popoverEl.popover('destroy').popover({
- html: true,
- placement: 'right',
- trigger: 'manual',
- title: window.env.t('closeCha'),
- content: html
- }).popover('show');
- };
-
- $scope.toggle = function(id){
- if($state.includes('options.social.challenges.detail', {cid: id})){
- $state.go('options.social.challenges')
- }else{
- $state.go('options.social.challenges.detail', {cid: id});
- }
- };
-
- $scope.toggleMember = function(cid, uid){
- if($state.includes('options.social.challenges.detail.member', {cid: cid, uid: uid})){
- $state.go('options.social.challenges.detail')
- }else{
- $state.go('options.social.challenges.detail.member', {cid: cid, uid: uid});
- }
- };
-
- //------------------------------------------------------------
- // Tasks
- //------------------------------------------------------------
-
- $scope.addTask = function(addTo, listDef) {
- var task = Shared.taskDefaults({text: listDef.newTask, type: listDef.type});
- addTo.unshift(task);
- //User.log({op: "addTask", data: task}); //TODO persist
- delete listDef.newTask;
- };
-
- $scope.removeTask = function(task, list) {
- if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return;
- //TODO persist
- // User.log({op: "delTask", data: task});
- _.remove(list, task);
- };
-
- $scope.saveTask = function(task){
- task._editing = false;
- // TODO persist
- }
-
- /*
- --------------------------
- Subscription
- --------------------------
- */
-
- $scope.join = function(challenge){
- challenge.$join(function(){
- _getChallenges()
- User.log({});
- });
-
- }
-
- $scope.leave = function(keep) {
- if (keep == 'cancel') {
- $scope.selectedChal = undefined;
- } else {
- $scope.selectedChal.$leave({keep:keep}, function(){
- _getChallenges()
- User.log({});
- });
- }
- $scope.popoverEl.popover('destroy');
- }
-
- /**
- * Named "clickLeave" to distinguish between "actual" leave above, since this triggers the
- * "are you sure?" dialog.
- */
- $scope.clickLeave = function(chal, $event) {
- $scope.selectedChal = chal;
- $scope.popoverEl = $($event.target);
- var html = $compile(
- '' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
' - )($scope); - $scope.popoverEl.popover('destroy').popover({ - html: true, - placement: 'top', - trigger: 'manual', - title: window.env.t('leaveCha'), - content: html - }).popover('show'); - } - - //------------------------------------------------------------ - // Filtering - //------------------------------------------------------------ - - $scope.filterChallenges = function(chal){ - if (!$scope.search) return true; - - return _shouldShowChallenge(chal); - } - - $scope.$watch('newChallenge.group', function(gid){ - if (!gid) return; - - _calculateMaxPrize(gid); - - if (gid == 'habitrpg') { - $scope.newChallenge.prize = 1; - } - }) - - $scope.selectAll = function(){ - $scope.search.group = _.transform($scope.groups, function(searchPool, group){ - searchPool[group._id] = true; - }); - } - - $scope.selectNone = function(){ - $scope.search.group = _.transform($scope.groups, function(searchPool, group){ - searchPool[group._id] = false; - }); - } - - $scope.shouldShow = function(task, list, prefs){ - return true; - }; - - $scope.insufficientGemsForTavernChallenge = function() { - var balance = User.user.balance || 0; - var isForTavern = $scope.newChallenge.group == 'habitrpg'; - - if (isForTavern) { - return balance <= 0; - } else { - return false; - } - } - - $scope.sendMessageToChallengeParticipant = function(uid) { - Members.selectMember(uid, function(){ - $rootScope.openModal('private-message',{controller:'MemberModalCtrl'}); - }); - }; - - $scope.sendGiftToChallengeParticipant = function(uid) { - Members.selectMember(uid, function(){ - $rootScope.openModal('send-gift',{controller:'MemberModalCtrl'}) - }); - }; - - $scope.filterInitialChallenges = function() { - $scope.groupsFilter = _.uniq(_.pluck($scope.challenges, 'group'), function(g){return g._id}); - $scope.search = { - group: _.transform($scope.groups, function(m,g){m[g._id]=true;}), - _isMember: "either", - _isOwner: "either" - }; - //If we game from a group, then override the filter to that group - - if ($scope.groupIdFilter) { - $scope.search.group = {}; - $scope.search.group[$scope.groupIdFilter] = true ; - } - } - - function _calculateMaxPrize(gid) { - - var userBalance = User.getBalanceInGems() || 0; - var availableGroupBalance = _calculateAvailableGroupBalance(gid); - - $scope.maxPrize = userBalance + availableGroupBalance; - } - - function _calculateAvailableGroupBalance(gid) { - var groupBalance = 0; - var group = _.find($scope.groups, { _id: gid }); - - if (group && group.balance && group.leader === User.user._id) { - groupBalance = group.balance * 4; - } - - return groupBalance; - } - - function _shouldShowChallenge(chal) { - // Have to check that the leader object exists first in the - // case where a challenge's leader deletes their account - var userIsOwner = (chal.leader && chal.leader._id) === User.user.id; - - var groupSelected = $scope.search.group[chal.group._id]; - var checkOwner = $scope.search._isOwner === 'either' || (userIsOwner === $scope.search._isOwner); - var checkMember = $scope.search._isMember === 'either' || (chal._isMember === $scope.search._isMember); - - return groupSelected && checkOwner && checkMember; - } - - function _backToChallenges(){ - $scope.popoverEl.popover('destroy'); - $scope.cid = null; - $state.go('options.social.challenges'); - $scope.challenges = Challenges.Challenge.query(); - User.log({}); - } - - - // Fetch single challenge if a cid is present; fetch multiple challenges - // otherwise - function _getChallenges() { - if ($scope.cid) { - Challenges.Challenge.get({cid: $scope.cid}, function(challenge) { - $scope.challenges = [challenge]; - }); - } else { - Challenges.Challenge.query(function(challenges){ - $scope.challenges = challenges; - $scope.filterInitialChallenges(); - }); - } - }; - -}]); diff --git a/website/public/js/controllers/chatCtrl.js b/website/public/js/controllers/chatCtrl.js deleted file mode 100644 index 8ba5b2a15c..0000000000 --- a/website/public/js/controllers/chatCtrl.js +++ /dev/null @@ -1,139 +0,0 @@ -'use strict'; - -habitrpg.controller('ChatCtrl', ['$scope', 'Groups', 'Chat', 'User', '$http', 'ApiUrl', 'Notification', 'Members', '$rootScope', 'Analytics', - function($scope, Groups, Chat, User, $http, ApiUrl, Notification, Members, $rootScope, Analytics){ - $scope.message = {content:''}; - $scope._sending = false; - - $scope.isUserMentioned = function(user, message) { - if(message.hasOwnProperty("highlight")) - return message.highlight; - message.highlight = false; - var messagetext = message.text.toLowerCase(); - var username = user.profile.name; - var mentioned = messagetext.indexOf(username.toLowerCase()); - var pattern = username+"([^\w]|$){1}"; - if(mentioned > -1) { - var preceedingchar = messagetext.substring(mentioned-1,mentioned); - if(mentioned == 0 || preceedingchar.trim() == '' || preceedingchar == '@'){ - var regex = new RegExp(pattern,'i'); - message.highlight = regex.test(messagetext); - } - } - return message.highlight; - } - - $scope.postChat = function(group, message){ - if (_.isEmpty(message) || $scope._sending) return; - $scope._sending = true; - var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false; - Chat.utils.postChat({gid: group._id, message:message, previousMsg: previousMsg}, undefined, function(data){ - if(data.chat){ - group.chat = data.chat; - }else if(data.message){ - group.chat.unshift(data.message); - } - $scope.message.content = ''; - $scope._sending = false; - if (group.type == 'party') { - Analytics.updateUser({'partyID':group.id,'partySize':group.memberCount}); - } - if (group.privacy == 'public'){ - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy,'groupName':group.name}); - } else { - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'group chat','groupType':group.type,'privacy':group.privacy}); - } - }, function(err){ - $scope._sending = false; - }); - } - - $scope.deleteChatMessage = function(group, message){ - if(message.uuid === User.user.id || (User.user.backer && User.user.contributor.admin)){ - var previousMsg = (group.chat && group.chat[0]) ? group.chat[0].id : false; - if(confirm('Are you sure you want to delete this message?')){ - Chat.utils.deleteChatMessage({gid:group._id, messageId:message.id, previousMsg:previousMsg}, undefined, function(data){ - if(data.chat) group.chat = data.chat; - - var i = _.findIndex(group.chat, {id: message.id}); - if(i !== -1) group.chat.splice(i, 1); - }); - } - } - } - - $scope.likeChatMessage = function(group,message) { - if (message.uuid == User.user._id) - return Notification.text(window.env.t('foreverAlone')); - if (!message.likes) message.likes = {}; - if (message.likes[User.user._id]) { - delete message.likes[User.user._id]; - } else { - message.likes[User.user._id] = true; - } - Chat.utils.like({ gid:group._id, messageId:message.id }, undefined); - } - - $scope.flagChatMessage = function(groupId,message) { - if(!message.flags) message.flags = {}; - if(message.flags[User.user._id]) - Notification.text(window.env.t('abuseAlreadyReported')); - else { - $scope.abuseObject = message; - $scope.groupId = groupId; - Members.selectMember(message.uuid, function(){ - $rootScope.openModal('abuse-flag',{ - controller:'MemberModalCtrl', - scope: $scope - }); - }); - } - }; - - $scope.copyToDo = function(message) { - var taskNotes = env.t("messageWroteIn", { - user: message.uuid == 'system' - ? 'system' - : '[' + message.user + '](' + env.BASE_URL + '/static/front/#?memberId=' + message.uuid + ')', - group: '[' + $scope.group.name + '](' + window.location.href + ')' - }); - - var newScope = $scope.$new(); - newScope.text = message.text; - newScope.notes = taskNotes; - - $rootScope.openModal('copyChatToDo',{ - controller:'CopyMessageModalCtrl', - scope: newScope - }); - }; - - $scope.sync = function(group){ - if(group.type == 'party') { - group.$syncParty(); // Syncs the whole party, not just 15 members - } else { - group.$get(); - } - // When the user clicks fetch recent messages we need to update - // that the user has seen the new messages - Chat.seenMessage(group._id); - } - - // List of Ordering options for the party members list - $scope.partyOrderChoices = { - 'level': window.env.t('sortLevel'), - 'random': window.env.t('sortRandom'), - 'pets': window.env.t('sortPets'), - 'habitrpg_date_joined' : window.env.t('sortHabitrpgJoined'), - 'party_date_joined': window.env.t('sortJoined'), - 'habitrpg_last_logged_in': window.env.t('sortHabitrpgLastLoggedIn'), - 'name': window.env.t('sortName'), - 'backgrounds': window.env.t('sortBackgrounds'), - }; - - $scope.partyOrderAscendingChoices = { - 'ascending': window.env.t('ascendingSort'), - 'descending': window.env.t('descendingSort') - } - - }]); diff --git a/website/public/js/controllers/footerCtrl.js b/website/public/js/controllers/footerCtrl.js deleted file mode 100644 index cd0b9ac182..0000000000 --- a/website/public/js/controllers/footerCtrl.js +++ /dev/null @@ -1,132 +0,0 @@ -"use strict"; - -angular.module('habitrpg').controller("FooterCtrl", -['$scope', '$rootScope', 'User', '$http', 'Notification', 'ApiUrl', 'Social', -function($scope, $rootScope, User, $http, Notification, ApiUrl, Social) { - - $scope.loadWidgets = Social.loadWidgets; - - if(env.isStaticPage){ - $scope.languages = env.avalaibleLanguages; - $scope.selectedLanguage = _.find(env.avalaibleLanguages, {code: env.language.code}); - - $rootScope.selectedLanguage = $scope.selectedLanguage; - - $scope.changeLang = function(){ - window.location = '?lang='+$scope.selectedLanguage.code; - } - } - - /** - External Scripts - JS files not needed right away (google charts) or entirely optional (analytics) - Each file gets loaded async via $.getScript, so it doesn't bog page-load - */ - - $scope.deferredScripts = function(){ - - // Amazon Payments - var amazonPaymentsUrl = 'https://static-na.payments-amazon.com/OffAmazonPayments/us/' + - (window.env.NODE_ENV === 'production' ? '' : 'sandbox/') + 'js/Widgets.js'; - $.getScript(amazonPaymentsUrl); - - // Stripe - $.getScript('//checkout.stripe.com/v2/checkout.js'); - - /* Google Content Experiments - if (window.env.NODE_ENV === 'production') { - $.getScript('//www.google-analytics.com/cx/api.js?experiment=boVO4eEyRfysNE5D53nCMQ', function(){ - $rootScope.variant = cxApi.chooseVariation(); - $rootScope.$apply(); - }) - } */ - - // Scripts only for desktop - if (!window.env.IS_MOBILE) { - // Add This - //$.getScript("//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4"); //FIXME why isn't this working when here? instead it's now in - var addthisServices = 'facebook,twitter,googleplus,tumblr,'+window.env.BASE_URL.replace('https://','').replace('http://',''); - window.addthis_config = { - ui_click: true, - services_custom:{ - name: "Download", - url: window.env.BASE_URL+"/export/avatar-"+User.user._id+".png", - icon: window.env.BASE_URL+"/favicon.ico" - }, - services_expanded:addthisServices, - services_compact:addthisServices - }; - - // Google Charts - $.getScript("//www.google.com/jsapi", function() { - google.load("visualization", "1", { - packages: ["corechart"], - callback: function() {} - }); - }); - } - } - - /** - * Debug functions. Note that the server route for gems is only available if process.env.DEBUG=true - */ - if (_.contains(['development','test'],window.env.NODE_ENV)) { - - $scope.setHealthLow = function(){ - User.set({ - 'stats.hp': 1 - }); - }; - - $scope.addMissedDay = function(numberOfDays){ - if (!confirm("Are you sure you want to reset the day by " + numberOfDays + " day(s)?")) return; - var dayBefore = moment(User.user.lastCron).subtract(numberOfDays, 'days').toDate(); - User.set({'lastCron': dayBefore}); - Notification.text('-' + numberOfDays + ' day(s), remember to refresh'); - }; - - $scope.addTenGems = function(){ - $http.post(ApiUrl.get() + '/api/v2/user/addTenGems').success(function(){ - User.log({}); - }) - }; - - $scope.addHourglass = function(){ - $http.post(ApiUrl.get() + '/api/v2/user/addHourglass').success(function(){ - User.log({}); - }) - }; - - $scope.addGold = function(){ - User.set({ - 'stats.gp': User.user.stats.gp + 500, - }); - }; - - $scope.addMana = function(){ - User.set({ - 'stats.mp': User.user.stats.mp + 500, - }); - }; - - $scope.addLevelsAndGold = function(){ - User.set({ - 'stats.exp': User.user.stats.exp + 10000, - 'stats.gp': User.user.stats.gp + 10000, - 'stats.mp': User.user.stats.mp + 10000 - }); - }; - - $scope.addOneLevel = function(){ - User.set({ - 'stats.exp': User.user.stats.exp + (Math.round(((Math.pow(User.user.stats.lvl, 2) * 0.25) + (10 * User.user.stats.lvl) + 139.75) / 10) * 10) - }); - }; - - $scope.addBossQuestProgressUp = function(){ - User.set({ - 'party.quest.progress.up': User.user.party.quest.progress.up + 1000 - }); - }; - } -}]) diff --git a/website/public/js/controllers/groupsCtrl.js b/website/public/js/controllers/groupsCtrl.js deleted file mode 100644 index e7865afb55..0000000000 --- a/website/public/js/controllers/groupsCtrl.js +++ /dev/null @@ -1,145 +0,0 @@ -"use strict"; - -habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '$http', '$q', 'User', 'Members', '$state', 'Notification', - function($scope, $rootScope, Shared, Groups, $http, $q, User, Members, $state, Notification) { - - $scope.isMemberOfPendingQuest = function(userid, group) { - if (!group.quest || !group.quest.members) return false; - if (group.quest.active) return false; // quest is started, not pending - return userid in group.quest.members && group.quest.members[userid] != false; - }; - - $scope.isMemberOfRunningQuest = function(userid, group) { - if (!group.quest || !group.quest.members) return false; - if (!group.quest.active) return false; // quest is pending, not started - return group.quest.members[userid]; - }; - - $scope.isMemberOfGroup = function(userid, group){ - - // If the group is a guild, just check for an intersection with the - // current user's guilds, rather than checking the members of the group. - if(group.type === 'guild') { - return _.detect(Groups.myGuilds(), function(g) { return g._id === group._id }); - } - - // Similarly, if we're dealing with the user's current party, return true. - if(group.type === 'party') { - var currentParty = Groups.party(); - if(currentParty._id && currentParty._id === group._id) return true; - } - - if (!group.members) return false; - var memberIds = _.map(group.members, function(x){return x._id}); - return ~(memberIds.indexOf(userid)); - }; - - $scope.isMember = function(user, group){ - return ~(group.members.indexOf(user._id)); - }; - - $scope.Members = Members; - $scope._editing = {group:false}; - $scope.groupCopy = {}; - - $scope.editGroup = function (group) { - angular.copy(group, $scope.groupCopy); - group._editing = true; - }; - - - $scope.saveEdit = function (group) { - var newLeader = $scope.groupCopy._newLeader && $scope.groupCopy._newLeader._id; - - if (newLeader) { - $scope.groupCopy.leader = newLeader; - } - - angular.copy($scope.groupCopy, group); - - group.$save(); - - $scope.cancelEdit(group); - }; - - $scope.cancelEdit = function (group) { - group._editing = false; - $scope.groupCopy = {}; - }; - - $scope.deleteAllMessages = function() { - if (confirm(window.env.t('confirmDeleteAllMessages'))) { - User.user.ops.clearPMs({}); - } - }; - - // ------ Modals ------ - - $scope.clickMember = function(uid, forceShow) { - if (User.user._id == uid && !forceShow) { - if ($state.is('tasks')) { - $state.go('options.profile.avatar'); - } else { - $state.go('tasks'); - } - } else { - // We need the member information up top here, but then we pass it down to the modal controller - // down below. Better way of handling this? - Members.selectMember(uid, function(){ - $rootScope.openModal('member', {controller:'MemberModalCtrl', windowClass:'profile-modal', size:'lg'}); - }); - } - }; - - - $scope.removeMember = function(group, member, isMember){ - // TODO find a better way to do this (share data with remove member modal) - $scope.removeMemberData = { - group: group, - member: member, - isMember: isMember - }; - $rootScope.openModal('remove-member', {scope: $scope}); - }; - - $scope.confirmRemoveMember = function(confirm){ - if(confirm){ - Groups.Group.removeMember({ - gid: $scope.removeMemberData.group._id, - uuid: $scope.removeMemberData.member._id, - message: $scope.removeMemberData.message, - }, undefined, function(){ - if($scope.removeMemberData.isMember){ - _.pull($scope.removeMemberData.group.members, $scope.removeMemberData.member); - }else{ - _.pull($scope.removeMemberData.group.invites, $scope.removeMemberData.member); - } - - $scope.removeMemberData = undefined; - }); - }else{ - $scope.removeMemberData = undefined; - } - }; - - $scope.openInviteModal = function(group){ - if (group.type !== 'party' && group.type !== 'guild') { - return console.log('Invalid group type.') - } - $rootScope.openModal('invite-' + group.type, { - controller:'InviteToGroupCtrl', - resolve: { - injectedGroup: function(){ - return group; - } - } - }); - }; - - $scope.quickReply = function(uid) { - Members.selectMember(uid, function(){ - $rootScope.openModal('private-message',{controller:'MemberModalCtrl'}); - }); - } - - }]); diff --git a/website/public/js/controllers/guildsCtrl.js b/website/public/js/controllers/guildsCtrl.js deleted file mode 100644 index df6b001448..0000000000 --- a/website/public/js/controllers/guildsCtrl.js +++ /dev/null @@ -1,94 +0,0 @@ -'use strict'; - -habitrpg.controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile', 'Analytics', - function($scope, Groups, User, Challenges, $rootScope, $state, $location, $compile, Analytics) { - $scope.groups = { - guilds: Groups.myGuilds(), - "public": Groups.publicGuilds() - } - - $scope.type = 'guild'; - $scope.text = window.env.t('guild'); - var newGroup = function(){ - return new Groups.Group({type:'guild', privacy:'private'}); - } - $scope.newGroup = newGroup() - $scope.create = function(group){ - if (User.user.balance < 1) - return $rootScope.openModal('buyGems', {track:"Gems > Create Group"}); - - if (confirm(window.env.t('confirmGuild'))) { - group.$save(function(saved){ - if (saved.privacy == 'public') {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'guild','privacy':saved.privacy,'groupName':saved.name})} - else {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'guild','privacy':saved.privacy})} - $rootScope.hardRedirect('/#/options/groups/guilds/' + saved._id); - }); - } - } - - $scope.join = function(group){ - // If we're accepting an invitation, we don't have the actual group object, but a faux group object (for performance - // purposes) {id, name}. Let's trick ngResource into thinking we have a group, so we can call the same $join - // function (server calls .attachGroup(), which finds group by _id and handles this properly) - if (group.id && !group._id) { - group = new Groups.Group({_id:group.id}); - } - - group.$join(function(joined){ - if (joined.privacy == 'public') {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'guild','privacy':joined.privacy,'groupName':joined.name})} - else {Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'guild','privacy':joined.privacy})} - $rootScope.hardRedirect('/#/options/groups/guilds/' + joined._id); - }) - } - - $scope.leave = function(keep) { - if (keep == 'cancel') { - $scope.selectedGroup = undefined; - $scope.popoverEl.popover('destroy'); - } else { - Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){ - $rootScope.hardRedirect('/#/options/groups/guilds'); - }); - } - } - - $scope.clickLeave = function(group, $event){ - $scope.selectedGroup = group; - $scope.popoverEl = $($event.target).closest('.btn'); - var html, title; - Challenges.Challenge.query(function(challenges) { - challenges = _.pluck(_.filter(challenges, function(c) { - return c.group._id == group._id; - }), '_id'); - - if (_.intersection(challenges, User.user.challenges).length > 0) { - html = $compile( - '' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
' - )($scope); - title = window.env.t('leaveGroupCha'); - } else { - html = $compile( - '' + window.env.t('confirm') + '
\n' + window.env.t('cancel') + '
' - )($scope); - title = window.env.t('leaveGroup') - } - - $scope.popoverEl.popover('destroy').popover({ - html: true, - placement: 'top', - trigger: 'manual', - title: title, - content: html - }).popover('show'); - }); - } - - $scope.reject = function(guild){ - var i = _.findIndex(User.user.invitations.guilds, {id:guild.id}); - if (~i){ - User.user.invitations.guilds.splice(i, 1); - User.set({'invitations.guilds':User.user.invitations.guilds}); - } - } - } - ]); diff --git a/website/public/js/controllers/hallCtrl.js b/website/public/js/controllers/hallCtrl.js deleted file mode 100644 index fe385a316c..0000000000 --- a/website/public/js/controllers/hallCtrl.js +++ /dev/null @@ -1,42 +0,0 @@ -"use strict"; - -habitrpg.controller("HallHeroesCtrl", ['$scope', '$rootScope', 'User', 'Notification', 'ApiUrl', '$resource', - function($scope, $rootScope, User, Notification, ApiUrl, $resource) { - var Hero = $resource(ApiUrl.get() + '/api/v2/hall/heroes/:uid', {uid:'@_id'}); - $scope.hero = undefined; - $scope.loadHero = function(uuid){ - $scope.hero = Hero.get({uid:uuid}); - } - $scope.saveHero = function(hero) { - $scope.hero.contributor.admin = ($scope.hero.contributor.level > 7) ? true : false; - hero.$save(function(){ - Notification.text("User updated"); - $scope.hero = undefined; - $scope._heroID = undefined; - $scope.heroes = Hero.query(); - }) - } - $scope.heroes = Hero.query(); - - $scope.populateContributorInput = function(id) { - $scope._heroID = id; - window.scrollTo(0,200); - $scope.loadHero(id); - }; - }]); - -habitrpg.controller("HallPatronsCtrl", ['$scope', '$rootScope', 'User', 'Notification', 'ApiUrl', '$resource', - function($scope, $rootScope, User, Notification, ApiUrl, $resource) { - var Patron = $resource(ApiUrl.get() + '/api/v2/hall/patrons/:uid', {uid:'@_id'}); - - var page = 0; - $scope.patrons = []; - - $scope.loadMore = function(){ - Patron.query({page: page++}, function(patrons){ - $scope.patrons = $scope.patrons.concat(patrons); - }) - } - $scope.loadMore(); - - }]); diff --git a/website/public/js/controllers/inviteToGroupCtrl.js b/website/public/js/controllers/inviteToGroupCtrl.js deleted file mode 100644 index f4a74dbac9..0000000000 --- a/website/public/js/controllers/inviteToGroupCtrl.js +++ /dev/null @@ -1,72 +0,0 @@ -'use strict'; - -habitrpg.controller('InviteToGroupCtrl', ['$scope', 'User', 'Groups', 'injectedGroup', '$http', 'Notification', function($scope, User, Groups, injectedGroup, $http, Notification) { - $scope.group = injectedGroup; - - $scope.inviter = User.user.profile.name; - _resetInvitees(); - - $scope.addUuid = function() { - $scope.invitees.push({uuid: ''}); - }; - - $scope.addEmail = function() { - $scope.emails.push({name: '', email: ''}); - }; - - $scope.inviteNewUsers = function(inviteMethod) { - if (!$scope.group._id) { - $scope.group.name = $scope.group.name || env.t('possessiveParty', {name: User.user.profile.name}); - return $scope.group.$save() - .then(function(res) { - _inviteByMethod(inviteMethod); - }); - } - - _inviteByMethod(inviteMethod); - }; - - function _inviteByMethod(inviteMethod) { - var invitationDetails; - - if (inviteMethod === 'email') { - var emails = _getEmails(); - invitationDetails = {inviter: $scope.inviter, emails: emails}; - } else if (inviteMethod === 'uuid') { - var uuids = _getOnlyUuids(); - invitationDetails = {uuids: uuids}; - } else { - return console.log('Invalid invite method.') - } - - Groups.Group.invite({gid: $scope.group._id}, invitationDetails, function(){ - Notification.text(window.env.t('invitationsSent')); - _resetInvitees(); - }, function(){ - _resetInvitees(); - }); - } - - function _getOnlyUuids() { - var uuids = _.pluck($scope.invitees, 'uuid'); - var filteredUuids = _.filter(uuids, function(id) { - return id != ''; - }); - return filteredUuids; - } - - function _getEmails() { - var emails = _.filter($scope.emails, function(obj) { - return obj.email != ''; - }); - return emails; - } - - function _resetInvitees() { - var emptyEmails = [{name:"",email:""},{name:"",email:""}]; - var emptyInvitees = [{uuid: ''}]; - - $scope.emails = emptyEmails; - $scope.invitees = emptyInvitees; - } - }]); diff --git a/website/public/js/controllers/memberModalCtrl.js b/website/public/js/controllers/memberModalCtrl.js deleted file mode 100644 index 54f0bb054a..0000000000 --- a/website/public/js/controllers/memberModalCtrl.js +++ /dev/null @@ -1,64 +0,0 @@ -"use strict"; - -habitrpg - .controller("MemberModalCtrl", ['$scope', '$rootScope', 'Members', 'Shared', '$http', 'Notification', 'Groups', 'Chat', '$controller', 'Stats', - function($scope, $rootScope, Members, Shared, $http, Notification, Groups, Chat, $controller, Stats) { - - $controller('RootCtrl', {$scope: $scope}); - - $scope.timestamp = function(timestamp){ - return moment(timestamp).format($rootScope.User.user.preferences.dateFormat.toUpperCase()); - } - - $scope.statCalc = Stats; - - // We watch Members.selectedMember because it's asynchronously set, so would be a hassle to handle updates here - $scope.$watch( function() { return Members.selectedMember; }, function (member) { - if(member) { - $scope.profile = member; - } - }); - - $scope.sendPrivateMessage = function(uuid, message){ - // Don't do anything if the user somehow gets here without a message. - if (!message) return; - - $http.post('/api/v2/members/'+uuid+'/message',{message:message}).success(function(){ - Notification.text(window.env.t('messageSentAlert')); - $rootScope.User.sync(); - $scope.$close(); - }); - }; - - $scope.gift = { - type: 'gems', - gems: {amount:0, fromBalance:true}, - subscription: {key:''}, - message:'' - }; - - $scope.sendGift = function(uuid, gift){ - $http.post('/api/v2/members/'+uuid+'/gift', gift).success(function(){ - Notification.text('Gift sent!') - $rootScope.User.sync(); - $scope.$close(); - }) - }; - - $scope.reportAbuse = function(reporter, message, groupId) { - message.flags[reporter._id] = true; - Chat.utils.flagChatMessage({gid: groupId, messageId: message.id}, undefined, function(data){ - Notification.text(window.env.t('abuseReported')); - $scope.$close(); - }); - }; - - $scope.clearFlagCount = function(message, groupId) { - Chat.utils.clearFlagCount({gid: groupId, messageId: message.id}, undefined, function(data){ - message.flagCount = 0; - Notification.text("Flags cleared"); - $scope.$close(); - }); - } - } - ]); diff --git a/website/public/js/controllers/notificationCtrl.js b/website/public/js/controllers/notificationCtrl.js deleted file mode 100644 index ac3fab9e6a..0000000000 --- a/website/public/js/controllers/notificationCtrl.js +++ /dev/null @@ -1,194 +0,0 @@ -'use strict'; - -habitrpg.controller('NotificationCtrl', - ['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', - function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics) { - - $rootScope.$watch('user.stats.hp', function (after, before) { - if (after <= 0){ - $rootScope.playSound('Death'); - $rootScope.openModal('death', {keyboard:false, backdrop:'static'}); - } else if (after <= 30 && !User.user.flags.warnedLowHealth) { - $rootScope.openModal('lowHealth', {keyboard:false, backdrop:'static', controller:'UserCtrl', track:'Health Warning'}); - } - if (after == before) return; - if (User.user.stats.lvl == 0) return; - Notification.hp(after - before, 'hp'); - if (after < 0) $rootScope.playSound('Minus_Habit'); - }); - - $rootScope.$watch('user.stats.exp', function(after, before) { - if (after == before) return; - if (User.user.stats.lvl == 0) return; - Notification.exp(after - before); - }); - - $rootScope.$watch('user.achievements', function(){ - $rootScope.playSound('Achievement_Unlocked'); - }, true); - - $rootScope.$watch('user.achievements.challenges.length', function(after, before) { - if (after === before) return; - if (after > before) { - $rootScope.openModal('wonChallenge', {controller: 'UserCtrl', size: 'sm'}); - } - }); - - $rootScope.$watch('user.stats.gp', function(after, before) { - if (after == before) return; - if (User.user.stats.lvl == 0) return; - var money = after - before; - var bonus; - if (User.user._tmp) { - bonus = User.user._tmp.streakBonus || 0; - } - Notification.gp(money, bonus || 0); - - //Append Bonus - - if ((money > 0) && !!bonus) { - if (bonus < 0.01) bonus = 0.01; - Notification.text("+ " + Notification.coins(bonus) + ' ' + window.env.t('streakCoins')); - delete User.user._tmp.streakBonus; - } - }); - - $rootScope.$watch('user.stats.mp', function(after,before) { - if (after == before) return; - if (!User.user.flags.classSelected || User.user.preferences.disableClasses) return; - var mana = after - before; - Notification.mp(mana); - }); - - // Levels that already display modals and should not trigger generic Level Up - var unlockLevels = { - '3': 'drop system', - '10': 'class system', - '50': 'Orb of Rebirth' - } - - $rootScope.$watch('user.stats.lvl', function(after, before) { - if (after <= before) return; - Notification.lvl(); - $rootScope.playSound('Level_Up'); - if (User.user._tmp && User.user._tmp.drop && (User.user._tmp.drop.type === 'Quest')) return; - if (unlockLevels['' + after]) return; - if (!User.user.preferences.suppressModals.levelUp) $rootScope.openModal('levelUp', {controller:'UserCtrl', size:'sm'}); - }); - - $rootScope.$watch('!user.flags.classSelected && user.stats.lvl >= 10', function(after, before){ - if(after){ - $rootScope.openModal('chooseClass', {controller:'UserCtrl', keyboard:false, backdrop:'static'}); - } - }); - - $rootScope.$watch('user._tmp.crit', function(after, before){ - if (after == before || !after) return; - var amount = User.user._tmp.crit * 100 - 100; - // reset the crit counter - User.user._tmp.crit = undefined; - Notification.crit(amount); - }); - - $rootScope.$watch('user._tmp.drop', function(after, before){ - // won't work when getting the same item twice? - if (_.isEqual(after, before) || !after) return; - var text, notes, type; - $rootScope.playSound('Item_Drop'); - - // Note: For Mystery Item gear, after.type will be 'head', 'armor', etc - // so we use after.notificationType below. - - if (after.type !== 'gear' && after.type !== 'Quest' && after.notificationType !== 'Mystery') { - if (after.type === 'Food') { - type = 'food'; - } else if (after.type === 'HatchingPotion') { - type = 'hatchingPotions'; - } else { - type = after.type.toLowerCase() + 's'; - } - if(!User.user.items[type][after.key]){ - User.user.items[type][after.key] = 0; - } - User.user.items[type][after.key]++; - } - - if (after.type === 'HatchingPotion'){ - text = Content.hatchingPotions[after.key].text(); - notes = Content.hatchingPotions[after.key].notes(); - Notification.drop(env.t('messageDropPotion', {dropText: text, dropNotes: notes}), after); - } else if (after.type === 'Egg'){ - text = Content.eggs[after.key].text(); - notes = Content.eggs[after.key].notes(); - Notification.drop(env.t('messageDropEgg', {dropText: text, dropNotes: notes}), after); - } else if (after.type === 'Food'){ - text = Content.food[after.key].text(); - notes = Content.food[after.key].notes(); - Notification.drop(env.t('messageDropFood', {dropArticle: after.article, dropText: text, dropNotes: notes}), after); - } else if (after.type === 'Quest') { - $rootScope.selectedQuest = Content.quests[after.key]; - $rootScope.openModal('questDrop', {controller:'PartyCtrl',size:'sm'}); - } else if (after.notificationType === 'Mystery') { - text = Content.gear.flat[after.key].text(); - Notification.drop(env.t('messageDropMysteryItem', {dropText: text}), after); - } else { - // Keep support for another type of drops that might be added - Notification.drop(User.user._tmp.drop.dialog); - } - - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'acquire item','itemName':after.key,'acquireMethod':'Drop'}); - }); - - $rootScope.$watch('user.achievements.streak', function(after, before){ - if(before == undefined || after <= before) return; - Notification.streak(User.user.achievements.streak); - $rootScope.playSound('Achievement_Unlocked'); - if (!User.user.preferences.suppressModals.streak) { - $rootScope.openModal('achievements/streak', {controller:'UserCtrl'}); - } - }); - - $rootScope.$watch('user.achievements.ultimateGearSets', function(after, before){ - if (_.isEqual(after,before) || !_.contains(User.user.achievements.ultimateGearSets, true)) return; - $rootScope.openModal('achievements/ultimateGear', {controller:'UserCtrl'}); - }, true); - - $rootScope.$watch('user.flags.armoireEmpty', function(after,before){ - if (before == undefined || after == before || after == false) return; - $rootScope.openModal('armoireEmpty'); - }); - - $rootScope.$watch('user.achievements.rebirths', function(after, before){ - if(after === before) return; - $rootScope.openModal('achievements/rebirth', {controller:'UserCtrl', size: 'sm'}); - }); - - $rootScope.$watch('user.flags.contributor', function(after, before){ - if (after === before || after !== true) return; - $rootScope.openModal('achievements/contributor',{controller:'UserCtrl'}); - }); - - // Completed quest modal - $scope.$watch('user.party.quest.completed', function(after, before){ - if (!after) return; - $rootScope.openModal('questCompleted', {controller:'InventoryCtrl'}); - }); - - // Quest invitation modal - $scope.$watch('user.party.quest.RSVPNeeded && !user.party.quest.completed', function(after, before){ - if (after != true) return; - $rootScope.openModal('questInvitation', {controller:'PartyCtrl'}); - }); - - $rootScope.$on('responseError', function(ev, error){ - Notification.error(error); - }); - $rootScope.$on('responseText', function(ev, error){ - Notification.text(error); - }); - - // Show new-stuff modal on load - if (User.user.flags.newStuff) - $rootScope.openModal('newStuff', {size:'lg'}); - } -]); diff --git a/website/public/js/controllers/partyCtrl.js b/website/public/js/controllers/partyCtrl.js deleted file mode 100644 index 6494679911..0000000000 --- a/website/public/js/controllers/partyCtrl.js +++ /dev/null @@ -1,173 +0,0 @@ -'use strict'; - -habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','Challenges','$state','$compile','Analytics','Quests','Social', - function($rootScope,$scope,Groups,Chat,User,Challenges,$state,$compile,Analytics,Quests,Social) { - - var user = User.user; - - $scope.type = 'party'; - $scope.text = window.env.t('party'); - $scope.group = $rootScope.party = Groups.party(); - $scope.newGroup = new Groups.Group({type:'party'}); - $scope.inviteOrStartParty = Groups.inviteOrStartParty; - $scope.loadWidgets = Social.loadWidgets; - - if ($state.is('options.social.party')) { - $scope.group.$syncParty(); // Sync party automatically when navigating to party page - - // Checks if user's party has reached 2 players for the first time. - if(!user.achievements.partyUp - && $scope.group.memberCount >= 2) { - User.set({'achievements.partyUp':true}); - $rootScope.openModal('achievements/partyUp', {controller:'UserCtrl', size:'sm'}); - } - - // Checks if user's party has reached 4 players for the first time. - if(!user.achievements.partyOn - && $scope.group.memberCount >= 4) { - User.set({'achievements.partyOn':true}); - $rootScope.openModal('achievements/partyOn', {controller:'UserCtrl', size:'sm'}); - } - } - - Chat.seenMessage($scope.group._id); - - $scope.create = function(group){ - if (!group.name) group.name = env.t('possessiveParty', {name: User.user.profile.name}); - group.$save(function(){ - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':true,'groupType':'party','privacy':'private'}); - Analytics.updateUser({'partyID':group.id,'partySize':1}); - $rootScope.hardRedirect('/#/options/groups/party'); - }); - }; - - $scope.join = function(party){ - var group = new Groups.Group({_id: party.id, name: party.name}); - group.$join(function(){ - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'join group','owner':false,'groupType':'party','privacy':'private'}); - Analytics.updateUser({'partyID':party.id}); - $rootScope.hardRedirect('/#/options/groups/party'); - }); - }; - - // TODO: refactor guild and party leave into one function - $scope.leave = function(keep) { - if (keep == 'cancel') { - $scope.selectedGroup = undefined; - $scope.popoverEl.popover('destroy'); - } else { - Groups.Group.leave({gid: $scope.selectedGroup._id, keep:keep}, undefined, function(){ - Analytics.updateUser({'partySize':null,'partyID':null}); - $rootScope.hardRedirect('/#/options/groups/party'); - }); - } - }; - - // TODO: refactor guild and party clickLeave into one function - $scope.clickLeave = function(group, $event){ - Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Leave Party'}); - $scope.selectedGroup = group; - $scope.popoverEl = $($event.target).closest('.btn'); - var html, title; - Challenges.Challenge.query(function(challenges) { - challenges = _.pluck(_.filter(challenges, function(c) { - return c.group._id == group._id; - }), '_id'); - if (_.intersection(challenges, User.user.challenges).length > 0) { - html = $compile( - '' + window.env.t('removeTasks') + '
\n' + window.env.t('keepTasks') + '
\n' + window.env.t('cancel') + '
' - )($scope); - title = window.env.t('leavePartyCha'); - } else { - html = $compile( - '' + window.env.t('confirm') + '
\n' + window.env.t('cancel') + '
' - )($scope); - title = window.env.t('leaveParty'); - } - $scope.popoverEl.popover('destroy').popover({ - html: true, - placement: 'top', - trigger: 'manual', - title: title, - content: html - }).popover('show'); - }); - }; - - $scope.clickStartQuest = function(){ - Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Start a Quest'}); - var hasQuests = _.find(User.user.items.quests, function(quest) { - return quest > 0; - }); - - if (hasQuests){ - $rootScope.openModal("ownedQuests", { controller:"InventoryCtrl" }); - } else { - $rootScope.$state.go('options.inventory.quests'); - } - }; - - $scope.leaveOldPartyAndJoinNewParty = function(newPartyId, newPartyName) { - if (confirm('Are you sure you want to delete your party and join ' + newPartyName + '?')) { - Groups.Group.leave({gid: Groups.party()._id, keep:false}, undefined, function() { - $scope.group = { - loadingNewParty: true - }; - $scope.join({ id: newPartyId, name: newPartyName }); - }); - } - } - - $scope.reject = function(){ - User.set({'invitations.party':{}}); - } - - $scope.questCancel = function(){ - if (!confirm(window.env.t('sureCancel'))) return; - - Quests.sendAction('questCancel') - .then(function(quest) { - $scope.group.quest = quest; - }); - } - - $scope.questAbort = function(){ - if (!confirm(window.env.t('sureAbort'))) return; - if (!confirm(window.env.t('doubleSureAbort'))) return; - - Quests.sendAction('questAbort') - .then(function(quest) { - $scope.group.quest = quest; - }); - } - - $scope.questLeave = function(){ - if (!confirm(window.env.t('sureLeave'))) return; - - Quests.sendAction('questLeave') - .then(function(quest) { - $scope.group.quest = quest; - }); - } - - $scope.questAccept = function(){ - Quests.sendAction('questAccept') - .then(function(quest) { - $scope.group.quest = quest; - }); - }; - - $scope.questReject = function(){ - Quests.sendAction('questReject') - .then(function(quest) { - $scope.group.quest = quest; - }); - }; - - $scope.canEditQuest = function(party) { - var isQuestLeader = party.quest && party.quest.leader === User.user._id; - - return isQuestLeader; - }; - } - ]); diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js deleted file mode 100644 index 6073ec7fe7..0000000000 --- a/website/public/js/controllers/tasksCtrl.js +++ /dev/null @@ -1,283 +0,0 @@ -"use strict"; - -habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','Notification', '$http', 'ApiUrl', '$timeout', 'Content', 'Shared', 'Guide', 'Tasks', 'Analytics', - function($scope, $rootScope, $location, User, Notification, $http, ApiUrl, $timeout, Content, Shared, Guide, Tasks, Analytics) { - $scope.obj = User.user; // used for task-lists - $scope.user = User.user; - - $scope.armoireCount = function(gear) { - return Shared.count.remainingGearInSet(gear, 'armoire'); - }; - - $scope.score = function(task, direction) { - switch (task.type) { - case 'reward': - playRewardSound(task); - break; - case 'daily': - $rootScope.playSound('Daily'); - break; - case 'todo': - $rootScope.playSound('ToDo'); - break; - default: - if (direction === 'down') $rootScope.playSound('Minus_Habit'); - else if (direction === 'up') $rootScope.playSound('Plus_Habit'); - } - User.user.ops.score({params:{id: task.id, direction:direction}}); - Analytics.updateUser(); - Analytics.track({'hitType':'event','eventCategory':'behavior','eventAction':'score task','taskType':task.type,'direction':direction}); - }; - - function addTask(addTo, listDef, task) { - var newTask = { - text: task, - type: listDef.type, - tags: _.transform(User.user.filters, function(m,v,k){ - if (v) m[k]=v; - }) - }; - User.user.ops.addTask({body:newTask}); - } - - $scope.addTask = function(addTo, listDef) { - if (listDef.bulk) { - var tasks = listDef.newTask.split(/[\n\r]+/); - //Reverse the order of tasks so the tasks will appear in the order the user entered them - tasks.reverse(); - _.each(tasks, function(t) { - addTask(addTo, listDef, t); - }); - listDef.bulk = false; - } else { - addTask(addTo, listDef, listDef.newTask); - } - delete listDef.newTask; - delete listDef.focus; - if (listDef.type=='daily') Guide.goto('intro', 2); - }; - - $scope.toggleBulk = function(list) { - if (typeof list.bulk === 'undefined') { - list.bulk = false; - } - list.bulk = !list.bulk; - list.focus = true; - }; - - $scope.editTask = Tasks.editTask; - - /** - * Add the new task to the actions log - */ - $scope.clearDoneTodos = function() {}; - - /** - * Pushes task to top or bottom of list - */ - $scope.pushTask = function(task, index, location) { - var to = (location === 'bottom' || $scope.ctrlPressed) ? -1 : 0; - User.user.ops.sortTask({params:{id:task.id},query:{from:index, to:to}}) - }; - - /** - * This is calculated post-change, so task.completed=true if they just checked it - */ - $scope.changeCheck = function(task) { - if (task.completed) { - $scope.score(task, "up"); - } else { - $scope.score(task, "down"); - } - }; - - $scope.removeTask = function(task) { - if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return; - User.user.ops.deleteTask({params:{id:task.id}}) - }; - - $scope.saveTask = function(task, stayOpen, isSaveAndClose) { - if (task.checklist) - task.checklist = _.filter(task.checklist,function(i){return !!i.text}); - User.user.ops.updateTask({params:{id:task.id},body:task}); - if (!stayOpen) task._editing = false; - if (isSaveAndClose) - $("#task-" + task.id).parent().children('.popover').removeClass('in'); - if (task.type == 'habit') Guide.goto('intro', 3); - }; - - /** - * Reset $scope.task to $scope.originalTask - */ - $scope.cancel = function() { - var key; - for (key in $scope.task) { - $scope.task[key] = $scope.originalTask[key]; - } - $scope.originalTask = null; - $scope.editedTask = null; - $scope.editing = false; - }; - - $scope.unlink = function(task, keep) { - // TODO move this to userServices, turn userSerivces.user into ng-resource - $http.post(ApiUrl.get() + '/api/v2/user/tasks/' + task.id + '/unlink?keep=' + keep) - .success(function(){ - User.log({}); - }); - }; - - /* - ------------------------ - To-Dos - ------------------------ - */ - $scope._today = moment().add({days: 1}); - - /* - ------------------------ - Dailies - ------------------------ - */ - - $scope.openDatePicker = function($event, task) { - $event.preventDefault(); - $event.stopPropagation(); - - task._isDatePickerOpen = !task._isDatePickerOpen; - } - - /* - ------------------------ - Checklists - ------------------------ - */ - function focusChecklist(task,index) { - window.setTimeout(function(){ - $('#task-'+task.id+' .checklist-form input[type="text"]')[index].focus(); - }); - } - $scope.addChecklist = function(task) { - task.checklist = [{completed:false,text:""}]; - focusChecklist(task,0); - } - $scope.addChecklistItem = function(task,$event,$index) { - if (!task.checklist[$index].text) { - // Don't allow creation of an empty checklist item - // TODO Provide UI feedback that this item is still blank - } else if ($index == task.checklist.length-1){ - User.user.ops.updateTask({params:{id:task.id},body:task}); // don't preen the new empty item - task.checklist.push({completed:false,text:''}); - focusChecklist(task,task.checklist.length-1); - } else { - $scope.saveTask(task,true); - focusChecklist(task,$index+1); - } - } - $scope.removeChecklistItem = function(task,$event,$index,force){ - // Remove item if clicked on trash icon - if (force) { - task.checklist.splice($index,1); - $scope.saveTask(task,true); - } else if (!task.checklist[$index].text) { - // User deleted all the text and is now wishing to delete the item - // saveTask will prune the empty item - $scope.saveTask(task,true); - // Move focus if the list is still non-empty - if ($index > 0) - focusChecklist(task,$index-1); - // Don't allow the backspace key to navigate back now that the field is gone - $event.preventDefault(); - } - } - $scope.swapChecklistItems = function(task, oldIndex, newIndex) { - var toSwap = task.checklist.splice(oldIndex, 1)[0]; - task.checklist.splice(newIndex, 0, toSwap); - $scope.saveTask(task, true); - } - $scope.navigateChecklist = function(task,$index,$event){ - focusChecklist(task, $event.keyCode == '40' ? $index+1 : $index-1); - } - $scope.checklistCompletion = function(checklist){ - return _.reduce(checklist,function(m,i){return m+(i.completed ? 1 : 0);},0) - } - $scope.collapseChecklist = function(task) { - task.collapseChecklist = !task.collapseChecklist; - $scope.saveTask(task,true); - } - - /* - ------------------------ - Items - ------------------------ - */ - - $scope.$watch('user.items.gear.owned', function(){ - $scope.itemStore = Shared.updateStore(User.user); - },true); - - $scope.healthPotion = Content.potion; - $scope.armoire = Content.armoire; - - $scope.buy = function(item) { - playRewardSound(item); - User.user.ops.buy({params:{key:item.key}}); - }; - - - /* - ------------------------ - Hiding Tasks - ------------------------ - */ - - $scope.shouldShow = function(task, list, prefs){ - if (task._editing) // never hide a task while being edited - return true; - var shouldDo = task.type == 'daily' ? habitrpgShared.shouldDo(new Date, task, prefs) : true; - switch (list.view) { - case "yellowred": // Habits - return task.value < 1; - case "greenblue": // Habits - return task.value >= 1; - case "remaining": // Dailies and To-Dos - return !task.completed && shouldDo; - case "complete": // Dailies and To-Dos - return task.completed || !shouldDo; - case "dated": // To-Dos - return !task.completed && task.date; - case "ingamerewards": // All skills/rewards except the user's own - return false; // Because "rewards" list includes only the user's own - case "all": - return true; - } - } - - function playRewardSound (task) { - if (task.value <= User.user.stats.gp){ - $rootScope.playSound('Reward'); - } - } - - var ctrlKeys = [17, 224, 91]; - $scope.hoverIn = function () { - $(document).keydown(function (keyEvent) { - if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) { - $scope.ctrlPressed = true; - $scope.$apply(); - } - }); - $(document).keyup(function (keyEvent) { - console.log('blah'); - if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) { - $scope.ctrlPressed = false; - $scope.$apply(); - } - }); - } - $scope.hoverout = function () { - $(document).unbind('keydown'); - $(document).unbind('keyup'); - $scope.ctrlPressed = false; - } - }]); diff --git a/website/public/js/controllers/tavernCtrl.js b/website/public/js/controllers/tavernCtrl.js deleted file mode 100644 index 995fa22ad0..0000000000 --- a/website/public/js/controllers/tavernCtrl.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User', - function($scope, Groups, User) { - $scope.group = Groups.tavern(); - $scope.toggleUserTier = function($event) { - $($event.target).next().toggle(); - } - } - ]); diff --git a/website/public/js/services/challengeServices.js b/website/public/js/services/challengeServices.js deleted file mode 100644 index 51b91de8c2..0000000000 --- a/website/public/js/services/challengeServices.js +++ /dev/null @@ -1,26 +0,0 @@ -'use strict'; - -/** - * Services that persists and retrieves user from localStorage. - */ - -angular.module('habitrpg').factory('Challenges', -['ApiUrl', '$resource', -function(ApiUrl, $resource) { - var Challenge = $resource(ApiUrl.get() + '/api/v2/challenges/:cid', - {cid:'@_id'}, - { - //'query': {method: "GET", isArray:false} - join: {method: "POST", url: ApiUrl.get() + '/api/v2/challenges/:cid/join'}, - leave: {method: "POST", url: ApiUrl.get() + '/api/v2/challenges/:cid/leave'}, - close: {method: "POST", params: {uid:''}, url: ApiUrl.get() + '/api/v2/challenges/:cid/close'}, - getMember: {method: "GET", url: ApiUrl.get() + '/api/v2/challenges/:cid/member/:uid'} - }); - - //var challenges = []; - - return { - Challenge: Challenge - //challenges: challenges - } -}]); diff --git a/website/public/js/services/chatServices.js b/website/public/js/services/chatServices.js deleted file mode 100644 index 7fe2533506..0000000000 --- a/website/public/js/services/chatServices.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -angular.module('habitrpg').factory('Chat', -['$resource', '$http', 'ApiUrl', 'User', -function($resource, $http, ApiUrl, User) { - var utils = $resource(ApiUrl.get() + '/api/v2/groups/:gid', - {gid:'@_id', messageId: '@_messageId'}, - { - postChat: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/chat'}, - like: {method: 'POST', isArray: true, url: ApiUrl.get() + '/api/v2/groups/:gid/chat/:messageId/like'}, - deleteChatMessage: {method: "DELETE", url: ApiUrl.get() + '/api/v2/groups/:gid/chat/:messageId'}, - flagChatMessage: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/chat/:messageId/flag'}, - clearFlagCount: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/chat/:messageId/clearflags'}, - }); - - var chatService = { - seenMessage: seenMessage, - clearCards: clearCards, - utils: utils - }; - - return chatService; - - function clearCards() { - User.user.ops.update && User.set({'flags.cardReceived':false}); - } - - function seenMessage(gid) { - // On enter, set chat message to "seen" - $http.post(ApiUrl.get() + '/api/v2/groups/'+gid+'/chat/seen'); - if (User.user.newMessages) delete User.user.newMessages[gid]; - } -}]); diff --git a/website/public/js/services/groupServices.js b/website/public/js/services/groupServices.js deleted file mode 100644 index 001a137d63..0000000000 --- a/website/public/js/services/groupServices.js +++ /dev/null @@ -1,92 +0,0 @@ -'use strict'; - -(function() { - angular - .module('habitrpg') - .factory('Groups', groupsFactory); - - groupsFactory.$inject = [ - '$location', - '$resource', - '$rootScope', - 'Analytics', - 'ApiUrl', - 'Challenges', - 'User' - ]; - - function groupsFactory($location, $resource, $rootScope, Analytics, ApiUrl, Challenges, User) { - - var data = {party: undefined, myGuilds: undefined, publicGuilds: undefined, tavern: undefined}; - var Group = $resource(ApiUrl.get() + '/api/v2/groups/:gid', - {gid:'@_id', messageId: '@_messageId'}, - { - get: { - method: "GET", - isArray:false, - // Wrap challenges as ngResource so they have functions like $leave or $join - transformResponse: function(data) { - data = angular.fromJson(data); - _.each(data && data.challenges, function(c) { - angular.extend(c, Challenges.Challenge.prototype); - }); - return data; - } - }, - - syncParty: {method: "GET", url: '/api/v2/groups/party'}, - join: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/join'}, - leave: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/leave'}, - invite: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/invite'}, - removeMember: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/removeMember'}, - startQuest: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/questAccept'} - }); - - function party(cb) { - if (!data.party) return (data.party = Group.get({gid: 'party'}, cb)); - return (cb) ? cb(party) : data.party; - } - - function publicGuilds() { - //TODO combine these as {type:'guilds,public'} and create a $filter() to separate them - if (!data.publicGuilds) data.publicGuilds = Group.query({type:'public'}); - return data.publicGuilds; - } - - function myGuilds() { - if (!data.myGuilds) data.myGuilds = Group.query({type:'guilds'}); - return data.myGuilds; - } - - function tavern() { - if (!data.tavern) data.tavern = Group.get({gid:'habitrpg'}); - return data.tavern; - } - - function inviteOrStartParty(group) { - Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Invite Friends'}); - if (group.type === "party" || $location.$$path === "/options/groups/party") { - group.type = 'party'; - $rootScope.openModal('invite-party', { - controller:'InviteToGroupCtrl', - resolve: { - injectedGroup: function(){ return group; } - } - }); - } else { - $location.path("/options/groups/party"); - } - } - - return { - party: party, - publicGuilds: publicGuilds, - myGuilds: myGuilds, - tavern: tavern, - inviteOrStartParty: inviteOrStartParty, - - data: data, - Group: Group - } - } -})(); diff --git a/website/public/js/services/memberServices.js b/website/public/js/services/memberServices.js deleted file mode 100644 index 4146a4ea1f..0000000000 --- a/website/public/js/services/memberServices.js +++ /dev/null @@ -1,60 +0,0 @@ -'use strict'; -(function(){ - angular - .module('habitrpg') - .factory('Members', membersFactory); - - membersFactory.$inject = [ - '$rootScope', - 'Shared', - 'ApiUrl', - '$resource' - ]; - - function membersFactory($rootScope, Shared, ApiUrl, $resource) { - var members = {}; - var fetchMember = $resource(ApiUrl.get() + '/api/v2/members/:uid', { uid: '@_id' }).get; - - function selectMember(uid, cb) { - - var self = this; - var memberIsReady = _checkIfMemberIsReady(members[uid]); - - if (memberIsReady) { - _prepareMember(self, members[uid], cb); - } else { - fetchMember({ uid: uid }, function(member) { - addToMembersList(member); // lazy load for later - _prepareMember(self, member, cb); - }); - } - } - - function addToMembersList(member){ - if (member._id) { - members[member._id] = member; - } - } - - function _checkIfMemberIsReady(member) { - return member && member.items && member.items.weapon; - } - - function _prepareMember(self, member, cb) { - Shared.wrap(member, false); - self.selectedMember = members[member._id]; - cb(); - } - - $rootScope.$on('userUpdated', function(event, user){ - addToMembersList(user); - }) - - return { - members: members, - addToMembersList: addToMembersList, - selectedMember: undefined, - selectMember: selectMember - } - } -}()); diff --git a/website/public/js/services/taskServices.js b/website/public/js/services/taskServices.js deleted file mode 100644 index bbe7f6f689..0000000000 --- a/website/public/js/services/taskServices.js +++ /dev/null @@ -1,53 +0,0 @@ -'use strict'; - -(function(){ - var TASK_KEYS_TO_REMOVE = ['_id', 'completed', 'date', 'dateCompleted', 'dateCreated', 'history', 'id', 'streak']; - - angular - .module('habitrpg') - .factory('Tasks', tasksFactory); - - tasksFactory.$inject = [ - '$rootScope', - 'Shared', - 'User' - ]; - - function tasksFactory($rootScope, Shared, User) { - - function editTask(task) { - task._editing = !task._editing; - task._tags = !User.user.preferences.tagsCollapsed; - task._advanced = !User.user.preferences.advancedCollapsed; - if($rootScope.charts[task.id]) $rootScope.charts[task.id] = false; - } - - function cloneTask(task) { - var clonedTask = _.cloneDeep(task); - clonedTask = _cleanUpTask(clonedTask); - - return Shared.taskDefaults(clonedTask); - } - - function _cleanUpTask(task) { - var cleansedTask = _.omit(task, TASK_KEYS_TO_REMOVE); - - // Copy checklists but reset to uncomplete and assign new id - _(cleansedTask.checklist).forEach(function(item) { - item.completed = false; - item.id = Shared.uuid(); - }).value(); - - if (cleansedTask.type !== 'reward') { - delete cleansedTask.value; - } - - return cleansedTask; - } - - return { - editTask: editTask, - cloneTask: cloneTask - }; - } -})(); diff --git a/website/public/js/static.js b/website/public/js/static.js deleted file mode 100644 index 67a07df815..0000000000 --- a/website/public/js/static.js +++ /dev/null @@ -1,61 +0,0 @@ -"use strict"; - -window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui.bootstrap']) - .constant("API_URL", "") - .constant("STORAGE_USER_ID", 'habitrpg-user') - .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') - .constant("MOBILE_APP", false) - -.controller("RootCtrl", ['$scope', '$location', '$modal', '$http', 'Stats', function($scope, $location, $modal, $http, Stats){ - var memberId = $location.search()['memberId']; - if (memberId) { - $http.get('/api/v2/members/'+memberId).success(function(data, status, headers, config){ - $scope.profile = window.habitrpgShared.wrap(data, false); - $scope.statCalc = Stats; - $scope.Content = window.habitrpgShared.content; - $modal.open({ - templateUrl: 'modals/member.html', - scope: $scope - }); - }) - } - - $http.defaults.headers.common['x-client'] = 'habitica-web'; - }]) - -.controller("PlansCtrl", ['$rootScope','Analytics', - function($rootScope,Analytics) { - $rootScope.clickContact = function(){ - Analytics.track({'hitType':'event','eventCategory':'button','eventAction':'click','eventLabel':'Contact Us (Plans)'}) - } - } -]) - -.controller('AboutCtrl',[function(){ - $(document).ready(function(){ - $('a.gallery').colorbox({ - maxWidth: '90%', - maxHeight: '80%', - transition: 'none', - scalePhotos:true - //maxHeight: '70%' - }); - }); -}]) - -.controller('AccordionCtrl', function() { - function openHashAccordion() { - if (window.location.hash) { - var $target = $(window.location.hash.replace('/','')); - if ($target.hasClass('collapse')) { - $target.collapse('show'); - $('html, body').animate({ - scrollTop: $($target).offset().top - 100 - }); - } - } - } - $(document).ready(function(){ - openHashAccordion(); - }); -}) diff --git a/website/server/controllers/api-v2/auth.js b/website/server/controllers/api-v2/auth.js new file mode 100644 index 0000000000..cfa5c40a0d --- /dev/null +++ b/website/server/controllers/api-v2/auth.js @@ -0,0 +1,385 @@ +var _ = require('lodash'); +var validator = require('validator'); +var passport = require('passport'); +var shared = require('../../../../common'); +var async = require('async'); +var utils = require('../../libs/api-v2/utils'); +var nconf = require('nconf'); +var request = require('request'); +var FirebaseTokenGenerator = require('firebase-token-generator'); +import { + model as User, +} from '../../models/user'; +import { + model as EmailUnsubscription, +} from '../../models/emailUnsubscription'; + +var analytics = utils.analytics; +var i18n = require('./../../libs/api-v2/i18n'); + +var isProd = nconf.get('NODE_ENV') === 'production'; + +var api = module.exports; + +var NO_TOKEN_OR_UID = { err: shared.i18n.t('messageAuthMustIncludeTokens') }; +var NO_USER_FOUND = {err: shared.i18n.t('messageAuthNoUserFound') }; +var NO_SESSION_FOUND = { err: shared.i18n.t('messageAuthMustBeLoggedIn') }; +var accountSuspended = function(uuid){ + return { + err: 'Account has been suspended, please contact leslie@habitica.com with your UUID ('+uuid+') for assistance.', + code: 'ACCOUNT_SUSPENDED' + }; +} + +api.auth = function(req, res, next) { + var uid = req.headers['x-api-user']; + var token = req.headers['x-api-key']; + if (!(uid && token)) return res.status(401).json(NO_TOKEN_OR_UID); + User.findOne({_id: uid, apiToken: token}, function(err, user) { + if (err) return next(err); + if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); + if (user.auth.blocked) return res.status(401).json(accountSuspended(user._id)); + + res.locals.wasModified = req.query._v ? +user._v !== +req.query._v : true; + res.locals.user = user; + req.session.userId = user._id; + return next(); + }); +}; + +api.authWithSession = function(req, res, next) { //[todo] there is probably a more elegant way of doing this... + if (!(req.session && req.session.userId)) + return res.status(401).json(NO_SESSION_FOUND); + User.findOne({_id: req.session.userId}, function(err, user) { + if (err) return next(err); + if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); + res.locals.user = user; + next(); + }); +}; + +// TODO passing auth params as query params is not safe as they are logged by browser history, ... +api.authWithUrl = function(req, res, next) { + User.findOne({_id:req.query._id, apiToken:req.query.apiToken}, function(err,user){ + if (err) return next(err); + if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); + res.locals.user = user; + next(); + }); +} + +api.registerUser = function(req, res, next) { + var email = req.body.email && req.body.email.toLowerCase(); + var username = req.body.username; + // Get the lowercase version of username to check that we do not have duplicates + // So we can search for it in the database and then reject the choosen username if 1 or more results are found + var lowerCaseUsername = username && username.toLowerCase(); + + async.auto({ + validate: function(cb) { + if (!(username && req.body.password && email)) + return cb({code:401, err: shared.i18n.t('messageAuthCredentialsRequired')}); + if (req.body.password !== req.body.confirmPassword) + return cb({code:401, err: shared.i18n.t('messageAuthPasswordMustMatch')}); + if (!validator.isEmail(email)) + return cb({code:401, err: ":email invalid"}); + cb(); + }, + findReg: function(cb) { + // Search for duplicates using lowercase version of username + User.findOne({$or:[{'auth.local.email': email}, {'auth.local.lowerCaseUsername': lowerCaseUsername}]}, {'auth.local':1}, cb); + }, + findFacebook: function(cb){ + User.findOne({_id: req.headers['x-api-user'], apiToken: req.headers['x-api-key']}, {auth:1}, cb); + }, + register: ['validate', 'findReg', 'findFacebook', function(cb, data) { + if (data.findReg) { + if (email === data.findReg.auth.local.email) return cb({code:401, err:"Email already taken"}); + // Check that the lowercase username isn't already used + if (lowerCaseUsername === data.findReg.auth.local.lowerCaseUsername) return cb({code:401, err: shared.i18n.t('messageAuthUsernameTaken')}); + } + var salt = utils.makeSalt(); + var newUser = { + auth: { + local: { + username: username, + lowerCaseUsername: lowerCaseUsername, // Store the lowercase version of the username + email: email, // Store email as lowercase + salt: salt, + hashed_password: utils.encryptPassword(req.body.password, salt) + }, + timestamps: {created: +new Date(), loggedIn: +new Date()} + } + }; + // existing user, allow them to add local authentication + if (data.findFacebook) { + data.findFacebook.auth.local = newUser.auth.local; + data.findFacebook.registeredThrough = newUser.registeredThrough; + data.findFacebook.save(cb); + // new user, register them + } else { + newUser.preferences = newUser.preferences || {}; + newUser.preferences.language = req.language; // User language detected from browser, not saved + var user = new User(newUser); + + user.registeredThrough = req.headers['x-client']; + var analyticsData = { + category: 'acquisition', + type: 'local', + gaLabel: 'local', + uuid: user._id, + }; + analytics.track('register', analyticsData) + + user.save(function(err, savedUser){ + if (err) return cb(err); + // Clean previous email preferences + EmailUnsubscription.remove({email: savedUser.auth.local.email}, function(){ + utils.txnEmail(savedUser, 'welcome'); + }); + cb.apply(cb, arguments); + }); + } + }] + }, function(err, data) { + if (err) return err.code ? res.status(err.code).json(err) : next(err); + data.register[0].getTransformedData(function(err, userTransformed){ + if(err) return next(err); + res.status(200).json(userTransformed); + }); + }); +}; + +api.loginLocal = function(req, res, next) { + var username = req.body.username; + var password = req.body.password; + if (!(username && password)) return res.status(401).json({err:'Missing :username or :password in request body, please provide both'}); + var login = validator.isEmail(username) ? + {'auth.local.email':username.toLowerCase()} : // Emails are all lowercase + {'auth.local.username':username}; // Use the username as the user typed it + + User.findOne(login, {auth:1}, function(err, user){ + if (err) return next(err); + if (!user) return res.status(401).json({err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\" on the habitica.com website's login form."}); + if (user.auth.blocked) return res.status(401).json(accountSuspended(user._id)); + // We needed the whole user object first so we can get his salt to encrypt password comparison + User.findOne( + {$and: [login, {'auth.local.hashed_password': utils.encryptPassword(password, user.auth.local.salt)}]} + , {_id:1, apiToken:1} + , function(err, user){ + if (err) return next(err); + if (!user) return res.status(401).json({err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\" on the habitica.com website's login form."}); + res.json({id: user._id,token: user.apiToken}); + password = null; + }); + }); +}; + +/* + POST /user/auth/social + */ +api.loginSocial = function(req, res, next) { + var access_token = req.body.authResponse.access_token, + network = req.body.network; + if (network!=='facebook') + return res.status(401).json({err:"Only Facebook supported currently."}); + async.auto({ + profile: function (cb) { + passport._strategies[network].userProfile(access_token, cb); + }, + user: ['profile', function (cb, results) { + var q = {}; + q['auth.' + network + '.id'] = results.profile.id; + User.findOne(q, {_id: 1, apiToken: 1, auth: 1}, cb); + }], + register: ['profile', 'user', function (cb, results) { + if (results.user) return cb(null, results.user); + // Create new user + var prof = results.profile; + var user = { + preferences: { + language: req.language // User language detected from browser, not saved + }, + auth: { + timestamps: {created: +new Date(), loggedIn: +new Date()} + } + }; + user.auth[network] = prof; + user = new User(user); + user.registeredThrough = req.headers['x-client']; + + user.save(function(err, savedUser){ + // Clean previous email preferences + if(savedUser.auth.facebook.emails && savedUser.auth.facebook.emails[0] && savedUser.auth.facebook.emails[0].value){ + EmailUnsubscription.remove({email: savedUser.auth.facebook.emails[0].value}, function(){ + utils.txnEmail(savedUser, 'welcome'); + }); + } + cb.apply(cb, arguments); + }); + + var analyticsData = { + category: 'acquisition', + type: network, + gaLabel: network, + uuid: user._id, + }; + analytics.track('register', analyticsData) + }] + }, function(err, results){ + if (err) return res.status(401).json({err: err.toString ? err.toString() : err}); + var acct = results.register[0] ? results.register[0] : results.register; + if (acct.auth.blocked) return res.status(401).json(accountSuspended(acct._id)); + return res.status(200).json({id:acct._id, token:acct.apiToken}); + }) +}; + +/** + * DELETE /user/auth/social + */ +api.deleteSocial = function(req,res,next){ + if (!res.locals.user.auth.local.username) + return res.status(401).json({err:"Account lacks another authentication method, can't detach Facebook"}); + //TODO for some reason, the following gives https://gist.github.com/lefnire/f93eb306069b9089d123 + //res.locals.user.auth.facebook = null; + //res.locals.user.auth.save(function(err, saved){ + User.update({_id:res.locals.user._id}, {$unset:{'auth.facebook':1}}, function(err){ + if (err) return next(err); + res.sendStatus(200); + }) +} + +api.resetPassword = function(req, res, next){ + var email = req.body.email && req.body.email.toLowerCase(), // Emails are all lowercase + salt = utils.makeSalt(), + newPassword = utils.makeSalt(), // use a salt as the new password too (they'll change it later) + hashed_password = utils.encryptPassword(newPassword, salt); + + if(!email) return res.status(400).json({err: "Email not provided"}); + + User.findOne({'auth.local.email': email}, function(err, user){ + if (err) return next(err); + if (!user) return res.status(401).json({err:"Sorry, we can't find a user registered with email " + email + "\n- Make sure your email address is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login."}); + user.auth.local.salt = salt; + user.auth.local.hashed_password = hashed_password; + utils.sendEmail({ + from: "Habitica
Important! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at " + nconf.get('BASE_URL') + ". After you've logged in, head to " + nconf.get('BASE_URL') + "/#/options/settings/settings and change your password." + }); + user.save(function(err){ + if(err) return next(err); + res.send('New password sent to '+ email); + email = salt = newPassword = hashed_password = null; + }); + }); +}; + +var invalidPassword = function(user, password){ + var hashed_password = utils.encryptPassword(password, user.auth.local.salt); + if (hashed_password !== user.auth.local.hashed_password) + return {code:401, err:"Incorrect password"}; + return false; +} + +api.changeUsername = function(req, res, next) { + var user = res.locals.user; + var username = req.body.username; + var lowerCaseUsername = username && username.toLowerCase(); // we search for the lowercased version to intercept duplicates + + if(!username) return res.status(400).json({err: "Username not provided"}); + async.waterfall([ + function(cb){ + User.findOne({'auth.local.lowerCaseUsername': lowerCaseUsername}, {auth:1}, cb); + }, + function(found, cb){ + if (found) return cb({code:401, err: "Username already taken"}); + if (invalidPassword(user, req.body.password)) return cb(invalidPassword(user, req.body.password)); + user.auth.local.username = username; + user.auth.local.lowerCaseUsername = lowerCaseUsername; + + user.save(cb); + } + ], function(err){ + if (err) return err.code ? res.status(err.code).json(err) : next(err); + res.sendStatus(200); + }) +} + +api.changeEmail = function(req, res, next){ + var email = req.body.email && req.body.email.toLowerCase(); // emails are all lowercase + if(!email) return res.status(400).json({err: "Email not provided"}); + + async.waterfall([ + function(cb){ + User.findOne({'auth.local.email': email}, {auth:1}, cb); + }, + function(found, cb){ + if(found) return cb({code:401, err: shared.i18n.t('messageAuthEmailTaken')}); + if (invalidPassword(res.locals.user, req.body.password)) return cb(invalidPassword(res.locals.user, req.body.password)); + res.locals.user.auth.local.email = email; + res.locals.user.save(cb); + } + ], function(err){ + if (err) return err.code ? res.status(err.code).json(err) : next(err); + res.sendStatus(200); + }) +} + +api.changePassword = function(req, res, next) { + var user = res.locals.user, + oldPassword = req.body.oldPassword, + newPassword = req.body.newPassword, + confirmNewPassword = req.body.confirmNewPassword; + + if (newPassword != confirmNewPassword) + return res.status(401).json({err: "Password & Confirm don't match"}); + + var salt = user.auth.local.salt, + hashed_old_password = utils.encryptPassword(oldPassword, salt), + hashed_new_password = utils.encryptPassword(newPassword, salt); + + if (hashed_old_password !== user.auth.local.hashed_password) + return res.status(401).json({err:"Old password doesn't match"}); + + user.auth.local.hashed_password = hashed_new_password; + user.save(function(err, saved){ + if (err) next(err); + res.sendStatus(200); + }) +}; + +// DISABLED FOR API v2 +/*var firebaseTokenGeneratorInstance = new FirebaseTokenGenerator(nconf.get('FIREBASE:SECRET')); +api.getFirebaseToken = function(req, res, next) { + var user = res.locals.user; + // Expires 24 hours after now (60*60*24*1000) (in milliseconds) + var expires = new Date(); + expires.setTime(expires.getTime() + 86400000); + + var token = firebaseTokenGeneratorInstance + .createToken({ + uid: user._id, + isHabiticaUser: true + }, { + expires: expires + }); + + res.status(200).json({ + token: token, + expires: expires + }); +};*/ + +// DISABLED FOR API v2 +/*api.setupPassport = function(router) { + + router.get('/logout', i18n.getUserLanguage, function(req, res) { + req.logout(); + delete req.session.userId; + res.redirect('/'); + }) + +};*/ diff --git a/website/server/controllers/api-v2/challenges.js b/website/server/controllers/api-v2/challenges.js new file mode 100644 index 0000000000..c5d716d88e --- /dev/null +++ b/website/server/controllers/api-v2/challenges.js @@ -0,0 +1,428 @@ +// @see ../routes for routing + +var _ = require('lodash'); +var nconf = require('nconf'); +var async = require('async'); +var shared = require('../../../../common'); +import { + model as User, +} from '../../models/user'; +import { + model as Group, + basicFields as basicGroupFields, + TAVERN_ID, +} from '../../models/group'; +import { + model as Challenge, +} from '../../models/challenge'; +import * as Tasks from '../../models/task'; +var logging = require('./../../libs/api-v2/logging'); +var csvStringify = require('csv-stringify'); +var utils = require('../../libs/api-v2/utils'); +var api = module.exports; +var pushNotify = require('./pushNotifications'); +import Bluebird from 'bluebird'; +import v3MembersController from '../api-v3/members'; +/* + ------------------------------------------------------------------------ + Challenges + ------------------------------------------------------------------------ +*/ + +var nameFields = 'profile.name'; + +api.list = async function(req, res, next) { + try { + var user = res.locals.user; + + let challenges = await Challenge.find({ + $or: [ + {_id: {$in: user.challenges}}, // Challenges where the user is participating + {group: {$in: user.getGroups()}}, // Challenges in groups where I'm a member + {leader: user._id}, // Challenges where I'm the leader + ], + _id: {$ne: '95533e05-1ff9-4e46-970b-d77219f199e9'}, // remove the Spread the Word Challenge for now, will revisit when we fix the closing-challenge bug TODO revisit + }) + .sort('-official -timestamp') + // .populate('group', basicGroupFields) + // .populate('leader', nameFields) + .exec(); + + let resChals = challenges.map(challenge => { + let obj = challenge.toJSON(); + + obj._isMember = user.challenges.indexOf(challenge._id) !== -1; + return obj; + }); + + // Instead of populate we make a find call manually because of https://github.com/Automattic/mongoose/issues/3833 + await Bluebird.all(resChals.map((chal, index) => { + return Bluebird.all([ + User.findById(chal.leader).select(nameFields).exec(), + Group.findById(chal.group).select(basicGroupFields).exec(), + ]).then(populatedData => { + resChals[index].leader = populatedData[0] ? populatedData[0].toJSON({minimize: true}) : null; + resChals[index].group = populatedData[1] ? populatedData[1].toJSON({minimize: true}) : null; + }); + })); + + res.json(resChals); + } catch (err) { + next(err); + } +} + +// GET +api.get = async function(req, res, next) { + try { + let user = res.locals.user; + let challengeId = req.params.cid; + + let challenge = await Challenge.findById(challengeId) + // Don't populate the group as we'll fetch it manually later + // .populate('leader', nameFields) + .exec(); + if (!challenge) return res.status(404).json({err: 'Challenge ' + req.params.cid + ' not found'}); + + // Fetching basic group data + let group = await Group.getGroup({user, groupId: challenge.group, optionalMembership: true}); + if (!group || !challenge.canView(user, group)) return res.status(404).json({err: 'Challenge ' + req.params.cid + ' not found'}); + + let leaderRes = await User.findById(challenge.leader).select('profile.name').exec(); + leaderRes = leaderRes ? leaderRes.toJSON({minimize: true}) : null; + + challenge.getTransformedData({ + populateMembers: 'profile.name', + cb (err, transformedChal) { + transformedChal.group = group.toJSON({minimize: true}); + transformedChal.leader = leaderRes; + transformedChal._isMember = user.challenges.indexOf(transformedChal._id) !== -1; + res.json(transformedChal); + } + }); + } catch (err) { + next(err); + } +} + +api.csv = function(req, res, next) { + var cid = req.params.cid; + req.params.challengeId = cid; + v3MembersController.exportChallengeCsv.handler(req, res, next).catch(next); +} + +api.getMember = function(req, res, next) { + var cid = req.params.cid; + var uid = req.params.uid; + + req.params.memberId = uid; + req.params.challengeId = cid; + v3MembersController.getChallengeMemberProgress.handler(req, res, next) + .then(result => { + let newResult = { + profile: { + name: result.profile.name, + }, + habits: [], + dailys: [], + todos: [], + rewards: [], + }; + + let tasks = result.tasks; + tasks.forEach(task => { + let taskObj = task.toJSONV2(); + newResult[taskObj.type + 's'].push(taskObj); + }); + + res.json(newResult); + }) + .catch(next); +} + +// CREATE +api.create = async function(req, res, next){ + try { + var user = res.locals.user; + + let groupId = req.body.group; + let prize = req.body.prize; + + let group = await Group.getGroup({user, groupId, fields: '-chat', mustBeMember: true}); + if (!group) return res.status(404).json({err:"Group." + req.body.group + " not found"}); + if (!group.isMember(user)) return res.status(404).json({err:"Group." + req.body.group + " not found"}); + + if (group.leaderOnly && group.leaderOnly.challenges && group.leader !== user._id) { + return res.status(401).json({err:"Only the group leader can create challenges"}); + } + + if (group._id === TAVERN_ID && prize < 1) { + return res.status(401).json({err: 'Prize must be at least 1 Gem for public challenges.'}) + } + + if (prize > 0) { + let groupBalance = group.balance && group.leader === user._id ? group.balance : 0; + let prizeCost = prize / 4; + + if (prizeCost > user.balance + groupBalance) { + return res.status(401).json({err: 'You can\'t afford this prize. Purchase more gems or lower the prize amount.'}); + } + + if (groupBalance >= prizeCost) { + // Group pays for all of prize + group.balance -= prizeCost; + } else if (groupBalance > 0) { + // User pays remainder of prize cost after group + let remainder = prizeCost - group.balance; + group.balance = 0; + user.balance -= remainder; + } else { + // User pays for all of prize + user.balance -= prizeCost; + } + } + + group.challengeCount += 1; + + req.body.leader = user._id; + req.body.official = user.contributor.admin && req.body.official; + let challenge = new Challenge(Challenge.sanitize(req.body)); + + // First validate challenge so we don't save group if it's invalid (only runs sync validators) + let challengeValidationErrors = challenge.validateSync(); + if (challengeValidationErrors) throw challengeValidationErrors; + + req.body.habits = req.body.habits || []; + req.body.todos = req.body.todos || []; + req.body.dailys = req.body.dailys || []; + req.body.rewards = req.body.rewards || []; + + var chalTasks = req.body.habits.concat(req.body.rewards) + .concat(req.body.dailys).concat(req.body.todos) + .map(v2Task => Tasks.Task.fromJSONV2(v2Task)); + + chalTasks = chalTasks.map(function(task) { + var newTask = new Tasks[task.type](Tasks.Task.sanitize(task)); + newTask.challenge.id = challenge._id; + return newTask.save(); + }); + + let results = await Bluebird.all([challenge.save({ + validateBeforeSave: false, // already validated + }), group.save()].concat(chalTasks)); + let savedChal = results[0]; + + await savedChal.syncToUser(user); // (it also saves the user) + + savedChal.getTransformedData({ + cb (err, transformedChal) { + res.status(201).json(transformedChal); + }, + }); + } catch (err) { + next(err); + } +} + +// UPDATE +api.update = function(req, res, next){ + var cid = req.params.cid; + var user = res.locals.user; + var before; + var updatedTasks; + + async.waterfall([ + function(cb){ + // We first need the original challenge data, since we're going to compare against new & decide to sync users + Challenge.findById(cid, cb); + }, + function(chal, cb){ + if(!chal) return cb({chal: null}); + + chal.getTasks(function(err, tasks){ + cb(err, { + chal: chal, + tasks: tasks + }); + }); + }, + function(_before, cb) { + if (!_before.chal) return cb('Challenge ' + cid + ' not found'); + if (_before.chal.leader != user._id && !user.contributor.admin) return cb({code: 401, err: shared.i18n.t('noPermissionEditChallenge', req.language)}); + // Update the challenge, since syncing will need the updated challenge. But store `before` we're going to do some + // before-save / after-save comparison to determine if we need to sync to users + before = {chal: _before.chal, tasks: _before.tasks}; + var chalAttrs = _.pick(req.body, 'name shortName description date'.split(' ')); + async.parallel({ + chal: function(cb1){ + Challenge.findByIdAndUpdate(cid, {$set:chalAttrs}, {new: true}, cb1); + }, + tasks: function(cb1) { + // Convert to map of {id: task} so we can easily match them + var _beforeClonedTasks = _before.tasks; + updatedTasks = _.object(_.pluck(_beforeClonedTasks, '_id'), _beforeClonedTasks); + var newTasks = req.body.habits.concat(req.body.dailys) + .concat(req.body.todos).concat(req.body.rewards); + + var newTasksObj = _.object(_.pluck(newTasks, '_id'), newTasks); + async.forEachOf(newTasksObj, function(newTask, taskId, cb2){ + // some properties can't be changed + newTask = Tasks.Task.sanitize(newTask); + // we have to convert task to an object because otherwise things don't get merged correctly. Bad for performances? + _.assign(updatedTasks[taskId], shared.ops.updateTask(updatedTasks[taskId].toObject(), {body: newTask})); + _before.chal.updateTask(updatedTasks[taskId]).then(cb2).catch(cb2); + }, cb1); + } + }, cb); + }, + ], function(err, saved){ + if(err) { + return err.code ? res.json(err.code, err) : next(err); + } + + saved.chal.getTransformedData({cb: function(err, newChal){ + if(err) return next(err); + res.json(newChal); + }}) + cid = user = before = null; + }); +} + +/** + * Delete & close + */ +api.delete = async function(req, res, next){ + try { + var user = res.locals.user; + var cid = req.params.cid; + + let challenge = await Challenge.findOne({_id: req.params.cid}).exec(); + if (!challenge) return next('Challenge ' + cid + ' not found'); + if (!challenge.canModify(user)) return next(shared.i18n.t('noPermissionCloseChallenge')); + + // Close channel in background, some ops are run in the background without `await`ing + await challenge.closeChal({broken: 'CHALLENGE_DELETED'}); + res.sendStatus(200); + } catch (err) { + next(err); + } +} + +/** + * Select Winner & Close + */ +api.selectWinner = async function(req, res, next) { + try { + if (!req.query.uid) return res.status(401).json({err: 'Must select a winner'}); + + let challenge = await Challenge.findOne({_id: req.params.cid}).exec(); + if (!challenge) return next('Challenge ' + req.params.cid + ' not found'); + if (!challenge.canModify(res.locals.user)) return next(shared.i18n.t('noPermissionCloseChallenge')); + + let winner = await User.findOne({_id: req.query.uid}).exec(); + if (!winner || winner.challenges.indexOf(challenge._id) === -1) return next('Winner ' + req.query.uid + ' not found.'); + + // Close channel in background, some ops are run in the background without `await`ing + await challenge.closeChal({broken: 'CHALLENGE_CLOSED', winner}); + res.respond(200, {}); + } catch (err) { + next(err); + } +} + +api.join = async function(req, res, next){ + try { + var user = res.locals.user; + var cid = req.params.cid; + + let challenge = await Challenge.findOne({ _id: cid }); + if (!challenge) return next(shared.i18n.t('challengeNotFound')); + if (challenge.isMember(user)) return next(shared.i18n.t('userAlreadyInChallenge')); + + let group = await Group.getGroup({user, groupId: challenge.group, optionalMembership: true}); + if (!group || !challenge.hasAccess(user, group)) return next(shared.i18n.t('challengeNotFound')); + + challenge.memberCount += 1; + + // Add all challenge's tasks to user's tasks and save the challenge + await Bluebird.all([challenge.syncToUser(user), challenge.save()]); + + challenge.getTransformedData({ + cb (err, transformedChal) { + transformedChal._isMember = true; + res.json(transformedChal); + } + }); + } catch (e) { + next(e); + } +} + +api.leave = async function(req, res, next){ + try { + var user = res.locals.user; + var cid = req.params.cid; + // whether or not to keep challenge's tasks. strictly default to true if "keep-all" isn't provided + var keep = (/^remove-all/i).test(req.query.keep) ? 'remove-all' : 'keep-all'; + + let challenge = await Challenge.findOne({ _id: cid }); + if (!challenge) return next(shared.i18n.t('challengeNotFound')); + + let group = await Group.getGroup({user, groupId: challenge.group, fields: '_id type privacy'}); + if (!group || !challenge.canView(user, group)) return next(shared.i18n.t('challengeNotFound')); + + if (!challenge.isMember(user)) return next(shared.i18n.t('challengeMemberNotFound')); + + challenge.memberCount -= 1; + + // Unlink challenge's tasks from user's tasks and save the challenge + await Bluebird.all([challenge.unlinkTasks(user, keep), challenge.save()]); + + challenge.getTransformedData({ + cb (err, transformedChal) { + transformedChal._isMember = false; + res.json(transformedChal); + } + }); + } catch (e) { + next(e); + } +} + +import { removeFromArray } from '../../libs/api-v3/collectionManipulators'; + +api.unlink = async function(req, res, next) { + try { + var user = res.locals.user; + var tid = req.params.id; + var cid; + if (!req.query.keep) + return res.status(400).json({err: 'Provide unlink method as ?keep=keep-all (keep, keep-all, remove, remove-all)'}); + + let keep = req.query.keep; + let task = await Tasks.Task.findOne({ + _id: tid, + userId: user._id, + }).exec(); + + if (!task) return next(shared.i18n.t('taskNotFound')); + if (!task.challenge.id) return next(shared.i18n.t('cantOnlyUnlinkChalTask')); + + cid = task.challenge.id; + if (keep === 'keep') { + task.challenge = {}; + await task.save(); + } else { // remove + if (task.type !== 'todo' || !task.completed) { // eslint-disable-line no-lonely-if + removeFromArray(user.tasksOrder[`${task.type}s`], tid); + await Bluebird.all([user.save(), task.remove()]); + } else { + await task.remove(); + } + } + + res.sendStatus(200); + } catch (e) { + next(e); + } +} diff --git a/website/server/controllers/api-v2/coupon.js b/website/server/controllers/api-v2/coupon.js new file mode 100644 index 0000000000..17cd289bd3 --- /dev/null +++ b/website/server/controllers/api-v2/coupon.js @@ -0,0 +1,47 @@ +var _ = require('lodash'); +import { + model as Coupon, +} from '../../models/coupon'; +var api = module.exports; +var csvStringify = require('csv-stringify'); +var async = require('async'); + +api.ensureAdmin = function(req, res, next) { + if (!res.locals.user.contributor.sudo) return res.status(401).json({err:"You don't have admin access"}); + next(); +} + +api.generateCoupons = function(req,res,next) { + let count = Number(req.query.count); + Coupon.generate(req.params.event, count, function(err){ + if(err) return next(err); + res.sendStatus(200); + }); +} + +api.getCoupons = function(req,res,next) { + var options = {sort:'seq'}; + if (req.query.limit) options.limit = req.query.limit; + if (req.query.skip) options.skip = req.query.skip; + Coupon.find({},{}, options, function(err,coupons){ + let output = [['code']].concat(_.map(coupons, function(c){ + return [c._id]; + })) + + res.set({ + 'Content-Type': 'text/csv', + 'Content-disposition': 'attachment; filename=habitica-coupons.csv', + }); + csvStringify(output, (err, csv) => { + if (err) return next(err); + res.status(200).send(csv); + }); + }); +} + +api.enterCode = function(req,res,next) { + Coupon.apply(res.locals.user,req.params.code,function(err,user){ + if (err) return res.status(400).json({err:err}); + res.json(user); + }); +} diff --git a/website/server/controllers/api-v2/dataexport.js b/website/server/controllers/api-v2/dataexport.js new file mode 100644 index 0000000000..f0aad2b35c --- /dev/null +++ b/website/server/controllers/api-v2/dataexport.js @@ -0,0 +1,153 @@ +var _ = require('lodash'); +var express = require('express'); +var csvStringify = require('csv-stringify'); +var nconf = require('nconf'); +var moment = require('moment'); +var js2xmlparser = require("js2xmlparser"); +var pd = require('pretty-data').pd; +import { + model as User, +} from '../../models/user'; + +// Avatar screenshot/static-page includes +//var Pageres = require('pageres'); //https://github.com/sindresorhus/pageres +//var AWS = require('aws-sdk'); +//AWS.config.update({accessKeyId: nconf.get("S3:accessKeyId"), secretAccessKey: nconf.get("S3:secretAccessKey")}); +//var s3Stream = require('s3-upload-stream')(new AWS.S3()); //https://github.com/nathanpeck/s3-upload-stream +//var bucket = nconf.get("S3:bucket"); +//var request = require('request'); + +/* + ------------------------------------------------------------------------ + Data export + ------------------------------------------------------------------------ +*/ + +var dataexport = module.exports; + +dataexport.history = function(req, res) { + var user = res.locals.user; + var output = [ + ["Task Name", "Task ID", "Task Type", "Date", "Value"] + ]; + _.each(user.tasks, function(task) { + _.each(task.history, function(history) { + output.push([ + task.text, + task.id, + task.type, + moment(history.date).format("MM-DD-YYYY HH:mm:ss"), + history.value + ]); + }); + }); + + res.set({ + 'Content-Type': 'text/csv', + 'Content-disposition': 'attachment; filename=habitica-tasks-history.csv', + }); + + csvStringify(output, (err, csv) => { + if (err) return next(err); + res.status(200).send(csv); + }); +}; + +var userdata = function(user) { + if(user.auth && user.auth.local) { + delete user.auth.local.salt; + delete user.auth.local.hashed_password; + } + return user; +} + +dataexport.leanuser = function(req, res, next) { + User.findOne({_id: res.locals.user._id}).lean().exec(function(err, user) { + if (err) return res.status(500).json({err: err}); + if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); + res.locals.user = user; + return next(); + }); +}; + +dataexport.userdata = { + xml: function(req, res) { + var user = userdata(res.locals.user); + return res.xml({data: JSON.stringify(user), rootname: 'user'}); + }, + json: function(req, res) { + var user = userdata(res.locals.user); + return res.jsonstring(user); + } +} + +/* + ------------------------------------------------------------------------ + Express Extensions (should be refactored into a module) + ------------------------------------------------------------------------ +*/ + +var expressres = express.response || http.ServerResponse.prototype; + +expressres.xml = function(obj, headers, status) { + var body = ''; + this.charset = this.charset || 'utf-8'; + this.header('Content-Type', 'text/xml'); + this.header('Content-Disposition', 'attachment'); + body = pd.xml(js2xmlparser(obj.rootname,obj.data)); + return this.send(body, headers, status); +}; + +expressres.jsonstring = function(obj, headers, status) { + var body = ''; + this.charset = this.charset || 'utf-8'; + this.header('Content-Type', 'application/json'); + this.header('Content-Disposition', 'attachment'); + body = pd.json(JSON.stringify(obj)); + return this.send(body, headers, status); +}; + +/* + ------------------------------------------------------------------------ + Static page and image screenshot of avatar + ------------------------------------------------------------------------ + */ + + +dataexport.avatarPage = function(req, res) { + User.findById(req.params.uuid).select('stats profile items achievements preferences backer contributor').exec(function(err, user){ + res.render('avatar-static', { + title: user.profile.name, + env: _.defaults({user:user}, res.locals.habitrpg) + }); + }) +}; + +dataexport.avatarImage = function(req, res, next) { + var filename = 'avatars/'+req.params.uuid+'.png'; + request.head('https://'+bucket+'.s3.amazonaws.com/'+filename, function(err,response,body) { + // cache images for 10 minutes on aws, else upload a new one + if (response.statusCode==200 && moment().diff(response.headers['last-modified'], 'minutes') < 10) + return res.redirect(301, 'https://' + bucket + '.s3.amazonaws.com/' + filename); + new Pageres()//{delay:1} + .src(nconf.get('BASE_URL') + '/export/avatar-' + req.params.uuid + '.html', ['140x147'], {crop: true, filename: filename.replace('.png', '')}) + .run() + .then(function (file) { + var upload = s3Stream.upload({ + Bucket: bucket, + Key: filename, + ACL: "public-read", + StorageClass: "REDUCED_REDUNDANCY", + ContentType: "image/png", + Expires: +moment().add({minutes: 3}) + }); + upload.on('error', function (err) { + next(err); + }); + upload.on('uploaded', function (details) { + res.redirect(details.Location); + }); + file[0].pipe(upload); + }).catch(next); + }) +}; diff --git a/website/server/controllers/api-v2/groups.js b/website/server/controllers/api-v2/groups.js new file mode 100644 index 0000000000..31a21d7dc9 --- /dev/null +++ b/website/server/controllers/api-v2/groups.js @@ -0,0 +1,1227 @@ +'use strict'; +// @see ../routes for routing + +function clone(a) { + return JSON.parse(JSON.stringify(a)); +} + +var _ = require('lodash'); +var nconf = require('nconf'); +var async = require('async'); +var Bluebird = require('bluebird'); +var utils = require('./../../libs/api-v2/utils'); +var shared = require('../../../../common'); + +import { removeFromArray } from '../../libs/api-v3/collectionManipulators'; + +import { + model as User, +} from './../../models/user'; +import { + model as Group, + TAVERN_ID, +} from './../../models/group'; +import { + model as Challenge, +} from './../../models/challenge'; +import { + model as EmailUnsubscription, +} from './../../models/emailUnsubscription'; + +var isProd = nconf.get('NODE_ENV') === 'production'; +var api = module.exports; +var pushNotify = require('./pushNotifications'); +var analytics = utils.analytics; +var firebase = require('../../libs/api-v2/firebase'); + +/* + ------------------------------------------------------------------------ + Groups + ------------------------------------------------------------------------ +*/ + +var partyFields = api.partyFields = 'profile preferences stats achievements party backer contributor auth.timestamps items'; +var nameFields = 'profile.name'; +var challengeFields = '_id name'; +var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} }; +const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map(email => {return {email, canSend: true}}); + +/** + * For parties, we want a lot of member details so we can show their avatars in the header. For guilds, we want very + * limited fields - and only a sampling of the members, beacuse they can be in the thousands + * @param type: 'party' or otherwise + * @param q: the Mongoose query we're building up + * @param additionalFields: if we want to populate some additional field not fetched normally + * pass it as a string, parties only + */ +var populateQuery = function(type, q, additionalFields){ + if (type == 'party') + q.populate('members', partyFields + (additionalFields ? (' ' + additionalFields) : '')); + else + q.populate(guildPopulate); + q.populate('leader', nameFields); + q.populate('invites', nameFields); + q.populate({ + path: 'challenges', + match: (type=='habitrpg') ? {_id:{$ne:'95533e05-1ff9-4e46-970b-d77219f199e9'}} : undefined, // remove the Spread the Word Challenge for now, will revisit when we fix the closing-challenge bug + select: challengeFields, + options: {sort: {official: -1, timestamp: -1}} + }); + return q; +} + +/** + * Fetch groups list. This no longer returns party or tavern, as those can be requested indivdually + * as /groups/party or /groups/tavern + */ +api.list = function(req, res, next) { + var user = res.locals.user; + var groupFields = 'name description memberCount balance leader'; + var sort = '-memberCount'; + var type = req.query.type || 'party,guilds,public,tavern'; + + async.parallel({ + + // unecessary given our ui-router setup + party: function(cb){ + if (!~type.indexOf('party')) return cb(null, {}); + Group.findOne({_id: user.party._id, type: 'party'}) + .select(groupFields).exec(function(err, party){ + if (err) return cb(err); + if (!party) return cb(null, []); + party.getTransformedData({cb: function (err, transformedParty) { + if (err) return cb(err); + cb(null, (transformedParty === null ? [] : [transformedParty])); // return as an array for consistent ngResource use + }}); + }); + }, + + guilds: function(cb) { + if (!~type.indexOf('guilds')) return cb(null, []); + Group.find({_id: {'$in': user.guilds}, type:'guild'}) + .select(groupFields).sort(sort).exec(function (err, guilds) { + if (err) return cb(err); + async.map(guilds, function (guild, cb1) { + guild.getTransformedData({cb: cb1}) + }, function(err, guildsTransormed) { + cb(err, guildsTransormed); + }); + }); + }, + + 'public': function(cb) { + if (!~type.indexOf('public')) return cb(null, []); + Group.find({privacy: 'public'}) + .select(groupFields) + .sort(sort) + .lean() + .exec(function(err, groups){ + if (err) return cb(err); + _.each(groups, function(g){ + // To save some client-side performance, don't send down the full members arr, just send down temp var _isMember + if (user.guilds.indexOf(g._id) !== -1) g._isMember = true; + }); + cb(null, groups); + }); + }, + + // unecessary given our ui-router setup + tavern: function(cb) { + if (!~type.indexOf('tavern')) return cb(null, {}); + Group.findById(TAVERN_ID).select(groupFields).exec(function(err, tavern){ + if (err) return cb(err); + tavern.getTransformedData({cb: function (err, transformedTavern) { + if (err) return cb(err); + cb(null, ([transformedTavern])); // return as an array for consistent ngResource use + }}); + }); + } + + }, function(err, results){ + if (err) return next(err); + // ngResource expects everything as arrays. We used to send it down as a structured object: {public:[], party:{}, guilds:[], tavern:{}} + // but unfortunately ngResource top-level attrs are considered the ngModels in the list, so we had to do weird stuff and multiple + // requests to get it to work properly. Instead, we're not depending on the client to do filtering / organization, and we're + // just sending down a merged array. Revisit + var arr = _.reduce(results, function(m,v){ + if (_.isEmpty(v)) return m; + return m.concat(_.isArray(v) ? v : [v]); + }, []) + res.json(arr); + + user = groupFields = sort = type = null; + }) +}; + +/** + * Get group + * TODO: implement requesting fields ?fields=chat,members + */ +api.get = function(req, res, next) { + var user = res.locals.user; + var gid = req.params.gid; + let isUserGuild = user.guilds.indexOf(gid) !== -1; + + var q; + + if (gid === 'party' || gid === user.party._id) { + q = Group.findOne({_id: user.party._id, type: 'party'}) + } else { + + if (isUserGuild) { + q = Group.findOne({type: 'guild', _id: gid}); + } else if (gid === 'habitrpg') { + q = Group.findOne({_id: TAVERN_ID}); + } else { + q = Group.findOne({type: 'guild', privacy: 'public', _id: gid}); + } + } + + q.populate('leader', nameFields); + + //populateQuery(gid, q); + q.exec(function(err, group){ + if (err) return next(err); + if(!group){ + if(gid !== 'party') return res.status(404).json({err: shared.i18n.t('messageGroupNotFound')}); + + // Don't send a 404 when querying for a party even if it doesn't exist + // so that users with no party don't get a 404 on every access to the site + return res.json(group); + } + + group.getTransformedData({ + cb: function (err, transformedGroup) { + if (err) return next(err); + + if (!user.contributor.admin) { + _purgeFlagInfoFromChat(transformedGroup, user); + } + + //Since we have a limit on how many members are populate to the group, we want to make sure the user is always in the group + var userInGroup = _.find(transformedGroup.members, function(member){ return member._id == user._id; }); + if ((gid === 'party' || isUserGuild) && !userInGroup) { + transformedGroup.members.splice(0,1); + transformedGroup.members.push(user); + } + + res.json(transformedGroup); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + populateInvites: nameFields, + populateChallenges: challengeFields, + }); + }); +}; + + +api.create = function(req, res, next) { + var group = new Group(req.body); + var user = res.locals.user; + //group.members = [user._id]; + group.leader = user._id; + if (!group.name) group.name = 'group name'; + + if(group.type === 'guild'){ + user.guilds.push(group._id); + if(user.balance < 1) return res.status(401).json({err: shared.i18n.t('messageInsufficientGems')}); + + group.balance = 1; + user.balance--; + + async.waterfall([ + function(cb){user.save(cb)}, + function(saved,ct,cb){group.save(cb)}, + function(saved,ct,cb){ + firebase.updateGroupData(saved); + firebase.addUserToGroup(saved._id, user._id); + saved.getTransformedData({ + populateMembers: nameFields, + cb, + }) + } + ],function(err,groupTransformed){ + if (err) return next(err); + res.json(groupTransformed); + group = user = null; + }); + + } else{ + if (user.party._id) return res.status(400).json({err:shared.i18n.t('messageGroupAlreadyInParty')}); + user.party._id = group._id; + user.save(function (err) { + if (err) return next(err); + group.save(function(err, saved) { + if (err) return next(err); + saved.getTransformedData({ + populateMembers: nameFields, + cb (err, groupTransformed) { + res.json(groupTransformed); + }, + }); + }); + }) + } +} + +api.update = function(req, res, next) { + var group = res.locals.group; + var user = res.locals.user; + + if(group.leader !== user._id) + return res.status(401).json({err: shared.i18n.t('messageGroupOnlyLeaderCanUpdate')}); + + 'name description logo logo leaderMessage leader leaderOnly'.split(' ').forEach(function(attr){ + if (req.body[attr]) group[attr] = req.body[attr]; + }); + + group.save(function(err, saved){ + if (err) return next(err); + + firebase.updateGroupData(saved); + res.sendStatus(204); + }); +} + +// TODO remove from api object? +api.attachGroup = function(req, res, next) { + var user = res.locals.user; + var gid = req.params.gid === 'party' ? user.party._id : req.params.gid; + if (gid === 'habitrpg') gid = TAVERN_ID; + + let q = Group.findOne({_id: gid}) + + q.exec(function(err, group){ + if(err) return next(err); + if(!group) return res.status(404).json({err: shared.i18n.t('messageGroupNotFound')}); + + if (!user.contributor.admin) { + _purgeFlagInfoFromChat(group, user); + } + + res.locals.group = group; + next(); + }); +} + +api.getChat = function(req, res, next) { + // TODO: This code is duplicated from api.get - pull it out into a function to remove duplication. + var user = res.locals.user; + var gid = req.params.gid; + + var q; + let isUserGuild = user.guilds.indexOf(gid) !== -1; + + if (gid === 'party' || gid === user.party._id) { + q = Group.findOne({_id: user.party._id, type: 'party'}) + } else { + if (isUserGuild) { + q = Group.findOne({type: 'guild', _id: gid}); + } else if (gid === 'habitrpg') { + q = Group.findOne({_id: TAVERN_ID}); + } else { + q = Group.findOne({type: 'guild', privacy: 'public', _id: gid}); + } + } + + q.exec(function(err, group){ + if (err) return next(err); + if (!group && gid!=='party') return res.status(404).json({err: shared.i18n.t('messageGroupNotFound')}); + + res.json(res.locals.group.chat); + gid = null; + }); +}; + +/** + * TODO make this it's own ngResource so we don't have to send down group data with each chat post + */ +api.postChat = function(req, res, next) { + if(!req.query.message) { + return res.status(400).json({err: shared.i18n.t('messageGroupChatBlankMessage')}); + } else { + var user = res.locals.user + var group = res.locals.group; + if (group.type!='party' && user.flags.chatRevoked) return res.status(401).json({err:'Your chat privileges have been revoked.'}); + var lastClientMsg = req.query.previousMsg; + var chatUpdated = (lastClientMsg && group.chat && group.chat[0] && group.chat[0].id !== lastClientMsg) ? true : false; + + group.sendChat(req.query.message, user); // TODO this should be body, but ngResource is funky + + if (group.type === 'party') { + user.party.lastMessageSeen = group.chat[0].id; + user.save(); + } + + group.save(function(err, saved){ + if (err) return next(err); + chatUpdated ? res.json({chat: group.chat}) : res.json({message: saved.chat[0]}); + group = chatUpdated = null; + }); + } +} + +api.deleteChatMessage = function(req, res, next){ + var user = res.locals.user + var group = res.locals.group; + var message = _.find(group.chat, {id: req.params.messageId}); + + if(!message) return res.status(404).json({err: "Message not found!"}); + + if(user._id !== message.uuid && !(user.backer && user.contributor.admin)) + return res.status(401).json({err: "Not authorized to delete this message!"}) + + var lastClientMsg = req.query.previousMsg; + var chatUpdated = (lastClientMsg && group.chat && group.chat[0] && group.chat[0].id !== lastClientMsg) ? true : false; + + Group.update({_id:group._id}, {$pull:{chat:{id: req.params.messageId}}}, function(err){ + if(err) return next(err); + chatUpdated ? res.json({chat: group.chat}) : res.sendStatus(204); + group = chatUpdated = null; + }); +} + +api.flagChatMessage = function(req, res, next){ + var user = res.locals.user + var group = res.locals.group; + var message = _.find(group.chat, {id: req.params.mid}); + + if(!message) return res.status(404).json({err: shared.i18n.t('messageGroupChatNotFound')}); + if(message.uuid == user._id) return res.status(401).json({err: shared.i18n.t('messageGroupChatFlagOwnMessage')}); + + User.findOne({_id: message.uuid}, {auth: 1}, function(err, author){ + if(err) return next(err); + + // Log user ids that have flagged the message + if(!message.flags) message.flags = {}; + if(message.flags[user._id] && !user.contributor.admin) return res.status(401).json({err: shared.i18n.t('messageGroupChatFlagAlreadyReported')}); + message.flags[user._id] = true; + + // Log total number of flags (publicly viewable) + if(!message.flagCount) message.flagCount = 0; + if(user.contributor.admin){ + // Arbitraty amount, higher than 2 + message.flagCount = 5; + } else { + message.flagCount++ + } + + Group.update({_id: group._id, 'chat.id': message.id}, {'$set': { + 'chat.$.flags': message.flags, + 'chat.$.flagCount': message.flagCount, + }}, function(err) { + if (err) return next(err); + + utils.txnEmail(FLAG_REPORT_EMAILS, 'flag-report-to-mods', [ + {name: "MESSAGE_TIME", content: (new Date(message.timestamp)).toString()}, + {name: "MESSAGE_TEXT", content: message.text}, + + {name: "REPORTER_USERNAME", content: user.profile.name}, + {name: "REPORTER_UUID", content: user._id}, + {name: "REPORTER_EMAIL", content: user.auth.local ? user.auth.local.email : ((user.auth.facebook && user.auth.facebook.emails && user.auth.facebook.emails[0]) ? user.auth.facebook.emails[0].value : null)}, + {name: "REPORTER_MODAL_URL", content: "/static/front/#?memberId=" + user._id}, + + {name: "AUTHOR_USERNAME", content: message.user}, + {name: "AUTHOR_UUID", content: message.uuid}, + {name: "AUTHOR_EMAIL", content: author.auth.local ? author.auth.local.email : ((author.auth.facebook && author.auth.facebook.emails && author.auth.facebook.emails[0]) ? author.auth.facebook.emails[0].value : null)}, + {name: "AUTHOR_MODAL_URL", content: "/static/front/#?memberId=" + message.uuid}, + + {name: "GROUP_NAME", content: group.name}, + {name: "GROUP_TYPE", content: group.type}, + {name: "GROUP_ID", content: group._id}, + {name: "GROUP_URL", content: group._id == TAVERN_ID ? '/#/options/groups/tavern' : (group.type === 'guild' ? ('/#/options/groups/guilds/' + group._id) : 'party')}, + ]); + + return res.sendStatus(204); + }); + }); +} + +api.clearFlagCount = function(req, res, next){ + var user = res.locals.user + var group = res.locals.group; + var message = _.find(group.chat, {id: req.params.mid}); + + if(!message) return res.status(404).json({err: shared.i18n.t('messageGroupChatNotFound')}); + + if(user.contributor.admin){ + message.flagCount = 0; + + Group.update({_id: group._id, 'chat.id': message.id}, {'$set': { + 'chat.$.flagCount': message.flagCount, + }}, function(err) { + if(err) return next(err); + return res.sendStatus(204); + }); + } else { + return res.status(401).json({err: shared.i18n.t('messageGroupChatAdminClearFlagCount')}) + } +} + +api.seenMessage = function(req,res,next){ + // Skip the auth step, we want this to be fast. If !found with uuid/token, then it just doesn't save + // Check for req.params.gid to exist + if(req.params.gid){ + var update = {$unset:{}}; + update['$unset']['newMessages.'+req.params.gid] = ''; + User.update({_id:req.headers['x-api-user'], apiToken:req.headers['x-api-key']},update).exec(); + } + res.sendStatus(200); +} + +api.likeChatMessage = function(req, res, next) { + var user = res.locals.user; + var group = res.locals.group; + var message = _.find(group.chat, {id: req.params.mid}); + + if (!message) return res.status(404).json({err: shared.i18n.t('messageGroupChatNotFound')}); + if (message.uuid == user._id) return res.status(401).json({err: shared.i18n.t('messageGroupChatLikeOwnMessage')}); + if (!message.likes) message.likes = {}; + if (message.likes[user._id]) { + delete message.likes[user._id]; + } else { + message.likes[user._id] = true; + } + + Group.update({_id: group._id, 'chat.id': message.id}, {'$set': { + 'chat.$.likes': message.likes + }}, function(err) { + if (err) return next(err); + return res.send(group.chat); + }); +} + +api.join = function(req, res, next) { + var user = res.locals.user, + group = res.locals.group, + isUserInvited = false; + + if (group.type == 'party' && group._id == (user.invitations && user.invitations.party && user.invitations.party.id)) { + User.update({_id:user.invitations.party.inviter}, {$inc:{'items.quests.basilist':1}}).exec(); // Reward inviter + user.invitations.party = {}; // Clear invite + user.markModified('invitations.party'); + user.party._id = group._id; + user.save(); + // invite new user to pending quest + if (group.quest.key && !group.quest.active) { + User.update({_id:user._id},{$set: {'party.quest.RSVPNeeded': true, 'party.quest.key': group.quest.key}}).exec(); + group.quest.members[user._id] = undefined; + group.markModified('quest.members'); + } + isUserInvited = true; + } else if (group.type == 'guild') { + var i = _.findIndex(user.invitations.guilds, {id:group._id}); + if (~i){ + isUserInvited = true; + user.invitations.guilds.splice(i,1); + user.guilds.push(group._id); + user.save(); + }else{ + isUserInvited = group.privacy === 'private' ? false : true; + if (isUserInvited) { + user.guilds.push(group._id); + user.save(); + } + } + } + + if(!isUserInvited) return res.status(401).json({err: shared.i18n.t('messageGroupRequiresInvite')}); + + if (group.memberCount === 0) { + group.leader = user._id; + } + + /*if (!_.contains(group.members, user._id)){ + if (group.members.length === 0) { + group.leader = user._id; + } + + group.members.push(user._id); + + if (group.invites.length > 0) { + group.invites.splice(_.indexOf(group.invites, user._id), 1); + } + }*/ + + async.series([ + function(cb){ + group.save(cb); + }, + function(cb){ + firebase.addUserToGroup(group._id, user._id); + group.getTransformedData({ + cb, + populateMembers: group.type === 'party' ? partyFields : nameFields, + populateInvites: nameFields, + populateChallenges: challengeFields, + }) + } + ], function(err, results){ + if (err) return next(err); + // Return the group? Or not? + res.json(results[1]); + group = null; + }); +} + +api.leave = function(req, res, next) { + var user = res.locals.user; + var group = res.locals.group; + + if (group.type === 'party') { + if (group.quest && group.quest.leader === user._id) { + return res.json(403, 'You cannot leave your party when you have started a quest. Abort the quest first.'); + } + + if (group.quest && group.quest.active && group.quest.members && group.quest.members[user._id]) { + return res.json(403, 'You cannot leave party during an active quest. Please leave the quest first.'); + } + } + + // When removing the user from challenges, should we keep the tasks? + var keep = (/^remove-all/i).test(req.query.keep) ? 'remove-all' : 'keep-all'; + + group.leave(user, keep) + .then(() => res.sendStatus(204)) + .catch(next); +}; + +var inviteByUUIDs = function(uuids, group, req, res, next){ + async.each(uuids, function(uuid, cb){ + User.findById(uuid, function(err,invite){ + if (err) return cb(err); + if (!invite) + return cb({code:400,err:'User with id "' + uuid + '" not found'}); + if (group.type == 'guild') { + if (_.contains(invite.guilds, group._id)) + return cb({code:400, err: "User already in that group"}); + if (invite.invitations && invite.invitations.guilds && _.find(invite.invitations.guilds, {id:group._id})) + return cb({code:400, err:"User already invited to that group"}); + sendInvite(); + } else if (group.type == 'party') { + if (invite.invitations && !_.isEmpty(invite.invitations.party)) + return cb({code: 400,err:"User already pending invitation."}); + if (invite.party && invite.party._id) { + return cb({code: 400, err: "User already in a party."}) + } + sendInvite(); + } + + function sendInvite (){ + if(group.type === 'guild'){ + invite.invitations.guilds.push({id: group._id, name: group.name, inviter:res.locals.user._id}); + + pushNotify.sendNotify(invite, shared.i18n.t('invitedGuild'), group.name); + }else{ + //req.body.type in 'guild', 'party' + invite.invitations.party = {id: group._id, name: group.name, inviter:res.locals.user._id}; + + pushNotify.sendNotify(invite, shared.i18n.t('invitedParty'), group.name); + } + + //group.invites.push(invite._id); + + async.series([ + function(cb){ + invite.save(cb); + } + ], function(err, results){ + if (err) return cb(err); + + if(invite.preferences.emailNotifications['invited' + (group.type == 'guild' ? 'Guild' : 'Party')] !== false){ + var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); + var emailVars = [ + {name: 'INVITER', content: inviterVars.name} + ]; + + if(group.type == 'guild'){ + emailVars.push( + {name: 'GUILD_NAME', content: group.name}, + {name: 'GUILD_URL', content: '/#/options/groups/guilds/public'} + ); + }else{ + emailVars.push( + {name: 'PARTY_NAME', content: group.name}, + {name: 'PARTY_URL', content: '/#/options/groups/party'} + ) + } + + utils.txnEmail(invite, ('invited-' + (group.type == 'guild' ? 'guild' : 'party')), emailVars); + } + + cb(); + }); + } + }); + }, function(err){ + if(err) return err.code ? res.status(err.code).json({err: err.err}) : next(err); + + async.series([ + function(cb) { + group.save(cb); + }, + function(cb) { + // TODO pass group from save above don't find it again, or you have to find it again in order to run populate? + Group.findById(group._id).populate('leader', nameFields).exec(function (err, savedGroup) { + if (err) return next(err); + savedGroup.getTransformedData({ + cb: function (err, transformedGroup) { + if (err) return next(err); + res.json(transformedGroup); + }, + populateMembers: savedGroup.type === 'party' ? partyFields : nameFields, + populateInvites: nameFields, + populateChallenges: challengeFields, + }) + }); + } + ]); + }); +}; + +var inviteByEmails = function(invites, group, req, res, next){ + var usersAlreadyRegistered = []; + + async.each(invites, function(invite, cb){ + if (invite.email) { + User.findOne({$or: [ + {'auth.local.email': invite.email}, + {'auth.facebook.emails.value': invite.email} + ]}).select({_id: true, 'preferences.emailNotifications': true}) + .exec(function(err, userToContact){ + if(err) return next(err); + + if(userToContact){ + usersAlreadyRegistered.push(userToContact._id); + return cb(); + } + + // yeah, it supports guild too but for backward compatibility we'll use partyInvite as query + + var link = '?partyInvite='+ utils.encrypt(JSON.stringify({id:group._id, inviter:res.locals.user._id, name:group.name})); + + var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); + var variables = [ + {name: 'LINK', content: link}, + {name: 'INVITER', content: req.body.inviter || inviterVars.name} + ]; + + if(group.type == 'guild'){ + variables.push({name: 'GUILD_NAME', content: group.name}); + } + + // TODO implement "users can only be invited once" + // Check for the email address not to be unsubscribed + EmailUnsubscription.findOne({email: invite.email}, function(err, unsubscribed){ + if(err) return cb(err); + if(unsubscribed) return cb(); + + utils.txnEmail(invite, ('invite-friend' + (group.type == 'guild' ? '-guild' : '')), variables); + + cb(); + }); + }); + }else{ + cb(); + } + }, function(err){ + if(err) return err.code ? res.status(err.code).json({err: err.err}) : next(err); + + if (usersAlreadyRegistered.length > 0){ + inviteByUUIDs(usersAlreadyRegistered, group, req, res, next); + } else{ + + // Send only status code down the line because it doesn't need + // info on invited users since they are not yet registered + res.status(200).json({}); + } + }); +}; + +api.invite = function(req, res, next){ + var group = res.locals.group; + let userParty = res.locals.user.party && res.locals.user.party._id; + let userGuilds = res.locals.user.guilds; + + if (group.type === 'party' && userParty !== group._id) { + return res.status(401).json({err: "Only a member can invite new members!"}); + } + + if (group.type === 'guild' && group.privacy === 'private' && !_.contains(userGuilds, group._id)) { + return res.status(401).json({err: "Only a member can invite new members!"}); + } + + if (req.body.uuids) { + inviteByUUIDs(req.body.uuids, group, req, res, next); + } else if (req.body.emails) { + inviteByEmails(req.body.emails, group, req, res, next) + } else { + return res.status(400).json({err: "Can only invite by email or uuid"}); + } +} + +api.removeMember = function(req, res, next){ + var group = res.locals.group; + var uuid = req.query.uuid; + var message = req.query.message; + var user = res.locals.user; + + // Send an email to the removed user with an optional message from the leader + var sendMessage = function(removedUser){ + if(removedUser.preferences.emailNotifications.kickedGroup !== false){ + utils.txnEmail(removedUser, ('kicked-from-' + group.type), [ + {name: 'GROUP_NAME', content: group.name}, + {name: 'MESSAGE', content: message}, + {name: 'GUILDS_LINK', content: '/#/options/groups/guilds/public'}, + {name: 'PARTY_WANTED_GUILD', content: '/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'} + ]); + } + } + + if(group.leader !== user._id){ + return res.status(401).json({err: "Only group leader can remove a member!"}); + } + + if(user._id === uuid){ + return res.status(401).json({err: "You cannot remove yourself!"}); + } + + User.findById(uuid, function(err, removedUser){ + if (err) return next(err); + let isMember = group._id === removedUser.party._id || _.contains(removedUser.guilds, group._id); + let isInvited = group._id === removedUser.invitations.party._id || !!_.find(removedUser.invitations.guilds, {id: group._id}); + + if(isMember){ + var update = {}; + if (group.quest && group.quest.leader === uuid) { + update['$set'] = { + quest: { key: null, leader: null } + }; + } else if(group.quest && group.quest.members){ + // remove member from quest + update['$unset'] = {}; + update['$unset']['quest.members.' + uuid] = ""; + } + update['$inc'] = {memberCount: -1}; + Group.update({_id:group._id},update, function(err, saved){ + if (err) return next(err); + + sendMessage(removedUser); + + //Mark removed users messages as seen + var update = {$unset:{}}; + if (group.type === 'guild') { + update.$pull = {guilds: group._id}; + } else { + update.$unset.party = true; + } + update.$unset['newMessages.' + group._id] = ''; + if (group.quest && group.quest.active && group.quest.leader === uuid) { + update['$inc'] = {}; + update['$inc']['items.quests.' + group.quest.key] = 1; + } + User.update({_id: removedUser._id, apiToken: removedUser.apiToken}, update).exec(); + + // Sending an empty 204 because Group.update doesn't return the group + // see http://mongoosejs.com/docs/api.html#model_Model.update + group = uuid = null; + return res.sendStatus(204); + }); + }else if(isInvited){ + var invitations = removedUser.invitations; + if(group.type === 'guild'){ + invitations.guilds.splice(_.indexOf(invitations.guilds, group._id), 1); + }else{ + invitations.party = undefined; + } + + async.series([ + function(cb){ + removedUser.save(cb); + }, + ], function(err, results){ + if (err) return next(err); + + // Sending an empty 204 because Group.update doesn't return the group + // see http://mongoosejs.com/docs/api.html#model_Model.update + sendMessage(removedUser); + group = uuid = null; + return res.sendStatus(204); + }); + }else{ + group = uuid = null; + return res.status(400).json({err: "User not found among group's members!"}); + } + }); +} + +// ------------------------------------ +// Quests +// ------------------------------------ +function canStartQuestAutomatically (group) { + // If all members are either true (accepted) or false (rejected) return true + // If any member is null/undefined (undecided) return false + return _.every(group.quest.members, _.isBoolean); +} + +function questStart(req, res, next) { + var group = res.locals.group; + var force = req.query.force; + + // if (group.quest.active) return res.status(400).json({err:'Quest already began.'}); + // temporarily send error email, until we know more about this issue (then remove below, uncomment above). + if (group.quest.active) return next('Quest already began.'); + + group.markModified('quest'); + + // Not ready yet, wait till everyone's accepted, rejected, or we force-start + var statuses = _.values(group.quest.members); + if (!force && (~statuses.indexOf(undefined) || ~statuses.indexOf(null))) { + return group.save(function(err,saved){ + if (err) return next(err); + res.json(saved); + }) + } + + var parallel = [], + questMembers = {}, + key = group.quest.key, + quest = shared.content.quests[key], + collected = quest.collect ? _.transform(quest.collect, function(m,v,k){m[k]=0}) : {}; + + _.each(group.members, function(m){ + var updates = {$set:{},$inc:{'_v':1}}; + if (m == group.quest.leader) + updates['$inc']['items.quests.'+key] = -1; + if (group.quest.members[m] == true) { + // See https://github.com/HabitRPG/habitrpg/issues/2168#issuecomment-31556322 , we need to *not* reset party.quest.progress.up + //updates['$set']['party.quest'] = Group.cleanQuestProgress({key:key,progress:{collect:collected}}); + updates['$set']['party.quest.key'] = key; + updates['$set']['party.quest.progress.down'] = 0; + updates['$set']['party.quest.progress.collect'] = collected; + updates['$set']['party.quest.completed'] = null; + questMembers[m] = true; + + User.findOne({_id: m}, {pushDevices: 1}, function(err, user){ + pushNotify.sendNotify(user, "HabitRPG", shared.i18n.t('questStarted') + ": "+ quest.text() ); + }); + } else { + updates['$set']['party.quest'] = Group.cleanQuestProgress(); + } + + parallel.push(function(cb2){ + User.update({_id:m},updates,cb2); + }); + }); + + group.quest.active = true; + if (quest.boss) { + group.quest.progress.hp = quest.boss.hp; + if (quest.boss.rage) group.quest.progress.rage = 0; + } else { + group.quest.progress.collect = collected; + } + group.quest.members = questMembers; + group.markModified('quest'); // members & progress.collect are both Mixed types + parallel.push(function(cb2){group.save(cb2)}); + + parallel.push(function(cb){ + // Fetch user.auth to send email, then remove it from data sent to the client + populateQuery(group.type, Group.findById(group._id), 'auth.facebook auth.local').exec(cb); + }); + + async.parallel(parallel,function(err, results){ + if (err) return next(err); + + var lastIndex = results.length -1; + var groupClone = clone(group); + + groupClone.members = results[lastIndex].members; + + // Send quest started email + var usersToEmail = groupClone.members.filter(function(user){ + return ( + user.preferences.emailNotifications.questStarted !== false && + user._id !== res.locals.user._id && + group.quest.members[user._id] == true + ) + }); + + utils.txnEmail(usersToEmail, 'quest-started', [ + {name: 'PARTY_URL', content: '/#/options/groups/party'} + ]); + + _.each(groupClone.members, function(user){ + // Remove sensitive data from what is sent to the public + // but after having sent emails as they are needed + user.auth.facebook = undefined; + user.auth.local = undefined; + }); + + group = null; + + return res.json(groupClone); + }); +} + +api.questAccept = function(req, res, next) { + var group = res.locals.group; + var user = res.locals.user; + var key = req.query.key; + + if (!group || group.type !== 'party') return res.status(400).json({err: "Must be in a party to start quests."}); + + // If ?key=xxx is provided, we're starting a new quest and inviting the party. Otherwise, we're a party member accepting the invitation + if (key) { + var quest = shared.content.quests[key]; + if (!quest) return res.status(404).json({err:'Quest ' + key + ' not found'}); + if (quest.lvl && user.stats.lvl < quest.lvl) return res.status(400).json({err: "You must be level "+quest.lvl+" to begin this quest."}); + if (group.quest.key) return res.status(400).json({err: 'Your party is already on a quest. Try again when the current quest has ended.'}); + if (!user.items.quests[key]) return res.status(400).json({err: "You don't own that quest scroll"}); + + let members; + + User.find({ + 'party._id': group._id, + _id: {$ne: user._id}, + }).select('auth.facebook auth.local preferences.emailNotifications profile.name pushDevices') + .exec().then(membersF => { + members = membersF; + + group.markModified('quest'); + group.quest.key = key; + group.quest.leader = user._id; + group.quest.members = {}; + group.quest.members[user._id] = true; + + user.party.quest.RSVPNeeded = false; + user.party.quest.key = key; + + return User.update({ + 'party._id': group._id, + _id: {$ne: user._id}, + }, { + $set: { + 'party.quest.RSVPNeeded': true, + 'party.quest.key': key, + }, + }, {multi: true}).exec(); + }).then(() => { + _.each(members, (member) => { + group.quest.members[member._id] = null; + }); + + if (canStartQuestAutomatically(group)) { + group.startQuest(user).then(() => { + return Bluebird.all([group.save(), user.save()]) + }) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); + + } else { + Bluebird.all([group.save(), user.save()]) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); + } + }).catch(next); + + // Party member accepting the invitation + } else { + group.markModified('quest'); + group.quest.members[user._id] = true; + user.party.quest.RSVPNeeded = false; + + if (canStartQuestAutomatically(group)) { + group.startQuest(user).then(() => { + return Bluebird.all([group.save(), user.save()]) + }) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); + + } else { + Bluebird.all([group.save(), user.save()]) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); + } + } +} + +api.questReject = function(req, res, next) { + var group = res.locals.group; + var user = res.locals.user; + + group.quest.members[user._id] = false; + group.markModified('quest.members'); + + user.party.quest = Group.cleanQuestProgress(); + user.markModified('party.quest'); + + if (canStartQuestAutomatically(group)) { + group.startQuest(user).then(() => { + return Bluebird.all([group.save(), user.save()]) + }) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); + + } else { + Bluebird.all([group.save(), user.save()]) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); + } +} + +api.questCancel = function(req, res, next){ + var group = res.locals.group; + + group.quest = Group.cleanGroupQuest(); + group.markModified('quest'); + + Bluebird.all([ + group.save(), + User.update( + {'party._id': group._id}, + {$set: {'party.quest': Group.cleanQuestProgress()}}, + {multi: true} + ), + ]).then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }).catch(next); + + // Cancel a quest BEFORE it has begun (i.e., in the invitation stage) + // Quest scroll has not yet left quest owner's inventory so no need to return it. + // Do not wipe quest progress for members because they'll want it to be applied to the next quest that's started. +} + +api.questAbort = function(req, res, next){ + var group = res.locals.group; + + let memberUpdates = User.update({ + 'party._id': group._id, + }, { + $set: {'party.quest': Group.cleanQuestProgress()}, + $inc: {_v: 1}, // TODO update middleware + }, {multi: true}).exec(); + + let questLeaderUpdate = User.update({ + _id: group.quest.leader, + }, { + $inc: { + [`items.quests.${group.quest.key}`]: 1, // give back the quest to the quest leader + }, + }).exec(); + + group.quest = Group.cleanGroupQuest(); + group.markModified('quest'); + + Bluebird.all([group.save(), memberUpdates, questLeaderUpdate]) + .then(results => { + results[0].getTransformedData({ + cb (err, groupTransformed) { + if (err) return next(err); + res.json(groupTransformed); + }, + populateMembers: group.type === 'party' ? partyFields : nameFields, + }); + }) + .catch(next); +} + +api.questLeave = function(req, res, next) { + // Non-member leave quest while still in progress + var group = res.locals.group; + var user = res.locals.user; + + if (!(group.quest && group.quest.active)) { + return res.status(404).json({ err: 'No active quest to leave' }); + } + + if (!(group.quest.members && group.quest.members[user._id])) { + return res.status(403).json({ err: 'You are not part of the quest' }); + } + + if (group.quest.leader === user._id) { + return res.status(403).json({ err: 'Quest leader cannot leave quest' }); + } + + group.quest.members[user._id] = false; + group.markModified('quest.members'); + + user.party.quest = Group.cleanQuestProgress(); + user.markModified('party.quest'); + + var groupSavePromise = Bluebird.promisify(group.save, {context: group}); + var userSavePromise = Bluebird.promisify(user.save, {context: user}); + + Bluebird.all([groupSavePromise(), userSavePromise()]) + .done(function(values) { + return res.sendStatus(204); + }, function(error) { + return next(error); + }); +} + +function _purgeFlagInfoFromChat(group, user) { + group.chat = _.filter(group.chat, function(message) { return !message.flagCount || message.flagCount < 2; }); + _.each(group.chat, function (message) { + if (message.flags) { + var userHasFlagged = message.flags[user._id]; + message.flags = {}; + + if (userHasFlagged) message.flags[user._id] = userHasFlagged; + } + }); +} diff --git a/website/server/controllers/api-v2/hall.js b/website/server/controllers/api-v2/hall.js new file mode 100644 index 0000000000..05d3bf520c --- /dev/null +++ b/website/server/controllers/api-v2/hall.js @@ -0,0 +1,89 @@ +var _ = require('lodash'); +var nconf = require('nconf'); +var async = require('async'); +var shared = require('../../../../common'); +import { + model as User, +} from '../../models/user'; +import { + model as Group, +} from '../../models/group'; +var api = module.exports; + +api.ensureAdmin = function(req, res, next) { + var user = res.locals.user; + if (!(user.contributor && user.contributor.admin)) return res.status(401).json({err:"You don't have admin access"}); + next(); +} + +api.getHeroes = function(req,res,next) { + User.find({'contributor.level':{$gt:0}}) + .select('contributor backer balance profile.name') + .sort('-contributor.level') + .exec(function(err, users){ + if (err) return next(err); + res.json(users); + }); +} + +api.getPatrons = function(req,res,next){ + var page = req.query.page || 0, + perPage = 50; + User.find({'backer.tier':{$gt:0}}) + .select('contributor backer profile.name') + .sort('-backer.tier') + .skip(page*perPage) + .limit(perPage) + .exec(function(err, users){ + if (err) return next(err); + res.json(users); + }); +} + +api.getHero = function(req,res,next) { + User.findById(req.params.uid) + .select('contributor balance profile.name purchased items') + .select('auth.local.username auth.local.email auth.facebook auth.blocked') + .exec(function(err, user){ + if (err) return next(err) + if (!user) return res.status(400).json({err:'User not found'}); + res.json(user); + }); +} + +api.updateHero = function(req,res,next) { + async.waterfall([ + function(cb){ + User.findById(req.params.uid, cb); + }, + function(member, cb){ + if (!member) return res.status(404).json({err: "User not found"}); + member.balance = req.body.balance || 0; + var newTier = req.body.contributor.level; // tier = level in this context + var oldTier = member.contributor && member.contributor.level || 0; + if (newTier > oldTier) { + member.flags.contributor = true; + var gemsPerTier = {1:3, 2:3, 3:3, 4:4, 5:4, 6:4, 7:4, 8:0, 9:0}; // e.g., tier 5 gives 4 gems. Tier 8 = moderator. Tier 9 = staff + var tierDiff = newTier - oldTier; // can be 2+ tier increases at once + while (tierDiff) { + member.balance += gemsPerTier[newTier] / 4; // balance is in $ + tierDiff--; + newTier--; // give them gems for the next tier down if they weren't aready that tier + } + } + member.contributor = req.body.contributor; + member.purchased.ads = req.body.purchased.ads; + if (member.contributor.level >= 6) member.items.pets['Dragon-Hydra'] = 5; + if (req.body.itemPath && req.body.itemVal + && req.body.itemPath.indexOf('items.') === 0 + && User.schema.paths[req.body.itemPath]) { + shared.dotSet(member, req.body.itemPath, req.body.itemVal); // Sanitization at 5c30944 (deemed unnecessary) + } + if (_.isBoolean(req.body.auth.blocked)) member.auth.blocked = req.body.auth.blocked; + member.save(cb); + } + ], function(err, saved){ + if (err) return next(err); + res.status(204).json({}); + }) +} diff --git a/website/server/controllers/api-v2/members.js b/website/server/controllers/api-v2/members.js new file mode 100644 index 0000000000..232bb9ed73 --- /dev/null +++ b/website/server/controllers/api-v2/members.js @@ -0,0 +1,139 @@ +import { + model as groups, + chatDefaults, +} from '../../models/group'; +import { + model as User, +} from '../../models/user'; +let partyFields = require('./groups').partyFields; +var api = module.exports; +var async = require('async'); +var _ = require('lodash'); +var shared = require('../../../../common'); +var utils = require('../../libs/api-v2/utils'); +var nconf = require('nconf'); +var pushNotify = require('./pushNotifications'); + +var fetchMember = function(uuid, restrict){ + return function(cb){ + var q = User.findById(uuid); + if (restrict) q.select(partyFields); + q.exec(function(err, member){ + if (err) return cb(err); + if (!member) return cb({code:404, err: 'User not found'}); + return cb(null, member); + }) + } +} + +var sendErr = function(err, res, next){ + err.code ? res.status(err.code).json({err: err.err}) : next(err); +} + +api.getMember = function(req, res, next) { + fetchMember(req.params.uuid, true)(function(err, member){ + if (err) return sendErr(err, res, next); + res.json(member); + }) +} + +api.sendMessage = function(user, member, data){ + var msg; + if (!data.type) { + msg = data.message + } else { + msg = "`Hello " + member.profile.name + ", " + user.profile.name + " has sent you "; + if (data.type == 'gems') { + var gemAmount = data.gems.amount; + var gemLabel = gemAmount > 1 ? "gems" : "gem"; + msg += gemAmount + " " + gemLabel + "!`"; + } else { + var monthAmount = shared.content.subscriptionBlocks[data.subscription.key].months; + var monthLabel = monthAmount > 1 ? "months" : "month"; + msg += monthAmount + " " + monthLabel + " of subscription!`"; + } + msg += data.message ? data.message : ''; + } + shared.refPush(member.inbox.messages, chatDefaults(msg, user)); + member.inbox.newMessages++; + member._v++; + member.markModified('inbox.messages'); + + shared.refPush(user.inbox.messages, _.defaults({sent:true}, chatDefaults(msg, member))); + user.markModified('inbox.messages'); +} + +api.sendPrivateMessage = function(req, res, next){ + var fetchedMember; + async.waterfall([ + fetchMember(req.params.uuid), + function(member, cb) { + fetchedMember = member; + if (~member.inbox.blocks.indexOf(res.locals.user._id) // can't send message if that user blocked me + || ~res.locals.user.inbox.blocks.indexOf(member._id) // or if I blocked them + || member.inbox.optOut) { // or if they've opted out of messaging + return cb({code: 401, err: "Can't send message to this user."}); + } + api.sendMessage(res.locals.user, member, {message:req.body.message}); + async.parallel([ + function (cb2) { member.save(cb2) }, + function (cb2) { res.locals.user.save(cb2) } + ], cb); + } + ], function(err){ + if (err) return sendErr(err, res, next); + + if(fetchedMember.preferences.emailNotifications.newPM !== false){ + utils.txnEmail(fetchedMember, 'new-pm', [ + {name: 'SENDER', content: utils.getUserInfo(res.locals.user, ['name']).name}, + {name: 'PMS_INBOX_URL', content: '/#/options/groups/inbox'} + ]); + } + + res.sendStatus(200); + }) +} + +api.sendGift = function(req, res, next){ + async.waterfall([ + fetchMember(req.params.uuid), + function(member, cb) { + // Gems + switch (req.body.type) { + case "gems": + var amt = req.body.gems.amount / 4, + user = res.locals.user; + if (member.id == user.id) + return cb({code: 401, err: "Cannot send gems to yourself. Try a subscription instead."}); + if (!amt || amt <=0 || user.balance < amt) + return cb({code: 401, err: "Amount must be within 0 and your current number of gems."}); + member.balance += amt; + user.balance -= amt; + api.sendMessage(user, member, req.body); + + var byUsername = utils.getUserInfo(user, ['name']).name; + + if(member.preferences.emailNotifications.giftedGems !== false){ + utils.txnEmail(member, 'gifted-gems', [ + {name: 'GIFTER', content: byUsername}, + {name: 'X_GEMS_GIFTED', content: req.body.gems.amount} + ]); + } + + pushNotify.sendNotify(member, shared.i18n.t('giftedGems'), shared.i18n.t('giftedGemsInfo', { amount: req.body.gems.amount, name: byUsername })); + + return async.parallel([ + function (cb2) { member.save(cb2) }, + function (cb2) { user.save(cb2) } + ], cb); + case "subscription": + return cb(); + default: + return cb({code:400, err:"Body must contain a gems:{amount,fromBalance} or subscription:{months} object"}); + } + } + ], function(err) { + if (err) return sendErr(err, res, next); + res.sendStatus(200); + }); +} diff --git a/website/server/controllers/api-v2/pushNotifications.js b/website/server/controllers/api-v2/pushNotifications.js new file mode 100644 index 0000000000..860cfbf56a --- /dev/null +++ b/website/server/controllers/api-v2/pushNotifications.js @@ -0,0 +1,58 @@ +// TODO move to /api-v2 +var api = module.exports; +var _ = require('lodash'); +var nconf = require('nconf'); + +var pushNotify = require('push-notify'); + +var gcmApiKey = nconf.get("PUSH_CONFIGS:GCM_SERVER_API_KEY"); + +var gcm = gcmApiKey ? pushNotify.gcm({ + apiKey: gcmApiKey, + retries: 3 +}) : undefined; + +if(gcm){ + gcm.on('transmitted', function (result, message, registrationId) { + //console.info("transmitted", result, message, registrationId); + }); + + gcm.on('transmissionError', function (error, message, registrationId) { + //console.info("transmissionError", error, message, registrationId); + }); + gcm.on('updated', function (result, registrationId) { + //console.info("updated", result, registrationId); + }); +} + +api.sendNotify = function(user, title, msg, timeToLive){ + timeToLive = timeToLive || 15; + + // need investigation: + // https://github.com/HabitRPG/habitrpg/issues/5252 + if(!user) + return; + + _.forEach(user.pushDevices, function(pushDevice){ + switch(pushDevice.type){ + case "android": + if(gcm){ + gcm.send({ + registrationId: pushDevice.regId, + //collapseKey: 'COLLAPSE_KEY', + delayWhileIdle: true, + timeToLive: timeToLive, + data: { + title: title, + message: msg + } + }); + } + + break; + + case "ios": + break; + } + }); +}; diff --git a/website/server/controllers/api-v2/unsubscription.js b/website/server/controllers/api-v2/unsubscription.js new file mode 100644 index 0000000000..a91db19d86 --- /dev/null +++ b/website/server/controllers/api-v2/unsubscription.js @@ -0,0 +1,40 @@ +import { + model as User, +} from '../../models/user'; +import { + model as EmailUnsubscription, +} from '../../models/emailUnsubscription'; +var utils = require('../../libs/api-v2/utils'); +var i18n = require('../../../../common').i18n; + +var api = module.exports = {}; + +api.unsubscribe = function(req, res, next){ + if(!req.query.code) return res.status(500).json({err: 'Missing unsubscription code.'}); + + var data = JSON.parse(utils.decrypt(req.query.code)); + + if(data._id){ + User.update({_id: data._id}, { + $set: {'preferences.emailNotifications.unsubscribeFromAll': true} + }, {multi: false}, function(err, updateRes){ + if(err) return next(err); + if(updateRes.n !== 1) return res.json(404, {err: 'User not found'}); + + res.send('
' + i18n.t('unsubscribedSuccessfully', null, req.language) + '
' + i18n.t('unsubscribedTextUsers', null, req.language)); + }); + }else{ + EmailUnsubscription.findOne({email: data.email}, function(err, doc){ + if(err) return next(err); + var okRes = '' + i18n.t('unsubscribedSuccessfully', null, req.language) + '
' + i18n.t('unsubscribedTextOthers', null, req.language); + + if(doc) return res.send(okRes); + + EmailUnsubscription.create({email: data.email}, function(err, doc){ + if(err) return next(err); + + res.send(okRes); + }) + }); + } +}; diff --git a/website/server/controllers/api-v2/user.js b/website/server/controllers/api-v2/user.js new file mode 100644 index 0000000000..b9439de09a --- /dev/null +++ b/website/server/controllers/api-v2/user.js @@ -0,0 +1,1068 @@ +var url = require('url'); +var ipn = require('paypal-ipn'); +var _ = require('lodash'); +var validator = require('validator'); +var nconf = require('nconf'); +var asyncM = require('async'); +var shared = require('../../../../common'); +import { + model as User, +} from '../../models/user'; +import { + NotFound, +} from '../../libs/api-v3/errors'; +import { model as Tag } from '../../models/tag'; +import * as Tasks from '../../models/task'; +import Bluebird from 'bluebird'; +import {removeFromArray} from './../../libs/api-v3/collectionManipulators'; +var utils = require('./../../libs/api-v2/utils'); +var analytics = utils.analytics; +import { + basicFields as basicGroupFields, + model as Group, +} from '../../models/group'; +import { + model as Challenge, +} from '../../models/challenge'; +var moment = require('moment'); +var logging = require('./../../libs/api-v2/logging'); +var acceptablePUTPaths; +let restrictedPUTSubPaths; +import v3UserController from '../api-v3/user'; + +let i18n = shared.i18n; + +var api = module.exports; +var firebase = require('../../libs/api-v2/firebase'); +var webhook = require('../../libs/api-v2/webhook'); + +const partyMembersFields = 'profile.name stats achievements items.special'; + +// api.purchase // Shared.ops + +api.getContent = function(req, res, next) { + var language = 'en'; + + if (typeof req.query.language != 'undefined') + language = req.query.language.toString(); //|| 'en' in i18n + + var content = _.cloneDeep(shared.content); + var walk = function(obj, lang){ + _.each(obj, function(item, key, source){ + if (_.isPlainObject(item) || _.isArray(item)) return walk(item, lang); + if (_.isFunction(item) && item.i18nLangFunc) source[key] = item(lang); + }); + } + walk(content, language); + res.json(content); +} + +api.getModelPaths = function(req,res,next){ + res.json(_.reduce(User.schema.paths,function(m,v,k){ + m[k] = v.instance || 'Boolean'; + return m; + },{})); +} + +/* + ------------------------------------------------------------------------ + Tasks + ------------------------------------------------------------------------ +*/ + + +/* + Local Methods + --------------- +*/ + +var findTask = function(req, res) { + return res.locals.user.tasks[req.params.id]; +}; + +function findTaskByIdOrLegacyId (user, taskId, callback) { + asyncM.waterfall([ + function (cb) { + Tasks.Task.findOne({ + _id: taskId, + userId: user._id, + }, cb); + }, + function (task, cb) { + if (task) return cb(null, task); + + Tasks.Task.findOne({ + _legacyId: taskId, + userId: user._id, + }, cb); + }, + ], callback); +} + +/* + API Routes + --------------- +*/ + +api.score = function(req, res, next) { + var id = req.params.id, + direction = req.params.direction, + user = res.locals.user, + body = req.body || {}, + task; + + // Send error responses for improper API call + if (!id) return res.json(400, {err: ':id required'}); + if (direction !== 'up' && direction !== 'down') { + if (direction == 'unlink' || direction == 'sort') return next(); + return res.json(400, {err: ":direction must be 'up' or 'down'"}); + } + + findTaskByIdOrLegacyId(user, id, function (err, task) { + if (err) return next(err); + + // If exists already, score it + if (!task) { + // If it doesn't exist, this is likely a 3rd party up/down - create a new one, then score it + // Defaults. Other defaults are handled in user.ops.addTask() + var taskOptions = { + type: body.type || 'habit', + text: body.text || id, + userId: user._id, + notes: body.notes || "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task." // TODO translate + } + + if (validator.isUUID(id)) { + taskOptions._id = id; // TODO this might easily lead to conflicts as ids are now unique db-wide + } else { + taskOptions._legacyId = id; + } + + task = new Tasks.Task(taskOptions); + + user.tasksOrder[task.type + 's'].unshift(task._id); + } + + // Set completed if type is daily or todo + if (task.type === 'daily' || task.type === 'todo') { + task.completed = direction === 'up'; + } + + var [delta] = shared.ops.scoreTask({ + user, + task, + direction, + }, req); + // Drop system (don't run on the client, as it would only be discarded since ops are sent to the API, not the results) + if (direction === 'up') user.fns.randomDrop({task, delta}, req); + + asyncM.parallel({ + task: task.save.bind(task), + user: user.save.bind(user) + }, function(err, results){ + if(err) return next(err); + + // TODO this is suuuper strange, sometimes results.user is an array, sometimes user directly + var saved = Array.isArray(results.user) ? results.user[0] : results.user; + var task = Array.isArray(results.task) ? results.task[0] : results.task; + + var userStats = saved.toJSON().stats; + var resJsonData = _.extend({ delta: delta, _tmp: user._tmp }, userStats); + res.json(200, resJsonData); + + var webhookData = _generateWebhookTaskData( + task, direction, delta, userStats, user + ); + webhook.sendTaskWebhook(user.preferences.webhooks, webhookData); + + if ( + (!task.challenge.id || task.challenge.broken) // If it's a challenge task, sync the score. Do it in the background, we've already sent down a response and the user doesn't care what happens back there + || (task.type == 'reward') // we don't want to update the reward GP cost + ) return; + + // select name and shortName because they can be synced on syncToUser + Challenge.findById(task.challenge.id, 'name shortName', function(err, chal) { + if (err) return next(err); + if (!chal) { + task.challenge.broken = 'CHALLENGE_DELETED'; + task.save(); + return; + } + + Tasks.Task.findOne({ + '_id': task.challenge.taskId, + userId: {$exists: false} + }, function(err, chalTask){ + if(err) return; //TODO + // this task was removed from the challenge, notify user + if(!chalTask) { + // TODO finish + chal.getTasks(function(err, chalTasks){ + if(err) return; //TODO + chal.syncToUser(user, chalTasks); + }); + } else { + chalTask.value += delta; + if (chalTask.type == 'habit' || chalTask.type == 'daily') + chalTask.history.push({value: chalTask.value, date: +new Date}); + chalTask.save(); + } + }); + }); + }); + }); +}; + +/** + * Get all tasks + */ +api.getTasks = function(req, res, next) { + var user = res.locals.user; + + user.getTasks(req.query.type, function (err, tasks) { + if (err) return next(err); + res.status(200).json(tasks.map(task => task.toJSONV2())); + }); +}; + +/** + * Get Task + */ +api.getTask = function(req, res, next) { + var user = res.locals.user, + id = req.params.id; + + findTaskByIdOrLegacyId(user, id, function (err, task) { + if (err) return next(err); + if (!task) return res.status(404).json({err: shared.i18n.t('messageTaskNotFound')}); + res.status(200).json(task.toJSONV2()); + }); +}; + +/* + ------------------------------------------------------------------------ + Items + ------------------------------------------------------------------------ +*/ +// api.buy // handled in Shard.ops + +api.getBuyList = function (req, res, next) { + var list = shared.updateStore(res.locals.user); + return res.status(200).json(list); +}; + +/* + ------------------------------------------------------------------------ + User + ------------------------------------------------------------------------ +*/ + +/** + * Get User + */ +api.getUser = function(req, res, next) { + res.locals.user.getTransformedData(function(err, user){ + user.stats.toNextLevel = shared.tnl(user.stats.lvl); + user.stats.maxHealth = shared.maxHealth; + user.stats.maxMP = res.locals.user._statsComputed.maxMP; + delete user.apiToken; + if (user.auth && user.auth.local) { + delete user.auth.local.hashed_password; + delete user.auth.local.salt; + } + return res.status(200).json(user); + }); +}; + +/** + * Get anonymized User + */ +api.getUserAnonymized = function(req, res, next) { + res.locals.user.getTransformedData(function(err, user){ + user.stats.toNextLevel = shared.tnl(user.stats.lvl); + user.stats.maxHealth = shared.maxHealth; + user.stats.maxMP = res.locals.user._statsComputed.maxMP; + + delete user.apiToken; + + if (user.auth) { + delete user.auth.local; + delete user.auth.facebook; + } + + delete user.newMessages; + + delete user.profile; + delete user.purchased.plan; + delete user.contributor; + delete user.invitations; + + delete user.items.special.nyeReceived; + delete user.items.special.valentineReceived; + + delete user.webhooks; + delete user.achievements.challenges; + + _.forEach(user.inbox.messages, function(msg){ + msg.text = "inbox message text"; + }); + + _.forEach(user.tags, function(tag){ + tag.name = "tag"; + tag.challenge = "challenge"; + }); + + function cleanChecklist(task){ + var checklistIndex = 0; + + _.forEach(task.checklist, function(c){ + c.text = "item" + checklistIndex++; + }); + } + + _.forEach(user.habits, function(task){ + task.text = "task text"; + task.notes = "task notes"; + }); + + _.forEach(user.rewards, function(task){ + task.text = "task text"; + task.notes = "task notes"; + }); + + _.forEach(user.dailys, function(task){ + task.text = "task text"; + task.notes = "task notes"; + + cleanChecklist(task); + }); + + _.forEach(user.todos, function(task){ + task.text = "task text"; + task.notes = "task notes"; + + cleanChecklist(task); + }); + + return res.status(200).json(user); + }); +}; + +/** + * This tells us for which paths users can call `PUT /user` (or batch-update equiv, which use `User.set()` on our client). + * The trick here is to only accept leaf paths, not root/intermediate paths (see http://goo.gl/OEzkAs) + * TODO - one-by-one we want to widdle down this list, instead replacing each needed set path with API operations + */ +acceptablePUTPaths = _.reduce(require('./../../models/user').schema.paths, (m, v, leaf) => { + let updatablePaths = 'achievements filters flags invitations lastCron party preferences profile stats inbox'.split(' '); + let found = _.find(updatablePaths, (rootPath) => { + return leaf.indexOf(rootPath) === 0; + }); + + if (found) m[leaf] = true; + + return m; +}, {}); + +restrictedPUTSubPaths = 'stats.class'.split(' '); + +_.each(restrictedPUTSubPaths, (removePath) => { + delete acceptablePUTPaths[removePath]; +}); + +let requiresPurchase = { + 'preferences.background': 'background', + 'preferences.shirt': 'shirt', + 'preferences.size': 'size', + 'preferences.skin': 'skin', + 'preferences.chair': 'chair', + 'preferences.hair.bangs': 'hair.bangs', + 'preferences.hair.base': 'hair.base', + 'preferences.hair.beard': 'hair.beard', + 'preferences.hair.color': 'hair.color', + 'preferences.hair.flower': 'hair.flower', + 'preferences.hair.mustache': 'hair.mustache', +}; + +let checkPreferencePurchase = (user, path, item) => { + let itemPath = `${path}.${item}`; + let appearance = _.get(shared.content.appearances, itemPath) + if (!appearance) return false; + if (appearance.price === 0) return true; + + return _.get(user.purchased, itemPath); +}; + +/** + * Update user + * Send up PUT /user as `req.body={path1:val, path2:val, etc}`. Example: + * PUT /user {'stats.hp':50, 'tasks.TASK_ID.repeat.m':false} + * See acceptablePUTPaths for which user paths are supported +*/ +api.update = (req, res, next) => { + let user = res.locals.user; + let errors = []; + + if (_.isEmpty(req.body)) return res.status(200).json(user); + + _.each(req.body, (v, k) => { + let purchasable = requiresPurchase[k]; + + if (purchasable && !checkPreferencePurchase(user, purchasable, v)) { + return errors.push(`Must purchase ${v} to set it on ${k}`); + } + + if (acceptablePUTPaths[k]) { + user.fns.dotSet(k, v); + } else { + errors.push(shared.i18n.t('messageUserOperationProtected', { operation: k })); + } + return true; + }); + + user.save((err) => { + if (!_.isEmpty(errors)) return res.status(401).json({err: errors}); + if (err) { + if (err.name == 'ValidationError') { + let errorMessages = _.map(_.values(err.errors), (error) => { + return error.message; + }); + return res.status(400).json({err: errorMessages}); + } + return next(err); + } + + res.status(200).json(user); + user = errors = null; + }); +}; + +api.cron = require('../../middlewares/api-v3/cron'); + +// api.reroll // Shared.ops +// api.reset // Shared.ops + +api.delete = function(req, res, next) { + var user = res.locals.user; + var plan = user.purchased.plan; + + if (plan && plan.customerId && !plan.dateTerminated){ + return res.status(400).json({err:"You have an active subscription, cancel your plan before deleting your account."}); + } + + let types = ['party', 'guilds']; + let groupFields = basicGroupFields.concat(' leader memberCount'); + + Group.getGroups({user, types, groupFields}) + .then(groups => { + return Bluebird.all(groups.map((group) => { + return group.leave(user, 'remove-all'); + })); + }) + .then(() => { + return Tasks.Task.remove({ + userId: user._id, + }).exec(); + }) + .then(() => { + return user.remove(); + }) + .then(() => { + firebase.deleteUser(user._id); + res.sendStatus(200); + }) + .catch(next); +} + +/* + ------------------------------------------------------------------------ + Development Only Operations + ------------------------------------------------------------------------ + */ +if (nconf.get('NODE_ENV') === 'development') { + + api.addTenGems = function(req, res, next) { + var user = res.locals.user; + + user.balance += 2.5; + + user.save(function(err){ + if (err) return next(err); + res.sendStatus(204); + }); + }; + + api.addHourglass = function(req, res, next) { + var user = res.locals.user; + + user.purchased.plan.consecutive.trinkets += 1; + + user.save(function(err){ + if (err) return next(err); + res.sendStatus(204); + }); + }; +} + +/* + ------------------------------------------------------------------------ + Tags + ------------------------------------------------------------------------ + */ + +api.getTags = function (req, res, next) { + res.json(res.locals.user.tags.toObject().map(tag => { + return { + name: tag.name, + id: tag.id, + challenge: tag.challenge, + } + })); +}; + +api.getTag = function (req, res, next) { + let tag = _.find(res.locals.user.tags, {id: req.params.id}); + if (!tag) { + return res.status(404).json({err: i18n.t('messageTagNotFound', req.language)}); + } + + res.json({ + name: tag.name, + id: tag.id, + challenge: tag.challenge, + }); +}; + +api.addTag = function (req, res, next) { + let user = res.locals.user; + + user.tags.push(Tag.sanitize(req.body)); + user.save(function (err, user) { + if (err) return next(err); + + res.json(user.tags.toObject().map(tag => { + return { + name: tag.name, + id: tag.id, + challenge: tag.challenge, + } + })); + }); +}; + +api.updateTag = function (req, res, next) { + let user = res.locals.user; + + let tag = _.find(res.locals.user.tags, {id: req.params.id}); + if (!tag) { + return res.status(404).json({err: i18n.t('messageTagNotFound', req.language)}); + } + + tag.name = req.body.name; + user.save(function (err, user) { + if (err) return next(err); + + res.json({ + name: tag.name, + id: tag.id, + challenge: tag.challenge, + }); + }); +} + +api.sortTag = function (req, res, next) { + var ref = req.query; + var to = ref.to; + var from = ref.from; + let user = res.locals.user; + + if (!((to != null) && (from != null))) { + return res.statu(500).json('?to=__&from=__ are required'); + } + + user.tags.splice(to, 0, user.tags.splice(from, 1)[0]); + user.save(function (err, user) { + if (err) return next(err); + + res.json(user.tags.toObject().map(tag => { + return { + name: tag.name, + id: tag.id, + challenge: tag.challenge, + } + })); + }); +} + +api.deleteTag = function (req, res, next) { + let user = res.locals.user; + + let tag = removeFromArray(user.tags, { id: req.params.id }); + if (!tag) { + return res.status(404).json({err: i18n.t('messageTagNotFound', req.language)}); + } + + + Tasks.Task.update({ + userId: user._id, + }, { + $pull: { + tags: tag.id, + }, + }, {multi: true}).exec(); + + user.save(function (err, user) { + if (err) return next(err); + + res.json(user.tags.toObject().map(tag => { + return { + name: tag.name, + id: tag.id, + challenge: tag.challenge, + } + })); + }); +} + +/* + ------------------------------------------------------------------------ + Spells + ------------------------------------------------------------------------ + */ +api.cast = async function(req, res, next) { + try { + let user = res.locals.user; + let spellId = req.params.spell; + let targetId = req.query.targetId; + + if (spellId === 'heallAll') { + spellId = 'healAll'; + } else if (spellId === 'spookDust') { + spellId = 'spookySparkles'; + } + + let klass = shared.content.spells.special[spellId] ? 'special' : user.stats.class; + let spell = shared.content.spells[klass][spellId]; + + if (!spell) return res.status(404).json({err: 'Spell "' + req.params.spell + '" not found.'}); + if (spell.mana > user.stats.mp) return res.status(400).json({err: 'Not enough mana to cast spell'}); + + let targetType = spell.target; + + if (targetType === 'task') { + let task = await Tasks.Task.findOne({ + _id: targetId, + userId: user._id, + }).exec(); + if (!task) { + return res.status(404).json({err: 'Task "' + targetId + '" not found.'}); + } + if (task.challenge.id) return res.status(40).json({err: 'Cannot cast spell on challenge task.'}); + + + spell.cast(user, task, req); + await task.save(); + } else if (targetType === 'self') { + spell.cast(user, null, req); + await user.save(); + } else if (targetType === 'tasks') { // new target type when all the user's tasks are necessary + let tasks = await Tasks.Task.find({ + userId: user._id, + 'challenge.id': {$exists: false}, // exclude challenge tasks + $or: [ // Exclude completed todos + {type: 'todo', completed: false}, + {type: {$in: ['habit', 'daily', 'reward']}}, + ], + }).exec(); + + spell.cast(user, tasks, req); + + let toSave = tasks.filter(t => t.isModified()); + let isUserModified = user.isModified(); + toSave.unshift(user.save()); + let saved = await Bluebird.all(toSave); + } else if (targetType === 'party' || targetType === 'user') { + let party = await Group.getGroup({groupId: 'party', user}); + // arrays of users when targetType is 'party' otherwise single users + let partyMembers; + + if (targetType === 'party') { + if (!party) { + partyMembers = [user]; // Act as solo party + } else { + partyMembers = await User.find({'party._id': party._id}).select(partyMembersFields).exec(); + } + + spell.cast(user, partyMembers, req); + await Bluebird.all(partyMembers.map(m => m.save())); + } else { + if (!party && (!targetId || user._id === targetId)) { + partyMembers = user; + } else { + partyMembers = await User.findOne({_id: targetId, 'party._id': party._id}).select(partyMembersFields).exec(); + } + + if (!partyMembers) throw new NotFound(res.t('userWithIDNotFound', {userId: targetId})); + spell.cast(user, partyMembers, req); + if (partyMembers === user) { + await partyMembers.save(); + } else { + await Bluebird.all([ + await partyMembers.save(), + await user.save(), + ]); + } + } + + if (party && !spell.silent) { + let message = `\`${user.profile.name} casts ${spell.text()}${targetType === 'user' ? ` on ${partyMembers.profile.name}` : ' for the party'}.\``; + party.sendChat(message); + await party.save(); + } + } + + user.getTransformedData(function (err, transformedUser) { + if (err) next(err); + res.json(transformedUser); + }); + } catch (e) { + return res.status(500).json({err: 'An error happened'}); + } +} + +// It supports guild too now but we'll stick to partyInvite for backward compatibility +api.sessionPartyInvite = function(req,res,next){ + if (!req.session.partyInvite) return next(); + var inv = res.locals.user.invitations; + if (inv.party && inv.party.id) return next(); // already invited to a party + asyncM.waterfall([ + function(cb){ + Group.findOne({_id:req.session.partyInvite.id, members:{$in:[req.session.partyInvite.inviter]}}) + .select('invites members type').exec(cb); + }, + function(group, cb){ + if (!group){ + // Don't send error as it will prevent users from using the site + delete req.session.partyInvite; + return cb(); + } + + if (group.type == 'guild'){ + inv.guilds.push(req.session.partyInvite); + } else{ + //req.body.type in 'guild', 'party' + inv.party = req.session.partyInvite; + } + inv.party = req.session.partyInvite; + delete req.session.partyInvite; + if (!~group.invites.indexOf(res.locals.user._id)) + group.invites.push(res.locals.user._id); //$addToSt + group.save(cb); + }, + function(saved, cb){ + res.locals.user.save(cb); + } + ], next); +} + +api.clearCompleted = function(req, res, next) { + var user = res.locals.user; + + Tasks.Task.remove({ + userId: user._id, + type: 'todo', + completed: true, + 'challenge.id': {$exists: false}, + }, function (err) { + if (err) return next(err); + + Tasks.Task.find({ + userId: user._id, + type: 'todo', + completed: false, + }, function (err, uncompleted) { + if (err) return next(err); + res.json(uncompleted); + }); + }); +}; + +api.sortTask = async function (req, res, next) { + try { + let user = res.locals.user; + let to = Number(req.query.to); + + let task = await Tasks.Task.findOne({ + _id: req.params.id, + userId: user._id, + }).exec(); + + if (!task) return res.status(404).json(i18n.t('messageTaskNotFound', req.language)); + if (task.type !== 'todo' || !task.completed) { + let order = user.tasksOrder[`${task.type}s`]; + let currentIndex = order.indexOf(task._id); + + // If for some reason the task isn't ordered (should never happen), push it in the new position + // if the task is moved to a non existing position + // or if the task is moved to position -1 (push to bottom) + // -> push task at end of list + if (!order[to] && to !== -1) { + order.push(task._id); + } else { + if (currentIndex !== -1) order.splice(currentIndex, 1); + if (to === -1) { + order.push(task._id); + } else { + order.splice(to, 0, task._id); + } + } + await user.save(); + } + + user.getTasks(function (err, userTasks) { + if(err) return next(err); + res.json(userTasks); + }); + } catch (e) { + res.status(500).json({err: 'An error happened.'}); + } +} + +api.deleteTask = function(req, res, next) { + var user = res.locals.user; + if(!req.params || !req.params.id) return res.json(404, shared.i18n.t('messageTaskNotFound', req.language)); + + var id = req.params.id; + // Try removing from all orders since we don't know the task's type + var removeTaskFromOrder = function(array) { + removeFromArray(array, id); + }; + + ['habits', 'dailys', 'todos', 'rewards'].forEach(function (type){ + removeTaskFromOrder(user.tasksOrder[type]) + }); + + asyncM.parallel({ + user: user.save.bind(user), + task: function(cb) { + Tasks.Task.remove({_id: id, userId: user._id}, cb); + } + }, function(err, results) { + if(err) return next(err); + + if(results.task.result.n < 1){ + return res.status(404).json({err: shared.i18n.t('messageTaskNotFound', req.language)}) + } + + res.status(200).json({}); + }); +}; + +api.updateTask = function(req, res, next) { + var user = res.locals.user, + id = req.params.id; + + req.body = Tasks.Task.fromJSONV2(req.body); + + findTaskByIdOrLegacyId(user, id, function (err, task) { + if(err) return next(err); + if(!task) return res.status(404).json({err: 'Task not found.'}) + + try { + // we have to convert task to an object because otherwise things don't get merged correctly. Bad for performances? + let [updatedTaskObj] = shared.ops.updateTask(task.toObject(), req); + + // Sanitize differently user tasks linked to a challenge + let sanitizedObj; + + if (task.userId && task.challenge && task.challenge.id) { + sanitizedObj = Tasks.Task.sanitizeUserChallengeTask(updatedTaskObj); + } else { + sanitizedObj = Tasks.Task.sanitize(updatedTaskObj); + } + + _.assign(task, sanitizedObj); + + task.save(function(err, task){ + if(err) return next(err); + + return res.json(task.toJSONV2()); + }); + } catch (err) { + return res.status(err.code).json({err: err.message}); + } + }); +}; + +api.addTask = function(req, res, next) { + var user = res.locals.user; + req.body.type = req.body.type || 'habit'; + req.body.text = req.body.text || 'text'; + req.body = Tasks.Task.fromJSONV2(req.body); + + var task = new Tasks[req.body.type](Tasks.Task.sanitize(req.body)); + + task.userId = user._id; + user.tasksOrder[task.type + 's'].unshift(task._id); + + // Validate that the task is valid and throw if it isn't + // otherwise since we're saving user/challenge and task in parallel it could save the user/challenge with a tasksOrder that doens't match reality + let validationErrors = task.validateSync(); + if (validationErrors) return next(validationErrors); + + Bluebird.all([ + user.save(), + task.save({validateBeforeSave: false}) // already done ^ + ]).then(results => { + res.status(200).json(results[1].toJSONV2()); + }).catch(next); +}; + +/** + * All other user.ops which can easily be mapped to common/script/index.js, not requiring custom API-wrapping + */ +_.each(shared.ops, function(op,k){ + var kv3; + + if (['rebirth', 'reroll', 'reset'].indexOf(k) !== -1) { // proxy ops that change tasks directly to v3 + if (k === 'rebirth') kv3 = 'userRebirth'; // the name is different in v3 + if (k === 'reroll') kv3 = 'userReroll'; + if (k === 'reset') kv3 = 'userReset'; + + api[k] = function (req, res, next) { + req.v2 = true; + v3UserController[kv3].handler(req, res, next).catch(next); + } + } else if (!api[k]) { + api[k] = function(req, res, next) { + var opResponse; + try { + req.v2 = true; // Used to indicate to the shared code that the old response data should be returned + opResponse = shared.ops[k](res.locals.user, req, analytics); + if (Array.isArray(opResponse) && opResponse.length < 3) { + opResponse = opResponse[0]; + } + } catch (err) { + if (!err.code) return next(err); + if (err.code >= 400) return res.status(err.code).json({err:err.message}); + } + + // If we want to send something other than 500, pass err as {code: 200, message: "Not enough GP"} + res.locals.user.save(function(err){ + if (err) return next(err); + if (opResponse === res.locals.user) { // add tasks + res.locals.user.getTransformedData(function (err, transformedUser) { + if (err) return next(err); + res.status(200).json(transformedUser); + }); + } else { + res.status(200).json(opResponse); + } + }); + } + } +}) + +/* + ------------------------------------------------------------------------ + Batch Update + Run a bunch of updates all at once + ------------------------------------------------------------------------ +*/ +api.batchUpdate = function(req, res, next) { + if (_.isEmpty(req.body)) req.body = []; // cases of {} or null + if (req.body[0] && req.body[0].data) + return res.status(501).json({err: "API has been updated, please refresh your browser or upgrade your mobile app."}) + + var user = res.locals.user; + var oldSend = res.send; + var oldJson = res.json; + + // Stash user.save, we'll queue the save op till the end (so we don't overload the server) + //var oldSave = user.save; + //user.save = function(cb){cb(null,user)} + + // Setup the array of functions we're going to call in parallel with async + res.locals.ops = []; + var ops = _.transform(req.body, function(m,_req){ + if (_.isEmpty(_req)) return; + _req.language = req.language; + + m.push(function() { + var cb = arguments[arguments.length-1]; + res.locals.ops.push(_req); + res.send = res.json = function(code, data) { + if (_.isNumber(code) && code >= 500) + return cb(code+": "+ (data.message ? data.message : data.err ? data.err : JSON.stringify(data))); + return cb(); + }; + if(!api[_req.op]) { return cb(shared.i18n.t('messageUserOperationNotFound', { operation: _req.op })); } + + api[_req.op](_req, res, cb); + }); + }) + // Finally, save user at the end + .concat(/*function(){ + user.save = oldSave; + user.save(arguments[arguments.length-1]); + }*/); + + // call all the operations, then return the user object to the requester + asyncM.waterfall(ops, function(err) { + res.json = oldJson; + res.send = oldSend; + if (err) return next(err); + + var response; + + // return only drops & streaks + if (user._tmp && user._tmp.drop){ + response = user.toJSON(); + res.status(200).json({_tmp: {drop: response._tmp.drop}, _v: response._v}); + + // Fetch full user object + } else if (res.locals.wasModified){ + // Preen 3-day past-completed To-Dos from Angular & mobile app + user.getTransformedData(function(err, transformedData){ + if (err) next(err); + response = transformedData; + + response.todos = shared.preenTodos(response.todos); + response.wasModified = true; + res.status(200).json(response); + }); + // return only the version number + } else{ + response = user.toJSON(); + res.status(200).json({_v: response._v}); + } + + //user.fns.nullify(); + user = res.locals.user = oldSend = oldJson = null; + }); +}; + +function _generateWebhookTaskData(task, direction, delta, stats, user) { + var extendedStats = _.extend(stats, { + toNextLevel: shared.tnl(user.stats.lvl), + maxHealth: shared.maxHealth, + maxMP: user._statsComputed.maxMP + }); + + var userData = { + _id: user._id, + _tmp: user._tmp, + stats: extendedStats + }; + + var taskData = { + details: task, + direction: direction, + delta: delta + } + + return { + task: taskData, + user: userData + } +} diff --git a/website/server/controllers/api-v3/auth.js b/website/server/controllers/api-v3/auth.js new file mode 100644 index 0000000000..8e641f74e5 --- /dev/null +++ b/website/server/controllers/api-v3/auth.js @@ -0,0 +1,521 @@ +import validator from 'validator'; +import moment from 'moment'; +import passport from 'passport'; +import nconf from 'nconf'; +import { + authWithHeaders, +} from '../../middlewares/api-v3/auth'; +import { + NotAuthorized, + BadRequest, + NotFound, +} from '../../libs/api-v3/errors'; +import Bluebird from 'bluebird'; +import * as passwordUtils from '../../libs/api-v3/password'; +import logger from '../../libs/api-v3/logger'; +import { model as User } from '../../models/user'; +import { model as Group } from '../../models/group'; +import { model as EmailUnsubscription } from '../../models/emailUnsubscription'; +import { sendTxn as sendTxnEmail } from '../../libs/api-v3/email'; +import { decrypt } from '../../libs/api-v3/encryption'; +import FirebaseTokenGenerator from 'firebase-token-generator'; +import { send as sendEmail } from '../../libs/api-v3/email'; + +let api = {}; + +// When the user signed up after having been invited to a group, invite them automatically to the group +async function _handleGroupInvitation (user, invite) { + // wrapping the code in a try because we don't want it to prevent the user from signing up + // that's why errors are not translated + try { + let {sentAt, id: groupId, inviter} = JSON.parse(decrypt(invite)); + + // check that the invite has not expired (after 7 days) + if (sentAt && moment().subtract(7, 'days').isAfter(sentAt)) { + let err = new Error('Invite expired.'); + err.privateData = invite; + throw err; + } + + let group = await Group.getGroup({user, optionalMembership: true, groupId, fields: 'name type'}); + if (!group) throw new NotFound('Group not found.'); + + if (group.type === 'party') { + user.invitations.party = {id: group._id, name: group.name, inviter}; + } else { + user.invitations.guilds.push({id: group._id, name: group.name, inviter}); + } + } catch (err) { + logger.error(err); + } +} + +/** + * @api {post} /api/v3/user/auth/local/register Register + * @apiDescription Register a new user with email, username and password or attach local auth to a social user + * @apiVersion 3.0.0 + * @apiName UserRegisterLocal + * @apiGroup User + * + * @apiParam {String} username Body parameter - Username of the new user + * @apiParam {String} email Body parameter - Email address of the new user + * @apiParam {String} password Body parameter - Password for the new user + * @apiParam {String} confirmPassword Body parameter - Password confirmation + * + * @apiSuccess {Object} data The user object, if local auth was just attached to a social user then only user.auth.local + */ +api.registerLocal = { + method: 'POST', + middlewares: [authWithHeaders(true)], + url: '/user/auth/local/register', + async handler (req, res) { + let fbUser = res.locals.user; // If adding local auth to social user + + req.checkBody({ + email: { + notEmpty: {errorMessage: res.t('missingEmail')}, + isEmail: {errorMessage: res.t('notAnEmail')}, + }, + username: {notEmpty: {errorMessage: res.t('missingUsername')}}, + password: { + notEmpty: {errorMessage: res.t('missingPassword')}, + equals: {options: [req.body.confirmPassword], errorMessage: res.t('passwordConfirmationMatch')}, + }, + }); + let validationErrors = req.validationErrors(); + if (validationErrors) throw validationErrors; + + let { email, username, password } = req.body; + + // Get the lowercase version of username to check that we do not have duplicates + // So we can search for it in the database and then reject the choosen username if 1 or more results are found + email = email.toLowerCase(); + let lowerCaseUsername = username.toLowerCase(); + + // Search for duplicates using lowercase version of username + let user = await User.findOne({$or: [ + {'auth.local.email': email}, + {'auth.local.lowerCaseUsername': lowerCaseUsername}, + ]}, {'auth.local': 1}).exec(); + + if (user) { + if (email === user.auth.local.email) throw new NotAuthorized(res.t('emailTaken')); + // Check that the lowercase username isn't already used + if (lowerCaseUsername === user.auth.local.lowerCaseUsername) throw new NotAuthorized(res.t('usernameTaken')); + } + + let salt = passwordUtils.makeSalt(); + let hashed_password = passwordUtils.encrypt(password, salt); // eslint-disable-line camelcase + let newUser = { + auth: { + local: { + username, + lowerCaseUsername, + email, + salt, + hashed_password, // eslint-disable-line camelcase + }, + }, + preferences: { + language: req.language, + }, + }; + + if (fbUser) { + if (!fbUser.auth.facebook.id) throw new NotAuthorized(res.t('onlySocialAttachLocal')); + fbUser.auth.local = newUser.auth.local; + newUser = fbUser; + } else { + newUser = new User(newUser); + newUser.registeredThrough = req.headers['x-client']; // Not saved, used to create the correct tasks based on the device used + } + + // we check for partyInvite for backward compatibility + if (req.query.groupInvite || req.query.partyInvite) { + await _handleGroupInvitation(newUser, req.query.groupInvite || req.query.partyInvite); + } + + let savedUser = await newUser.save(); + + if (savedUser.auth.facebook.id) { + res.respond(200, savedUser.toJSON().auth.local); // We convert to toJSON to hide private fields + } else { + res.respond(201, savedUser); + } + + // Clean previous email preferences and send welcome email + EmailUnsubscription + .remove({email: savedUser.auth.local.email}) + .then(() => sendTxnEmail(savedUser, 'welcome')); + + if (!savedUser.auth.facebook.id) { + res.analytics.track('register', { + category: 'acquisition', + type: 'local', + gaLabel: 'local', + uuid: savedUser._id, + }); + } + + return null; + }, +}; + +function _loginRes (user, req, res) { + if (user.auth.blocked) throw new NotAuthorized(res.t('accountSuspended', {userId: user._id})); + return res.respond(200, {id: user._id, apiToken: user.apiToken}); +} + +/** + * @api {post} /api/v3/user/auth/local/login Login + * @apiDescription Login a user with email / username and password + * @apiVersion 3.0.0 + * @apiName UserLoginLocal + * @apiGroup User + * + * @apiParam {String} username Body parameter - Username or email of the user + * @apiParam {String} password Body parameter - The user's password + * + * @apiSuccess {String} data._id The user's unique identifier + * @apiSuccess {String} data.apiToken The user's api token that must be used to authenticate requests. + */ +api.loginLocal = { + method: 'POST', + url: '/user/auth/local/login', + middlewares: [], + async handler (req, res) { + req.checkBody({ + username: { + notEmpty: true, + errorMessage: res.t('missingUsernameEmail'), + }, + password: { + notEmpty: true, + errorMessage: res.t('missingPassword'), + }, + }); + let validationErrors = req.validationErrors(); + if (validationErrors) throw validationErrors; + + req.sanitizeBody('username').trim(); + req.sanitizeBody('password').trim(); + + let login; + let username = req.body.username; + + if (validator.isEmail(username)) { + login = {'auth.local.email': username.toLowerCase()}; // Emails are stored lowercase + } else { + login = {'auth.local.username': username}; + } + + let user = await User.findOne(login, {auth: 1, apiToken: 1}).exec(); + let isValidPassword = user && user.auth.local.hashed_password === passwordUtils.encrypt(req.body.password, user.auth.local.salt); + if (!isValidPassword) throw new NotAuthorized(res.t('invalidLoginCredentialsLong')); + return _loginRes(user, ...arguments); + }, +}; + +function _passportFbProfile (accessToken) { + return new Bluebird((resolve, reject) => { + passport._strategies.facebook.userProfile(accessToken, (err, profile) => { + if (err) { + reject(err); + } else { + resolve(profile); + } + }); + }); +} + +// Called as a callback by Facebook (or other social providers). Internal route +api.loginSocial = { + method: 'POST', + url: '/user/auth/social', // this isn't the most appropriate url but must be the same as v2 + async handler (req, res) { + let accessToken = req.body.authResponse.access_token; + let network = req.body.network; + + if (network !== 'facebook') throw new NotAuthorized(res.t('onlyFbSupported')); + + let profile = await _passportFbProfile(accessToken); + + let user = await User.findOne({ + [`auth.${network}.id`]: profile.id, + }, {_id: 1, apiToken: 1, auth: 1}).exec(); + + // User already signed up + if (user) { + _loginRes(user, ...arguments); + } else { // Create new user + user = new User({ + auth: { + [network]: profile, + }, + preferences: { + language: req.language, + }, + }); + user.registeredThrough = req.headers['x-client']; + + let savedUser = await user.save(); + + _loginRes(user, ...arguments); + + // Clean previous email preferences + if (savedUser.auth[network].emails && savedUser.auth.facebook.emails[0] && savedUser.auth[network].emails[0].value) { + EmailUnsubscription + .remove({email: savedUser.auth[network].emails[0].value.toLowerCase()}) + .exec() + .then(() => sendTxnEmail(savedUser, 'welcome')); // eslint-disable-line max-nested-callbacks + } + + res.analytics.track('register', { + category: 'acquisition', + type: network, + gaLabel: network, + uuid: savedUser._id, + }); + + return null; + } + }, +}; + +/** + * @api {put} /api/v3/user/auth/update-username Update username + * @apiDescription Update the username of a local user + * @apiVersion 3.0.0 + * @apiName UpdateUsername + * @apiGroup User + * + * @apiParam {string} password Body parameter - The current user password + * @apiParam {string} username Body parameter - The new username + + * @apiSuccess {String} data.username The new username + **/ +api.updateUsername = { + method: 'PUT', + middlewares: [authWithHeaders()], + url: '/user/auth/update-username', + async handler (req, res) { + let user = res.locals.user; + + req.checkBody({ + password: { + notEmpty: {errorMessage: res.t('missingPassword')}, + }, + username: { + notEmpty: { errorMessage: res.t('missingUsername') }, + }, + }); + + let validationErrors = req.validationErrors(); + if (validationErrors) throw validationErrors; + + if (!user.auth.local.username) throw new BadRequest(res.t('userHasNoLocalRegistration')); + + let oldPassword = passwordUtils.encrypt(req.body.password, user.auth.local.salt); + if (oldPassword !== user.auth.local.hashed_password) throw new NotAuthorized(res.t('wrongPassword')); + + let count = await User.count({ 'auth.local.lowerCaseUsername': req.body.username.toLowerCase() }); + if (count > 0) throw new BadRequest(res.t('usernameTaken')); + + // save username + user.auth.local.lowerCaseUsername = req.body.username.toLowerCase(); + user.auth.local.username = req.body.username; + await user.save(); + + res.respond(200, { username: req.body.username }); + }, +}; + +/** + * @api {put} /api/v3/user/auth/update-password + * @apiDescription Update the password of a local user + * @apiVersion 3.0.0 + * @apiName UpdatePassword + * @apiGroup User + * + * @apiParam {string} password Body parameter - The old password + * @apiParam {string} newPassword Body parameter - The new password + * @apiParam {string} confirmPassword Body parameter - New password confirmation + * + * @apiSuccess {Object} data An empty object + **/ +api.updatePassword = { + method: 'PUT', + middlewares: [authWithHeaders()], + url: '/user/auth/update-password', + async handler (req, res) { + let user = res.locals.user; + + if (!user.auth.local.hashed_password) throw new BadRequest(res.t('userHasNoLocalRegistration')); + + req.checkBody({ + password: { + notEmpty: {errorMessage: res.t('missingPassword')}, + }, + newPassword: { + notEmpty: {errorMessage: res.t('missingNewPassword')}, + }, + confirmPassword: { + notEmpty: {errorMessage: res.t('missingNewPassword')}, + }, + }); + + let validationErrors = req.validationErrors(); + + if (validationErrors) { + throw validationErrors; + } + + let oldPassword = passwordUtils.encrypt(req.body.password, user.auth.local.salt); + if (oldPassword !== user.auth.local.hashed_password) throw new NotAuthorized(res.t('wrongPassword')); + + if (req.body.newPassword !== req.body.confirmPassword) throw new NotAuthorized(res.t('passwordConfirmationMatch')); + + user.auth.local.hashed_password = passwordUtils.encrypt(req.body.newPassword, user.auth.local.salt); // eslint-disable-line camelcase + await user.save(); + res.respond(200, {}); + }, +}; + +/** + * @api {post} /api/v3/user/reset-password Reset password + * @apiDescription Reset the user password + * @apiVersion 3.0.0 + * @apiName ResetPassword + * @apiGroup User + * + * @apiParam {string} email Body parameter - The email address of the user + * + * @apiSuccess {string} message The localized success message + **/ +api.resetPassword = { + method: 'POST', + middlewares: [], + url: '/user/reset-password', + async handler (req, res) { + req.checkBody({ + email: { + notEmpty: {errorMessage: res.t('missingEmail')}, + }, + }); + let validationErrors = req.validationErrors(); + if (validationErrors) throw validationErrors; + + let email = req.body.email.toLowerCase(); + let salt = passwordUtils.makeSalt(); + let newPassword = passwordUtils.makeSalt(); // use a salt as the new password too (they'll change it later) + let hashedPassword = passwordUtils.encrypt(newPassword, salt); + + let user = await User.findOne({ 'auth.local.email': email }, { 'auth.local': 1 }); + + if (user) { + user.auth.local.salt = salt; + user.auth.local.hashed_password = hashedPassword; // eslint-disable-line camelcase + sendEmail({ + from: 'Habitica${res.t('unsubscribedSuccessfully')}
${res.t('unsubscribedTextUsers')}`); + } else { + let unsubscribedEmail = await EmailUnsubscription.findOne({email: data.email.toLowerCase()}); + let okResponse = `${res.t('unsubscribedSuccessfully')}
${res.t('unsubscribedTextOthers')}`; + if (!unsubscribedEmail) await EmailUnsubscription.create({email: data.email.toLowerCase()}); + res.send(okResponse); + } + }, +}; + +module.exports = api; diff --git a/website/server/controllers/top-level/pages.js b/website/server/controllers/top-level/pages.js new file mode 100644 index 0000000000..0af5bb5f9c --- /dev/null +++ b/website/server/controllers/top-level/pages.js @@ -0,0 +1,88 @@ +import locals from '../../middlewares/api-v3/locals'; +import _ from 'lodash'; +import markdownIt from 'markdown-it'; + +const md = markdownIt({ + html: true, +}); + +let api = {}; + +const TOTAL_USER_COUNT = '1,100,000'; + +api.getFrontPage = { + method: 'GET', + url: '/', + middlewares: [locals], + runCron: false, + async handler (req, res) { + if (!req.header('x-api-user') && !req.header('x-api-key') && !(req.session && req.session.userId)) { + return res.redirect('/static/front'); + } + + return res.render('index.jade', { + title: 'Habitica | Your Life The Role Playing Game', + env: res.locals.habitrpg, + }); + }, +}; + +let staticPages = ['front', 'privacy', 'terms', 'api-v2', 'features', + 'videos', 'contact', 'plans', 'new-stuff', 'community-guidelines', + 'old-news', 'press-kit', 'faq', 'overview', 'apps', + 'clear-browser-data', 'merch', 'maintenance-info']; + +_.each(staticPages, (name) => { + api[`get${name}Page`] = { + method: 'GET', + url: `/static/${name}`, + middlewares: [locals], + runCron: false, + async handler (req, res) { + return res.render(`static/${name}.jade`, { + env: res.locals.habitrpg, + md, + userCount: TOTAL_USER_COUNT, + }); + }, + }; +}); + +api.redirectApi = { + method: 'GET', + url: '/static/api', + runCron: false, + async handler (req, res) { + res.redirect(301, '/apidoc'); + }, +}; + +let shareables = ['level-up', 'hatch-pet', 'raise-pet', 'unlock-quest', 'won-challenge', 'achievement']; + +_.each(shareables, (name) => { + api[`get${name}ShareablePage`] = { + method: 'GET', + url: `/social/${name}`, + middlewares: [locals], + runCron: false, + async handler (req, res) { + return res.render(`social/${name}`, { + env: res.locals.habitrpg, + md, + userCount: TOTAL_USER_COUNT, + }); + }, + }; +}); + +api.redirectExtensionsPage = { + method: 'GET', + url: '/static/extensions', + runCron: false, + async handler (req, res) { + return res.redirect('http://habitica.wikia.com/wiki/App_and_Extension_Integrations'); + }, +}; + + +module.exports = api; diff --git a/website/server/controllers/top-level/payments/amazon.js b/website/server/controllers/top-level/payments/amazon.js new file mode 100644 index 0000000000..a22618fa23 --- /dev/null +++ b/website/server/controllers/top-level/payments/amazon.js @@ -0,0 +1,256 @@ +import { + BadRequest, + NotAuthorized, +} from '../../../libs/api-v3/errors'; +import amzLib from '../../../libs/api-v3/amazonPayments'; +import { + authWithHeaders, + authWithUrl, +} from '../../../middlewares/api-v3/auth'; +import shared from '../../../../../common'; +import payments from '../../../libs/api-v3/payments'; +import moment from 'moment'; +import { model as Coupon } from '../../../models/coupon'; +import { model as User } from '../../../models/user'; +import cc from 'coupon-code'; + +let api = {}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /amazon/verifyAccessToken Amazon Payments: verify access token + * @apiVersion 3.0.0 + * @apiName AmazonVerifyAccessToken + * @apiGroup Payments + * + * @apiSuccess {Object} data Empty object + **/ +api.verifyAccessToken = { + method: 'POST', + url: '/amazon/verifyAccessToken', + middlewares: [authWithHeaders()], + async handler (req, res) { + let accessToken = req.body.access_token; + + if (!accessToken) throw new BadRequest('Missing req.body.access_token'); + + await amzLib.getTokenInfo(accessToken); + res.respond(200, {}); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /amazon/createOrderReferenceId Amazon Payments: create order reference id + * @apiVersion 3.0.0 + * @apiName AmazonCreateOrderReferenceId + * @apiGroup Payments + * + * @apiSuccess {string} data.orderReferenceId The order reference id. + **/ +api.createOrderReferenceId = { + method: 'POST', + url: '/amazon/createOrderReferenceId', + middlewares: [authWithHeaders()], + async handler (req, res) { + let billingAgreementId = req.body.billingAgreementId; + + if (!billingAgreementId) throw new BadRequest('Missing req.body.billingAgreementId'); + + let response = await amzLib.createOrderReferenceId({ + Id: billingAgreementId, + IdType: 'BillingAgreement', + ConfirmNow: false, + }); + + res.respond(200, { + orderReferenceId: response.OrderReferenceDetails.AmazonOrderReferenceId, + }); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /amazon/checkout Amazon Payments: checkout + * @apiVersion 3.0.0 + * @apiName AmazonCheckout + * @apiGroup Payments + * + * @apiSuccess {object} data Empty object + **/ +api.checkout = { + method: 'POST', + url: '/amazon/checkout', + middlewares: [authWithHeaders()], + async handler (req, res) { + let gift = req.body.gift; + let user = res.locals.user; + let orderReferenceId = req.body.orderReferenceId; + let amount = 5; + + if (!orderReferenceId) throw new BadRequest('Missing req.body.orderReferenceId'); + + if (gift) { + if (gift.type === 'gems') { + amount = gift.gems.amount / 4; + } else if (gift.type === 'subscription') { + amount = shared.content.subscriptionBlocks[gift.subscription.key].price; + } + } + + await amzLib.setOrderReferenceDetails({ + AmazonOrderReferenceId: orderReferenceId, + OrderReferenceAttributes: { + OrderTotal: { + CurrencyCode: 'USD', + Amount: amount, + }, + SellerNote: 'HabitRPG Payment', + SellerOrderAttributes: { + SellerOrderId: shared.uuid(), + StoreName: 'HabitRPG', + }, + }, + }); + + await amzLib.confirmOrderReference({ AmazonOrderReferenceId: orderReferenceId }); + + await amzLib.authorize({ + AmazonOrderReferenceId: orderReferenceId, + AuthorizationReferenceId: shared.uuid().substring(0, 32), + AuthorizationAmount: { + CurrencyCode: 'USD', + Amount: amount, + }, + SellerAuthorizationNote: 'HabitRPG Payment', + TransactionTimeout: 0, + CaptureNow: true, + }); + + await amzLib.closeOrderReference({ AmazonOrderReferenceId: orderReferenceId }); + + // execute payment + let method = 'buyGems'; + let data = { user, paymentMethod: 'Amazon Payments' }; + + if (gift) { + if (gift.type === 'subscription') method = 'createSubscription'; + gift.member = await User.findById(gift ? gift.uuid : undefined); + data.gift = gift; + data.paymentMethod = 'Gift'; + } + + await payments[method](data); + + res.respond(200); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /amazon/subscribe Amazon Payments: subscribe + * @apiVersion 3.0.0 + * @apiName AmazonSubscribe + * @apiGroup Payments + * + * @apiSuccess {object} data Empty object + **/ +api.subscribe = { + method: 'POST', + url: '/amazon/subscribe', + middlewares: [authWithHeaders()], + async handler (req, res) { + let billingAgreementId = req.body.billingAgreementId; + let sub = req.body.subscription ? shared.content.subscriptionBlocks[req.body.subscription] : false; + let coupon = req.body.coupon; + let user = res.locals.user; + + if (!sub) throw new BadRequest(res.t('missingSubscriptionCode')); + if (!billingAgreementId) throw new BadRequest('Missing req.body.billingAgreementId'); + + if (sub.discount) { // apply discount + if (!coupon) throw new BadRequest(res.t('couponCodeRequired')); + let result = await Coupon.findOne({_id: cc.validate(coupon), event: sub.key}); + if (!result) throw new NotAuthorized(res.t('invalidCoupon')); + } + + await amzLib.setBillingAgreementDetails({ + AmazonBillingAgreementId: billingAgreementId, + BillingAgreementAttributes: { + SellerNote: 'HabitRPG Subscription', + SellerBillingAgreementAttributes: { + SellerBillingAgreementId: shared.uuid(), + StoreName: 'HabitRPG', + CustomInformation: 'HabitRPG Subscription', + }, + }, + }); + + await amzLib.confirmBillingAgreement({ + AmazonBillingAgreementId: billingAgreementId, + }); + + await amzLib.authorizeOnBillingAgreement({ + AmazonBillingAgreementId: billingAgreementId, + AuthorizationReferenceId: shared.uuid().substring(0, 32), + AuthorizationAmount: { + CurrencyCode: 'USD', + Amount: sub.price, + }, + SellerAuthorizationNote: 'HabitRPG Subscription Payment', + TransactionTimeout: 0, + CaptureNow: true, + SellerNote: 'HabitRPG Subscription Payment', + SellerOrderAttributes: { + SellerOrderId: shared.uuid(), + StoreName: 'HabitRPG', + }, + }); + + await payments.createSubscription({ + user, + customerId: billingAgreementId, + paymentMethod: 'Amazon Payments', + sub, + }); + + res.respond(200); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /amazon/subscribe/cancel Amazon Payments: subscribe cancel + * @apiVersion 3.0.0 + * @apiName AmazonSubscribe + * @apiGroup Payments + **/ +api.subscribeCancel = { + method: 'GET', + url: '/amazon/subscribe/cancel', + middlewares: [authWithUrl], + async handler (req, res) { + let user = res.locals.user; + let billingAgreementId = user.purchased.plan.customerId; + + if (!billingAgreementId) throw new NotAuthorized(res.t('missingSubscription')); + + await amzLib.closeBillingAgreement({ + AmazonBillingAgreementId: billingAgreementId, + }); + + await payments.cancelSubscription({ + user, + nextBill: moment(user.purchased.plan.lastBillingDate).add({ days: 30 }), + paymentMethod: 'Amazon Payments', + }); + + if (req.query.noRedirect) { + res.respond(200); + } else { + res.redirect('/'); + } + }, +}; + +module.exports = api; diff --git a/website/server/controllers/top-level/payments/iap.js b/website/server/controllers/top-level/payments/iap.js new file mode 100644 index 0000000000..e99590fa71 --- /dev/null +++ b/website/server/controllers/top-level/payments/iap.js @@ -0,0 +1,191 @@ +import iap from 'in-app-purchase'; +import nconf from 'nconf'; +import { + authWithHeaders, + authWithUrl, +} from '../../../middlewares/api-v3/auth'; +import payments from '../../../libs/api-v3/payments'; + +// NOT PORTED TO v3 + +iap.config({ + // this is the path to the directory containing iap-sanbox/iap-live files + googlePublicKeyPath: nconf.get('IAP_GOOGLE_KEYDIR'), +}); + +// Validation ERROR Codes +const INVALID_PAYLOAD = 6778001; +// const CONNECTION_FAILED = 6778002; +// const PURCHASE_EXPIRED = 6778003; + +let api = {}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /iap/android/verify Android Verify IAP + * @apiVersion 3.0.0 + * @apiName IapAndroidVerify + * @apiGroup Payments + **/ +api.iapAndroidVerify = { + method: 'POST', + url: '/iap/android/verify', + middlewares: [authWithUrl], + async handler (req, res) { + let user = res.locals.user; + let iapBody = req.body; + + iap.setup((error) => { + if (error) { + let resObj = { + ok: false, + data: 'IAP Error', + }; + + return res.json(resObj); + } + + // google receipt must be provided as an object + // { + // "data": "{stringified data object}", + // "signature": "signature from google" + // } + let testObj = { + data: iapBody.transaction.receipt, + signature: iapBody.transaction.signature, + }; + + // iap is ready + iap.validate(iap.GOOGLE, testObj, (err, googleRes) => { + if (err) { + let resObj = { + ok: false, + data: { + code: INVALID_PAYLOAD, + message: err.toString(), + }, + }; + + return res.json(resObj); + } + + if (iap.isValidated(googleRes)) { + let resObj = { + ok: true, + data: googleRes, + }; + + payments.buyGems({ + user, + paymentMethod: 'IAP GooglePlay', + amount: 5.25, + }).then(() => res.json(resObj)); + } + }); + }); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /iap/ios/verify iOS Verify IAP + * @apiVersion 3.0.0 + * @apiName IapiOSVerify + * @apiGroup Payments + **/ +api.iapiOSVerify = { + method: 'POST', + url: '/iap/ios/verify', + middlewares: [authWithHeaders()], + async handler (req, res) { + let iapBody = req.body; + let user = res.locals.user; + + iap.setup(function iosSetupResult (error) { + if (error) { + let resObj = { + ok: false, + data: 'IAP Error', + }; + + return res.json(resObj); + } + + // iap is ready + iap.validate(iap.APPLE, iapBody.transaction.receipt, (err, appleRes) => { + if (err) { + let resObj = { + ok: false, + data: { + code: INVALID_PAYLOAD, + message: err.toString(), + }, + }; + + return res.json(resObj); + } + + if (iap.isValidated(appleRes)) { + let purchaseDataList = iap.getPurchaseData(appleRes); + if (purchaseDataList.length > 0) { + let correctReceipt = true; + + for (let index in purchaseDataList) { + switch (purchaseDataList[index].productId) { + case 'com.habitrpg.ios.Habitica.4gems': + payments.buyGems({user, paymentMethod: 'IAP AppleStore', amount: 1}); + break; + case 'com.habitrpg.ios.Habitica.8gems': + payments.buyGems({user, paymentMethod: 'IAP AppleStore', amount: 2}); + break; + case 'com.habitrpg.ios.Habitica.20gems': + case 'com.habitrpg.ios.Habitica.21gems': + payments.buyGems({user, paymentMethod: 'IAP AppleStore', amount: 5.25}); + break; + case 'com.habitrpg.ios.Habitica.42gems': + payments.buyGems({user, paymentMethod: 'IAP AppleStore', amount: 10.5}); + break; + default: + correctReceipt = false; + } + } + + if (correctReceipt) { + let resObj = { + ok: true, + data: appleRes, + }; + + // yay good! + return res.json(resObj); + } + } + + // wrong receipt content + let resObj = { + ok: false, + data: { + code: INVALID_PAYLOAD, + message: 'Incorrect receipt content', + }, + }; + + return res.json(resObj); + } + + // invalid receipt + let resObj = { + ok: false, + data: { + code: INVALID_PAYLOAD, + message: 'Invalid receipt', + }, + }; + + return res.json(resObj); + }); + }); + }, +}; + +module.exports = api; diff --git a/website/server/controllers/top-level/payments/paypal.js b/website/server/controllers/top-level/payments/paypal.js new file mode 100644 index 0000000000..f60d5058dc --- /dev/null +++ b/website/server/controllers/top-level/payments/paypal.js @@ -0,0 +1,278 @@ +/* eslint-disable camelcase */ + +import nconf from 'nconf'; +import moment from 'moment'; +import _ from 'lodash'; +import payments from '../../../libs/api-v3/payments'; +import ipn from 'paypal-ipn'; +import paypal from 'paypal-rest-sdk'; +import shared from '../../../../../common'; +import cc from 'coupon-code'; +import Bluebird from 'bluebird'; +import { model as Coupon } from '../../../models/coupon'; +import { model as User } from '../../../models/user'; +import { + authWithUrl, + authWithSession, +} from '../../../middlewares/api-v3/auth'; +import { + BadRequest, + NotAuthorized, +} from '../../../libs/api-v3/errors'; + +const BASE_URL = nconf.get('BASE_URL'); + +// This is the plan.id for paypal subscriptions. You have to set up billing plans via their REST sdk (they don't have +// a web interface for billing-plan creation), see ./paypalBillingSetup.js for how. After the billing plan is created +// there, get it's plan.id and store it in config.json +_.each(shared.content.subscriptionBlocks, (block) => { + block.paypalKey = nconf.get(`PAYPAL:billing_plans:${block.key}`); +}); + +paypal.configure({ + mode: nconf.get('PAYPAL:mode'), // sandbox or live + client_id: nconf.get('PAYPAL:client_id'), + client_secret: nconf.get('PAYPAL:client_secret'), +}); + +// TODO better handling of errors +const paypalPaymentCreate = Bluebird.promisify(paypal.payment.create, {context: paypal.payment}); +const paypalPaymentExecute = Bluebird.promisify(paypal.payment.execute, {context: paypal.payment}); +const paypalBillingAgreementCreate = Bluebird.promisify(paypal.billingAgreement.create, {context: paypal.billingAgreement}); +const paypalBillingAgreementExecute = Bluebird.promisify(paypal.billingAgreement.execute, {context: paypal.billingAgreement}); +const paypalBillingAgreementGet = Bluebird.promisify(paypal.billingAgreement.get, {context: paypal.billingAgreement}); +const paypalBillingAgreementCancel = Bluebird.promisify(paypal.billingAgreement.cancel, {context: paypal.billingAgreement}); + +const ipnVerifyAsync = Bluebird.promisify(ipn.verify, {context: ipn}); + +let api = {}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /paypal/checkout Paypal: checkout + * @apiVersion 3.0.0 + * @apiName PaypalCheckout + * @apiGroup Payments + **/ +api.checkout = { + method: 'GET', + url: '/paypal/checkout', + middlewares: [authWithUrl], + async handler (req, res) { + let gift = req.query.gift ? JSON.parse(req.query.gift) : undefined; + req.session.gift = req.query.gift; + + let amount = 5.00; + let description = 'HabitRPG gems'; + if (gift) { + if (gift.type === 'gems') { + amount = Number(gift.gems.amount / 4).toFixed(2); + description = `${description} (Gift)`; + } else { + amount = Number(shared.content.subscriptionBlocks[gift.subscription.key].price).toFixed(2); + description = 'mo. HabitRPG Subscription (Gift)'; + } + } + + let createPayment = { + intent: 'sale', + payer: { payment_method: 'Paypal' }, + redirect_urls: { + return_url: `${BASE_URL}/paypal/checkout/success`, + cancel_url: `${BASE_URL}`, + }, + transactions: [{ + item_list: { + items: [{ + name: description, + // sku: 1, + price: amount, + currency: 'USD', + quantity: 1, + }], + }, + amount: { + currency: 'USD', + total: amount, + }, + description, + }], + }; + + let result = await paypalPaymentCreate(createPayment); + let link = _.find(result.links, { rel: 'approval_url' }).href; + res.redirect(link); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /paypal/checkout/success Paypal: checkout success + * @apiVersion 3.0.0 + * @apiName PaypalCheckoutSuccess + * @apiGroup Payments + **/ +api.checkoutSuccess = { + method: 'GET', + url: '/paypal/checkout/success', + middlewares: [authWithSession], + async handler (req, res) { + let paymentId = req.query.paymentId; + let customerId = req.query.PayerID; + + let method = 'buyGems'; + let data = { + user: res.locals.user, + customerId, + paymentMethod: 'Paypal', + }; + + let gift = req.session.gift ? JSON.parse(req.session.gift) : undefined; + delete req.session.gift; + + if (gift) { + gift.member = await User.findById(gift.uuid); + if (gift.type === 'subscription') { + method = 'createSubscription'; + } + + data.paymentMethod = 'Gift'; + data.gift = gift; + } + + await paypalPaymentExecute(paymentId, { payer_id: customerId }); + await payments[method](data); + res.redirect('/'); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /paypal/subscribe Paypal: subscribe + * @apiVersion 3.0.0 + * @apiName PaypalSubscribe + * @apiGroup Payments + **/ +api.subscribe = { + method: 'GET', + url: '/paypal/subscribe', + middlewares: [authWithUrl], + async handler (req, res) { + let sub = shared.content.subscriptionBlocks[req.query.sub]; + + if (sub.discount) { + if (!req.query.coupon) throw new BadRequest(res.t('couponCodeRequired')); + let coupon = await Coupon.findOne({_id: cc.validate(req.query.coupon), event: sub.key}); + if (!coupon) throw new NotAuthorized(res.t('invalidCoupon')); + } + + let billingPlanTitle = `HabitRPG Subscription ($${sub.price} every ${sub.months} months, recurring)`; + let billingAgreementAttributes = { + name: billingPlanTitle, + description: billingPlanTitle, + start_date: moment().add({ minutes: 5 }).format(), + plan: { + id: sub.paypalKey, + }, + payer: { + payment_method: 'Paypal', + }, + }; + let billingAgreement = await paypalBillingAgreementCreate(billingAgreementAttributes); + + req.session.paypalBlock = req.query.sub; + let link = _.find(billingAgreement.links, { rel: 'approval_url' }).href; + res.redirect(link); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /paypal/subscribe/success Paypal: subscribe success + * @apiVersion 3.0.0 + * @apiName PaypalSubscribeSuccess + * @apiGroup Payments + **/ +api.subscribeSuccess = { + method: 'GET', + url: '/paypal/subscribe/success', + middlewares: [authWithSession], + async handler (req, res) { + let user = res.locals.user; + let block = shared.content.subscriptionBlocks[req.session.paypalBlock]; + delete req.session.paypalBlock; + + let result = await paypalBillingAgreementExecute(req.query.token, {}); + await payments.createSubscription({ + user, + customerId: result.id, + paymentMethod: 'Paypal', + sub: block, + }); + + res.redirect('/'); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /paypal/subscribe/cancel Paypal: subscribe cancel + * @apiVersion 3.0.0 + * @apiName PaypalSubscribeCancel + * @apiGroup Payments + **/ +api.subscribeCancel = { + method: 'GET', + url: '/paypal/subscribe/cancel', + middlewares: [authWithUrl], + async handler (req, res) { + let user = res.locals.user; + let customerId = user.purchased.plan.customerId; + if (!user.purchased.plan.customerId) throw new NotAuthorized(res.t('missingSubscription')); + + let customer = await paypalBillingAgreementGet(customerId); + + let nextBillingDate = customer.agreement_details.next_billing_date; + if (customer.agreement_details.cycles_completed === '0') { // hasn't billed yet + throw new BadRequest(res.t('planNotActive', { nextBillingDate })); + } + + await paypalBillingAgreementCancel(customerId, { note: res.t('cancelingSubscription') }); + await payments.cancelSubscription({ + user, + paymentMethod: 'Paypal', + nextBill: nextBillingDate, + }); + + res.redirect('/'); + }, +}; + +// General IPN handler. We catch cancelled HabitRPG subscriptions for users who manually cancel their +// recurring paypal payments in their paypal dashboard. TODO ? Remove this when we can move to webhooks or some other solution + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /paypal/ipn Paypal IPN + * @apiVersion 3.0.0 + * @apiName PaypalIpn + * @apiGroup Payments + **/ +api.ipn = { + method: 'POST', + url: '/paypal/ipn', + async handler (req, res) { + res.sendStatus(200); + + await ipnVerifyAsync(req.body); + + if (req.body.txn_type === 'recurring_payment_profile_cancel' || req.body.txn_type === 'subscr_cancel') { + let user = await User.findOne({ 'purchased.plan.customerId': req.body.recurring_payment_id }); + if (user) { + await payments.cancelSubscription({ user, paymentMethod: 'Paypal' }); + } + } + }, +}; + +module.exports = api; diff --git a/website/server/controllers/top-level/payments/stripe.js b/website/server/controllers/top-level/payments/stripe.js new file mode 100644 index 0000000000..ea6d665613 --- /dev/null +++ b/website/server/controllers/top-level/payments/stripe.js @@ -0,0 +1,169 @@ +import stripeModule from 'stripe'; +import shared from '../../../../../common'; +import { + BadRequest, + NotAuthorized, +} from '../../../libs/api-v3/errors'; +import { model as Coupon } from '../../../models/coupon'; +import payments from '../../../libs/api-v3/payments'; +import nconf from 'nconf'; +import { model as User } from '../../../models/user'; +import cc from 'coupon-code'; +import { + authWithHeaders, + authWithUrl, +} from '../../../middlewares/api-v3/auth'; + +const stripe = stripeModule(nconf.get('STRIPE_API_KEY')); + +let api = {}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /stripe/checkout Stripe checkout + * @apiVersion 3.0.0 + * @apiName StripeCheckout + * @apiGroup Payments + * + * @apiParam {string} id Body parameter - The token + * @apiParam {string} email Body parameter - the customer email + * @apiParam {string} gift Query parameter - stringified json object, gift + * @apiParam {string} sub Query parameter - subscription, possible values are: basic_earned, basic_3mo, basic_6mo, google_6mo, basic_12mo + * @apiParam {string} coupon Query parameter - coupon for the matching subscription, required only for certain subscriptions + * + * @apiSuccess {Object} data Empty object + **/ +api.checkout = { + method: 'POST', + url: '/stripe/checkout', + middlewares: [authWithHeaders()], + async handler (req, res) { + let token = req.body.id; + let user = res.locals.user; + let gift = req.query.gift ? JSON.parse(req.query.gift) : undefined; + let sub = req.query.sub ? shared.content.subscriptionBlocks[req.query.sub] : false; + let coupon; + let response; + + if (!token) throw new BadRequest('Missing req.body.id'); + + if (sub) { + if (sub.discount) { + if (!req.query.coupon) throw new BadRequest(res.t('couponCodeRequired')); + coupon = await Coupon.findOne({_id: cc.validate(req.query.coupon), event: sub.key}); + if (!coupon) throw new BadRequest(res.t('invalidCoupon')); + } + + response = await stripe.customers.create({ + email: req.body.email, + metadata: { uuid: user._id }, + card: token, + plan: sub.key, + }); + } else { + let amount = 500; // $5 + + if (gift) { + if (gift.type === 'subscription') { + amount = `${shared.content.subscriptionBlocks[gift.subscription.key].price * 100}`; + } else { + amount = `${gift.gems.amount / 4 * 100}`; + } + } + + response = await stripe.charges.create({ + amount, + currency: 'usd', + card: token, + }); + } + + if (sub) { + await payments.createSubscription({ + user, + customerId: response.id, + paymentMethod: 'Stripe', + sub, + }); + } else { + let method = 'buyGems'; + let data = { + user, + customerId: response.id, + paymentMethod: 'Stripe', + gift, + }; + + if (gift) { + let member = await User.findById(gift.uuid); + gift.member = member; + if (gift.type === 'subscription') method = 'createSubscription'; + data.paymentMethod = 'Gift'; + } + + await payments[method](data); + } + + res.respond(200, {}); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {post} /stripe/subscribe/edit Edit Stripe subscription + * @apiVersion 3.0.0 + * @apiName StripeSubscribeEdit + * @apiGroup Payments + * + * @apiParam {string} id Body parameter - The token + * + * @apiSuccess {Object} data Empty object + **/ +api.subscribeEdit = { + method: 'POST', + url: '/stripe/subscribe/edit', + middlewares: [authWithHeaders()], + async handler (req, res) { + let token = req.body.id; + let user = res.locals.user; + let customerId = user.purchased.plan.customerId; + + if (!customerId) throw new NotAuthorized(res.t('missingSubscription')); + if (!token) throw new BadRequest('Missing req.body.id'); + + let subscriptions = await stripe.customers.listSubscriptions(customerId); + let subscriptionId = subscriptions.data[0].id; + await stripe.customers.updateSubscription(customerId, subscriptionId, { card: token }); + + res.respond(200, {}); + }, +}; + +/** + * @apiIgnore Payments are considered part of the private API + * @api {get} /stripe/subscribe/cancel Cancel Stripe subscription + * @apiVersion 3.0.0 + * @apiName StripeSubscribeCancel + * @apiGroup Payments + **/ +api.subscribeCancel = { + method: 'GET', + url: '/stripe/subscribe/cancel', + middlewares: [authWithUrl], + async handler (req, res) { + let user = res.locals.user; + if (!user.purchased.plan.customerId) throw new NotAuthorized(res.t('missingSubscription')); + + let customer = await stripe.customers.retrieve(user.purchased.plan.customerId); + await stripe.customers.del(user.purchased.plan.customerId); + await payments.cancelSubscription({ + user, + nextBill: customer.subscription.current_period_end * 1000, // timestamp in seconds + paymentMethod: 'Stripe', + }); + + res.redirect('/'); + }, +}; + +module.exports = api; diff --git a/website/server/index.js b/website/server/index.js new file mode 100644 index 0000000000..ec8e882c99 --- /dev/null +++ b/website/server/index.js @@ -0,0 +1,46 @@ +'use strict'; +/* eslint-disable global-require, no-process-env */ + +// Register babel hook so we can write the real entry file (server.js) in ES6 +// In production, the es6 code is pre-transpiled so it doesn't need it +if (process.env.NODE_ENV !== 'production') { + require('babel-register'); +} + +// The BabelJS polyfill is needed in production too +require('babel-polyfill'); + +// Setup Bluebird as the global promise library +global.Promise = require('bluebird'); + +// Initialize configuration BEFORE anything +const setupNconf = require('./libs/api-v3/setupNconf'); +setupNconf(); + +const nconf = require('nconf'); + +const cluster = require('cluster'); +const logger = require('./libs/api-v3/logger'); + +const IS_PROD = nconf.get('IS_PROD'); +const IS_DEV = nconf.get('IS_DEV'); +const CORES = Number(nconf.get('WEB_CONCURRENCY')) || 0; + +// Initialize New Relic +if (IS_PROD && nconf.get('NEW_RELIC_ENABLED') === 'true') require('newrelic'); + +// Setup the cluster module +if (CORES !== 0 && cluster.isMaster && (IS_DEV || IS_PROD)) { + // Fork workers. If config.json has CORES=x, use that - otherwise, use all cpus-1 (production) + for (let i = 0; i < CORES; i += 1) { + cluster.fork(); + } + + cluster.on('disconnect', function onWorkerDisconnect (worker) { + let w = cluster.fork(); // replace the dead worker + + logger.info('[%s] [master:%s] worker:%s disconnect! new worker:%s fork', new Date(), process.pid, worker.process.pid, w.process.pid); + }); +} else { + module.exports = require('./server.js'); +} diff --git a/website/server/libs/api-v2/analytics.js b/website/server/libs/api-v2/analytics.js new file mode 100644 index 0000000000..6c1ccd3020 --- /dev/null +++ b/website/server/libs/api-v2/analytics.js @@ -0,0 +1,205 @@ +require('./i18n'); + +var _ = require('lodash'); +var Content = require('../../../../common').content; +var Amplitude = require('amplitude'); +var googleAnalytics = require('universal-analytics'); + +var ga; +var amplitude; + +var analytics = { + trackPurchase: trackPurchase, + track: track +} + +function init(options) { + if(!options) { throw 'No options provided' } + + amplitude = new Amplitude(options.amplitudeToken); + ga = googleAnalytics(options.googleAnalytics); + + return analytics; +} + +function track(eventType, data) { + _sendDataToAmplitude(eventType, data); + _sendDataToGoogle(eventType, data); +} + +function _sendDataToAmplitude(eventType, data) { + var amplitudeData = _formatDataForAmplitude(data); + amplitudeData.event_type = eventType; + amplitude.track(amplitudeData).catch(function(error) { + // @TODO log error with new relic + }); +} + +function _sendDataToGoogle(eventType, data) { + var eventData = { + ec: data.category, + ea: eventType + } + + var label = _generateLabelForGoogleAnalytics(data); + if(label) { eventData.el = label; } + + var value = _generateValueForGoogleAnalytics(data); + if(value) { eventData.ev = value; } + + ga.event(eventData).send(); +} + +function _generateLabelForGoogleAnalytics(data) { + var label; + var POSSIBLE_LABELS = ['gaLabel', 'itemKey']; + + _(POSSIBLE_LABELS).each(function(key) { + if(data[key]) { + label = data[key]; + return false; // exit _.each early + } + }).value(); + + return label; +} + +function _generateValueForGoogleAnalytics(data) { + var value; + var POSSIBLE_VALUES = ['gaValue', 'gemCost', 'goldCost']; + + _(POSSIBLE_VALUES).each(function(key) { + if(data[key]) { + value = data[key]; + return false; // exit _.each early + } + }).value(); + + return value; +} + +function trackPurchase(data) { + _sendPurchaseDataToAmplitude(data); + _sendPurchaseDataToGoogle(data); +} + +function _sendPurchaseDataToAmplitude(data) { + var amplitudeData = _formatDataForAmplitude(data); + amplitudeData.event_type = 'purchase'; + amplitudeData.revenue = data.purchaseValue; + + amplitude.track(amplitudeData).catch(function(error) { + // @TODO log error with new relic + }); +} + +function _formatDataForAmplitude(data) { + var PROPERTIES_TO_SCRUB = ['uuid', 'user', 'purchaseValue', 'gaLabel', 'gaValue']; + var event_properties = _.omit(data, PROPERTIES_TO_SCRUB); + + var ampData = { + user_id: data.uuid || 'no-user-id-was-provided', + platform: 'server', + event_properties: event_properties + } + + if(data.user) { + ampData.user_properties = _formatUserData(data.user); + } + + var itemName = _lookUpItemName(data.itemKey); + if(itemName) { + event_properties.itemName = itemName; + } + + return ampData; +} + +function _lookUpItemName(itemKey) { + if (!itemKey) return; + + var gear = Content.gear.flat[itemKey]; + var egg = Content.eggs[itemKey]; + var food = Content.food[itemKey]; + var hatchingPotion = Content.hatchingPotions[itemKey]; + var quest = Content.quests[itemKey]; + var spell = Content.special[itemKey]; + + var itemName; + + if (gear) { + itemName = gear.text(); + } else if (egg) { + itemName = egg.text() + ' Egg'; + } else if (food) { + itemName = food.text(); + } else if (hatchingPotion) { + itemName = hatchingPotion.text() + " Hatching Potion"; + } else if (quest) { + itemName = quest.text(); + } else if (spell) { + itemName = spell.text(); + } + + return itemName; +} + +function _formatUserData(user) { + var properties = {}; + + if (user.stats) { + properties.Class = user.stats.class; + properties.Experience = Math.floor(user.stats.exp); + properties.Gold = Math.floor(user.stats.gp); + properties.Health = Math.ceil(user.stats.hp); + properties.Level = user.stats.lvl; + properties.Mana = Math.floor(user.stats.mp); + } + + properties.tutorialComplete = user.flags && user.flags.tour && user.flags.tour.intro === -2; + + if (user.habits && user.dailys && user.todos && user.rewards) { + properties["Number Of Tasks"] = { + habits: user.habits.length, + dailys: user.dailys.length, + todos: user.todos.length, + rewards: user.rewards.length + }; + } + + if (user.contributor && user.contributor.level) { + properties.contributorLevel = user.contributor.level; + } + + if (user.purchased && user.purchased.plan.planId) { + properties.subscription = user.purchased.plan.planId; + } + + return properties; +} + +function _sendPurchaseDataToGoogle(data) { + var label = data.paymentMethod; + var type = data.purchaseType; + var price = data.purchaseValue; + var qty = data.quantity; + var sku = data.sku; + var itemKey = data.itemPurchased; + var variation = type; + if(data.gift) variation += ' - Gift'; + + var eventData = { + ec: 'commerce', + ea: type, + el: label, + ev: price + }; + + ga.event(eventData).send(); + + ga.transaction(data.uuid, price) + .item(price, qty, sku, itemKey, variation) + .send(); +} + +module.exports = init; diff --git a/website/server/libs/api-v2/buildManifest.js b/website/server/libs/api-v2/buildManifest.js new file mode 100644 index 0000000000..bfbab1421a --- /dev/null +++ b/website/server/libs/api-v2/buildManifest.js @@ -0,0 +1,59 @@ +var fs = require('fs'); +var path = require('path'); +var nconf = require('nconf'); +var _ = require('lodash'); +var manifestFiles = require("../../../client/manifest.json"); + +var IS_PROD = nconf.get('NODE_ENV') === 'production'; +var buildFiles = []; + +var walk = function(folder){ + var res = fs.readdirSync(folder); + + res.forEach(function(fileName){ + var file = folder + '/' + fileName; + if(fs.statSync(file).isDirectory()){ + walk(file); + }else{ + var relFolder = path.relative(path.join(__dirname, "/../../../build"), folder); + var old = fileName.replace(/-.{8}(\.[\d\w]+)$/, '$1'); + + if(relFolder){ + old = relFolder + '/' + old; + fileName = relFolder + '/' + fileName; + } + + buildFiles[old] = fileName; + } + }); +}; + +walk(path.join(__dirname, "/../../../build")); + +var getBuildUrl = module.exports.getBuildUrl = function(url){ + if(buildFiles[url]) return '/' + buildFiles[url]; + + return '/' + url; +}; + +module.exports.getManifestFiles = function(page){ + var files = manifestFiles[page]; + + if(!files) throw new Error("Page not found!"); + + var code = ''; + + if(IS_PROD){ + code += ''; + code += ''; + }else{ + _.each(files.css, function(file){ + code += ''; + }); + _.each(files.js, function(file){ + code += ''; + }); + } + + return code; +}; diff --git a/website/server/libs/api-v2/firebase.js b/website/server/libs/api-v2/firebase.js new file mode 100644 index 0000000000..8a8d9f002c --- /dev/null +++ b/website/server/libs/api-v2/firebase.js @@ -0,0 +1,83 @@ +var Firebase = require('firebase'); +var nconf = require('nconf'); +var isProd = nconf.get('NODE_ENV') === 'production'; +var firebaseConfig = nconf.get('FIREBASE'); + +var firebaseRef; +var isFirebaseEnabled = (nconf.get('NODE_ENV') === 'production') && (firebaseConfig.ENABLED === 'true'); + +import { TAVERN_ID } from '../../models/group'; + +// Setup +if(isFirebaseEnabled){ + firebaseRef = new Firebase('https://' + firebaseConfig.APP + '.firebaseio.com'); + + // TODO what happens if an op is sent before client is authenticated? + firebaseRef.authWithCustomToken(firebaseConfig.SECRET, function(err, authData){ + // TODO it's ok to kill the server here? what if FB is offline? + if(err) throw new Error('Impossible to authenticate Firebase'); + }); +} + +var api = module.exports = {}; + +api.updateGroupData = function(group){ + if(!isFirebaseEnabled) return; + // TODO is throw ok? we don't have callbacks + if(!group) throw new Error('group is required.'); + // Return in case of tavern (comparison working because we use string for _id) + if(group._id === TAVERN_ID) return; + + firebaseRef.child('rooms/' + group._id) + .set({ + name: group.name + }); +}; + +api.addUserToGroup = function(groupId, userId){ + if(!isFirebaseEnabled) return; + if(!userId || !groupId) throw new Error('groupId, userId are required.'); + if(groupId === TAVERN_ID) return; + + firebaseRef.child('members/' + groupId + '/' + userId) + .set(true); + + firebaseRef.child('users/' + userId + '/rooms/' + groupId) + .set(true); +}; + +api.removeUserFromGroup = function(groupId, userId){ + if(!isFirebaseEnabled) return; + if(!userId || !groupId) throw new Error('groupId, userId are required.'); + if(groupId === TAVERN_ID) return; + + firebaseRef.child('members/' + groupId + '/' + userId) + .remove(); + + firebaseRef.child('users/' + userId + '/rooms/' + groupId) + .remove(); +}; + +api.deleteGroup = function(groupId){ + if(!isFirebaseEnabled) return; + if(!groupId) throw new Error('groupId is required.'); + if(groupId === TAVERN_ID) return; + + firebaseRef.child('rooms/' + groupId) + .remove(); + + // TODO not really necessary as long as we only store room data, + // as empty objects are automatically deleted (/members/... in future...) + firebaseRef.child('members/' + groupId) + .remove(); +}; + +// TODO not really necessary as long as we only store room data, +// as empty objects are automatically deleted +api.deleteUser = function(userId){ + if(!isFirebaseEnabled) return; + if(!userId) throw new Error('userId is required.'); + + firebaseRef.child('users/' + userId) + .remove(); +}; diff --git a/website/server/libs/api-v2/i18n.js b/website/server/libs/api-v2/i18n.js new file mode 100644 index 0000000000..e8295deb03 --- /dev/null +++ b/website/server/libs/api-v2/i18n.js @@ -0,0 +1,180 @@ +var fs = require('fs'), + path = require('path'), + _ = require('lodash'), + User = require('../../models/user').model, + accepts = require('accepts'), + shared = require('../../../../common'), + translations = {}; + +var localePath = path.join(__dirname, "/../../../../common/locales/") + +var loadTranslations = function(locale){ + var files = fs.readdirSync(path.join(localePath, locale)); + translations[locale] = {}; + _.each(files, function(file){ + if(path.extname(file) !== '.json') return; + _.merge(translations[locale], require(path.join(localePath, locale, file))); + }); +}; + +// First fetch english so we can merge with missing strings in other languages +loadTranslations('en'); + +fs.readdirSync(localePath).forEach(function(file) { + if(file === 'en' || fs.statSync(path.join(localePath, file)).isDirectory() === false) return; + loadTranslations(file); + // Merge missing strings from english + _.defaults(translations[file], translations.en); +}); + +var langCodes = Object.keys(translations); + +var avalaibleLanguages = _.map(langCodes, function(langCode){ + return { + code: langCode, + name: translations[langCode].languageName + } +}); + +// Load MomentJS localization files +var momentLangs = {}; + +// Handle different language codes from MomentJS and /locales +var momentLangsMapping = { + 'en': 'en-gb', + 'en_GB': 'en-gb', + 'no': 'nn', + 'zh': 'zh-cn', + 'es_419': 'es' +}; + +var momentLangs = {}; + +_.each(langCodes, function(code){ + var lang = _.find(avalaibleLanguages, {code: code}); + lang.momentLangCode = (momentLangsMapping[code] || code); + try{ + // MomentJS lang files are JS files that has to be executed in the browser so we load them as plain text files + var f = fs.readFileSync(path.join(__dirname, '/../../node_modules/moment/locale/' + lang.momentLangCode + '.js'), 'utf8'); + momentLangs[code] = f; + }catch (e){} +}); + +// Remove en_GB from langCodes checked by browser to avaoi it being +// used in place of plain original 'en' +var defaultLangCodes = _.without(langCodes, 'en_GB'); + +// A list of languages that have different versions +var multipleVersionsLanguages = ['es', 'zh']; + +var latinAmericanSpanishes = { + 'es-419': 'es_419', + 'es-mx': 'es_419', + 'es-gt': 'es_419', + 'es-cr': 'es_419', + 'es-pa': 'es_419', + 'es-do': 'es_419', + 'es-ve': 'es_419', + 'es-co': 'es_419', + 'es-pe': 'es_419', + 'es-ar': 'es_419', + 'es-ec': 'es_419', + 'es-cl': 'es_419', + 'es-uy': 'es_419', + 'es-py': 'es_419', + 'es-bo': 'es_419', + 'es-sv': 'es_419', + 'es-hn': 'es_419', + 'es-ni': 'es_419', + 'es-pr': 'es_419', +}; + +var chineseVersions = { + 'zh-tw': 'zh_TW', +}; + +var getUserLanguage = function(req, res, next){ + var getFromBrowser = function(){ + var acceptedLanguages = accepts(req).languages(); + + var acceptable = _(acceptedLanguages).map(function(lang){ + return lang.slice(0, 2); + }).uniq().value(); + + var matches = _.intersection(acceptable, defaultLangCodes); + + var iAcceptedCompleteLang = (matches.length > 0) ? multipleVersionsLanguages.indexOf(matches[0].toLowerCase()) : -1; + + if(iAcceptedCompleteLang !== -1){ + var acceptedCompleteLang = _.find(acceptedLanguages, function(accepted){ + return accepted.slice(0, 2) == multipleVersionsLanguages[iAcceptedCompleteLang]; + }); + + if(acceptedCompleteLang){ + acceptedCompleteLang = acceptedCompleteLang.toLowerCase(); + }else{ + return 'en'; + } + + if(matches[0] === 'es'){ + return latinAmericanSpanishes[acceptedCompleteLang] || 'es'; + }else if(matches[0] === 'zh'){ + return chineseVersions[acceptedCompleteLang] || 'zh'; + }else{ + return en; + } + + }else if(matches.length > 0){ + return matches[0].toLowerCase(); + }else{ + return 'en'; + } + }; + + var getFromUser = function(user){ + var lang; + if(user && user.preferences.language && translations[user.preferences.language]){ + lang = user.preferences.language; + }else{ + var preferred = getFromBrowser(); + lang = translations[preferred] ? preferred : 'en'; + } + req.language = lang; + next(); + }; + + if(req.query.lang){ + req.language = translations[req.query.lang] ? (req.query.lang) : 'en'; + next(); + }else if(req.locals && req.locals.user){ + getFromUser(req.locals.user); + }else if(req.session && req.session.userId){ + User.findOne({_id: req.session.userId}, 'preferences.language', function(err, user){ + if(err) return next(err); + getFromUser(user); + }); + }else{ + getFromUser(null); + } +}; + +shared.i18n.translations = translations; + +module.exports = { + translations: translations, + avalaibleLanguages: avalaibleLanguages, + langCodes: langCodes, + getUserLanguage: getUserLanguage, + momentLangs: momentLangs +}; + + +// Export en strings only, temporary solution for mobile +// This is copied from middlewares/locals#t() +module.exports.enTranslations = function(){ // stringName and vars are the allowed parameters + var language = _.find(avalaibleLanguages, {code: 'en'}); + //language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); + var args = Array.prototype.slice.call(arguments, 0); + args.push(language.code); + return shared.i18n.t.apply(null, args); +}; diff --git a/website/server/libs/api-v2/logging.js b/website/server/libs/api-v2/logging.js new file mode 100644 index 0000000000..454b5a5aa8 --- /dev/null +++ b/website/server/libs/api-v2/logging.js @@ -0,0 +1,35 @@ +var nconf = require('nconf'); +var winston = require('winston'); + +var logger; + +if (!logger) { + logger = new (winston.Logger)({}); + logger.add(winston.transports.Console, {colorize:true}); // TODO remove + + if (nconf.get('NODE_ENV') !== 'production') { + logger.add(winston.transports.File, {filename: 'habitrpg.log'}); + } +} + +// A custom log function that wraps Winston. Makes it easy to instrument code +// and still possible to replace Winston in the future. +module.exports.log = function(/* variable args */) { + if (logger) + logger.log.apply(logger, arguments); +}; + +module.exports.info = function(/* variable args */) { + if (logger) + logger.info.apply(logger, arguments); +}; + +module.exports.warn = function(/* variable args */) { + if (logger) + logger.warn.apply(logger, arguments); +}; + +module.exports.error = function(/* variable args */) { + if (logger) + logger.error.apply(logger, arguments); +}; \ No newline at end of file diff --git a/website/src/libs/utils.js b/website/server/libs/api-v2/utils.js similarity index 90% rename from website/src/libs/utils.js rename to website/server/libs/api-v2/utils.js index 6266843edf..8657bf6513 100644 --- a/website/src/libs/utils.js +++ b/website/server/libs/api-v2/utils.js @@ -4,8 +4,8 @@ var crypto = require('crypto'); var path = require("path"); var request = require('request'); -// Set when utils.setupConfig is run -var isProd, baseUrl; +const IS_PROD = nconf.get('IS_PROD'); +const BASE_URL = nconf.get('BASE_URL'); module.exports.sendEmail = function(mailData) { var smtpTransport = nodemailer.createTransport({ @@ -17,7 +17,7 @@ module.exports.sendEmail = function(mailData) { }); smtpTransport.sendMail(mailData, function(error, response){ - var logging = require('./logging'); + var logging = require('./api-v2/logging'); if(error) logging.error(error); else logging.info("Message sent: " + response.message); smtpTransport.close(); // shut down the connection pool, no more messages @@ -60,7 +60,7 @@ module.exports.txnEmail = function(mailingInfoArray, emailType, variables, perso var mailingInfoArray = Array.isArray(mailingInfoArray) ? mailingInfoArray : [mailingInfoArray]; var variables = [ - {name: 'BASE_URL', content: baseUrl} + {name: 'BASE_URL', content: BASE_URL} ].concat(variables || []); // It's important to pass at least a user with its `preferences` as we need to check if he unsubscribed @@ -121,7 +121,7 @@ module.exports.txnEmail = function(mailingInfoArray, emailType, variables, perso }); } - if(isProd && mailingInfoArray.length > 0){ + if(IS_PROD && mailingInfoArray.length > 0){ request({ url: nconf.get('EMAIL_SERVER:url') + '/job', method: 'POST', @@ -168,20 +168,12 @@ module.exports.analytics = { track: function() { }, trackPurchase: function() { * Load nconf and define default configuration values if config.json or ENV vars are not found */ module.exports.setupConfig = function(){ - nconf.argv() - .env() - //.file('defaults', path.join(path.resolve(__dirname, '../config.json.example'))) - .file('user', path.join(path.resolve(__dirname, './../../../config.json'))); - - if (nconf.get('NODE_ENV') === "development") + if (nconf.get('IS_DEV')) Error.stackTraceLimit = Infinity; - if (nconf.get('NODE_ENV') === 'production' && nconf.get('NEW_RELIC_ENABLED') === 'true') + if (IS_PROD && nconf.get('NEW_RELIC_ENABLED') === 'true') require('newrelic'); - isProd = nconf.get('NODE_ENV') === 'production'; - baseUrl = nconf.get('BASE_URL'); - - var analytics = isProd && require('./analytics'); + var analytics = IS_PROD && require('./api-v2/analytics'); var analyticsTokens = { amplitudeToken: nconf.get('AMPLITUDE_KEY'), googleAnalytics: nconf.get('GA_ID') diff --git a/website/src/libs/webhook.js b/website/server/libs/api-v2/webhook.js similarity index 100% rename from website/src/libs/webhook.js rename to website/server/libs/api-v2/webhook.js diff --git a/website/server/libs/api-v3/amazonPayments.js b/website/server/libs/api-v3/amazonPayments.js new file mode 100644 index 0000000000..4d3a3756b8 --- /dev/null +++ b/website/server/libs/api-v3/amazonPayments.js @@ -0,0 +1,62 @@ +import amazonPayments from 'amazon-payments'; +import nconf from 'nconf'; +import common from '../../../../common'; +import Bluebird from 'bluebird'; +import { + BadRequest, +} from './errors'; + +// TODO better handling of errors + +const i18n = common.i18n; +const IS_PROD = nconf.get('NODE_ENV') === 'production'; + +let amzPayment = amazonPayments.connect({ + environment: amazonPayments.Environment[IS_PROD ? 'Production' : 'Sandbox'], + sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), + mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'), + mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'), + clientId: nconf.get('AMAZON_PAYMENTS:CLIENT_ID'), +}); + +let getTokenInfo = Bluebird.promisify(amzPayment.api.getTokenInfo, {context: amzPayment.api}); +let createOrderReferenceId = Bluebird.promisify(amzPayment.offAmazonPayments.createOrderReferenceForId, {context: amzPayment.offAmazonPayments}); +let setOrderReferenceDetails = Bluebird.promisify(amzPayment.offAmazonPayments.setOrderReferenceDetails, {context: amzPayment.offAmazonPayments}); +let confirmOrderReference = Bluebird.promisify(amzPayment.offAmazonPayments.confirmOrderReference, {context: amzPayment.offAmazonPayments}); +let closeOrderReference = Bluebird.promisify(amzPayment.offAmazonPayments.closeOrderReference, {context: amzPayment.offAmazonPayments}); +let setBillingAgreementDetails = Bluebird.promisify(amzPayment.offAmazonPayments.setBillingAgreementDetails, {context: amzPayment.offAmazonPayments}); +let confirmBillingAgreement = Bluebird.promisify(amzPayment.offAmazonPayments.confirmBillingAgreement, {context: amzPayment.offAmazonPayments}); +let closeBillingAgreement = Bluebird.promisify(amzPayment.offAmazonPayments.closeBillingAgreement, {context: amzPayment.offAmazonPayments}); + +let authorizeOnBillingAgreement = (inputSet) => { + return new Promise((resolve, reject) => { + amzPayment.offAmazonPayments.authorizeOnBillingAgreement(inputSet, (err, response) => { + if (err) return reject(err); + if (response.AuthorizationDetails.AuthorizationStatus.State === 'Declined') return reject(new BadRequest(i18n.t('paymentNotSuccessful'))); + return resolve(response); + }); + }); +}; + +let authorize = (inputSet) => { + return new Promise((resolve, reject) => { + amzPayment.offAmazonPayments.authorize(inputSet, (err, response) => { + if (err) return reject(err); + if (response.AuthorizationDetails.AuthorizationStatus.State === 'Declined') return reject(new BadRequest(i18n.t('paymentNotSuccessful'))); + return resolve(response); + }); + }); +}; + +module.exports = { + getTokenInfo, + createOrderReferenceId, + setOrderReferenceDetails, + confirmOrderReference, + closeOrderReference, + confirmBillingAgreement, + setBillingAgreementDetails, + closeBillingAgreement, + authorizeOnBillingAgreement, + authorize, +}; diff --git a/website/server/libs/api-v3/analyticsService.js b/website/server/libs/api-v3/analyticsService.js new file mode 100644 index 0000000000..b810ac1858 --- /dev/null +++ b/website/server/libs/api-v3/analyticsService.js @@ -0,0 +1,237 @@ +/* eslint-disable camelcase */ +import nconf from 'nconf'; +import Amplitude from 'amplitude'; +import Bluebird from 'bluebird'; +import googleAnalytics from 'universal-analytics'; +import { + each, + omit, +} from 'lodash'; +import { content as Content } from '../../../../common'; + +const AMPLIUDE_TOKEN = nconf.get('AMPLITUDE_KEY'); +const GA_TOKEN = nconf.get('GA_ID'); +const GA_POSSIBLE_LABELS = ['gaLabel', 'itemKey']; +const GA_POSSIBLE_VALUES = ['gaValue', 'gemCost', 'goldCost']; +const AMPLITUDE_PROPERTIES_TO_SCRUB = ['uuid', 'user', 'purchaseValue', 'gaLabel', 'gaValue']; + +let amplitude = new Amplitude(AMPLIUDE_TOKEN); +let ga = googleAnalytics(GA_TOKEN); + +let _lookUpItemName = (itemKey) => { + if (!itemKey) return; + + let gear = Content.gear.flat[itemKey]; + let egg = Content.eggs[itemKey]; + let food = Content.food[itemKey]; + let hatchingPotion = Content.hatchingPotions[itemKey]; + let quest = Content.quests[itemKey]; + let spell = Content.special[itemKey]; + + let itemName; + + if (gear) { + itemName = gear.text(); + } else if (egg) { + itemName = `${egg.text()} Egg`; + } else if (food) { + itemName = food.text(); + } else if (hatchingPotion) { + itemName = `${hatchingPotion.text()} Hatching Potion`; + } else if (quest) { + itemName = quest.text(); + } else if (spell) { + itemName = spell.text(); + } + + return itemName; +}; + +let _formatUserData = (user) => { + let properties = {}; + + if (user.stats) { + properties.Class = user.stats.class; + properties.Experience = Math.floor(user.stats.exp); + properties.Gold = Math.floor(user.stats.gp); + properties.Health = Math.ceil(user.stats.hp); + properties.Level = user.stats.lvl; + properties.Mana = Math.floor(user.stats.mp); + } + + properties.tutorialComplete = user.flags && user.flags.tour && user.flags.tour.intro === -2; + + if (user.habits && user.dailys && user.todos && user.rewards) { + properties['Number Of Tasks'] = { + habits: user.habits.length, + dailys: user.dailys.length, + todos: user.todos.length, + rewards: user.rewards.length, + }; + } + + if (user.contributor && user.contributor.level) { + properties.contributorLevel = user.contributor.level; + } + + if (user.purchased && user.purchased.plan.planId) { + properties.subscription = user.purchased.plan.planId; + } + + return properties; +}; + + +let _formatDataForAmplitude = (data) => { + let event_properties = omit(data, AMPLITUDE_PROPERTIES_TO_SCRUB); + + let ampData = { + user_id: data.uuid || 'no-user-id-was-provided', + platform: 'server', + event_properties, + }; + + if (data.user) { + ampData.user_properties = _formatUserData(data.user); + } + + let itemName = _lookUpItemName(data.itemKey); + + if (itemName) { + event_properties.itemName = itemName; + } + + return ampData; +}; + +let _sendDataToAmplitude = (eventType, data) => { + let amplitudeData = _formatDataForAmplitude(data); + + amplitudeData.event_type = eventType; + + return new Bluebird((resolve, reject) => { + amplitude.track(amplitudeData) + .then(resolve) + .catch(reject); + }); +}; + +let _generateLabelForGoogleAnalytics = (data) => { + let label; + + each(GA_POSSIBLE_LABELS, (key) => { + if (data[key]) { + label = data[key]; + return false; // exit each early + } + }); + + return label; +}; + +let _generateValueForGoogleAnalytics = (data) => { + let value; + + each(GA_POSSIBLE_VALUES, (key) => { + if (data[key]) { + value = data[key]; + return false; // exit each early + } + }); + + return value; +}; + +let _sendDataToGoogle = (eventType, data) => { + let eventData = { + ec: data.category, + ea: eventType, + }; + + let label = _generateLabelForGoogleAnalytics(data); + + if (label) { + eventData.el = label; + } + + let value = _generateValueForGoogleAnalytics(data); + + if (value) { + eventData.ev = value; + } + + return new Bluebird((resolve, reject) => { + ga.event(eventData, (err) => { + if (err) return reject(err); + resolve(); + }); + }); +}; + +let _sendPurchaseDataToAmplitude = (data) => { + let amplitudeData = _formatDataForAmplitude(data); + + amplitudeData.event_type = 'purchase'; + amplitudeData.revenue = data.purchaseValue; + + return new Bluebird((resolve, reject) => { + amplitude.track(amplitudeData) + .then(resolve) + .catch(reject); + }); +}; + +let _sendPurchaseDataToGoogle = (data) => { + let label = data.paymentMethod; + let type = data.purchaseType; + let price = data.purchaseValue; + let qty = data.quantity; + let sku = data.sku; + let itemKey = data.itemPurchased; + let variation = type; + + if (data.gift) variation += ' - Gift'; + + let eventData = { + ec: 'commerce', + ea: type, + el: label, + ev: price, + }; + + return new Bluebird((resolve) => { + ga.event(eventData).send(); + + ga.transaction(data.uuid, price) + .item(price, qty, sku, itemKey, variation) + .send(); + + resolve(); + }); +}; + +function track (eventType, data) { + return Bluebird.all([ + _sendDataToAmplitude(eventType, data), + _sendDataToGoogle(eventType, data), + ]); +} + +function trackPurchase (data) { + return Bluebird.all([ + _sendPurchaseDataToAmplitude(data), + _sendPurchaseDataToGoogle(data), + ]); +} + +// Stub for non-prod environments +let mockAnalyticsService = { + track: () => { }, + trackPurchase: () => { }, +}; + +module.exports = { + track, + trackPurchase, + mockAnalyticsService, +}; diff --git a/website/server/libs/api-v3/baseModel.js b/website/server/libs/api-v3/baseModel.js new file mode 100644 index 0000000000..009b735fa6 --- /dev/null +++ b/website/server/libs/api-v3/baseModel.js @@ -0,0 +1,79 @@ +import { v4 as uuid } from 'uuid'; +import validator from 'validator'; +import objectPath from 'object-path'; // TODO use lodash's unset once v4 is out +import _ from 'lodash'; + +module.exports = function baseModel (schema, options = {}) { + if (options._id !== false) { + schema.add({ + _id: { + type: String, + default: uuid, + validate: [validator.isUUID, 'Invalid uuid.'], + }, + }); + } + + if (options.timestamps) { + schema.add({ + createdAt: { + type: Date, + default: Date.now, + }, + updatedAt: { + type: Date, + default: Date.now, + }, + }); + } + + if (options.timestamps) { + schema.pre('save', function updateUpdatedAt (next) { + if (!this.isNew) this.updatedAt = Date.now(); + next(); + }); + + schema.pre('update', function preUpdateModel () { + this.update({}, { $set: { updatedAt: new Date() } }); + }); + } + + let noSetFields = ['createdAt', 'updatedAt']; + let privateFields = ['__v']; + + if (Array.isArray(options.noSet)) noSetFields.push(...options.noSet); + // This method accepts an additional array of fields to be sanitized that can be passed at runtime + schema.statics.sanitize = function sanitize (objToSanitize = {}, additionalFields = []) { + noSetFields.concat(additionalFields).forEach((fieldPath) => { + objectPath.del(objToSanitize, fieldPath); + }); + + // Allow a sanitize transform function to be used + return options.sanitizeTransform ? options.sanitizeTransform(objToSanitize) : objToSanitize; + }; + + if (Array.isArray(options.private)) privateFields.push(...options.private); + + if (!schema.options.toJSON) schema.options.toJSON = {}; + schema.options.toJSON.transform = function transformToObject (doc, plainObj) { + privateFields.forEach((fieldPath) => { + objectPath.del(plainObj, fieldPath); + }); + + // Always return `id` + if (!plainObj.id && plainObj._id) plainObj.id = plainObj._id; + + // Allow an additional toJSON transform function to be used + return options.toJSONTransform ? options.toJSONTransform(plainObj, doc) : plainObj; + }; + + schema.statics.getModelPaths = function getModelPaths () { + return _.reduce(this.schema.paths, (result, field, path) => { + if (privateFields.indexOf(path) === -1) { + result[path] = field.instance || 'Boolean'; + } + + return result; + }, {}); + }; +}; diff --git a/website/server/libs/api-v3/buildManifest.js b/website/server/libs/api-v3/buildManifest.js new file mode 100644 index 0000000000..55db474354 --- /dev/null +++ b/website/server/libs/api-v3/buildManifest.js @@ -0,0 +1,62 @@ +import fs from 'fs'; +import path from 'path'; +import nconf from 'nconf'; + +const MANIFEST_FILE_PATH = path.join(__dirname, '/../../../client/manifest.json'); +const BUILD_FOLDER_PATH = path.join(__dirname, '/../../../build'); +let manifestFiles = require(MANIFEST_FILE_PATH); + +const IS_PROD = nconf.get('IS_PROD'); +let buildFiles = []; + +function _walk (folder) { + let files = fs.readdirSync(folder); + + files.forEach((fileName) => { + let file = `${folder}/${fileName}`; + + if (fs.statSync(file).isDirectory()) { + _walk(file); + } else { + let relFolder = path.relative(BUILD_FOLDER_PATH, folder); + let original = fileName.replace(/-.{8}(\.[\d\w]+)$/, '$1'); // Match the hash part of the filename + + if (relFolder) { + original = `${relFolder}/${original}`; + fileName = `${relFolder}/${fileName}`; + } + + buildFiles[original] = fileName; + } + }); +} + +// Walks through all the files in the build directory +// and creates a map of original files names and hashed files names +_walk(BUILD_FOLDER_PATH); + +export function getBuildUrl (url) { + return `/${buildFiles[url] || url}`; +} + +export function getManifestFiles (page) { + let files = manifestFiles[page]; + + if (!files) throw new Error(`Page "${page}" not found!`); + + let htmlCode = ''; + + if (IS_PROD) { + htmlCode += ``; // eslint-disable-line prefer-template + htmlCode += ``; // eslint-disable-line prefer-template + } else { + files.css.forEach((file) => { + htmlCode += ``; + }); + files.js.forEach((file) => { + htmlCode += ``; + }); + } + + return htmlCode; +} diff --git a/website/server/libs/api-v3/collectionManipulators.js b/website/server/libs/api-v3/collectionManipulators.js new file mode 100644 index 0000000000..95d3981601 --- /dev/null +++ b/website/server/libs/api-v3/collectionManipulators.js @@ -0,0 +1,22 @@ +import { + findIndex, + isPlainObject, +} from 'lodash'; + +export function removeFromArray (array, element) { + let elementIndex; + + if (isPlainObject(element)) { + elementIndex = findIndex(array, element); + } else { + elementIndex = array.indexOf(element); + } + + if (elementIndex !== -1) { + let removedElement = array[elementIndex]; + array.splice(elementIndex, 1); + return removedElement; + } + + return false; +} diff --git a/website/server/libs/api-v3/cron.js b/website/server/libs/api-v3/cron.js new file mode 100644 index 0000000000..6b46a7a435 --- /dev/null +++ b/website/server/libs/api-v3/cron.js @@ -0,0 +1,310 @@ +import moment from 'moment'; +import Bluebird from 'bluebird'; +import { model as User } from '../../models/user'; +import common from '../../../../common/'; +import { preenUserHistory } from '../../libs/api-v3/preening'; +import _ from 'lodash'; +import nconf from 'nconf'; + +const CRON_SAFE_MODE = nconf.get('CRON_SAFE_MODE') === 'true'; +const CRON_SEMI_SAFE_MODE = nconf.get('CRON_SEMI_SAFE_MODE') === 'true'; +const shouldDo = common.shouldDo; +const scoreTask = common.ops.scoreTask; +// const maxPMs = 200; + +export async function recoverCron (status, locals) { + let {user} = locals; + + await Bluebird.delay(300); + + let reloadedUser = await User.findOne({_id: user._id}).exec(); + + if (!reloadedUser) { + throw new Error(`User ${user._id} not found while recovering.`); + } else if (reloadedUser._cronSignature !== 'NOT_RUNNING') { + status.times++; + + if (status.times < 5) { + await recoverCron(status, locals); + } else { + throw new Error(`Impossible to recover from cron for user ${user._id}.`); + } + } else { + locals.user = reloadedUser; + return null; + } +} + +let CLEAR_BUFFS = { + str: 0, + int: 0, + per: 0, + con: 0, + stealth: 0, + streaks: false, +}; + +function grantEndOfTheMonthPerks (user, now) { + let plan = user.purchased.plan; + + if (moment(plan.dateUpdated).format('MMYYYY') !== moment().format('MMYYYY')) { + plan.gemsBought = 0; // reset gem-cap + plan.dateUpdated = now; + // For every month, inc their "consecutive months" counter. Give perks based on consecutive blocks + // If they already got perks for those blocks (eg, 6mo subscription, subscription gifts, etc) - then dec the offset until it hits 0 + // TODO use month diff instead of ++ / --? see https://github.com/HabitRPG/habitrpg/issues/4317 + _.defaults(plan.consecutive, {count: 0, offset: 0, trinkets: 0, gemCapExtra: 0}); + + plan.consecutive.count++; + + if (plan.consecutive.offset > 0) { + plan.consecutive.offset--; + } else if (plan.consecutive.count % 3 === 0) { // every 3 months + plan.consecutive.trinkets++; + plan.consecutive.gemCapExtra += 5; + if (plan.consecutive.gemCapExtra > 25) plan.consecutive.gemCapExtra = 25; // cap it at 50 (hard 25 limit + extra 25) + } + } +} + +function removeTerminatedSubscription (user) { + // If subscription's termination date has arrived + let plan = user.purchased.plan; + + if (plan.dateTerminated && moment(plan.dateTerminated).isBefore(new Date())) { + _.merge(plan, { + planId: null, + customerId: null, + paymentMethod: null, + }); + + _.merge(plan.consecutive, { + count: 0, + offset: 0, + gemCapExtra: 0, + }); + + user.markModified('purchased.plan'); + } +} + +function performSleepTasks (user, tasksByType, now) { + user.stats.buffs = _.cloneDeep(CLEAR_BUFFS); + + tasksByType.dailys.forEach((daily) => { + let completed = daily.completed; + let thatDay = moment(now).subtract({days: 1}); + + if (shouldDo(thatDay.toDate(), daily, user.preferences) || completed) { + // TODO also untick checklists if the Daily was due on previous missed days, if two or more days were missed at once -- https://github.com/HabitRPG/habitrpg/pull/7218#issuecomment-219256016 + if (daily.checklist) { + daily.checklist.forEach(box => box.completed = false); + } + } + + daily.completed = false; + }); +} + +// Perform various beginning-of-day reset actions. +export function cron (options = {}) { + let {user, tasksByType, analytics, now = new Date(), daysMissed, timezoneOffsetFromUserPrefs} = options; + + user.preferences.timezoneOffsetAtLastCron = timezoneOffsetFromUserPrefs; + // User is only allowed a certain number of drops a day. This resets the count. + if (user.items.lastDrop.count > 0) user.items.lastDrop.count = 0; + + // "Perfect Day" achievement for perfect-days + let perfect = true; + + if (user.isSubscribed()) { + grantEndOfTheMonthPerks(user, now); + if (!CRON_SAFE_MODE) removeTerminatedSubscription(user); + } + + // User is resting at the inn. + // On cron, buffs are cleared and all dailies are reset without performing damage + if (user.preferences.sleep === true) { + performSleepTasks(user, tasksByType, now); + return; + } + + let multiDaysCountAsOneDay = true; + // If the user does not log in for two or more days, cron (mostly) acts as if it were only one day. + // When site-wide difficulty settings are introduced, this can be a user preference option. + + // Tally each task + let todoTally = 0; + + tasksByType.todos.forEach(task => { // make uncompleted To-Dos redder (further incentive to complete them) + scoreTask({ + task, + user, + direction: 'down', + cron: true, + times: multiDaysCountAsOneDay ? 1 : daysMissed, + }); + + todoTally += task.value; + }); + + // For incomplete Dailys, add value (further incentive), deduct health, keep records for later decreasing the nightly mana gain + let dailyChecked = 0; // how many dailies were checked? + let dailyDueUnchecked = 0; // how many dailies were un-checked? + if (!user.party.quest.progress.down) user.party.quest.progress.down = 0; + + tasksByType.dailys.forEach((task) => { + let completed = task.completed; + // Deduct points for missed Daily tasks + let EvadeTask = 0; + let scheduleMisses = daysMissed; + + if (completed) { + dailyChecked += 1; + } else { + // dailys repeat, so need to calculate how many they've missed according to their own schedule + scheduleMisses = 0; + + for (let i = 0; i < daysMissed; i++) { + let thatDay = moment(now).subtract({days: i + 1}); + + if (shouldDo(thatDay.toDate(), task, user.preferences)) { + scheduleMisses++; + if (user.stats.buffs.stealth) { + user.stats.buffs.stealth--; + EvadeTask++; + } + if (multiDaysCountAsOneDay) break; + } + } + + if (scheduleMisses > EvadeTask) { + // The user did not complete this due Daily (but no penalty if cron is running in safe mode). + if (CRON_SAFE_MODE) { + dailyChecked += 1; // allows full allotment of mp to be gained + } else { + perfect = false; + + if (task.checklist && task.checklist.length > 0) { // Partially completed checklists dock fewer mana points + let fractionChecked = _.reduce(task.checklist, (m, i) => m + (i.completed ? 1 : 0), 0) / task.checklist.length; + dailyDueUnchecked += 1 - fractionChecked; + dailyChecked += fractionChecked; + } else { + dailyDueUnchecked += 1; + } + + let delta = scoreTask({ + user, + task, + direction: 'down', + times: multiDaysCountAsOneDay ? 1 : scheduleMisses - EvadeTask, + cron: true, + }); + + if (!CRON_SEMI_SAFE_MODE) { + // Apply damage from a boss, less damage for Trivial priority (difficulty) + user.party.quest.progress.down += delta * (task.priority < 1 ? task.priority : 1); + // NB: Medium and Hard priorities do not increase damage from boss. This was by accident + // initially, and when we realised, we could not fix it because users are used to + // their Medium and Hard Dailies doing an Easy amount of damage from boss. + // Easy is task.priority = 1. Anything < 1 will be Trivial (0.1) or any future + // setting between Trivial and Easy. + } + } + } + } + + task.history.push({ + date: Number(new Date()), + value: task.value, + }); + task.completed = false; + + if (completed || scheduleMisses > 0) { + if (task.checklist) { + task.checklist.forEach(i => i.completed = false); + } + } + }); + + // move singleton Habits towards yellow. + tasksByType.habits.forEach((task) => { // slowly reset 'onlies' value to 0 + if (task.up === false || task.down === false) { + task.value = Math.abs(task.value) < 0.1 ? 0 : task.value = task.value / 2; + } + }); + + // Finished tallying + user.history.todos.push({date: now, value: todoTally}); + + // tally experience + let expTally = user.stats.exp; + let lvl = 0; // iterator + while (lvl < user.stats.lvl - 1) { + lvl++; + expTally += common.tnl(lvl); + } + + user.history.exp.push({date: now, value: expTally}); + + // preen user history so that it doesn't become a performance problem + // also for subscribed users but differently + // TODO also do while resting in the inn. Note that later we'll be allowing the value/color of tasks to change while sleeping (https://github.com/HabitRPG/habitrpg/issues/5232), so the code in performSleepTasks() might be best merged back into here for that. Perhaps wait until then to do preen history for sleeping users. + preenUserHistory(user, tasksByType, user.preferences.timezoneOffset); + + if (perfect) { + user.achievements.perfect++; + let lvlDiv2 = Math.ceil(common.capByLevel(user.stats.lvl) / 2); + user.stats.buffs = { + str: lvlDiv2, + int: lvlDiv2, + per: lvlDiv2, + con: lvlDiv2, + stealth: 0, + streaks: false, + }; + } else { + user.stats.buffs = _.cloneDeep(CLEAR_BUFFS); + } + + // Add 10 MP, or 10% of max MP if that'd be more. Perform this after Perfect Day for maximum benefit + // Adjust for fraction of dailies completed + if (dailyDueUnchecked === 0 && dailyChecked === 0) dailyChecked = 1; + user.stats.mp += _.max([10, 0.1 * user._statsComputed.maxMP]) * dailyChecked / (dailyDueUnchecked + dailyChecked); + if (user.stats.mp > user._statsComputed.maxMP) user.stats.mp = user._statsComputed.maxMP; + + // After all is said and done, progress up user's effect on quest, return those values & reset the user's + let progress = user.party.quest.progress; + let _progress = _.cloneDeep(progress); + _.merge(progress, {down: 0, up: 0}); + progress.collect = _.transform(progress.collect, (m, v, k) => m[k] = 0); + + // TODO: Clean PMs - keep 200 for subscribers and 50 for free users. Should also be done while resting in the inn + // let numberOfPMs = Object.keys(user.inbox.messages).length; + // if (numberOfPMs > maxPMs) { + // _(user.inbox.messages) + // .sortBy('timestamp') + // .takeRight(numberOfPMs - maxPMs) + // .each(pm => { + // delete user.inbox.messages[pm.id]; + // }).value(); + // + // user.markModified('inbox.messages'); + // } + + // Analytics + user.flags.cronCount++; + analytics.track('Cron', { // TODO also do while resting in the inn. https://github.com/HabitRPG/habitrpg/issues/7161#issuecomment-218214191 + category: 'behavior', + gaLabel: 'Cron Count', + gaValue: user.flags.cronCount, + uuid: user._id, + user, + resting: user.preferences.sleep, + cronCount: user.flags.cronCount, + progressUp: _.min([_progress.up, 900]), + progressDown: _progress.down, + }); + + return _progress; +} diff --git a/website/server/libs/api-v3/csvStringify.js b/website/server/libs/api-v3/csvStringify.js new file mode 100644 index 0000000000..39fb7c16c8 --- /dev/null +++ b/website/server/libs/api-v3/csvStringify.js @@ -0,0 +1,11 @@ +import csvStringify from 'csv-stringify'; +import Bluebird from 'bluebird'; + +module.exports = (input) => { + return new Bluebird((resolve, reject) => { + csvStringify(input, (err, output) => { + if (err) return reject(err); + return resolve(output); + }); + }); +}; diff --git a/website/server/libs/api-v3/email.js b/website/server/libs/api-v3/email.js new file mode 100644 index 0000000000..fd2e166098 --- /dev/null +++ b/website/server/libs/api-v3/email.js @@ -0,0 +1,156 @@ +import { createTransport } from 'nodemailer'; +import nconf from 'nconf'; +import { encrypt } from './encryption'; +import request from 'request'; +import logger from './logger'; + +const IS_PROD = nconf.get('IS_PROD'); +const EMAIL_SERVER = { + url: nconf.get('EMAIL_SERVER:url'), + auth: { + user: nconf.get('EMAIL_SERVER:authUser'), + password: nconf.get('EMAIL_SERVER:authPassword'), + }, +}; +const BASE_URL = nconf.get('BASE_URL'); + +let smtpTransporter = createTransport({ + service: nconf.get('SMTP_SERVICE'), + auth: { + user: nconf.get('SMTP_USER'), + pass: nconf.get('SMTP_PASS'), + }, +}); + +// Send email directly from the server using the smtpTransporter, +// used only to send password reset emails because users unsubscribed on Mandrill wouldn't get them +export function send (mailData) { + return smtpTransporter.sendMail(mailData); // promise +} + +export function getUserInfo (user, fields = []) { + let info = {}; + + if (fields.indexOf('name') !== -1) { + info.name = user.profile && user.profile.name; + + if (!info.name) { + if (user.auth.local && user.auth.local.username) { + info.name = user.auth.local.username; + } else if (user.auth.facebook) { + info.name = user.auth.facebook.displayName || user.auth.facebook.username; + } + } + } + + if (fields.indexOf('email') !== -1) { + if (user.auth.local && user.auth.local.email) { + info.email = user.auth.local.email; + } else if (user.auth.facebook && user.auth.facebook.emails && user.auth.facebook.emails[0] && user.auth.facebook.emails[0].value) { + info.email = user.auth.facebook.emails[0].value; + } + } + + if (fields.indexOf('_id') !== -1) { + info._id = user._id; + } + + if (fields.indexOf('canSend') !== -1) { + if (user.preferences && user.preferences.emailNotifications) { + info.canSend = user.preferences.emailNotifications.unsubscribeFromAll !== true; + } + } + + return info; +} + +// Send a transactional email using Mandrill through the external email server +export function sendTxn (mailingInfoArray, emailType, variables, personalVariables) { + mailingInfoArray = Array.isArray(mailingInfoArray) ? mailingInfoArray : [mailingInfoArray]; + + variables = [ + {name: 'BASE_URL', content: BASE_URL}, + ].concat(variables || []); + + // It's important to pass at least a user with its `preferences` as we need to check if he unsubscribed + mailingInfoArray = mailingInfoArray.map((mailingInfo) => { + return mailingInfo._id ? getUserInfo(mailingInfo, ['_id', 'email', 'name', 'canSend']) : mailingInfo; + }).filter((mailingInfo) => { + // Always send reset-password emails + // Don't check canSend for non registered users as already checked before + return mailingInfo.email && (!mailingInfo._id || mailingInfo.canSend || emailType === 'reset-password'); + }); + + // Personal variables are personal to each email recipient, if they are missing + // we manually create a structure for them with RECIPIENT_NAME and RECIPIENT_UNSUB_URL + // otherwise we just add RECIPIENT_NAME and RECIPIENT_UNSUB_URL to the existing personal variables + if (!personalVariables || personalVariables.length === 0) { + personalVariables = mailingInfoArray.map((mailingInfo) => { + return { + rcpt: mailingInfo.email, + vars: [ + { + name: 'RECIPIENT_NAME', + content: mailingInfo.name, + }, + { + name: 'RECIPIENT_UNSUB_URL', + content: `/email/unsubscribe?code=${encrypt(JSON.stringify({ + _id: mailingInfo._id, + email: mailingInfo.email, + }))}`, + }, + ], + }; + }); + } else { + let temporaryPersonalVariables = {}; + + mailingInfoArray.forEach((mailingInfo) => { + temporaryPersonalVariables[mailingInfo.email] = { + name: mailingInfo.name, + _id: mailingInfo._id, + }; + }); + + personalVariables.forEach((singlePersonalVariables) => { + singlePersonalVariables.vars.push( + { + name: 'RECIPIENT_NAME', + content: temporaryPersonalVariables[singlePersonalVariables.rcpt].name, + }, + { + name: 'RECIPIENT_UNSUB_URL', + content: `/email/unsubscribe?code=${encrypt(JSON.stringify({ + _id: temporaryPersonalVariables[singlePersonalVariables.rcpt]._id, + email: singlePersonalVariables.rcpt, + }))}`, + } + ); + }); + } + + if (IS_PROD && mailingInfoArray.length > 0) { + request.post({ + url: `${EMAIL_SERVER.url}/job`, + auth: { + user: EMAIL_SERVER.auth.user, + pass: EMAIL_SERVER.auth.password, + }, + json: { + type: 'email', + data: { + emailType, + to: mailingInfoArray, + variables, + personalVariables, + }, + options: { + priority: 'high', + attempts: 5, + backoff: {delay: 10 * 60 * 1000, type: 'fixed'}, + }, + }, + }, (err) => logger.error(err)); + } +} diff --git a/website/server/libs/api-v3/encryption.js b/website/server/libs/api-v3/encryption.js new file mode 100644 index 0000000000..390c59234e --- /dev/null +++ b/website/server/libs/api-v3/encryption.js @@ -0,0 +1,24 @@ +import { + createCipher, + createDecipher, +} from 'crypto'; +import nconf from 'nconf'; + +const algorithm = 'aes-256-ctr'; +const SESSION_SECRET = nconf.get('SESSION_SECRET'); + +export function encrypt (text) { + let cipher = createCipher(algorithm, SESSION_SECRET); + let crypted = cipher.update(text, 'utf8', 'hex'); + + crypted += cipher.final('hex'); + return crypted; +} + +export function decrypt (text) { + let decipher = createDecipher(algorithm, SESSION_SECRET); + let dec = decipher.update(text, 'hex', 'utf8'); + + dec += decipher.final('utf8'); + return dec; +} diff --git a/website/server/libs/api-v3/errors.js b/website/server/libs/api-v3/errors.js new file mode 100644 index 0000000000..2b6d52bbe3 --- /dev/null +++ b/website/server/libs/api-v3/errors.js @@ -0,0 +1,62 @@ +import common from '../../../../common'; + +export const CustomError = common.errors.CustomError; + +/** + * @apiDefine NotAuthorized + * @apiError NotAuthorized The client is not authorized to make this request. + * + * @apiErrorExample Error-Response: + * HTTP/1.1 401 Unauthorized + * { + * "error": "NotAuthorized", + * "message": "Not authorized." + * } + */ +export const NotAuthorized = common.errors.NotAuthorized; + +/** + * @apiDefine BadRequest + * @apiError BadRequest The request wasn't formatted correctly. + * + * @apiErrorExample Error-Response: + * HTTP/1.1 400 Bad Request + * { + * "error": "BadRequest", + * "message": "Bad request." + * } + */ +export const BadRequest = common.errors.BadRequest; + +/** + * @apiDefine NotFound + * @apiError NotFound The requested resource was not found. + * + * @apiErrorExample Error-Response: + * HTTP/1.1 404 Not Found + * { + * "error": "NotFound", + * "message": "Not found." + * } + */ +export const NotFound = common.errors.NotFound; + +/** + * @apiDefine InternalServerError + * @apiError InternalServerError An unexpected error occurred. + * + * @apiErrorExample Error-Response: + * HTTP/1.1 500 Internal Server Error + * { + * "error": "InternalServerError", + * "message": "An unexpected error occurred." + * } + */ +export class InternalServerError extends CustomError { + constructor (customMessage) { + super(); + this.name = this.constructor.name; + this.httpCode = 500; + this.message = customMessage || 'An unexpected error occurred.'; + } +} diff --git a/website/server/libs/api-v3/firebase.js b/website/server/libs/api-v3/firebase.js new file mode 100644 index 0000000000..324183e85f --- /dev/null +++ b/website/server/libs/api-v3/firebase.js @@ -0,0 +1,69 @@ +import Firebase from 'firebase'; +import nconf from 'nconf'; +import { TAVERN_ID } from '../../models/group'; + +const FIREBASE_CONFIG = nconf.get('FIREBASE'); +const FIREBASE_ENABLED = FIREBASE_CONFIG.ENABLED === 'true'; + +let firebaseRef; + +if (FIREBASE_ENABLED) { + firebaseRef = new Firebase(`https://${FIREBASE_CONFIG.APP}.firebaseio.com`); + + // TODO what happens if an op is sent before client is authenticated? + firebaseRef.authWithCustomToken(FIREBASE_CONFIG.SECRET, (err) => { + // TODO it's ok to kill the server here? what if FB is offline? + if (err) throw new Error('Impossible to authenticate Firebase'); + }); +} + +export function updateGroupData (group) { + if (!FIREBASE_ENABLED) return; + // TODO is throw ok? we don't have callbacks + if (!group) throw new Error('group obj is required.'); + // Return in case of tavern (comparison working because we use string for _id) + if (group._id === TAVERN_ID) return; + + firebaseRef.child(`rooms/${group._id}`) + .set({ + name: group.name, + }); +} + +export function addUserToGroup (groupId, userId) { + if (!FIREBASE_ENABLED) return; + if (!userId || !groupId) throw new Error('groupId, userId are required.'); + if (groupId === TAVERN_ID) return; + + firebaseRef.child(`members/${groupId}/${userId}`).set(true); + firebaseRef.child(`users/${userId}/rooms/${groupId}`).set(true); +} + +export function removeUserFromGroup (groupId, userId) { + if (!FIREBASE_ENABLED) return; + if (!userId || !groupId) throw new Error('groupId, userId are required.'); + if (groupId === TAVERN_ID) return; + + firebaseRef.child(`members/${groupId}/${userId}`).remove(); + firebaseRef.child(`users/${userId}/rooms/${groupId}`).remove(); +} + +export function deleteGroup (groupId) { + if (!FIREBASE_ENABLED) return; + if (!groupId) throw new Error('groupId is required.'); + if (groupId === TAVERN_ID) return; + + firebaseRef.child(`members/${groupId}`).remove(); + // TODO not really necessary as long as we only store room data, + // as empty objects are automatically deleted (/members/... in future...) + firebaseRef.child(`rooms/${groupId}`).remove(); +} + +// TODO not really necessary as long as we only store room data, +// as empty objects are automatically deleted +export function deleteUser (userId) { + if (!FIREBASE_ENABLED) return; + if (!userId) throw new Error('userId is required.'); + + firebaseRef.child(`users/${userId}`).remove(); +} diff --git a/website/server/libs/api-v3/i18n.js b/website/server/libs/api-v3/i18n.js new file mode 100644 index 0000000000..4c424ace39 --- /dev/null +++ b/website/server/libs/api-v3/i18n.js @@ -0,0 +1,105 @@ +import fs from 'fs'; +import path from 'path'; +import _ from 'lodash'; +import shared from '../../../../common'; + +export const localePath = path.join(__dirname, '/../../../../common/locales/'); + +// Store translations +export let translations = {}; +// Store MomentJS localization files +export let momentLangs = {}; + +// Handle differencies in language codes between MomentJS and /locales +let momentLangsMapping = { + en: 'en-gb', + en_GB: 'en-gb', // eslint-disable-line camelcase + no: 'nn', + zh: 'zh-cn', + es_419: 'es', // eslint-disable-line camelcase +}; + +function _loadTranslations (locale) { + let files = fs.readdirSync(path.join(localePath, locale)); + + translations[locale] = {}; + + files.forEach((file) => { + if (path.extname(file) !== '.json') return; + + // We use require to load and parse a JSON file + _.merge(translations[locale], require(path.join(localePath, locale, file))); // eslint-disable-line global-require + }); +} + +// First fetch English strings so we can merge them with missing strings in other languages +_loadTranslations('en'); + +// Then load all other languages +fs.readdirSync(localePath).forEach((file) => { + if (file === 'en' || fs.statSync(path.join(localePath, file)).isDirectory() === false) return; + _loadTranslations(file); + + // Merge missing strings from english + _.defaults(translations[file], translations.en); +}); + +// Add translations to shared +shared.i18n.translations = translations; + +export let langCodes = Object.keys(translations); + +export let availableLanguages = langCodes.map((langCode) => { + return { + code: langCode, + name: translations[langCode].languageName, + }; +}); + +langCodes.forEach((code) => { + let lang = _.find(availableLanguages, {code}); + + lang.momentLangCode = momentLangsMapping[code] || code; + + try { + // MomentJS lang files are JS files that has to be executed in the browser so we load them as plain text files + // We wrap everything in a try catch because the file might not exist + let f = fs.readFileSync(path.join(__dirname, `/../../../node_modules/moment/locale/${lang.momentLangCode}.js`), 'utf8'); + + momentLangs[code] = f; + } catch (e) { // eslint-disable-lint no-empty + // The catch block is mandatory so it won't crash the server + } +}); + +// Remove en_GB from langCodes checked by browser to avoid it being +// used in place of plain original 'en' (it's an optional language that can be enabled only in setting) +export let defaultLangCodes = _.without(langCodes, 'en_GB'); + +// A map of languages that have different versions and the relative versions +export let multipleVersionsLanguages = { + es: { + 'es-419': 'es_419', + 'es-mx': 'es_419', + 'es-gt': 'es_419', + 'es-cr': 'es_419', + 'es-pa': 'es_419', + 'es-do': 'es_419', + 'es-ve': 'es_419', + 'es-co': 'es_419', + 'es-pe': 'es_419', + 'es-ar': 'es_419', + 'es-ec': 'es_419', + 'es-cl': 'es_419', + 'es-uy': 'es_419', + 'es-py': 'es_419', + 'es-bo': 'es_419', + 'es-sv': 'es_419', + 'es-hn': 'es_419', + 'es-ni': 'es_419', + 'es-pr': 'es_419', + }, + zh: { + 'zh-tw': 'zh_TW', + }, +}; diff --git a/website/server/libs/api-v3/logger.js b/website/server/libs/api-v3/logger.js new file mode 100644 index 0000000000..21622d8634 --- /dev/null +++ b/website/server/libs/api-v3/logger.js @@ -0,0 +1,84 @@ +// Logger utility +import winston from 'winston'; +import nconf from 'nconf'; +import _ from 'lodash'; +import { + CustomError, +} from './errors'; + +const IS_PROD = nconf.get('IS_PROD'); +const IS_TEST = nconf.get('IS_TEST'); +const ENABLE_LOGS_IN_TEST = nconf.get('ENABLE_CONSOLE_LOGS_IN_TEST') === 'true'; +const ENABLE_LOGS_IN_PROD = nconf.get('ENABLE_CONSOLE_LOGS_IN_PROD') === 'true'; + +const logger = new winston.Logger(); + +if (IS_PROD) { + if (ENABLE_LOGS_IN_PROD) { + logger.add(winston.transports.Console, { + timestamp: true, + colorize: false, + prettyPrint: false, + }); + } +} else if (!IS_TEST || IS_TEST && ENABLE_LOGS_IN_TEST) { // Do not log anything when testing unless specified + logger + .add(winston.transports.Console, { + timestamp: true, + colorize: true, + prettyPrint: true, + }); +} + +// exports a public interface insteaf of accessing directly the logger module +let loggerInterface = { + info (...args) { + logger.info(...args); + }, + + // Accepts two argument, + // an Error object (required) + // and an object of additional data to log alongside the error + // If the first argument isn't an Error, it'll call logger.error with all the arguments supplied + error (...args) { + let [err, errorData = {}, ...otherArgs] = args; + + if (err instanceof Error) { + // pass the error stack as the first parameter to logger.error + let stack = err.stack || err.message || err; + + if (_.isPlainObject(errorData) && !errorData.fullError) { + // If the error object has interesting data (not only httpCode, message and name from the CustomError class) + // add it to the logs + if (err instanceof CustomError) { + let errWithoutCommonProps = _.omit(err, ['name', 'httpCode', 'message']); + + if (Object.keys(errWithoutCommonProps).length > 0) { + errorData.fullError = errWithoutCommonProps; + } + } else { + errorData.fullError = err; + } + } + + let loggerArgs = [stack, errorData, ...otherArgs]; + + // Treat 4xx errors that are handled as warnings, 5xx and uncaught errors as serious problems + if (!errorData || !errorData.isHandledError || errorData.httpCode >= 500) { + logger.error(...loggerArgs); + } else { + logger.warn(...loggerArgs); + } + } else { + logger.error(...args); + } + }, +}; + +// Logs unhandled promises errors +// when no catch is attached to a promise a unhandledRejection event will be triggered +process.on('unhandledRejection', function handlePromiseRejection (reason) { + loggerInterface.error(reason); +}); + +module.exports = loggerInterface; diff --git a/website/server/libs/api-v3/password.js b/website/server/libs/api-v3/password.js new file mode 100644 index 0000000000..c825083936 --- /dev/null +++ b/website/server/libs/api-v3/password.js @@ -0,0 +1,18 @@ +// Utilities for working with passwords +import crypto from 'crypto'; + +// Return the encrypted version of a password (using sha1) given a salt +export function encrypt (password, salt) { + return crypto + .createHmac('sha1', salt) + .update(password) + .digest('hex'); +} + +// Create a salt, default length is 10 +export function makeSalt (len = 10) { + return crypto + .randomBytes(Math.ceil(len / 2)) + .toString('hex') + .substring(0, len); +} \ No newline at end of file diff --git a/website/server/libs/api-v3/payments.js b/website/server/libs/api-v3/payments.js new file mode 100644 index 0000000000..ae825abff3 --- /dev/null +++ b/website/server/libs/api-v3/payments.js @@ -0,0 +1,190 @@ +import _ from 'lodash' ; +import analytics from './analyticsService'; +import { + getUserInfo, + sendTxn as txnEmail, +} from './email'; +import moment from 'moment'; +import nconf from 'nconf'; +import sendPushNotification from './pushNotifications'; +import shared from '../../../../common' ; + +const IS_PROD = nconf.get('IS_PROD'); + +let api = {}; + +function revealMysteryItems (user) { + _.each(shared.content.gear.flat, function findMysteryItems (item) { + if ( + item.klass === 'mystery' && + moment().isAfter(shared.content.mystery[item.mystery].start) && + moment().isBefore(shared.content.mystery[item.mystery].end) && + !user.items.gear.owned[item.key] && + user.purchased.plan.mysteryItems.indexOf(item.key) === -1 + ) { + user.purchased.plan.mysteryItems.push(item.key); + } + }); +} + +api.createSubscription = async function createSubscription (data) { + let recipient = data.gift ? data.gift.member : data.user; + let plan = recipient.purchased.plan; + let block = shared.content.subscriptionBlocks[data.gift ? data.gift.subscription.key : data.sub.key]; + let months = Number(block.months); + + if (data.gift) { + if (plan.customerId && !plan.dateTerminated) { // User has active plan + plan.extraMonths += months; + } else { + plan.dateTerminated = moment(plan.dateTerminated).add({months}).toDate(); + if (!plan.dateUpdated) plan.dateUpdated = new Date(); + } + + if (!plan.customerId) plan.customerId = 'Gift'; // don't override existing customer, but all sub need a customerId + } else { + _(plan).merge({ // override with these values + planId: block.key, + customerId: data.customerId, + dateUpdated: new Date(), + gemsBought: 0, + paymentMethod: data.paymentMethod, + extraMonths: Number(plan.extraMonths) + + Number(plan.dateTerminated ? moment(plan.dateTerminated).diff(new Date(), 'months', true) : 0), + dateTerminated: null, + // Specify a lastBillingDate just for Amazon Payments + // Resetted every time the subscription restarts + lastBillingDate: data.paymentMethod === 'Amazon Payments' ? new Date() : undefined, + }).defaults({ // allow non-override if a plan was previously used + dateCreated: new Date(), + mysteryItems: [], + }).value(); + } + + // Block sub perks + let perks = Math.floor(months / 3); + if (perks) { + plan.consecutive.offset += months; + plan.consecutive.gemCapExtra += perks * 5; + if (plan.consecutive.gemCapExtra > 25) plan.consecutive.gemCapExtra = 25; + plan.consecutive.trinkets += perks; + } + + revealMysteryItems(recipient); + + if (IS_PROD) { + if (!data.gift) txnEmail(data.user, 'subscription-begins'); + + analytics.trackPurchase({ + uuid: data.user._id, + itemPurchased: 'Subscription', + sku: `${data.paymentMethod.toLowerCase()}-subscription`, + purchaseType: 'subscribe', + paymentMethod: data.paymentMethod, + quantity: 1, + gift: Boolean(data.gift), + purchaseValue: block.price, + }); + } + + data.user.purchased.txnCount++; + + if (data.gift) { + let message = `\`Hello ${data.gift.member.profile.name}, ${data.user.profile.name} has sent you ${shared.content.subscriptionBlocks[data.gift.subscription.key].months} months of subscription!\``; + if (data.gift.message) message += ` ${data.gift.message}`; + + data.user.sendMessage(data.gift.member, message); + + let byUserName = getUserInfo(data.user, ['name']).name; + + if (data.gift.member.preferences.emailNotifications.giftedSubscription !== false) { + txnEmail(data.gift.member, 'gifted-subscription', [ + {name: 'GIFTER', content: byUserName}, + {name: 'X_MONTHS_SUBSCRIPTION', content: months}, + ]); + } + + if (data.gift.member._id !== data.user._id) { // Only send push notifications if sending to a user other than yourself + sendPushNotification(data.gift.member, shared.i18n.t('giftedSubscription'), `${months} months - by ${byUserName}`); + } + } + + await data.user.save(); + if (data.gift) await data.gift.member.save(); +}; + +// Sets their subscription to be cancelled later +api.cancelSubscription = async function cancelSubscription (data) { + let plan = data.user.purchased.plan; + let now = moment(); + let remaining = data.nextBill ? moment(data.nextBill).diff(new Date(), 'days') : 30; + let nowStr = `${now.format('MM')}/${moment(plan.dateUpdated).format('DD')}/${now.format('YYYY')}`; + let nowStrFormat = 'MM/DD/YYYY'; + + plan.dateTerminated = + moment(nowStr, nowStrFormat) + .add({days: remaining}) // end their subscription 1mo from their last payment + .add({days: Math.ceil(30 * plan.extraMonths)}) // plus any extra time (carry-over, gifted subscription, etc) they have. + .toDate(); + plan.extraMonths = 0; // clear extra time. If they subscribe again, it'll be recalculated from p.dateTerminated + + await data.user.save(); + + txnEmail(data.user, 'cancel-subscription'); + + analytics.track('unsubscribe', { + uuid: data.user._id, + gaCategory: 'commerce', + gaLabel: data.paymentMethod, + paymentMethod: data.paymentMethod, + }); +}; + +api.buyGems = async function buyGems (data) { + let amt = data.amount || 5; + amt = data.gift ? data.gift.gems.amount / 4 : amt; + + (data.gift ? data.gift.member : data.user).balance += amt; + data.user.purchased.txnCount++; + + if (IS_PROD) { + if (!data.gift) txnEmail(data.user, 'donation'); + + analytics.trackPurchase({ + uuid: data.user._id, + itemPurchased: 'Gems', + sku: `${data.paymentMethod.toLowerCase()}-checkout`, + purchaseType: 'checkout', + paymentMethod: data.paymentMethod, + quantity: 1, + gift: Boolean(data.gift), + purchaseValue: amt, + }); + } + + if (data.gift) { + let byUsername = getUserInfo(data.user, ['name']).name; + let gemAmount = data.gift.gems.amount || 20; + + let message = `\`Hello ${data.gift.member.profile.name}, ${data.user.profile.name} has sent you ${gemAmount} gems!\``; + if (data.gift.message) message += ` ${data.gift.message}`; + data.user.sendMessage(data.gift.member, message); + + if (data.gift.member.preferences.emailNotifications.giftedGems !== false) { + txnEmail(data.gift.member, 'gifted-gems', [ + {name: 'GIFTER', content: byUsername}, + {name: 'X_GEMS_GIFTED', content: gemAmount}, + ]); + } + + if (data.gift.member._id !== data.user._id) { // Only send push notifications if sending to a user other than yourself + sendPushNotification(data.gift.member, shared.i18n.t('giftedGems'), `${gemAmount} Gems - by ${byUsername}`); + } + + await data.gift.member.save(); + } + + await data.user.save(); +}; + +module.exports = api; diff --git a/website/server/libs/api-v3/preening.js b/website/server/libs/api-v3/preening.js new file mode 100644 index 0000000000..00be142299 --- /dev/null +++ b/website/server/libs/api-v3/preening.js @@ -0,0 +1,82 @@ +import _ from 'lodash'; +import moment from 'moment'; + +// Aggregate entries +function _aggregate (history, aggregateBy) { + return _.chain(history) + .groupBy(entry => { // group entries by aggregateBy + return moment(entry.date).format(aggregateBy); + }) + .sortBy((entry, key) => key) // sort by date + .map(entries => { + return { + date: Number(entries[0].date), + value: _.reduce(entries, (previousValue, entry) => { + return previousValue + entry.value; + }, 0) / entries.length, + }; + }) + .value(); +} + +/* Preen an array of history entries +Free users: +- 1 value for each day of the past 60 days (no compression) +- 1 value each month for the previous 10 months +- 1 value each year for the previous years +Subscribers and challenges: +- 1 value for each day of the past 365 days (no compression) +- 1 value each month for the previous 12 months +- 1 value each year for the previous years + */ +export function preenHistory (history, isSubscribed, timezoneOffset) { + // history = _.filter(history, historyEntry => Boolean(historyEntry)); // Filter missing entries + let now = timezoneOffset ? moment().zone(timezoneOffset) : moment(); + // Date after which to begin compressing data + let cutOff = now.subtract(isSubscribed ? 365 : 60, 'days').startOf('day'); + + // Keep uncompressed entries (modifies history and returns removed items) + let newHistory = _.remove(history, entry => { + let date = moment(entry.date); + return date.isSame(cutOff) || date.isAfter(cutOff); + }); + + // Date after which to begin compressing data by year + let monthsCutOff = cutOff.subtract(isSubscribed ? 12 : 10, 'months').startOf('day'); + let aggregateByMonth = _.remove(history, entry => { + let date = moment(entry.date); + return date.isSame(monthsCutOff) || date.isAfter(monthsCutOff); + }); + // Aggregate remaining entries by month and year + if (aggregateByMonth.length > 0) newHistory.unshift(..._aggregate(aggregateByMonth, 'YYYYMM')); + if (history.length > 0) newHistory.unshift(..._aggregate(history, 'YYYY')); + + return newHistory; +} + +// Preen history for users and tasks. +export function preenUserHistory (user, tasksByType) { + let isSubscribed = user.isSubscribed(); + let timezoneOffset = user.preferences.timezoneOffset; + let minHistoryLength = isSubscribed ? 365 : 60; + + function _processTask (task) { + if (task.history && task.history.length > minHistoryLength) { + task.history = preenHistory(task.history, isSubscribed, timezoneOffset); + task.markModified('history'); + } + } + + tasksByType.habits.forEach(_processTask); + tasksByType.dailys.forEach(_processTask); + + if (user.history.exp.length > minHistoryLength) { + user.history.exp = preenHistory(user.history.exp, isSubscribed, timezoneOffset); + user.markModified('history.exp'); + } + + if (user.history.todos.length > minHistoryLength) { + user.history.todos = preenHistory(user.history.todos, isSubscribed, timezoneOffset); + user.markModified('history.todos'); + } +} diff --git a/website/server/libs/api-v3/pushNotifications.js b/website/server/libs/api-v3/pushNotifications.js new file mode 100644 index 0000000000..ce5af61661 --- /dev/null +++ b/website/server/libs/api-v3/pushNotifications.js @@ -0,0 +1,58 @@ +/* eslint-disable */ + +import _ from 'lodash'; +import nconf from 'nconf'; +import pushNotify from 'push-notify'; + +const GCM_API_KEY = nconf.get('PUSH_CONFIGS:GCM_SERVER_API_KEY'); + +let gcm = GCM_API_KEY ? pushNotify.gcm({ + apiKey: GCM_API_KEY, + retries: 3, +}) : undefined; + +// TODO review and test this file when push notifications are added back + +if (gcm) { + gcm.on('transmitted', (/* result, message, registrationId */) => { + // console.info("transmitted", result, message, registrationId); + }); + + gcm.on('transmissionError', (/* error, message, registrationId */) => { + // console.info("transmissionError", error, message, registrationId); + }); + + gcm.on('updated', (/* result, registrationId */) => { + // console.info("updated", result, registrationId); + }); +} + +module.exports = function sendNotification (user, title, message, timeToLive = 15) { + return; // TODO push notifications are not currently enabled + + if (!user) return; + let pushDevices = user.pushDevices.toObject ? user.pushDevices.toObject() : user.pushDevices; + + _.each(pushDevices, pushDevice => { + switch (pushDevice.type) { + case 'android': + if (gcm) { + gcm.send({ + registrationId: pushDevice.regId, + // collapseKey: 'COLLAPSE_KEY', + delayWhileIdle: true, + timeToLive, + data: { + title, + message, + }, + }); + } + + break; + + case 'ios': + break; + } + }); +}; diff --git a/website/server/libs/api-v3/routes.js b/website/server/libs/api-v3/routes.js new file mode 100644 index 0000000000..c0399fb73c --- /dev/null +++ b/website/server/libs/api-v3/routes.js @@ -0,0 +1,61 @@ +import fs from 'fs'; +import _ from 'lodash'; +import { + getUserLanguage, +} from '../../middlewares/api-v3/language'; +import cron from '../../middlewares/api-v3/cron'; + +// Wrapper function to handler `async` route handlers that return promises +// It takes the async function, execute it and pass any error to next (args[2]) +let _wrapAsyncFn = fn => (...args) => fn(...args).catch(args[2]); +let noop = (req, res, next) => next(); + +module.exports.readController = function readController (router, controller) { + _.each(controller, (action) => { + let {method, url, middlewares = [], handler, runCron} = action; + + // If an authentication middleware is used run getUserLanguage after it, otherwise before + // for cron instead use it only if an authentication middleware is present + let authMiddlewareIndex = _.findIndex(middlewares, middleware => { + if (middleware.name.indexOf('authWith') === 0) { // authWith{Headers|Session|Url|...} + return true; + } else { + return false; + } + }); + + let middlewaresToAdd = [getUserLanguage]; + + if (authMiddlewareIndex !== -1) { // the user will be authenticated, getUserLanguage and cron after authentication + if (!(runCron === false)) { // eslint-disable-line no-extra-parens + middlewaresToAdd.push(cron); + } + + if (authMiddlewareIndex === middlewares.length - 1) { + middlewares.push(...middlewaresToAdd); + } else { + middlewares.splice(authMiddlewareIndex + 1, 0, ...middlewaresToAdd); + } + } else { // no auth, getUserLanguage as the first middleware + middlewares.unshift(...middlewaresToAdd); + } + + method = method.toLowerCase(); + let fn = handler ? _wrapAsyncFn(handler) : noop; + + router[method](url, ...middlewares, fn); + }); +}; + +module.exports.walkControllers = function walkControllers (router, filePath) { + fs + .readdirSync(filePath) + .forEach(fileName => { + if (!fs.statSync(filePath + fileName).isFile()) { + walkControllers(router, `${filePath}${fileName}/`); + } else if (fileName.match(/\.js$/)) { + let controller = require(filePath + fileName); // eslint-disable-line global-require + module.exports.readController(router, controller); + } + }); +}; diff --git a/website/server/libs/api-v3/setupMongoose.js b/website/server/libs/api-v3/setupMongoose.js new file mode 100644 index 0000000000..41ba9e5358 --- /dev/null +++ b/website/server/libs/api-v3/setupMongoose.js @@ -0,0 +1,28 @@ +import nconf from 'nconf'; +import logger from './logger'; +import autoinc from 'mongoose-id-autoinc'; +import mongoose from 'mongoose'; +import Bluebird from 'bluebird'; + +const IS_PROD = nconf.get('IS_PROD'); +const MAINTENANCE_MODE = nconf.get('MAINTENANCE_MODE'); + +// Use Q promises instead of mpromise in mongoose +mongoose.Promise = Bluebird; + +// Do not connect to MongoDB when in maintenance mode +if (MAINTENANCE_MODE !== 'true') { + let mongooseOptions = !IS_PROD ? {} : { + replset: { socketOptions: { keepAlive: 120, connectTimeoutMS: 30000 } }, + server: { socketOptions: { keepAlive: 120, connectTimeoutMS: 30000 } }, + }; + + const NODE_DB_URI = nconf.get('IS_TEST') ? nconf.get('TEST_DB_URI') : nconf.get('NODE_DB_URI'); + + let db = mongoose.connect(NODE_DB_URI, mongooseOptions, (err) => { + if (err) throw err; + logger.info('Connected with Mongoose.'); + }); + + autoinc.init(db); +} \ No newline at end of file diff --git a/website/server/libs/api-v3/setupNconf.js b/website/server/libs/api-v3/setupNconf.js new file mode 100644 index 0000000000..d88b04014e --- /dev/null +++ b/website/server/libs/api-v3/setupNconf.js @@ -0,0 +1,17 @@ +import nconf from 'nconf'; +import { join, resolve } from 'path'; + +const PATH_TO_CONFIG = join(resolve(__dirname, '../../../../config.json')); + +module.exports = function setupNconf (file) { + let configFile = file || PATH_TO_CONFIG; + + nconf + .argv() + .env() + .file('user', configFile); + + nconf.set('IS_PROD', nconf.get('NODE_ENV') === 'production'); + nconf.set('IS_DEV', nconf.get('NODE_ENV') === 'development'); + nconf.set('IS_TEST', nconf.get('NODE_ENV') === 'test'); +}; diff --git a/website/server/libs/api-v3/setupPassport.js b/website/server/libs/api-v3/setupPassport.js new file mode 100644 index 0000000000..dd9fdeaaa2 --- /dev/null +++ b/website/server/libs/api-v3/setupPassport.js @@ -0,0 +1,24 @@ +import passport from 'passport'; +import nconf from 'nconf'; +import passportFacebook from 'passport-facebook'; + +const FacebookStrategy = passportFacebook.Strategy; + +// Passport session setup. +// To support persistent login sessions, Passport needs to be able to +// serialize users into and deserialize users out of the session. Typically, +// this will be as simple as storing the user ID when serializing, and finding +// the user by ID when deserializing. However, since this example does not +// have a database of user records, the complete Facebook profile is serialized +// and deserialized. +passport.serializeUser((user, done) => done(null, user)); +passport.deserializeUser((obj, done) => done(null, obj)); + +// TODO remove? +// This auth strategy is no longer used. It's just kept around for auth.js#loginFacebook() (passport._strategies.facebook.userProfile) +// The proper fix would be to move to a general OAuth module simply to verify accessTokens +passport.use(new FacebookStrategy({ + clientID: nconf.get('FACEBOOK_KEY'), + clientSecret: nconf.get('FACEBOOK_SECRET'), + // callbackURL: nconf.get("BASE_URL") + "/auth/facebook/callback" +}, (accessToken, refreshToken, profile, done) => done(null, profile))); diff --git a/website/server/libs/api-v3/webhook.js b/website/server/libs/api-v3/webhook.js new file mode 100644 index 0000000000..e53eebf541 --- /dev/null +++ b/website/server/libs/api-v3/webhook.js @@ -0,0 +1,31 @@ +import { each } from 'lodash'; +import { post } from 'request'; +import { isURL } from 'validator'; +import logger from './logger'; + +let _sendWebhook = (url, body) => { + post({ + url, + body, + json: true, + }, (err) => logger.error(err)); +}; + +let _isInvalidWebhook = (hook) => { + return !hook.enabled || !isURL(hook.url); +}; + +export function sendTaskWebhook (webhooks, data) { + each(webhooks, (hook) => { + if (_isInvalidWebhook(hook)) return; + + let body = { + direction: data.task.direction, + task: data.task.details, + delta: data.task.delta, + user: data.user, + }; + + _sendWebhook(hook.url, body); + }); +} diff --git a/website/server/middlewares/api-v2/domain.js b/website/server/middlewares/api-v2/domain.js new file mode 100644 index 0000000000..db3e65df2e --- /dev/null +++ b/website/server/middlewares/api-v2/domain.js @@ -0,0 +1,49 @@ +var nconf = require('nconf'); +var moment = require('moment'); +var domainMiddleware = require('domain-middleware'); +var os = require('os'); +var request = require('request'); + +var IS_PROD = nconf.get('NODE_ENV') === 'production'; + +module.exports = function(server,mongoose) { + /* if (IS_PROD) { + var mins = 3, // how often to run this check + useAvg = false, // use average over 3 minutes, or simply the last minute's report + url = 'https://api.newrelic.com/v2/applications/'+nconf.get('NEW_RELIC_APPLICATION_ID')+'/metrics/data.json?names[]=Apdex&values[]=score'; + setInterval(function(){ + // see https://docs.newrelic.com/docs/apm/apis/api-v2-examples/average-response-time-examples-api-v2, https://rpm.newrelic.com/api/explore/applications/data + request({ + url: useAvg ? url+'&from='+moment().subtract({minutes:mins}).utc().format()+'&to='+moment().utc().format()+'&summarize=true' : url, + headers: {'X-Api-Key': nconf.get('NEW_RELIC_API_KEY')} + }, function(err, response, body){ + var ts = JSON.parse(body).metric_data.metrics[0].timeslices, + score = ts[ts.length-1].values.score, + memory = os.freemem() / os.totalmem(), + memoryHigh = memory < 0.1; + + if (memoryHigh) { + var newRelicMemoryLeakMessage = '[Memory Leak] Apdex='+score+' Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format(); + throw newRelicMemoryLeakMessage; + } + }); + + var memory = os.freemem() / os.totalmem(), + memoryHigh = memory < 0.1; + if (memoryHigh) { + var memoryLeakMessage = '[Memory Leak] Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format(); + throw memoryLeakMessage; + } + }, mins*60*1000); + } */ + + return domainMiddleware({ + server: { + close:function(){ + server.close(); + mongoose.connection.close(); + } + }, + killTimeout: 10000 + }); +}; diff --git a/website/server/middlewares/api-v2/errorHandler.js b/website/server/middlewares/api-v2/errorHandler.js new file mode 100644 index 0000000000..fcea9d175c --- /dev/null +++ b/website/server/middlewares/api-v2/errorHandler.js @@ -0,0 +1,17 @@ +var logging = require('../../libs/api-v2/logging'); + +module.exports = function(err, req, res, next) { + //res.locals.domain.emit('error', err); + // when we hit an error, send it to admin as an email. If no ADMIN_EMAIL is present, just send it to yourself (SMTP_USER) + var stack = (err.stack ? err.stack : err.message ? err.message : err) + + "\n ----------------------------\n" + + "\n\noriginalUrl: " + req.originalUrl + + "\n\nauth: " + req.headers['x-api-user'] + ' | ' + req.headers['x-api-key'] + + "\n\nheaders: " + JSON.stringify(req.headers) + + "\n\nbody: " + JSON.stringify(req.body) + + (res.locals.ops ? "\n\ncompleted ops: " + JSON.stringify(res.locals.ops) : ""); + logging.error(stack); + var message = err.message ? err.message : err; + message = (message.length < 200) ? message : message.substring(0,100) + message.substring(message.length-100,message.length); + res.status(500).json({err:message}); //res.end(err.message); +}; diff --git a/website/server/middlewares/api-v2/locals.js b/website/server/middlewares/api-v2/locals.js new file mode 100644 index 0000000000..223186a81a --- /dev/null +++ b/website/server/middlewares/api-v2/locals.js @@ -0,0 +1,70 @@ +var nconf = require('nconf'); +var _ = require('lodash'); +var utils = require('../libs/api-v2/utils'); +var shared = require('../../../common'); +var i18n = require('../libs/api-v2/i18n'); +var buildManifest = require('../libs/api-v2/buildManifest'); +var shared = require('../../../common'); +var forceRefresh = require('./forceRefresh'); +var tavernQuest = require('../models/group').tavernQuest; +var mods = require('../models/user').mods; + +// To avoid stringifying more data then we need, +// items from `env` used on the client will have to be specified in this array +var clientVars = ['language', 'isStaticPage', 'avalaibleLanguages', 'translations', + 'FACEBOOK_KEY', 'NODE_ENV', 'BASE_URL', 'GA_ID', + 'AMAZON_PAYMENTS', 'STRIPE_PUB_KEY', 'AMPLITUDE_KEY', + 'worldDmg', 'mods', 'IS_MOBILE']; + +var env = { + getManifestFiles: buildManifest.getManifestFiles, + getBuildUrl: buildManifest.getBuildUrl, + _: _, + clientVars: clientVars, + mods: mods, + Content: shared.content, + siteVersion: forceRefresh.siteVersion, + avalaibleLanguages: i18n.avalaibleLanguages, + AMAZON_PAYMENTS: { + SELLER_ID: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), + CLIENT_ID: nconf.get('AMAZON_PAYMENTS:CLIENT_ID') + } +}; + +'NODE_ENV BASE_URL GA_ID STRIPE_PUB_KEY FACEBOOK_KEY AMPLITUDE_KEY'.split(' ').forEach(function(key){ + env[key] = nconf.get(key); +}); + +module.exports = function(req, res, next) { + var language = _.find(i18n.avalaibleLanguages, {code: req.language}); + var isStaticPage = req.url.split('/')[1] === 'static'; // If url contains '/static/' + + // Load moment.js language file only when not on static pages + language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); + + res.locals.habitrpg = _.assign(env, { + IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')), + language: language, + isStaticPage: isStaticPage, + translations: i18n.translations[language.code], + t: function(){ // stringName and vars are the allowed parameters + var args = Array.prototype.slice.call(arguments, 0); + args.push(language.code); + return shared.i18n.t.apply(null, args); + }, + // Defined here and not outside of the middleware because tavernQuest might be an + // empty object until the query to fetch it finishes + worldDmg: (tavernQuest && tavernQuest.extra && tavernQuest.extra.worldDmg) || {}, + }); + + // Put query-string party (& guild but use partyInvite for backward compatibility) + // invitations into session to be handled later + // TODO once we have proper logging in place, log errors here + if(req.query.partyInvite){ + try{ + req.session.partyInvite = JSON.parse(utils.decrypt(req.query.partyInvite)); + } catch(e){} + } + + next(); +}; diff --git a/website/server/middlewares/api-v3/analytics.js b/website/server/middlewares/api-v3/analytics.js new file mode 100644 index 0000000000..8512d16011 --- /dev/null +++ b/website/server/middlewares/api-v3/analytics.js @@ -0,0 +1,23 @@ +import nconf from 'nconf'; +import { + track, + trackPurchase, + mockAnalyticsService, +} from '../../libs/api-v3/analyticsService'; + +let service; + +if (nconf.get('IS_PROD')) { + service = { + track, + trackPurchase, + }; +} else { + service = mockAnalyticsService; +} + +module.exports = function attachAnalytics (req, res, next) { + res.analytics = service; + + next(); +}; diff --git a/website/server/middlewares/api-v3/auth.js b/website/server/middlewares/api-v3/auth.js new file mode 100644 index 0000000000..0feb73a98d --- /dev/null +++ b/website/server/middlewares/api-v3/auth.js @@ -0,0 +1,87 @@ +import { + NotAuthorized, +} from '../../libs/api-v3/errors'; +import { + model as User, +} from '../../models/user'; + +// Strins won't be translated here because getUserLanguage has not run yet + +// Authenticate a request through the x-api-user and x-api key header +// If optional is true, don't error on missing authentication +export function authWithHeaders (optional = false) { + return function authWithHeadersHandler (req, res, next) { + let userId = req.header('x-api-user'); + let apiToken = req.header('x-api-key'); + + if (!userId || !apiToken) { + if (optional) return next(); + return next(new NotAuthorized(res.t('missingAuthHeaders'))); + } + + return User.findOne({ + _id: userId, + apiToken, + }) + .exec() + .then((user) => { + if (!user) throw new NotAuthorized(res.t('invalidCredentials')); + if (user.auth.blocked) throw new NotAuthorized(res.t('accountSuspended', {userId: user._id})); + + res.locals.user = user; + + req.session.userId = user._id; + return next(); + }) + .catch(next); + }; +} + +// Authenticate a request through a valid session +export function authWithSession (req, res, next) { + let userId = req.session.userId; + + // Always allow authentication with headers + if (!userId) { + if (!req.header('x-api-user') || !req.header('x-api-key')) { + return next(new NotAuthorized(res.t('invalidCredentials'))); + } else { + return authWithHeaders()(req, res, next); + } + } + + return User.findOne({ + _id: userId, + }) + .exec() + .then((user) => { + if (!user) throw new NotAuthorized(res.t('invalidCredentials')); + + res.locals.user = user; + return next(); + }) + .catch(next); +} + +export function authWithUrl (req, res, next) { + let userId = req.query._id; + let apiToken = req.query.apiToken; + + // Always allow authentication with headers + if (!userId || !apiToken) { + if (!req.header('x-api-user') || !req.header('x-api-key')) { + return next(new NotAuthorized(res.t('missingAuthParams'))); + } else { + return authWithHeaders()(req, res, next); + } + } + + return User.findOne({ _id: userId, apiToken }).exec() + .then((user) => { + if (!user) throw new NotAuthorized(res.t('invalidCredentials')); + + res.locals.user = user; + return next(); + }) + .catch(next); +} diff --git a/website/server/middlewares/api-v3/cors.js b/website/server/middlewares/api-v3/cors.js new file mode 100644 index 0000000000..c249c183c6 --- /dev/null +++ b/website/server/middlewares/api-v3/cors.js @@ -0,0 +1,9 @@ +module.exports = function corsMiddleware (req, res, next) { + res.set({ + 'Access-Control-Allow-Origin': req.header('origin') || '*', + 'Access-Control-Allow-Methods': 'OPTIONS,GET,POST,PUT,HEAD,DELETE', + 'Access-Control-Allow-Headers': 'Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key', + }); + if (req.method === 'OPTIONS') return res.sendStatus(200); + return next(); +}; diff --git a/website/server/middlewares/api-v3/cron.js b/website/server/middlewares/api-v3/cron.js new file mode 100644 index 0000000000..18d9907d0d --- /dev/null +++ b/website/server/middlewares/api-v3/cron.js @@ -0,0 +1,212 @@ +import _ from 'lodash'; +import moment from 'moment'; +import common from '../../../../common'; +import * as Tasks from '../../models/task'; +import Bluebird from 'bluebird'; +import { model as Group } from '../../models/group'; +import { model as User } from '../../models/user'; +import { recoverCron, cron } from '../../libs/api-v3/cron'; +import { v4 as uuid } from 'uuid'; + +const daysSince = common.daysSince; + +async function cronAsync (req, res) { + let user = res.locals.user; + if (!user) return null; // User might not be available when authentication is not mandatory + + let analytics = res.analytics; + let now = new Date(); + + try { + // If the user's timezone has changed (due to travel or daylight savings), + // cron can be triggered twice in one day, so we check for that and use + // both timezones to work out if cron should run. + // CDS = Custom Day Start time. + let timezoneOffsetFromUserPrefs = user.preferences.timezoneOffset; + let timezoneOffsetAtLastCron = _.isFinite(user.preferences.timezoneOffsetAtLastCron) ? user.preferences.timezoneOffsetAtLastCron : timezoneOffsetFromUserPrefs; + let timezoneOffsetFromBrowser = Number(req.header('x-user-timezoneoffset')); + timezoneOffsetFromBrowser = _.isFinite(timezoneOffsetFromBrowser) ? timezoneOffsetFromBrowser : timezoneOffsetFromUserPrefs; + // NB: All timezone offsets can be 0, so can't use `... || ...` to apply non-zero defaults + + if (timezoneOffsetFromBrowser !== timezoneOffsetFromUserPrefs) { + // The user's browser has just told Habitica that the user's timezone has + // changed so store and use the new zone. + user.preferences.timezoneOffset = timezoneOffsetFromBrowser; + timezoneOffsetFromUserPrefs = timezoneOffsetFromBrowser; + } + + // How many days have we missed using the user's current timezone: + let daysMissed = daysSince(user.lastCron, _.defaults({now}, user.preferences)); + + if (timezoneOffsetAtLastCron !== timezoneOffsetFromUserPrefs) { + // Since cron last ran, the user's timezone has changed. + // How many days have we missed using the old timezone: + let daysMissedNewZone = daysMissed; + let daysMissedOldZone = daysSince(user.lastCron, _.defaults({ + now, + timezoneOffsetOverride: timezoneOffsetAtLastCron, + }, user.preferences)); + + if (timezoneOffsetAtLastCron < timezoneOffsetFromUserPrefs) { + // The timezone change was in the unsafe direction. + // E.g., timezone changes from UTC+1 (offset -60) to UTC+0 (offset 0). + // or timezone changes from UTC-4 (offset 240) to UTC-5 (offset 300). + // Local time changed from, for example, 03:00 to 02:00. + + if (daysMissedOldZone > 0 && daysMissedNewZone > 0) { + // Both old and new timezones indicate that we SHOULD run cron, so + // it is safe to do so immediately. + daysMissed = Math.min(daysMissedOldZone, daysMissedNewZone); + // use minimum value to be nice to user + } else if (daysMissedOldZone > 0) { + // The old timezone says that cron should run; the new timezone does not. + // This should be impossible for this direction of timezone change, but + // just in case I'm wrong... + // TODO + // console.log("zone has changed - old zone says run cron, NEW zone says no - stop cron now only -- SHOULD NOT HAVE GOT TO HERE", timezoneOffsetAtLastCron, timezoneOffsetFromUserPrefs, now); // used in production for confirming this never happens + } else if (daysMissedNewZone > 0) { + // The old timezone says that cron should NOT run -- i.e., cron has + // already run today, from the old timezone's point of view. + // The new timezone says that cron SHOULD run, but this is almost + // certainly incorrect. + // This happens when cron occurred at a time soon after the CDS. When + // you reinterpret that time in the new timezone, it looks like it + // was before the CDS, because local time has stepped backwards. + // To fix this, rewrite the cron time to a time that the new + // timezone interprets as being in today. + + daysMissed = 0; // prevent cron running now + let timezoneOffsetDiff = timezoneOffsetAtLastCron - timezoneOffsetFromUserPrefs; + // e.g., for dangerous zone change: 240 - 300 = -60 or -660 - -600 = -60 + + user.lastCron = moment(user.lastCron).subtract(timezoneOffsetDiff, 'minutes'); + // NB: We don't change user.auth.timestamps.loggedin so that will still record the time that the previous cron actually ran. + // From now on we can ignore the old timezone: + user.preferences.timezoneOffsetAtLastCron = timezoneOffsetFromUserPrefs; + } else { + // Both old and new timezones indicate that cron should + // NOT run. + daysMissed = 0; // prevent cron running now + } + } else if (timezoneOffsetAtLastCron > timezoneOffsetFromUserPrefs) { + daysMissed = daysMissedNewZone; + // TODO: Either confirm that there is nothing that could possibly go wrong here and remove the need for this else branch, or fix stuff. + // There are probably situations where the Dailies do not reset early enough for a user who was expecting the zone change and wants to use all their Dailies immediately in the new zone; + // if so, we should provide an option for easy reset of Dailies (can't be automatic because there will be other situations where the user was not prepared). + } + } + + if (daysMissed <= 0) { + if (user.isModified()) await user.save(); + return null; + } + + let _cronSignature = uuid(); + + // To avoid double cron we first set _cronSignature and then check that it's not changed while processing + let userUpdateResult = await User.update({ + _id: user._id, + _cronSignature: 'NOT_RUNNING', // Check that in the meantime another cron has not started + }, { + $set: { + _cronSignature, + lastCron: now, // setting lastCron now so we don't risk re-running parts of cron if it fails + 'auth.timestamps.loggedin': now, + }, + }).exec(); + + // If the cron signature is already set, cron is running in another request + // throw an error and recover later, + if (userUpdateResult.nMatched === 0 || userUpdateResult.nModified === 0) { + throw new Error('CRON_ALREADY_RUNNING'); + } + + let tasks = await Tasks.Task.find({ + userId: user._id, + $or: [ // Exclude completed todos + {type: 'todo', completed: false}, + {type: {$in: ['habit', 'daily', 'reward']}}, + ], + }).exec(); + + let tasksByType = {habits: [], dailys: [], todos: [], rewards: []}; + tasks.forEach(task => tasksByType[`${task.type}s`].push(task)); + + // Run cron + let progress = cron({user, tasksByType, now, daysMissed, analytics, timezoneOffsetFromUserPrefs}); + + // Clear old completed todos - 30 days for free users, 90 for subscribers + // Do not delete challenges completed todos TODO unless the task is broken? + Tasks.Task.remove({ + userId: user._id, + type: 'todo', + completed: true, + dateCompleted: { + $lt: moment(now).subtract(user.isSubscribed() ? 90 : 30, 'days').toDate(), + }, + 'challenge.id': {$exists: false}, + }).exec(); + + res.locals.wasModified = true; // TODO remove after v2 is retired + + // Group.tavernBoss(user, progress); + + // Save user and tasks + let toSave = [user.save()]; + tasks.forEach(task => { + if (task.isModified()) toSave.push(task.save()); + }); + await Bluebird.all(toSave); + + let quest = common.content.quests[user.party.quest.key]; + + if (quest) { + // If user is on a quest, roll for boss & player, or handle collections + let questType = quest.boss ? 'boss' : 'collect'; + await Group[`${questType}Quest`](user, progress); + } + + // Set _cronSignature, lastCron and auth.timestamps.loggedin to signal end of cron + await User.update({ + _id: user._id, + }, { + $set: { + _cronSignature: 'NOT_RUNNING', + }, + }).exec(); + + // Reload user + res.locals.user = await User.findOne({_id: user._id}).exec(); + return null; + } catch (err) { + // If cron was aborted for a race condition try to recover from it + if (err.message === 'CRON_ALREADY_RUNNING') { + // Recovering after abort, wait 300ms and reload user + // do it for max 5 times then reset _cronSignature so that it doesn't prevent cron from running + // at the next request + let recoveryStatus = { + times: 0, + }; + + await recoverCron(recoveryStatus, res.locals); + } else { + // For any other error make sure to reset _cronSignature so that it doesn't prevent cron from running + // at the next request + await User.update({ + _id: user._id, + }, { + _cronSignature: 'NOT_RUNNING', + }).exec(); + + throw err; // re-throw the original error + } + } +} + +module.exports = function cronMiddleware (req, res, next) { + cronAsync(req, res) + .then(() => { + next(); + }) + .catch(next); +}; diff --git a/website/server/middlewares/api-v3/domain.js b/website/server/middlewares/api-v3/domain.js new file mode 100644 index 0000000000..fb5e28d352 --- /dev/null +++ b/website/server/middlewares/api-v3/domain.js @@ -0,0 +1,13 @@ +import domainMiddleware from 'domain-middleware'; + +module.exports = function implementDomainMiddleware (server, mongoose) { + return domainMiddleware({ + server: { + close () { + server.close(); + mongoose.connection.close(); + }, + }, + killTimeout: 10000, + }); +}; diff --git a/website/server/middlewares/api-v3/ensureAccessRight.js b/website/server/middlewares/api-v3/ensureAccessRight.js new file mode 100644 index 0000000000..2fb64ed8af --- /dev/null +++ b/website/server/middlewares/api-v3/ensureAccessRight.js @@ -0,0 +1,23 @@ +import { + NotAuthorized, +} from '../../libs/api-v3/errors'; + +export function ensureAdmin (req, res, next) { + let user = res.locals.user; + + if (!user.contributor.admin) { + return next(new NotAuthorized(res.t('noAdminAccess'))); + } + + next(); +} + +export function ensureSudo (req, res, next) { + let user = res.locals.user; + + if (!user.contributor.sudo) { + return next(new NotAuthorized(res.t('noSudoAccess'))); + } + + next(); +} diff --git a/website/server/middlewares/api-v3/ensureDevelpmentMode.js b/website/server/middlewares/api-v3/ensureDevelpmentMode.js new file mode 100644 index 0000000000..98f70d33f5 --- /dev/null +++ b/website/server/middlewares/api-v3/ensureDevelpmentMode.js @@ -0,0 +1,12 @@ +import nconf from 'nconf'; +import { + NotFound, +} from '../../libs/api-v3/errors'; + +module.exports = function ensureDevelpmentMode (req, res, next) { + if (nconf.get('IS_PROD')) { + next(new NotFound()); + } else { + next(); + } +}; diff --git a/website/server/middlewares/api-v3/errorHandler.js b/website/server/middlewares/api-v3/errorHandler.js new file mode 100644 index 0000000000..b71fb9666e --- /dev/null +++ b/website/server/middlewares/api-v3/errorHandler.js @@ -0,0 +1,90 @@ +// The error handler middleware that handles all errors +// and respond to the client +import logger from '../../libs/api-v3/logger'; +import { + CustomError, + BadRequest, + InternalServerError, +} from '../../libs/api-v3/errors'; +import { + map, + omit, +} from 'lodash'; + +module.exports = function errorHandler (err, req, res, next) { // eslint-disable-line no-unused-vars + // In case of a CustomError class, use it's data + // Otherwise try to identify the type of error (mongoose validation, mongodb unique, ...) + // If we can't identify it, respond with a generic 500 error + let responseErr = err instanceof CustomError ? err : null; + + // Handle errors created with 'http-errors' or similar that have a status/statusCode property + if (err.statusCode && typeof err.statusCode === 'number') { + responseErr = new CustomError(); + responseErr.httpCode = err.statusCode; + responseErr.name = err.name; + responseErr.message = err.message; + } + + // Handle errors by express-validator + if (Array.isArray(err) && err[0].param && err[0].msg) { + responseErr = new BadRequest(res.t('invalidReqParams')); + responseErr.errors = err.map((paramErr) => { + return { + message: paramErr.msg, + param: paramErr.param, + value: paramErr.value, + }; + }); + } + + // Handle mongoose validation errors + if (err.name === 'ValidationError') { + responseErr = new BadRequest(err.message); // TODO standard message? translate? + responseErr.errors = map(err.errors, (mongooseErr) => { + return { + message: mongooseErr.message, + path: mongooseErr.path, + value: mongooseErr.value, + }; + }); + } + + // Handle Stripe Card errors errors (can be safely shown to the users) + // https://stripe.com/docs/api/node#errors + if (err.type === 'StripeCardError') { + responseErr = new BadRequest(err.message); + } + + if (!responseErr || responseErr.httpCode >= 500) { + // Try to identify the error... + // ... + // Otherwise create an InternalServerError and use it + // we don't want to leak anything, just a generic error message + // Use it also in case of identified errors but with httpCode === 500 + responseErr = new InternalServerError(); + } + + // log the error + logger.error(err, { + method: req.method, + originalUrl: req.originalUrl, + headers: omit(req.headers, ['x-api-key', 'cookie']), // don't send sensitive information that only adds noise + body: req.body, + httpCode: responseErr.httpCode, + isHandledError: responseErr.httpCode < 500, + }); + + let jsonRes = { + success: false, + error: responseErr.name, + message: responseErr.message, + }; + + if (responseErr.errors) { + jsonRes.errors = responseErr.errors; + } + + // In some occasions like when invalid JSON is supplied `res.respond` might be not yet avalaible, + // in this case we use the standard res.status(...).json(...) + return res.status(responseErr.httpCode).json(jsonRes); +}; diff --git a/website/server/middlewares/api-v3/index.js b/website/server/middlewares/api-v3/index.js new file mode 100644 index 0000000000..694fdb6ea5 --- /dev/null +++ b/website/server/middlewares/api-v3/index.js @@ -0,0 +1,87 @@ +// This module is only used to attach middlewares to the express app +import errorHandler from './errorHandler'; +import bodyParser from 'body-parser'; +import notFoundHandler from './notFound'; +import nconf from 'nconf'; +import morgan from 'morgan'; +import cookieSession from 'cookie-session'; +import cors from './cors'; +import staticMiddleware from './static'; +import domainMiddleware from './domain'; +import mongoose from 'mongoose'; +import compression from 'compression'; +import favicon from 'serve-favicon'; +import methodOverride from 'method-override'; +import passport from 'passport'; +import path from 'path'; +import maintenanceMode from './maintenanceMode'; +import { + forceSSL, + forceHabitica, +} from './redirects'; +import v1 from './v1'; +import v2 from './v2'; +import v3 from './v3'; +import responseHandler from './response'; +import { + attachTranslateFunction, +} from './language'; + +const IS_PROD = nconf.get('IS_PROD'); +const DISABLE_LOGGING = nconf.get('DISABLE_REQUEST_LOGGING'); +const PUBLIC_DIR = path.join(__dirname, '/../../../client'); + +const SESSION_SECRET = nconf.get('SESSION_SECRET'); +const TWO_WEEKS = 1000 * 60 * 60 * 24 * 14; + +module.exports = function attachMiddlewares (app, server) { + app.set('view engine', 'jade'); + app.set('views', `${__dirname}/../views`); + + app.use(domainMiddleware(server, mongoose)); + + if (!IS_PROD && !DISABLE_LOGGING) app.use(morgan('dev')); + + // add res.respond and res.t + app.use(responseHandler); + app.use(attachTranslateFunction); + + app.use(compression()); + app.use(favicon(`${PUBLIC_DIR}/favicon.ico`)); + + app.use(maintenanceMode); + + app.use(cors); + app.use(forceSSL); + app.use(forceHabitica); + + app.use(bodyParser.urlencoded({ + extended: true, // Uses 'qs' library as old connect middleware + })); + app.use(bodyParser.json()); + app.use(methodOverride()); + + app.use(cookieSession({ + name: 'connect:sess', // Used to keep backward compatibility with Express 3 cookies + secret: SESSION_SECRET, + httpOnly: true, // so cookies are not accessible with browser JS + // TODO what about https only (secure) ? + maxAge: TWO_WEEKS, + })); + + // Initialize Passport! Also use passport.session() middleware, to support + // persistent login sessions (recommended). + app.use(passport.initialize()); + app.use(passport.session()); + + app.use('/api/v2', v2); + app.use('/api/v1', v1); + app.use(v3); // the main app, also setup top-level routes + staticMiddleware(app); + + app.use(notFoundHandler); + + // Error handler middleware, define as the last one. + // Used for v3 and v1, v2 will keep using its own error handler + app.use(errorHandler); +}; diff --git a/website/server/middlewares/api-v3/language.js b/website/server/middlewares/api-v3/language.js new file mode 100644 index 0000000000..b83c9d5208 --- /dev/null +++ b/website/server/middlewares/api-v3/language.js @@ -0,0 +1,91 @@ +import { model as User } from '../../models/user'; +import accepts from 'accepts'; +import common from '../../../../common'; +import _ from 'lodash'; +import { + translations, + defaultLangCodes, + multipleVersionsLanguages, +} from '../../libs/api-v3/i18n'; + +const i18n = common.i18n; + +function _getUniqueListOfLanguages (languages) { + let acceptableLanguages = _(languages).map((lang) => { + return lang.slice(0, 2); + }).uniq().value(); + + let uniqueListOfLanguages = _.intersection(acceptableLanguages, defaultLangCodes); + + return uniqueListOfLanguages; +} + +function _checkForApplicableLanguageVariant (originalLanguageOptions) { + let languageVariant = _.find(originalLanguageOptions, (accepted) => { + let trimmedAccepted = accepted.slice(0, 2); + + return multipleVersionsLanguages[trimmedAccepted]; + }); + + return languageVariant; +} + +function _getFromBrowser (req) { + let originalLanguageOptions = accepts(req).languages(); + let uniqueListOfLanguages = _getUniqueListOfLanguages(originalLanguageOptions); + let baseLanguage = (uniqueListOfLanguages[0] || '').toLowerCase(); + let languageMapping = multipleVersionsLanguages[baseLanguage]; + + if (languageMapping) { + let languageVariant = _checkForApplicableLanguageVariant(originalLanguageOptions); + + if (languageVariant) { + languageVariant = languageVariant.toLowerCase(); + } else { + return 'en'; + } + + return languageMapping[languageVariant] || baseLanguage; + } else { + return baseLanguage || 'en'; + } +} + +function _getFromUser (user, req) { + let preferredLang = user && user.preferences && user.preferences.language; + let lang = translations[preferredLang] ? preferredLang : _getFromBrowser(req); + + return lang; +} + +export function attachTranslateFunction (req, res, next) { + res.t = function reqTranslation () { + return i18n.t(...arguments, req.language); + }; + + next(); +} + +export function getUserLanguage (req, res, next) { + if (req.query.lang) { // In case the language is specified in the request url, use it + req.language = translations[req.query.lang] ? req.query.lang : 'en'; + return next(); + } else if (req.locals && req.locals.user) { // If the request is authenticated, use the user's preferred language + req.language = _getFromUser(req.locals.user, req); + return next(); + } else if (req.session && req.session.userId) { // Same thing if the user has a valid session + return User.findOne({ + _id: req.session.userId, + }, 'preferences.language') + .lean() + .exec() + .then((user) => { + req.language = _getFromUser(user, req); + return next(); + }) + .catch(next); + } else { // Otherwise get from browser + req.language = _getFromUser(null, req); + return next(); + } +} diff --git a/website/server/middlewares/api-v3/locals.js b/website/server/middlewares/api-v3/locals.js new file mode 100644 index 0000000000..e6e06e3b16 --- /dev/null +++ b/website/server/middlewares/api-v3/locals.js @@ -0,0 +1,61 @@ +import nconf from 'nconf'; +import _ from 'lodash'; +import shared from '../../../../common'; +import * as i18n from '../../libs/api-v3/i18n'; +import { + getBuildUrl, + getManifestFiles, +} from '../../libs/api-v3/buildManifest'; +import forceRefresh from './../forceRefresh'; +import { tavernQuest } from '../../models/group'; +import { mods } from '../../models/user'; + +// To avoid stringifying more data then we need, +// items from `env` used on the client will have to be specified in this array +const CLIENT_VARS = ['language', 'isStaticPage', 'availableLanguages', 'translations', + 'FACEBOOK_KEY', 'NODE_ENV', 'BASE_URL', 'GA_ID', + 'AMAZON_PAYMENTS', 'STRIPE_PUB_KEY', 'AMPLITUDE_KEY', + 'worldDmg', 'mods', 'IS_MOBILE']; + +let env = { + getManifestFiles, + getBuildUrl, + _, + clientVars: CLIENT_VARS, + mods, + Content: shared.content, + siteVersion: forceRefresh.siteVersion, + availableLanguages: i18n.availableLanguages, + AMAZON_PAYMENTS: { + SELLER_ID: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), + CLIENT_ID: nconf.get('AMAZON_PAYMENTS:CLIENT_ID'), + }, +}; + +'NODE_ENV BASE_URL GA_ID STRIPE_PUB_KEY FACEBOOK_KEY AMPLITUDE_KEY'.split(' ').forEach(key => { + env[key] = nconf.get(key); +}); + +module.exports = function locals (req, res, next) { + let language = _.find(i18n.availableLanguages, {code: req.language}); + let isStaticPage = req.url.split('/')[1] === 'static'; // If url contains '/static/' + + // Load moment.js language file only when not on static pages + language.momentLang = !isStaticPage && i18n.momentLangs[language.code] || undefined; + + res.locals.habitrpg = _.assign(env, { + IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')), + language, + isStaticPage, + translations: i18n.translations[language.code], + t (...args) { // stringName and vars are the allowed parameters + args.push(language.code); + return shared.i18n.t(...args); + }, + // Defined here and not outside of the middleware because tavernQuest might be an + // empty object until the query to fetch it finishes + worldDmg: tavernQuest && tavernQuest.extra && tavernQuest.extra.worldDmg || {}, + }); + + next(); +}; diff --git a/website/server/middlewares/api-v3/maintenanceMode.js b/website/server/middlewares/api-v3/maintenanceMode.js new file mode 100644 index 0000000000..331663125a --- /dev/null +++ b/website/server/middlewares/api-v3/maintenanceMode.js @@ -0,0 +1,31 @@ +import { getUserLanguage } from './language'; +import nconf from 'nconf'; + +const MAINTENANCE_MODE = nconf.get('MAINTENANCE_MODE'); + +module.exports = function maintenanceMode (req, res, next) { + if (MAINTENANCE_MODE !== 'true') return next(); + + getUserLanguage(req, res, (err) => { + if (err) return next(err); + + let pageVariables = { + maintenanceStart: nconf.get('MAINTENANCE_START'), + maintenanceEnd: nconf.get('MAINTENANCE_END'), + translation: res.t, + }; + + if (req.headers && req.headers.accept && req.headers.accept.indexOf('text/html') !== -1) { + if (req.path === '/views/static/maintenance-info') { + return res.status(503).render('../../../views/static/maintenance-info', pageVariables); + } else { + return res.status(503).render('../../../views/static/maintenance', pageVariables); + } + } else { + return res.status(503).send({ + error: 'Maintenance', + message: 'Server offline for maintenance.', + }); + } + }); +}; diff --git a/website/server/middlewares/api-v3/notFound.js b/website/server/middlewares/api-v3/notFound.js new file mode 100644 index 0000000000..6a71b5def4 --- /dev/null +++ b/website/server/middlewares/api-v3/notFound.js @@ -0,0 +1,7 @@ +import { + NotFound, +} from '../../libs/api-v3/errors'; + +module.exports = function NotFoundMiddleware (req, res, next) { + next(new NotFound()); +}; diff --git a/website/server/middlewares/api-v3/redirects.js b/website/server/middlewares/api-v3/redirects.js new file mode 100644 index 0000000000..a907a89b14 --- /dev/null +++ b/website/server/middlewares/api-v3/redirects.js @@ -0,0 +1,43 @@ +import nconf from 'nconf'; + +const IS_PROD = nconf.get('IS_PROD'); +const IGNORE_REDIRECT = nconf.get('IGNORE_REDIRECT'); +const BASE_URL = nconf.get('BASE_URL'); + +function isHTTP (req) { + return ( // eslint-disable-line no-extra-parens + req.header('x-forwarded-proto') && + req.header('x-forwarded-proto') !== 'https' && + IS_PROD && + BASE_URL.indexOf('https') === 0 + ); +} + +function isProxied (req) { + return ( // eslint-disable-line no-extra-parens + req.header('x-habitica-lb') && + req.header('x-habitica-lb') === 'Yes' + ); +} + +export function forceSSL (req, res, next) { + if (isHTTP(req) && !isProxied(req)) { + return res.redirect(BASE_URL + req.originalUrl); + } + + next(); +} + +// Redirect to habitica for non-api urls + +function nonApiUrl (req) { + return req.originalUrl.search(/\/api\//) === -1; +} + +export function forceHabitica (req, res, next) { + if (IS_PROD && !IGNORE_REDIRECT && !isProxied(req) && nonApiUrl(req)) { + return res.redirect(301, BASE_URL + req.url); + } + + next(); +} diff --git a/website/server/middlewares/api-v3/response.js b/website/server/middlewares/api-v3/response.js new file mode 100644 index 0000000000..e00d691fb2 --- /dev/null +++ b/website/server/middlewares/api-v3/response.js @@ -0,0 +1,25 @@ +module.exports = function responseHandler (req, res, next) { + // Only used for successful responses + res.respond = function respond (status = 200, data = {}, message) { + let user = res.locals && res.locals.user; + + let response = { + success: status < 400, + data, + }; + + if (message) response.message = message; + + // When userV=Number (user version) query parameter is passed and a user is logged in, + // sends back the current user._v in the response so that the client + // can verify if it's the most up to date data. + // Considered part of the private API for now and not officially supported + if (user && req.query.userV) { + response.userV = user._v; + } + + res.status(status).json(response); + }; + + next(); +}; diff --git a/website/server/middlewares/api-v3/setupBody.js b/website/server/middlewares/api-v3/setupBody.js new file mode 100644 index 0000000000..b3309fb2da --- /dev/null +++ b/website/server/middlewares/api-v3/setupBody.js @@ -0,0 +1,5 @@ +// TODO test this middleware +module.exports = function setupBodyMiddleware (req, res, next) { + req.body = req.body || {}; + next(); +}; diff --git a/website/server/middlewares/api-v3/static.js b/website/server/middlewares/api-v3/static.js new file mode 100644 index 0000000000..19c1c9025c --- /dev/null +++ b/website/server/middlewares/api-v3/static.js @@ -0,0 +1,18 @@ +import express from 'express'; +import nconf from 'nconf'; +import path from 'path'; + +const IS_PROD = nconf.get('IS_PROD'); +const MAX_AGE = IS_PROD ? 31536000000 : 0; +const PUBLIC_DIR = path.join(__dirname, '/../../../client'); +const BUILD_DIR = path.join(__dirname, '/../../../build'); + +module.exports = function staticMiddleware (expressApp) { + // TODO move all static files to a single location (one for public and one for build) + expressApp.use(express.static(BUILD_DIR, { maxAge: MAX_AGE })); + expressApp.use('/common/dist', express.static(`${PUBLIC_DIR}/../../common/dist`, { maxAge: MAX_AGE })); + expressApp.use('/common/audio', express.static(`${PUBLIC_DIR}/../../common/audio`, { maxAge: MAX_AGE })); + expressApp.use('/common/script/public', express.static(`${PUBLIC_DIR}/../../common/script/public`, { maxAge: MAX_AGE })); + expressApp.use('/common/img', express.static(`${PUBLIC_DIR}/../../common/img`, { maxAge: MAX_AGE })); + expressApp.use(express.static(PUBLIC_DIR)); +}; diff --git a/website/server/middlewares/api-v3/v1.js b/website/server/middlewares/api-v3/v1.js new file mode 100644 index 0000000000..abe26f42e6 --- /dev/null +++ b/website/server/middlewares/api-v3/v1.js @@ -0,0 +1,19 @@ +// API v1 middlewares and routes +// DEPRECATED AND INACTIVE + +import express from 'express'; +import nconf from 'nconf'; +import { + NotFound, +} from '../../libs/api-v3/errors'; + +const router = express.Router(); // eslint-disable-line babel/new-cap + +const BASE_URL = nconf.get('BASE_URL'); + +router.all('*', function deprecatedV1 (req, res, next) { + let error = new NotFound(`API v1 is no longer supported, please use API v3 instead (${BASE_URL}/static/api).`); + return next(error); +}); + +module.exports = router; diff --git a/website/server/middlewares/api-v3/v2.js b/website/server/middlewares/api-v3/v2.js new file mode 100644 index 0000000000..ec49e326a4 --- /dev/null +++ b/website/server/middlewares/api-v3/v2.js @@ -0,0 +1,27 @@ +// DEPRECATED BUT STILL ACTIVE + +// import path from 'path'; +import swagger from 'swagger-node-express'; +// import shared from '../../../../common'; +import express from 'express'; +import analytics from './analytics'; +import responseHandler from './response'; + +const v2app = express(); + +// re-set the view options because they are not inherited from the top level app +v2app.set('view engine', 'jade'); +v2app.set('views', `${__dirname}/../../../views`); + +v2app.use(analytics); +v2app.use(responseHandler); + + +// Custom Directives +v2app.use('/', require('../../routes/api-v2/auth')); + +require('../../routes/api-v2/swagger')(swagger, v2app); + +v2app.use(require('../api-v2/errorHandler')); + +module.exports = v2app; diff --git a/website/server/middlewares/api-v3/v3.js b/website/server/middlewares/api-v3/v3.js new file mode 100644 index 0000000000..f9aa637fa0 --- /dev/null +++ b/website/server/middlewares/api-v3/v3.js @@ -0,0 +1,30 @@ +import express from 'express'; +import expressValidator from 'express-validator'; +import analytics from './analytics'; +import setupBody from './setupBody'; +import routes from '../../libs/api-v3/routes'; +import path from 'path'; + +const API_CONTROLLERS_PATH = path.join(__dirname, '/../../controllers/api-v3/'); +const TOP_LEVEL_CONTROLLERS_PATH = path.join(__dirname, '/../../controllers/top-level/'); + +const v3app = express(); + +// re-set the view options because they are not inherited from the top level app +v3app.set('view engine', 'jade'); +v3app.set('views', `${__dirname}/../../../views`); + +v3app.use(expressValidator()); +v3app.use(analytics); +v3app.use(setupBody); + +const topLevelRouter = express.Router(); // eslint-disable-line babel/new-cap + +routes.walkControllers(topLevelRouter, TOP_LEVEL_CONTROLLERS_PATH); +v3app.use('/', topLevelRouter); + +const v3Router = express.Router(); // eslint-disable-line babel/new-cap +routes.walkControllers(v3Router, API_CONTROLLERS_PATH); +v3app.use('/api/v3', v3Router); + +module.exports = v3app; diff --git a/website/server/middlewares/apiThrottle.js b/website/server/middlewares/apiThrottle.js new file mode 100644 index 0000000000..b392cc777e --- /dev/null +++ b/website/server/middlewares/apiThrottle.js @@ -0,0 +1,26 @@ +var nconf = require('nconf'); +var limiter = require('connect-ratelimit'); + +var IS_PROD = nconf.get('NODE_ENV') === 'production'; + +// TODO since Habitica runs on many different servers this module is pretty useless +// as it will only block requests that go to the same server but anyway we should probably have a rate limiter in place + +module.exports = function(app) { + // disable the rate limiter middleware + if (/*!IS_PROD || */true) return; + app.use(limiter({ + end:false, + categories:{ + normal: { + // 2 req/s, but split as minutes + totalRequests: 80, + every: 60000 + } + } + })).use(function(req,res,next){ + //logging.info(res.ratelimit); + if (res.ratelimit.exceeded) return res.status(429).json({err:'Rate limit exceeded'}); + next(); + }); +}; diff --git a/website/src/middlewares/forceRefresh.js b/website/server/middlewares/forceRefresh.js similarity index 83% rename from website/src/middlewares/forceRefresh.js rename to website/server/middlewares/forceRefresh.js index 6d5b4fa8c9..f843694790 100644 --- a/website/src/middlewares/forceRefresh.js +++ b/website/server/middlewares/forceRefresh.js @@ -1,3 +1,5 @@ +// TODO do we need this module anymore in v3? No + module.exports.siteVersion = 1; module.exports.middleware = function(req, res, next){ diff --git a/website/server/models/challenge.js b/website/server/models/challenge.js new file mode 100644 index 0000000000..511c969429 --- /dev/null +++ b/website/server/models/challenge.js @@ -0,0 +1,426 @@ +import mongoose from 'mongoose'; +import Bluebird from 'bluebird'; +import validator from 'validator'; +import baseModel from '../libs/api-v3/baseModel'; +import _ from 'lodash'; +import * as Tasks from './task'; +import { model as User } from './user'; +import { + model as Group, + TAVERN_ID, +} from './group'; +import { removeFromArray } from '../libs/api-v3/collectionManipulators'; +import shared from '../../../common'; +import { sendTxn as txnEmail } from '../libs/api-v3/email'; +import sendPushNotification from '../libs/api-v3/pushNotifications'; +import cwait from 'cwait'; + +let Schema = mongoose.Schema; + +let schema = new Schema({ + name: {type: String, required: true}, + shortName: {type: String, required: true, minlength: 3}, + description: String, + official: {type: Boolean, default: false}, + tasksOrder: { + habits: [{type: String, ref: 'Task'}], + dailys: [{type: String, ref: 'Task'}], + todos: [{type: String, ref: 'Task'}], + rewards: [{type: String, ref: 'Task'}], + }, + leader: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.'], required: true}, + group: {type: String, ref: 'Group', validate: [validator.isUUID, 'Invalid uuid.'], required: true}, + memberCount: {type: Number, default: 1}, + prize: {type: Number, default: 0, min: 0}, +}, { + strict: true, + minimize: false, // So empty objects are returned +}); + +schema.plugin(baseModel, { + noSet: ['_id', 'memberCount', 'tasksOrder'], + timestamps: true, +}); + +// A list of additional fields that cannot be updated (but can be set on creation) +let noUpdate = ['group', 'official', 'shortName', 'prize']; +schema.statics.sanitizeUpdate = function sanitizeUpdate (updateObj) { + return this.sanitize(updateObj, noUpdate); +}; + +// Returns true if user is a member of the challenge +schema.methods.isMember = function isChallengeMember (user) { + return user.challenges.indexOf(this._id) !== -1; +}; + +// Returns true if the user can modify (close, selectWinner, ...) the challenge +schema.methods.canModify = function canModifyChallenge (user) { + return user.contributor.admin || this.leader === user._id; +}; + +// Returns true if user has access to the challenge (can join) +schema.methods.hasAccess = function hasAccessToChallenge (user, group) { + if (group.type === 'guild' && group.privacy === 'public') return true; + return user.getGroups().indexOf(this.group) !== -1; +}; + +// Returns true if user can view the challenge +// Different from hasAccess because you can see challenges of groups you've been removed from if you're partecipating in them +schema.methods.canView = function canViewChallenge (user, group) { + if (this.isMember(user)) return true; + return this.hasAccess(user, group); +}; + +// Takes a Task document and return a plain object of attributes that can be synced to the user +function _syncableAttrs (task) { + let t = task.toObject(); // lodash doesn't seem to like _.omit on Document + // only sync/compare important attrs + let omitAttrs = ['_id', 'userId', 'challenge', 'history', 'tags', 'completed', 'streak', 'notes', 'updatedAt']; + if (t.type !== 'reward') omitAttrs.push('value'); + return _.omit(t, omitAttrs); +} + +// Sync challenge to user, including tasks and tags. +// Used when user joins the challenge or to force sync. +schema.methods.syncToUser = async function syncChallengeToUser (user) { + let challenge = this; + challenge.shortName = challenge.shortName || challenge.name; + + // Add challenge to user.challenges + if (!_.contains(user.challenges, challenge._id)) user.challenges.push(challenge._id); + + // Sync tags + let userTags = user.tags; + let i = _.findIndex(userTags, {id: challenge._id}); + + if (i !== -1) { + if (userTags[i].name !== challenge.shortName) { + // update the name - it's been changed since + userTags[i].name = challenge.shortName; + } + } else { + userTags.push({ + id: challenge._id, + name: challenge.shortName, + challenge: true, + }); + } + + let [challengeTasks, userTasks] = await Bluebird.all([ + // Find original challenge tasks + Tasks.Task.find({ + userId: {$exists: false}, + 'challenge.id': challenge._id, + }).exec(), + // Find user's tasks linked to this challenge + Tasks.Task.find({ + userId: user._id, + 'challenge.id': challenge._id, + }).exec(), + ]); + + let toSave = []; // An array of things to save + + challengeTasks.forEach(chalTask => { + let matchingTask = _.find(userTasks, userTask => userTask.challenge.taskId === chalTask._id); + + if (!matchingTask) { // If the task is new, create it + matchingTask = new Tasks[chalTask.type](Tasks.Task.sanitize(_syncableAttrs(chalTask))); + matchingTask.challenge = {taskId: chalTask._id, id: challenge._id}; + matchingTask.userId = user._id; + user.tasksOrder[`${chalTask.type}s`].push(matchingTask._id); + } else { + _.merge(matchingTask, _syncableAttrs(chalTask)); + // Make sure the task is in user.tasksOrder + let orderList = user.tasksOrder[`${chalTask.type}s`]; + if (orderList.indexOf(matchingTask._id) === -1 && (matchingTask.type !== 'todo' || !matchingTask.completed)) orderList.push(matchingTask._id); + } + + if (!matchingTask.notes) matchingTask.notes = chalTask.notes; // don't override the notes, but provide it if not provided + if (matchingTask.tags.indexOf(challenge._id) === -1) matchingTask.tags.push(challenge._id); // add tag if missing + toSave.push(matchingTask.save()); + }); + + // Flag deleted tasks as "broken" + userTasks.forEach(userTask => { + if (!_.find(challengeTasks, chalTask => chalTask._id === userTask.challenge.taskId)) { + userTask.challenge.broken = 'TASK_DELETED'; + toSave.push(userTask.save()); + } + }); + + toSave.push(user.save()); + return Bluebird.all(toSave); +}; + +async function _fetchMembersIds (challengeId) { + return (await User.find({challenges: {$in: [challengeId]}}).select('_id').lean().exec()).map(member => member._id); +} + +async function _addTaskFn (challenge, tasks, memberId) { + let updateTasksOrderQ = {$push: {}}; + let toSave = []; + + tasks.forEach(chalTask => { + let userTask = new Tasks[chalTask.type](Tasks.Task.sanitize(_syncableAttrs(chalTask))); + userTask.challenge = {taskId: chalTask._id, id: challenge._id}; + userTask.userId = memberId; + + let tasksOrderList = updateTasksOrderQ.$push[`tasksOrder.${chalTask.type}s`]; + if (!tasksOrderList) { + updateTasksOrderQ.$push[`tasksOrder.${chalTask.type}s`] = { + $position: 0, // unshift + $each: [userTask._id], + }; + } else { + tasksOrderList.$each.unshift(userTask._id); + } + + toSave.push(userTask.save({ + validateBeforeSave: false, // no user data supplied + })); + }); + + // Update the user + toSave.unshift(User.update({_id: memberId}, updateTasksOrderQ).exec()); + return await Bluebird.all(toSave); +} + +// Add a new task to challenge members +schema.methods.addTasks = async function challengeAddTasks (tasks) { + let challenge = this; + let membersIds = await _fetchMembersIds(challenge._id); + + let queue = new cwait.TaskQueue(Bluebird, 25); // process only 5 users concurrently + + await Bluebird.map(membersIds, queue.wrap((memberId) => { + return _addTaskFn(challenge, tasks, memberId); + })); +}; + +// Sync updated task to challenge members +schema.methods.updateTask = async function challengeUpdateTask (task) { + let challenge = this; + + let updateCmd = {$set: {}}; + + let syncableAttrs = _syncableAttrs(task); + for (let key in syncableAttrs) { + updateCmd.$set[key] = syncableAttrs[key]; + } + + // Updating instead of loading and saving for performances, risks becoming a problem if we introduce more complexity in tasks + await Tasks.Task.update({ + userId: {$exists: true}, + 'challenge.id': challenge.id, + 'challenge.taskId': task._id, + }, updateCmd, {multi: true}).exec(); +}; + +// Remove a task from challenge members +schema.methods.removeTask = async function challengeRemoveTask (task) { + let challenge = this; + + // Set the task as broken + await Tasks.Task.update({ + userId: {$exists: true}, + 'challenge.id': challenge.id, + 'challenge.taskId': task._id, + }, { + $set: {'challenge.broken': 'TASK_DELETED'}, + }, {multi: true}).exec(); +}; + +// Unlink challenges tasks (and the challenge itself) from user. TODO rename to 'leave' +schema.methods.unlinkTasks = async function challengeUnlinkTasks (user, keep) { + let challengeId = this._id; + let findQuery = { + userId: user._id, + 'challenge.id': challengeId, + }; + + removeFromArray(user.challenges, challengeId); + + if (keep === 'keep-all') { + await Tasks.Task.update(findQuery, { + $set: {challenge: {}}, + }, {multi: true}).exec(); + + await user.save(); + } else { // keep = 'remove-all' + let tasks = await Tasks.Task.find(findQuery).select('_id type completed').exec(); + let taskPromises = tasks.map(task => { + // Remove task from user.tasksOrder and delete them + if (task.type !== 'todo' || !task.completed) { + removeFromArray(user.tasksOrder[`${task.type}s`], task._id); + } + + return task.remove(); + }); + user.markModified('tasksOrder'); + taskPromises.push(user.save()); + return Bluebird.all(taskPromises); + } +}; + +// TODO everything here should be moved to a worker +// actually even for a worker it's probably just too big and will kill mongo, figure out something else +schema.methods.closeChal = async function closeChal (broken = {}) { + let challenge = this; + + let winner = broken.winner; + let brokenReason = broken.broken; + + // Delete the challenge + await this.model('Challenge').remove({_id: challenge._id}).exec(); + + // Refund the leader if the challenge is closed and the group not the tavern + if (challenge.group !== TAVERN_ID && brokenReason === 'CHALLENGE_DELETED') { + await User.update({_id: challenge.leader}, {$inc: {balance: challenge.prize / 4}}).exec(); + } + + // Update the challengeCount on the group + await Group.update({_id: challenge.group}, {$inc: {challengeCount: -1}}).exec(); + + // Award prize to winner and notify + if (winner) { + winner.achievements.challenges.push(challenge.name); + winner.balance += challenge.prize / 4; + let savedWinner = await winner.save(); + if (savedWinner.preferences.emailNotifications.wonChallenge !== false) { + txnEmail(savedWinner, 'won-challenge', [ + {name: 'CHALLENGE_NAME', content: challenge.name}, + ]); + } + + sendPushNotification(savedWinner, shared.i18n.t('wonChallenge'), challenge.name); + } + + // Run some operations in the background withouth blocking the thread + let backgroundTasks = [ + // And it's tasks + Tasks.Task.remove({'challenge.id': challenge._id, userId: {$exists: false}}).exec(), + // Set the challenge tag to non-challenge status and remove the challenge from the user's challenges + User.update({ + challenges: challenge._id, + 'tags._id': challenge._id, + }, { + $set: {'tags.$.challenge': false}, + $pull: {challenges: challenge._id}, + }, {multi: true}).exec(), + // Break users' tasks + Tasks.Task.update({ + 'challenge.id': challenge._id, + }, { + $set: { + 'challenge.broken': brokenReason, + 'challenge.winner': winner && winner.profile.name, + }, + }, {multi: true}).exec(), + ]; + + Bluebird.all(backgroundTasks); +}; + +// Methods to adapt the new schema to API v2 responses (mostly tasks inside the challenge model) +// These will be removed once API v2 is discontinued + +// Get all the tasks belonging to a challenge, +schema.methods.getTasks = function getChallengeTasks () { + let args = Array.from(arguments); + let cb; + let type; + + if (args.length === 1) { + cb = args[0]; + } else if (args.length > 1) { + type = args[0]; + cb = args[1]; + } else { + cb = function noop () {}; + } + + let query = { + userId: { + $exists: false, + }, + + 'challenge.id': this._id, + }; + + if (type) query.type = type; + + return Tasks.Task.find(query, cb); // so we can use it as a promise +}; + +// Given challenge and an array of tasks and one of members return an API compatible challenge + tasks obj + members +schema.methods.addToChallenge = function addToChallenge (tasks, members) { + let obj = this.toJSON(); + obj.members = members; + + let tasksOrder = obj.tasksOrder; // Saving a reference because we won't return it + + obj.habits = []; + obj.dailys = []; + obj.todos = []; + obj.rewards = []; + + obj.tasksOrder = undefined; + let unordered = []; + + tasks.forEach((task) => { + // We want to push the task at the same position where it's stored in tasksOrder + let pos = tasksOrder[`${task.type}s`].indexOf(task._id); + if (pos === -1) { // Should never happen, it means the lists got out of sync + unordered.push(task.toJSONV2()); + } else { + obj[`${task.type}s`][pos] = task.toJSONV2(); + } + }); + + // Reconcile unordered items + unordered.forEach((task) => { + obj[`${task.type}s`].push(task); + }); + + // Remove null values that can be created when inserting tasks at an index > length + ['habits', 'dailys', 'rewards', 'todos'].forEach((type) => { + obj[type] = _.compact(obj[type]); + }); + + return obj; +}; + +// Return the data maintaining backward compatibility +schema.methods.getTransformedData = function getTransformedData (options) { + let self = this; + + let cb = options.cb; + let populateMembers = options.populateMembers; + + let queryMembers = { + challenges: self._id, + }; + + let selectDataMembers = '_id'; + + if (populateMembers) { + selectDataMembers += ` ${populateMembers}`; + } + + let membersQuery = User.find(queryMembers).select(selectDataMembers); + if (options.limitPopulation) membersQuery.limit(15); + + Bluebird.all([ + membersQuery.exec(), + self.getTasks(), + ]) + .then((results) => { + cb(null, self.addToChallenge(results[1], results[0])); + }) + .catch(cb); +}; + +// END of API v2 methods + +export let model = mongoose.model('Challenge', schema); diff --git a/website/server/models/coupon.js b/website/server/models/coupon.js new file mode 100644 index 0000000000..af9953aba0 --- /dev/null +++ b/website/server/models/coupon.js @@ -0,0 +1,57 @@ +/* eslint-disable camelcase */ + +import mongoose from 'mongoose'; +import _ from 'lodash'; +import shared from '../../../common'; +import couponCode from 'coupon-code'; +import baseModel from '../libs/api-v3/baseModel'; +import { + BadRequest, + NotAuthorized, +} from '../libs/api-v3/errors'; + +export let schema = new mongoose.Schema({ + _id: {type: String, default: couponCode.generate}, + event: {type: String, enum: ['wondercon', 'google_6mo']}, + user: {type: String, ref: 'User'}, +}, { + strict: true, + minimize: false, // So empty objects are returned +}); + +schema.plugin(baseModel, { + timestamps: true, + _id: false, +}); + +schema.statics.generate = async function generateCoupons (event, count = 1) { + let coupons = _.times(count, () => { + return {event}; + }); + + return await this.create(coupons); +}; + +schema.statics.apply = async function applyCoupon (user, req, code) { + let coupon = await this.findById(couponCode.validate(code)).exec(); + if (!coupon) throw new BadRequest(shared.i18n.t('invalidCoupon', req.language)); + if (coupon.user) throw new NotAuthorized(shared.i18n.t('couponUsed', req.language)); + + if (coupon.event === 'wondercon') { + user.items.gear.owned.eyewear_special_wondercon_red = true; + user.items.gear.owned.eyewear_special_wondercon_black = true; + user.items.gear.owned.back_special_wondercon_black = true; + user.items.gear.owned.back_special_wondercon_red = true; + user.items.gear.owned.body_special_wondercon_red = true; + user.items.gear.owned.body_special_wondercon_black = true; + user.items.gear.owned.body_special_wondercon_gold = true; + user.extra = {signupEvent: 'wondercon'}; + } + + await user.save(); + coupon.user = user._id; + await coupon.save(); +}; + +module.exports.schema = schema; +export let model = mongoose.model('Coupon', schema); diff --git a/website/server/models/emailUnsubscription.js b/website/server/models/emailUnsubscription.js new file mode 100644 index 0000000000..fe30e5d608 --- /dev/null +++ b/website/server/models/emailUnsubscription.js @@ -0,0 +1,24 @@ +import mongoose from 'mongoose'; +import validator from 'validator'; +import baseModel from '../libs/api-v3/baseModel'; + +// A collection used to store mailing list unsubscription for non registered email addresses +export let schema = new mongoose.Schema({ + email: { + type: String, + required: true, + trim: true, + lowercase: true, + validator: [validator.isEmail, 'Invalid email.'], + }, +}, { + strict: true, + minimize: false, // So empty objects are returned +}); + +schema.plugin(baseModel, { + noSet: ['_id'], + timestamps: true, +}); + +export let model = mongoose.model('EmailUnsubscription', schema); diff --git a/website/server/models/group.js b/website/server/models/group.js new file mode 100644 index 0000000000..cff731c034 --- /dev/null +++ b/website/server/models/group.js @@ -0,0 +1,764 @@ +import mongoose from 'mongoose'; +import { + model as User, + nameFields, +} from './user'; +import shared from '../../../common'; +import _ from 'lodash'; +import { model as Challenge} from './challenge'; +import validator from 'validator'; +import { removeFromArray } from '../libs/api-v3/collectionManipulators'; +import { + InternalServerError, + BadRequest, +} from '../libs/api-v3/errors'; +import * as firebase from '../libs/api-v2/firebase'; +import baseModel from '../libs/api-v3/baseModel'; +import { sendTxn as sendTxnEmail } from '../libs/api-v3/email'; +import Bluebird from 'bluebird'; +import nconf from 'nconf'; +import sendPushNotification from '../libs/api-v3/pushNotifications'; + +const questScrolls = shared.content.quests; +const Schema = mongoose.Schema; + +export const INVITES_LIMIT = 100; +export const TAVERN_ID = shared.TAVERN_ID; + +const CRON_SAFE_MODE = nconf.get('CRON_SAFE_MODE') === 'true'; +const CRON_SEMI_SAFE_MODE = nconf.get('CRON_SEMI_SAFE_MODE') === 'true'; + +// NOTE once Firebase is enabled any change to groups' members in MongoDB will have to be run through the API +// changes made directly to the db will cause Firebase to get out of sync +export let schema = new Schema({ + name: {type: String, required: true}, + description: String, + leader: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.'], required: true}, + type: {type: String, enum: ['guild', 'party'], required: true}, + privacy: {type: String, enum: ['private', 'public'], default: 'private', required: true}, + chat: Array, + /* + # [{ + # timestamp: Date + # user: String + # text: String + # contributor: String + # uuid: String + # id: String + # }] + */ + leaderOnly: { // restrict group actions to leader (members can't do them) + challenges: {type: Boolean, default: false, required: true}, + // invites: {type: Boolean, default: false, required: true}, + }, + memberCount: {type: Number, default: 1}, + challengeCount: {type: Number, default: 0}, + balance: {type: Number, default: 0}, + logo: String, + leaderMessage: String, + quest: { + key: String, + active: {type: Boolean, default: false}, + leader: {type: String, ref: 'User'}, + progress: { + hp: Number, + collect: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, // {feather: 5, ingot: 3} + rage: Number, // limit break / "energy stored in shell", for explosion-attacks + }, + + // Shows boolean for each party-member who has accepted the quest. Eg {UUID: true, UUID: false}. Once all users click + // 'Accept', the quest begins. If a false user waits too long, probably a good sign to prod them or boot them. + // TODO when booting user, remove from .joined and check again if we can now start the quest + members: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + extra: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + }, +}, { + strict: true, + minimize: false, // So empty objects are returned +}); + +schema.plugin(baseModel, { + noSet: ['_id', 'balance', 'quest', 'memberCount', 'chat', 'challengeCount'], +}); + +// A list of additional fields that cannot be updated (but can be set on creation) +let noUpdate = ['privacy', 'type']; +schema.statics.sanitizeUpdate = function sanitizeUpdate (updateObj) { + return this.sanitize(updateObj, noUpdate); +}; + +// Basic fields to fetch for populating a group info +export let basicFields = 'name type privacy'; + +schema.pre('remove', true, async function preRemoveGroup (next, done) { + next(); + try { + await this.removeGroupInvitations(); + done(); + } catch (err) { + done(err); + } +}); + +schema.post('remove', function postRemoveGroup (group) { + firebase.deleteGroup(group._id); +}); + +schema.statics.getGroup = async function getGroup (options = {}) { + let {user, groupId, fields, optionalMembership = false, populateLeader = false, requireMembership = false} = options; + let query; + + let isUserParty = groupId === 'party' || user.party._id === groupId; + let isUserGuild = user.guilds.indexOf(groupId) !== -1; + let isTavern = ['habitrpg', TAVERN_ID].indexOf(groupId) !== -1; + + // When requireMembership is true check that user is member even in public guild + if (requireMembership && !isUserParty && !isUserGuild && !isTavern) { + return null; + } + + // When optionalMembership is true it's not required for the user to be a member of the group + if (isUserParty) { + query = {type: 'party', _id: user.party._id}; + } else if (isTavern) { + query = {_id: TAVERN_ID}; + } else if (optionalMembership === true) { + query = {_id: groupId}; + } else if (isUserGuild) { + query = {type: 'guild', _id: groupId}; + } else { + query = {type: 'guild', privacy: 'public', _id: groupId}; + } + + let mQuery = this.findOne(query); + if (fields) mQuery.select(fields); + if (populateLeader === true) mQuery.populate('leader', nameFields); + let group = await mQuery.exec(); + return group; +}; + +export const VALID_QUERY_TYPES = ['party', 'guilds', 'privateGuilds', 'publicGuilds', 'tavern']; + +schema.statics.getGroups = async function getGroups (options = {}) { + let {user, types, groupFields = basicFields, sort = '-memberCount', populateLeader = false} = options; + let queries = []; + + // Throw error if an invalid type is supplied + let areValidTypes = types.every(type => VALID_QUERY_TYPES.indexOf(type) !== -1); + if (!areValidTypes) throw new BadRequest(shared.i18n.t('groupTypesRequired')); + + types.forEach(type => { + switch (type) { + case 'party': { + queries.push(this.getGroup({user, groupId: 'party', fields: groupFields, populateLeader})); + break; + } + case 'guilds': { + let userGuildsQuery = this.find({ + type: 'guild', + _id: {$in: user.guilds}, + }).select(groupFields); + if (populateLeader === true) userGuildsQuery.populate('leader', nameFields); + userGuildsQuery.sort(sort).exec(); + queries.push(userGuildsQuery); + break; + } + case 'privateGuilds': { + let privateGuildsQuery = this.find({ + type: 'guild', + privacy: 'private', + _id: {$in: user.guilds}, + }).select(groupFields); + if (populateLeader === true) privateGuildsQuery.populate('leader', nameFields); + privateGuildsQuery.sort(sort).exec(); + queries.push(privateGuildsQuery); + break; + } + // NOTE: when returning publicGuilds we use `.lean()` so all mongoose methods won't be available. + // Docs are going to be plain javascript objects + case 'publicGuilds': { + let publicGuildsQuery = this.find({ + type: 'guild', + privacy: 'public', + }).select(groupFields); + if (populateLeader === true) publicGuildsQuery.populate('leader', nameFields); + publicGuildsQuery.sort(sort).lean().exec(); + queries.push(publicGuildsQuery); + break; + } + case 'tavern': { + if (types.indexOf('publicGuilds') === -1) { + queries.push(this.getGroup({user, groupId: TAVERN_ID, fields: groupFields})); + } + break; + } + } + }); + + let groupsArray = _.reduce(await Bluebird.all(queries), (previousValue, currentValue) => { + if (_.isEmpty(currentValue)) return previousValue; // don't add anything to the results if the query returned null or an empty array + return previousValue.concat(Array.isArray(currentValue) ? currentValue : [currentValue]); // otherwise concat the new results to the previousValue + }, []); + + return groupsArray; +}; + +// When converting to json remove chat messages with more than 1 flag and remove all flags info +// unless the user is an admin +// Not putting into toJSON because there we can't access user +schema.statics.toJSONCleanChat = function groupToJSONCleanChat (group, user) { + let toJSON = group.toJSON(); + if (!user.contributor.admin) { + _.remove(toJSON.chat, chatMsg => { + chatMsg.flags = {}; + return chatMsg.flagCount >= 2; + }); + } + return toJSON; +}; + +schema.methods.removeGroupInvitations = async function removeGroupInvitations () { + let group = this; + + let usersToRemoveInvitationsFrom = await User.find({ + [`invitations.${group.type}${group.type === 'guild' ? 's' : ''}.id`]: group._id, + }).exec(); + + let userUpdates = usersToRemoveInvitationsFrom.map(user => { + if (group.type === 'party') { + user.invitations.party = {}; + this.markModified('invitations.party'); + } else { + removeFromArray(user.invitations.guilds, { id: group._id }); + } + return user.save(); + }); + + return Bluebird.all(userUpdates); +}; + +// Return true if user is a member of the group +schema.methods.isMember = function isGroupMember (user) { + if (this._id === TAVERN_ID) { + return true; // everyone is considered part of the tavern + } else if (this.type === 'party') { + return user.party._id === this._id ? true : false; + } else { // guilds + return user.guilds.indexOf(this._id) !== -1; + } +}; + +export function chatDefaults (msg, user) { + let message = { + id: shared.uuid(), + text: msg, + timestamp: Number(new Date()), + likes: {}, + flags: {}, + flagCount: 0, + }; + + if (user) { + _.defaults(message, { + uuid: user._id, + contributor: user.contributor && user.contributor.toObject(), + backer: user.backer && user.backer.toObject(), + user: user.profile.name, + }); + } else { + message.uuid = 'system'; + } + + return message; +} + +const NO_CHAT_NOTIFICATIONS = [TAVERN_ID]; + +schema.methods.sendChat = function sendChat (message, user) { + this.chat.unshift(chatDefaults(message, user)); + this.chat.splice(200); + + // Kick off chat notifications in the background. + let lastSeenUpdate = {$set: {}}; + lastSeenUpdate.$set[`newMessages.${this._id}`] = {name: this.name, value: true}; + + // do not send notifications for guilds with more than 5000 users and for the tavern + if (NO_CHAT_NOTIFICATIONS.indexOf(this._id) !== -1 || this.memberCount > 5000) { + // TODO For Tavern, only notify them if their name was mentioned + // var profileNames = [] // get usernames from regex of @xyz. how to handle space-delimited profile names? + // User.update({'profile.name':{$in:profileNames}},lastSeenUpdate,{multi:true}).exec(); + } else { + let query = {}; + + if (this.type === 'party') { + query['party._id'] = this._id; + } else { + query.guilds = this._id; + } + + query._id = { $ne: user ? user._id : ''}; + + User.update(query, lastSeenUpdate, {multi: true}).exec(); + } +}; + +schema.methods.startQuest = async function startQuest (user) { + // not using i18n strings because these errors are meant for devs who forgot to pass some parameters + if (this.type !== 'party') throw new InternalServerError('Must be a party to use this method'); + if (!this.quest.key) throw new InternalServerError('Party does not have a pending quest'); + if (this.quest.active) throw new InternalServerError('Quest is already active'); + + let userIsParticipating = this.quest.members[user._id]; + let quest = questScrolls[this.quest.key]; + let collected = {}; + if (quest.collect) { + collected = _.transform(quest.collect, (result, n, itemToCollect) => { + result[itemToCollect] = 0; + }); + } + + this.markModified('quest'); + this.quest.active = true; + if (quest.boss) { + this.quest.progress.hp = quest.boss.hp; + if (quest.boss.rage) this.quest.progress.rage = 0; + } else if (quest.collect) { + this.quest.progress.collect = collected; + } + + // Changes quest.members to only include participating members + // TODO: is that important? What does it matter if the non-participating members + // are still on the object? + // TODO: is it important to run clean quest progress on non-members like we did in v2? + this.quest.members = _.pick(this.quest.members, _.identity); + let nonUserQuestMembers = _.keys(this.quest.members); + removeFromArray(nonUserQuestMembers, user._id); + + if (userIsParticipating) { + user.party.quest.key = this.quest.key; + user.party.quest.progress.down = 0; + user.party.quest.progress.collect = collected; + user.party.quest.completed = null; + user.markModified('party.quest'); + } + + // Remove the quest from the quest leader items (if they are the current user) + if (this.quest.leader === user._id) { + user.items.quests[this.quest.key] -= 1; + user.markModified('items.quests'); + } else { // another user is starting the quest, update the leader separately + await User.update({_id: this.quest.leader}, { + $inc: { + [`items.quests.${this.quest.key}`]: -1, + }, + }).exec(); + } + + // update the remaining users + await User.update({ + _id: { $in: nonUserQuestMembers }, + }, { + $set: { + 'party.quest.key': this.quest.key, + 'party.quest.progress.down': 0, + 'party.quest.progress.collect': collected, + 'party.quest.completed': null, + }, + }, { multi: true }).exec(); + + // send notifications in the background without blocking + User.find( + { _id: { $in: nonUserQuestMembers } }, + 'party.quest items.quests auth.facebook auth.local preferences.emailNotifications pushDevices profile.name' + ).exec().then((membersToNotify) => { + let membersToEmail = _.filter(membersToNotify, (member) => { + // send push notifications and filter users that disabled emails + sendPushNotification(member, 'HabitRPG', `${shared.i18n.t('questStarted')}: ${quest.text()}`); + + return member.preferences.emailNotifications.questStarted !== false && + member._id !== user._id; + }); + sendTxnEmail(membersToEmail, 'quest-started', [ + { name: 'PARTY_URL', content: '/#/options/groups/party' }, + ]); + }); +}; + +// return a clean object for user.quest +function _cleanQuestProgress (merge) { + let clean = { + key: null, + progress: { + up: 0, + down: 0, + collect: {}, + }, + completed: null, + RSVPNeeded: false, + }; + + if (merge) { + _.merge(clean, _.omit(merge, 'progress')); + if (merge.progress) _.merge(clean.progress, merge.progress); + } + + return clean; +} + +schema.statics.cleanQuestProgress = _cleanQuestProgress; + +// returns a clean object for group.quest +schema.statics.cleanGroupQuest = function cleanGroupQuest () { + return { + key: null, + active: false, + leader: null, + progress: { + collect: {}, + }, + members: {}, + }; +}; + +// Participants: Grant rewards & achievements, finish quest. +// Changes the group object update members +schema.methods.finishQuest = async function finishQuest (quest) { + let questK = quest.key; + let updates = {$inc: {}, $set: {}}; + + updates.$inc[`achievements.quests.${questK}`] = 1; + updates.$inc['stats.gp'] = Number(quest.drop.gp); + updates.$inc['stats.exp'] = Number(quest.drop.exp); + + if (this._id === TAVERN_ID) { + updates.$set['party.quest.completed'] = questK; // Just show the notif + } else { + updates.$set['party.quest'] = _cleanQuestProgress({completed: questK}); // clear quest progress + } + + _.each(quest.drop.items, (item) => { + let dropK = item.key; + + switch (item.type) { + case 'gear': { + // TODO This means they can lose their new gear on death, is that what we want? + updates.$set[`items.gear.owned.${dropK}`] = true; + break; + } + case 'eggs': + case 'food': + case 'hatchingPotions': + case 'quests': { + updates.$inc[`items.${item.type}.${dropK}`] = _.where(quest.drop.items, {type: item.type, key: item.key}).length; + break; + } + case 'pets': { + updates.$set[`items.pets.${dropK}`] = 5; + break; + } + case 'mounts': { + updates.$set[`items.mounts.${dropK}`] = true; + break; + } + } + }); + + let q = this._id === TAVERN_ID ? {} : {_id: {$in: _.keys(this.quest.members)}}; + this.quest = {}; + this.markModified('quest'); + + return await User.update(q, updates, {multi: true}).exec(); +}; + +function _isOnQuest (user, progress, group) { + return group && progress && group.quest && group.quest.active && group.quest.members[user._id] === true; +} + +schema.statics.collectQuest = async function collectQuest (user, progress) { + let group = await this.getGroup({user, groupId: 'party'}); + if (!_isOnQuest(user, progress, group)) return; + let quest = shared.content.quests[group.quest.key]; + + _.each(progress.collect, (v, k) => { + group.quest.progress.collect[k] += v; + }); + + let foundText = _.reduce(progress.collect, (m, v, k) => { + m.push(`${v} ${quest.collect[k].text('en')}`); + return m; + }, []); + + foundText = foundText ? foundText.join(', ') : 'nothing'; + group.sendChat(`\`${user.profile.name} found ${foundText}.\``); + group.markModified('quest.progress.collect'); + + // Still needs completing + if (_.find(shared.content.quests[group.quest.key].collect, (v, k) => { + return group.quest.progress.collect[k] < v.count; + })) return await group.save(); + + await group.finishQuest(quest); + group.sendChat('`All items found! Party has received their rewards.`'); + + return await group.save(); +}; + +schema.statics.bossQuest = async function bossQuest (user, progress) { + let group = await this.getGroup({user, groupId: 'party'}); + if (!_isOnQuest(user, progress, group)) return; + + let quest = shared.content.quests[group.quest.key]; + if (!progress || !quest) return; // TODO why is this ever happening, progress should be defined at this point, log? + + let down = progress.down * quest.boss.str; // multiply by boss strength + + group.quest.progress.hp -= progress.up; + // TODO Create a party preferred language option so emits like this can be localized. Suggestion: Always display the English version too. Or, if English is not displayed to the players, at least include it in a new field in the chat object that's visible in the database - essential for admins when troubleshooting quests! + let playerAttack = `${user.profile.name} attacks ${quest.boss.name('en')} for ${progress.up.toFixed(1)} damage.`; + let bossAttack = CRON_SAFE_MODE || CRON_SEMI_SAFE_MODE ? `${quest.boss.name('en')} does not attack, because it respects the fact that there are some bugs\` \`post-maintenance and it doesn't want to hurt anyone unfairly. It will continue its rampage soon!` : `${quest.boss.name('en')} attacks party for ${Math.abs(down).toFixed(1)} damage.`; + // TODO Consider putting the safe mode boss attack message in an ENV var + group.sendChat(`\`${playerAttack}\` \`${bossAttack}\``); + + // If boss has Rage, increment Rage as well + if (quest.boss.rage) { + group.quest.progress.rage += Math.abs(down); + if (group.quest.progress.rage >= quest.boss.rage.value) { + group.sendChat(quest.boss.rage.effect('en')); + group.quest.progress.rage = 0; + + // TODO To make Rage effects more expandable, let's turn these into functions in quest.boss.rage + if (quest.boss.rage.healing) group.quest.progress.hp += group.quest.progress.hp * quest.boss.rage.healing; + if (group.quest.progress.hp > quest.boss.hp) group.quest.progress.hp = quest.boss.hp; + } + } + + // Everyone takes damage + await User.update({ + _id: {$in: _.keys(group.quest.members)}, + }, { + $inc: {'stats.hp': down}, + }, {multi: true}).exec(); + // Apply changes the currently cronning user locally so we don't have to reload it to get the updated state + // TODO how to mark not modified? https://github.com/Automattic/mongoose/pull/1167 + // must be notModified or otherwise could overwrite future changes: if the user is saved it'll save + // the modified user.stats.hp but that must not happen as the hp value has already been updated by the User.update above + // if (down) user.stats.hp += down; + + // Boss slain, finish quest + if (group.quest.progress.hp <= 0) { + group.sendChat(`\`You defeated ${quest.boss.name('en')}! Questing party members receive the rewards of victory.\``); + + // Participants: Grant rewards & achievements, finish quest + await group.finishQuest(shared.content.quests[group.quest.key]); + } + + return await group.save(); +}; + +// to set a boss: `db.groups.update({_id:TAVERN_ID},{$set:{quest:{key:'dilatory',active:true,progress:{hp:1000,rage:1500}}}})` +// we export an empty object that is then populated with the query-returned data +export let tavernQuest = {}; +let tavernQ = {_id: TAVERN_ID, 'quest.key': {$ne: null}}; + +// we use process.nextTick because at this point the model is not yet available +process.nextTick(() => { + model // eslint-disable-line no-use-before-define + .findOne(tavernQ).exec() + .then(tavern => { + if (!tavern) return; // No tavern quest + + // Using _assign so we don't lose the reference to the exported tavernQuest + _.assign(tavernQuest, tavern.quest.toObject()); + }) + .catch(err => { + throw err; + }); +}); + +// returns a promise +schema.statics.tavernBoss = async function tavernBoss (user, progress) { + if (!progress) return; + + // hack: prevent crazy damage to world boss + let dmg = Math.min(900, Math.abs(progress.up || 0)); + let rage = -Math.min(900, Math.abs(progress.down || 0)); + + let tavern = await this.findOne(tavernQ).exec(); + if (!(tavern && tavern.quest && tavern.quest.key)) return; + + let quest = shared.content.quests[tavern.quest.key]; + + if (tavern.quest.progress.hp <= 0) { + tavern.sendChat(quest.completionChat('en')); + await tavern.finishQuest(quest); + _.assign(tavernQuest, {extra: null}); + return tavern.save(); + } else { + // Deal damage. Note a couple things here, str & def are calculated. If str/def are defined in the database, + // use those first - which allows us to update the boss on the go if things are too easy/hard. + if (!tavern.quest.extra) tavern.quest.extra = {}; + tavern.quest.progress.hp -= dmg / (tavern.quest.extra.def || quest.boss.def); + tavern.quest.progress.rage -= rage * (tavern.quest.extra.str || quest.boss.str); + + if (tavern.quest.progress.rage >= quest.boss.rage.value) { + if (!tavern.quest.extra.worldDmg) tavern.quest.extra.worldDmg = {}; + + let wd = tavern.quest.extra.worldDmg; + // Burnout attacks Ian, Seasonal Sorceress, tavern + // Be-Wilder attacks Alex, Matt, Bailey + let scene = wd.market ? wd.stables ? wd.bailey ? false : 'bailey' : 'stables' : 'market'; // eslint-disable-line no-nested-ternary + + if (!scene) { + tavern.sendChat(`\`${quest.boss.name('en')} tries to unleash ${quest.boss.rage.title('en')} but is too tired.\``); + tavern.quest.progress.rage = 0; // quest.boss.rage.value; + } else { + tavern.sendChat(quest.boss.rage[scene]('en')); + tavern.quest.extra.worldDmg[scene] = true; + tavern.quest.extra.worldDmg.recent = scene; + tavern.markModified('quest.extra.worldDmg'); + tavern.quest.progress.rage = 0; + if (quest.boss.rage.healing) { + tavern.quest.progress.hp += quest.boss.rage.healing * tavern.quest.progress.hp; + } + } + } + + if (quest.boss.desperation && tavern.quest.progress.hp < quest.boss.desperation.threshold && !tavern.quest.extra.desperate) { + tavern.sendChat(quest.boss.desperation.text('en')); + tavern.quest.extra.desperate = true; + tavern.quest.extra.def = quest.boss.desperation.def; + tavern.quest.extra.str = quest.boss.desperation.str; + tavern.markModified('quest.extra'); + } + + _.assign(tavernQuest, tavern.quest.toObject()); + return tavern.save(); + } +}; + +schema.methods.leave = async function leaveGroup (user, keep = 'keep-all') { + let group = this; + + let challenges = await Challenge.find({ + _id: {$in: user.challenges}, + group: group._id, + }); + + let challengesToRemoveUserFrom = challenges.map(chal => { + return chal.unlinkTasks(user, keep); + }); + await Bluebird.all(challengesToRemoveUserFrom); + + let promises = []; + + // remove the group from the user's groups + if (group.type === 'guild') { + promises.push(User.update({_id: user._id}, {$pull: {guilds: group._id}}).exec()); + } else { + promises.push(User.update({_id: user._id}, {$set: {party: {}}}).exec()); + } + + // If user is the last one in group and group is private, delete it + if (group.memberCount <= 1 && group.privacy === 'private') { + promises.push(group.remove()); + } else { // otherwise If the leader is leaving (or if the leader previously left, and this wasn't accounted for) + let update = { + $inc: {memberCount: -1}, + }; + + if (group.leader === user._id) { + let query = group.type === 'party' ? {'party._id': group._id} : {guilds: group._id}; + query._id = {$ne: user._id}; + let seniorMember = await User.findOne(query).select('_id').exec(); + + // could be missing in case of public guild (that can have 0 members) with 1 member who is leaving + if (seniorMember) update.$set = {leader: seniorMember._id}; + } + promises.push(group.update(update).exec()); + } + + firebase.removeUserFromGroup(group._id, user._id); + + return await Bluebird.all(promises); +}; + +// API v2 compatibility methods +schema.methods.getTransformedData = function getTransformedData (options) { + let cb = options.cb; + let populateMembers = options.populateMembers; + let populateInvites = options.populateInvites; + let populateChallenges = options.populateChallenges; + + let obj = this.toJSON(); + + let queryMembers = {}; + let queryInvites = {}; + + if (this.type === 'guild') { + queryInvites['invitations.guilds.id'] = this._id; + } else { + queryInvites['invitations.party.id'] = this._id; + } + + if (this.type === 'guild') { + queryMembers.guilds = this._id; + } else { + queryMembers['party._id'] = this._id; + } + + let selectDataMembers = '_id'; + let selectDataInvites = '_id'; + let selectDataChallenges = '_id'; + + if (populateMembers) { + selectDataMembers += ` ${populateMembers}`; + } + if (populateInvites) { + selectDataInvites += ` ${populateInvites}`; + } + if (populateChallenges) { + selectDataChallenges += ` ${populateChallenges}`; + } + + let membersQuery = User.find(queryMembers).select(selectDataMembers); + if (options.limitPopulation) membersQuery.limit(15); + + Bluebird.all([ + membersQuery.exec(), + User.find(queryInvites).select(populateInvites).exec(), + Challenge.find({group: obj._id}).select(populateMembers).exec(), + ]) + .then((results) => { + obj.members = results[0]; + obj.invites = results[1]; + obj.challenges = results[2]; + + cb(null, obj); + }) + .catch(cb); +}; +// END API v2 compatibility methods + +export let model = mongoose.model('Group', schema); + +// initialize tavern if !exists (fresh installs) +// do not run when testing as it's handled by the tests and can easily cause a race condition +if (!nconf.get('IS_TEST')) { + model.count({_id: TAVERN_ID}, (err, ct) => { + if (err) throw err; + if (ct > 0) return; + new model({ // eslint-disable-line babel/new-cap + _id: TAVERN_ID, + leader: '7bde7864-ebc5-4ee2-a4b7-1070d464cdb0', // Siena Leslie + name: 'Tavern', + type: 'guild', + privacy: 'public', + }).save(); + }); +} diff --git a/website/server/models/tag.js b/website/server/models/tag.js new file mode 100644 index 0000000000..f201541540 --- /dev/null +++ b/website/server/models/tag.js @@ -0,0 +1,27 @@ +import mongoose from 'mongoose'; +import baseModel from '../libs/api-v3/baseModel'; +import { v4 as uuid } from 'uuid'; +import validator from 'validator'; + +let Schema = mongoose.Schema; + +export let schema = new Schema({ + id: { + type: String, + default: uuid, + validate: [validator.isUUID, 'Invalid uuid.'], + }, + name: {type: String, required: true}, + challenge: {type: String}, +}, { + strict: true, + minimize: false, // So empty objects are returned + _id: false, // use id instead of _id +}); + +schema.plugin(baseModel, { + noSet: ['_id', 'id', 'challenge'], + _id: false, // use id instead of _id +}); + +export let model = mongoose.model('Tag', schema); diff --git a/website/server/models/task.js b/website/server/models/task.js new file mode 100644 index 0000000000..0664fab855 --- /dev/null +++ b/website/server/models/task.js @@ -0,0 +1,225 @@ +import mongoose from 'mongoose'; +import shared from '../../../common'; +import validator from 'validator'; +import moment from 'moment'; +import baseModel from '../libs/api-v3/baseModel'; +import _ from 'lodash'; +import { preenHistory } from '../libs/api-v3/preening'; + +let Schema = mongoose.Schema; +let discriminatorOptions = { + discriminatorKey: 'type', // the key that distinguishes task types +}; +let subDiscriminatorOptions = _.defaults(_.cloneDeep(discriminatorOptions), { + _id: false, + minimize: false, // So empty objects are returned +}); + +export let tasksTypes = ['habit', 'daily', 'todo', 'reward']; + +// Important +// When something changes here remember to update the client side model at common/script/libs/taskDefaults +export let TaskSchema = new Schema({ + _legacyId: String, // TODO Remove when v2 is deprecated + type: {type: String, enum: tasksTypes, required: true, default: tasksTypes[0]}, + text: {type: String, required: true}, + notes: {type: String, default: ''}, + tags: [{ + type: String, + validate: [validator.isUUID, 'Invalid uuid.'], + }], + value: {type: Number, default: 0, required: true}, // redness or cost for rewards Required because it must be settable (for rewards) + priority: { + type: Number, + default: 1, + required: true, + validate: [ + (val) => [0.1, 1, 1.5, 2].indexOf(val) !== -1, + 'Valid priority values are 0.1, 1, 1.5, 2.', + ], + }, + attribute: {type: String, default: 'str', enum: ['str', 'con', 'int', 'per']}, + userId: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.']}, // When not set it belongs to a challenge + + challenge: { + id: {type: String, ref: 'Challenge', validate: [validator.isUUID, 'Invalid uuid.']}, // When set (and userId not set) it's the original task + taskId: {type: String, ref: 'Task', validate: [validator.isUUID, 'Invalid uuid.']}, // When not set but challenge.id defined it's the original task + broken: {type: String, enum: ['CHALLENGE_DELETED', 'TASK_DELETED', 'UNSUBSCRIBED', 'CHALLENGE_CLOSED', 'CHALLENGE_TASK_NOT_FOUND']}, // CHALLENGE_TASK_NOT_FOUND comes from v3 migration + winner: String, // user.profile.name of the winner + }, + + reminders: [{ + _id: false, + id: {type: String, validate: [validator.isUUID, 'Invalid uuid.'], default: shared.uuid, required: true}, + startDate: {type: Date}, + time: {type: Date, required: true}, + }], +}, _.defaults({ + minimize: false, // So empty objects are returned + strict: true, +}, discriminatorOptions)); + +TaskSchema.plugin(baseModel, { + noSet: ['challenge', 'userId', 'completed', 'history', 'dateCompleted', '_legacyId'], + sanitizeTransform (taskObj) { + if (taskObj.type && taskObj.type !== 'reward') { // value should be settable directly only for rewards + delete taskObj.value; + } + + return taskObj; + }, + private: [], + timestamps: true, +}); + +// Sanitize user tasks linked to a challenge +// See http://habitica.wikia.com/wiki/Challenges#Challenge_Participant.27s_Permissions for more info +TaskSchema.statics.sanitizeUserChallengeTask = function sanitizeUserChallengeTask (taskObj) { + let initialSanitization = this.sanitize(taskObj); + + return _.pick(initialSanitization, ['streak', 'checklist', 'attribute', 'reminders', 'tags', 'notes']); +}; + +// Sanitize checklist objects (disallowing id) +TaskSchema.statics.sanitizeChecklist = function sanitizeChecklist (checklistObj) { + delete checklistObj.id; + return checklistObj; +}; + +// Sanitize reminder objects (disallowing id) +TaskSchema.statics.sanitizeReminder = function sanitizeReminder (reminderObj) { + delete reminderObj.id; + return reminderObj; +}; + +TaskSchema.methods.scoreChallengeTask = async function scoreChallengeTask (delta) { + let chalTask = this; + + chalTask.value += delta; + + if (chalTask.type === 'habit' || chalTask.type === 'daily') { + // Add only one history entry per day + let lastChallengHistoryIndex = chalTask.history.length - 1; + + if (chalTask.history[lastChallengHistoryIndex] && + moment(chalTask.history[lastChallengHistoryIndex].date).isSame(new Date(), 'day')) { + chalTask.history[lastChallengHistoryIndex] = { + date: Number(new Date()), + value: chalTask.value, + }; + chalTask.markModified(`history.${lastChallengHistoryIndex}`); + } else { + chalTask.history.push({ + date: Number(new Date()), + value: chalTask.value, + }); + + // Only preen task history once a day when the task is scored first + if (chalTask.history.length > 365) { + chalTask.history = preenHistory(chalTask.history, true); // true means the challenge will retain as much entries as a subscribed user + } + } + } + + await chalTask.save(); +}; + + +// Methods to adapt the new schema to API v2 responses (mostly tasks inside the user model) +// These will be removed once API v2 is discontinued + +// toJSON for API v2 +TaskSchema.methods.toJSONV2 = function toJSONV2 () { + let toJSON = this.toJSON(); + if (toJSON._legacyId) { + toJSON.id = toJSON._legacyId; + } else { + toJSON.id = toJSON._id; + } + + if (!toJSON.challenge) toJSON.challenge = {}; + + let v3Tags = this.tags; + + toJSON.tags = {}; + v3Tags.forEach(tag => { + toJSON.tags[tag] = true; + }); + + toJSON.dateCreated = this.createdAt; + + return toJSON; +}; + +TaskSchema.statics.fromJSONV2 = function fromJSONV2 (taskObj) { + if (taskObj.id) taskObj._id = taskObj.id; + + let v2Tags = taskObj.tags || {}; + + taskObj.tags = []; + taskObj.tags = _.map(v2Tags, (tag, key) => key); + + return taskObj; +}; + +// END of API v2 methods + +export let Task = mongoose.model('Task', TaskSchema); + +// habits and dailies shared fields +let habitDailySchema = () => { + return {history: Array}; // [{date:Date, value:Number}], // this causes major performance problems +}; + +// dailys and todos shared fields +let dailyTodoSchema = () => { + return { + completed: {type: Boolean, default: false}, + // Checklist fields (dailies and todos) + collapseChecklist: {type: Boolean, default: false}, + checklist: [{ + completed: {type: Boolean, default: false}, + text: {type: String, required: false, default: ''}, // required:false because it can be empty on creation + _id: false, + id: {type: String, default: shared.uuid, required: true, validate: [validator.isUUID, 'Invalid uuid.']}, + }], + }; +}; + +export let HabitSchema = new Schema(_.defaults({ + up: {type: Boolean, default: true}, + down: {type: Boolean, default: true}, +}, habitDailySchema()), subDiscriminatorOptions); +export let habit = Task.discriminator('habit', HabitSchema); + +export let DailySchema = new Schema(_.defaults({ + frequency: {type: String, default: 'weekly', enum: ['daily', 'weekly']}, + everyX: {type: Number, default: 1}, // e.g. once every X weeks + startDate: { + type: Date, + default () { + return moment().startOf('day').toDate(); + }, + }, + repeat: { // used only for 'weekly' frequency, + m: {type: Boolean, default: true}, + t: {type: Boolean, default: true}, + w: {type: Boolean, default: true}, + th: {type: Boolean, default: true}, + f: {type: Boolean, default: true}, + s: {type: Boolean, default: true}, + su: {type: Boolean, default: true}, + }, + streak: {type: Number, default: 0}, +}, habitDailySchema(), dailyTodoSchema()), subDiscriminatorOptions); +export let daily = Task.discriminator('daily', DailySchema); + +export let TodoSchema = new Schema(_.defaults({ + dateCompleted: Date, + // TODO we're getting parse errors, people have stored as "today" and "3/13". Need to run a migration & put this back to type: Date see http://stackoverflow.com/questions/1353684/detecting-an-invalid-date-date-instance-in-javascript + date: String, // due date for todos +}, dailyTodoSchema()), subDiscriminatorOptions); +export let todo = Task.discriminator('todo', TodoSchema); + +export let RewardSchema = new Schema({}, subDiscriminatorOptions); +export let reward = Task.discriminator('reward', RewardSchema); diff --git a/website/server/models/user.js b/website/server/models/user.js new file mode 100644 index 0000000000..db305e3330 --- /dev/null +++ b/website/server/models/user.js @@ -0,0 +1,824 @@ +import mongoose from 'mongoose'; +import shared from '../../../common'; +import _ from 'lodash'; +import validator from 'validator'; +import moment from 'moment'; +import * as Tasks from './task'; +import Bluebird from 'bluebird'; +import { schema as TagSchema } from './tag'; +import baseModel from '../libs/api-v3/baseModel'; +import { + chatDefaults, + TAVERN_ID, +} from './group'; +import { defaults } from 'lodash'; + +let Schema = mongoose.Schema; + +// User schema definition +export let schema = new Schema({ + apiToken: { + type: String, + default: shared.uuid, + }, + + auth: { + blocked: Boolean, + facebook: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + local: { + email: { + type: String, + validate: [validator.isEmail, shared.i18n.t('invalidEmail')], + }, + username: { + type: String, + }, + // Store a lowercase version of username to check for duplicates + lowerCaseUsername: String, + hashed_password: String, // eslint-disable-line camelcase + salt: String, + }, + timestamps: { + created: {type: Date, default: Date.now}, + loggedin: {type: Date, default: Date.now}, + }, + }, + // We want to know *every* time an object updates. Mongoose uses __v to designate when an object contains arrays which + // have been updated (http://goo.gl/gQLz41), but we want *every* update + _v: { type: Number, default: 0 }, + migration: String, + achievements: { + originalUser: Boolean, + habitSurveys: Number, + ultimateGearSets: { + healer: {type: Boolean, default: false}, + wizard: {type: Boolean, default: false}, + rogue: {type: Boolean, default: false}, + warrior: {type: Boolean, default: false}, + }, + beastMaster: Boolean, + beastMasterCount: Number, + mountMaster: Boolean, + mountMasterCount: Number, + triadBingo: Boolean, + triadBingoCount: Number, + veteran: Boolean, + snowball: Number, + spookySparkles: Number, + shinySeed: Number, + seafoam: Number, + streak: Number, + challenges: Array, + quests: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + rebirths: Number, + rebirthLevel: Number, + perfect: {type: Number, default: 0}, + habitBirthdays: Number, + valentine: Number, + costumeContest: Boolean, // Superseded by costumeContests + nye: Number, + habiticaDays: Number, + greeting: Number, + thankyou: Number, + costumeContests: Number, + birthday: Number, + partyUp: Boolean, + partyOn: Boolean, + }, + + backer: { + tier: Number, + npc: String, + tokensApplied: Boolean, + }, + + contributor: { + // 1-9, see https://trello.com/c/wkFzONhE/277-contributor-gear https://github.com/HabitRPG/habitrpg/issues/3801 + level: { + type: Number, + min: 0, + max: 9, + }, + admin: Boolean, + sudo: Boolean, + // Artisan, Friend, Blacksmith, etc + text: String, + // a markdown textarea to list their contributions + links + contributions: String, + critical: String, + }, + + balance: {type: Number, default: 0}, + // Not saved on the user right now + filters: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + + purchased: { + ads: {type: Boolean, default: false}, + // eg, {skeleton: true, pumpkin: true, eb052b: true} + skin: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + hair: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + shirt: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + background: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + txnCount: {type: Number, default: 0}, + mobileChat: Boolean, + plan: { + planId: String, + paymentMethod: String, // enum: ['Paypal','Stripe', 'Gift', 'Amazon Payments', '']} + customerId: String, // Billing Agreement Id in case of Amazon Payments + dateCreated: Date, + dateTerminated: Date, + dateUpdated: Date, + extraMonths: {type: Number, default: 0}, + gemsBought: {type: Number, default: 0}, + mysteryItems: {type: Array, default: () => []}, + lastBillingDate: Date, // Used only for Amazon Payments to keep track of billing date + consecutive: { + count: {type: Number, default: 0}, + offset: {type: Number, default: 0}, // when gifted subs, offset++ for each month. offset-- each new-month (cron). count doesn't ++ until offset==0 + gemCapExtra: {type: Number, default: 0}, + trinkets: {type: Number, default: 0}, + }, + }, + }, + + flags: { + customizationsNotification: {type: Boolean, default: false}, + showTour: {type: Boolean, default: true}, + tour: { + // -1 indicates "uninitiated", -2 means "complete", any other number is the current tour step (0-index) + intro: {type: Number, default: -1}, + classes: {type: Number, default: -1}, + stats: {type: Number, default: -1}, + tavern: {type: Number, default: -1}, + party: {type: Number, default: -1}, + guilds: {type: Number, default: -1}, + challenges: {type: Number, default: -1}, + market: {type: Number, default: -1}, + pets: {type: Number, default: -1}, + mounts: {type: Number, default: -1}, + hall: {type: Number, default: -1}, + equipment: {type: Number, default: -1}, + }, + tutorial: { + common: { + habits: {type: Boolean, default: false}, + dailies: {type: Boolean, default: false}, + todos: {type: Boolean, default: false}, + rewards: {type: Boolean, default: false}, + party: {type: Boolean, default: false}, + pets: {type: Boolean, default: false}, + gems: {type: Boolean, default: false}, + skills: {type: Boolean, default: false}, + classes: {type: Boolean, default: false}, + tavern: {type: Boolean, default: false}, + equipment: {type: Boolean, default: false}, + items: {type: Boolean, default: false}, + }, + ios: { + addTask: {type: Boolean, default: false}, + editTask: {type: Boolean, default: false}, + deleteTask: {type: Boolean, default: false}, + filterTask: {type: Boolean, default: false}, + groupPets: {type: Boolean, default: false}, + inviteParty: {type: Boolean, default: false}, + }, + }, + dropsEnabled: {type: Boolean, default: false}, + itemsEnabled: {type: Boolean, default: false}, + newStuff: {type: Boolean, default: false}, + rewrite: {type: Boolean, default: true}, + classSelected: {type: Boolean, default: false}, + mathUpdates: Boolean, + rebirthEnabled: {type: Boolean, default: false}, + levelDrops: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + chatRevoked: Boolean, + // Used to track the status of recapture emails sent to each user, + // can be 0 - no email sent - 1, 2, 3 or 4 - 4 means no more email will be sent to the user + recaptureEmailsPhase: {type: Number, default: 0}, + // Needed to track the tip to send inside the email + weeklyRecapEmailsPhase: {type: Number, default: 0}, + // Used to track when the next weekly recap should be sent + lastWeeklyRecap: {type: Date, default: Date.now}, + // Used to enable weekly recap emails as users login + lastWeeklyRecapDiscriminator: Boolean, + communityGuidelinesAccepted: {type: Boolean, default: false}, + cronCount: {type: Number, default: 0}, + welcomed: {type: Boolean, default: false}, + armoireEnabled: {type: Boolean, default: false}, + armoireOpened: {type: Boolean, default: false}, + armoireEmpty: {type: Boolean, default: false}, + cardReceived: {type: Boolean, default: false}, + warnedLowHealth: {type: Boolean, default: false}, + }, + + history: { + exp: Array, // [{date: Date, value: Number}], // big peformance issues if these are defined + todos: Array, // [{data: Date, value: Number}] // big peformance issues if these are defined + }, + + items: { + gear: { + owned: _.transform(shared.content.gear.flat, (m, v) => { + m[v.key] = {type: Boolean}; + if (v.key.match(/[armor|head|shield]_warrior_0/) || v.gearSet === 'glasses') { + m[v.key].default = true; + } + }), + + equipped: { + weapon: String, + armor: {type: String, default: 'armor_base_0'}, + head: {type: String, default: 'head_base_0'}, + shield: {type: String, default: 'shield_base_0'}, + back: String, + headAccessory: String, + eyewear: String, + body: String, + }, + costume: { + weapon: String, + armor: {type: String, default: 'armor_base_0'}, + head: {type: String, default: 'head_base_0'}, + shield: {type: String, default: 'shield_base_0'}, + back: String, + headAccessory: String, + eyewear: String, + body: String, + }, + }, + + special: { + snowball: {type: Number, default: 0}, + spookySparkles: {type: Number, default: 0}, + shinySeed: {type: Number, default: 0}, + seafoam: {type: Number, default: 0}, + valentine: {type: Number, default: 0}, + valentineReceived: Array, // array of strings, by sender name + nye: {type: Number, default: 0}, + nyeReceived: Array, + greeting: {type: Number, default: 0}, + greetingReceived: Array, + thankyou: {type: Number, default: 0}, + thankyouReceived: Array, + birthday: {type: Number, default: 0}, + birthdayReceived: Array, + }, + + // -------------- Animals ------------------- + // Complex bit here. The result looks like: + // pets: { + // 'Wolf-Desert': 0, // 0 means does not own + // 'PandaCub-Red': 10, // Number represents "Growth Points" + // etc... + // } + pets: _.defaults( + // First transform to a 1D eggs/potions mapping + _.transform(shared.content.pets, (m, v, k) => m[k] = Number), + // Then add additional pets (quest, backer, contributor, premium) + _.transform(shared.content.questPets, (m, v, k) => m[k] = Number), + _.transform(shared.content.specialPets, (m, v, k) => m[k] = Number), + _.transform(shared.content.premiumPets, (m, v, k) => m[k] = Number) + ), + currentPet: String, // Cactus-Desert + + // eggs: { + // 'PandaCub': 0, // 0 indicates "doesn't own" + // 'Wolf': 5 // Number indicates "stacking" + // } + eggs: _.transform(shared.content.eggs, (m, v, k) => m[k] = Number), + + // hatchingPotions: { + // 'Desert': 0, // 0 indicates "doesn't own" + // 'CottonCandyBlue': 5 // Number indicates "stacking" + // } + hatchingPotions: _.transform(shared.content.hatchingPotions, (m, v, k) => m[k] = Number), + + // Food: { + // 'Watermelon': 0, // 0 indicates "doesn't own" + // 'RottenMeat': 5 // Number indicates "stacking" + // } + food: _.transform(shared.content.food, (m, v, k) => m[k] = Number), + + // mounts: { + // 'Wolf-Desert': true, + // 'PandaCub-Red': false, + // etc... + // } + mounts: _.defaults( + // First transform to a 1D eggs/potions mapping + _.transform(shared.content.pets, (m, v, k) => m[k] = Boolean), + // Then add quest and premium pets + _.transform(shared.content.questPets, (m, v, k) => m[k] = Boolean), + _.transform(shared.content.premiumPets, (m, v, k) => m[k] = Boolean), + // Then add additional mounts (backer, contributor) + _.transform(shared.content.specialMounts, (m, v, k) => m[k] = Boolean) + ), + currentMount: String, + + // Quests: { + // 'boss_0': 0, // 0 indicates "doesn't own" + // 'collection_honey': 5 // Number indicates "stacking" + // } + quests: _.transform(shared.content.quests, (m, v, k) => m[k] = Number), + + lastDrop: { + date: {type: Date, default: Date.now}, + count: {type: Number, default: 0}, + }, + }, + + lastCron: {type: Date, default: Date.now}, + _cronSignature: {type: String, default: 'NOT_RUNNING'}, // Private property used to avoid double cron + + // {GROUP_ID: Boolean}, represents whether they have unseen chat messages + newMessages: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + + challenges: [{type: String, ref: 'Challenge', validate: [validator.isUUID, 'Invalid uuid.']}], + + invitations: { + // Using an array without validation because otherwise mongoose treat this as a subdocument and applies _id by default + // Schema is (id, name, inviter) + // TODO one way to fix is http://mongoosejs.com/docs/guide.html#_id + guilds: {type: Array, default: () => []}, + // Using a Mixed type because otherwise user.invitations.party = {} // to reset invitation, causes validation to fail TODO + // schema is the same as for guild invitations (id, name, inviter) + party: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + }, + + guilds: [{type: String, ref: 'Group', validate: [validator.isUUID, 'Invalid uuid.']}], + + party: { + _id: {type: String, validate: [validator.isUUID, 'Invalid uuid.'], ref: 'Group'}, + order: {type: String, default: 'level'}, + orderAscending: {type: String, default: 'ascending'}, + quest: { + key: String, + progress: { + up: {type: Number, default: 0}, + down: {type: Number, default: 0}, + collect: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, // {feather:1, ingot:2} + }, + completed: String, // When quest is done, we move it from key => completed, and it's a one-time flag (for modal) that they unset by clicking "ok" in browser + RSVPNeeded: {type: Boolean, default: false}, // Set to true when invite is pending, set to false when quest invite is accepted or rejected, quest starts, or quest is cancelled + }, + }, + preferences: { + dayStart: {type: Number, default: 0, min: 0, max: 23}, + size: {type: String, enum: ['broad', 'slim'], default: 'slim'}, + hair: { + color: {type: String, default: 'red'}, + base: {type: Number, default: 3}, + bangs: {type: Number, default: 1}, + beard: {type: Number, default: 0}, + mustache: {type: Number, default: 0}, + flower: {type: Number, default: 1}, + }, + hideHeader: {type: Boolean, default: false}, + skin: {type: String, default: '915533'}, + shirt: {type: String, default: 'blue'}, + timezoneOffset: {type: Number, default: 0}, + sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']}, + chair: {type: String, default: 'none'}, + timezoneOffsetAtLastCron: Number, + language: String, + automaticAllocation: Boolean, + allocationMode: {type: String, enum: ['flat', 'classbased', 'taskbased'], default: 'flat'}, + autoEquip: {type: Boolean, default: true}, + costume: Boolean, + dateFormat: {type: String, enum: ['MM/dd/yyyy', 'dd/MM/yyyy', 'yyyy/MM/dd'], default: 'MM/dd/yyyy'}, + sleep: {type: Boolean, default: false}, + stickyHeader: {type: Boolean, default: true}, + disableClasses: {type: Boolean, default: false}, + newTaskEdit: {type: Boolean, default: false}, + dailyDueDefaultView: {type: Boolean, default: false}, + tagsCollapsed: {type: Boolean, default: false}, + advancedCollapsed: {type: Boolean, default: false}, + toolbarCollapsed: {type: Boolean, default: false}, + reverseChatOrder: {type: Boolean, default: false}, + background: String, + displayInviteToPartyWhenPartyIs1: {type: Boolean, default: true}, + webhooks: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + // For the following fields make sure to use strict comparison when searching for falsey values (=== false) + // As users who didn't login after these were introduced may have them undefined/null + emailNotifications: { + unsubscribeFromAll: {type: Boolean, default: false}, + newPM: {type: Boolean, default: true}, + kickedGroup: {type: Boolean, default: true}, + wonChallenge: {type: Boolean, default: true}, + giftedGems: {type: Boolean, default: true}, + giftedSubscription: {type: Boolean, default: true}, + invitedParty: {type: Boolean, default: true}, + invitedGuild: {type: Boolean, default: true}, + questStarted: {type: Boolean, default: true}, + invitedQuest: {type: Boolean, default: true}, + // remindersToLogin: {type: Boolean, default: true}, + // importantAnnouncements are in fact the recapture emails + importantAnnouncements: {type: Boolean, default: true}, + weeklyRecaps: {type: Boolean, default: true}, + }, + suppressModals: { + levelUp: {type: Boolean, default: false}, + hatchPet: {type: Boolean, default: false}, + raisePet: {type: Boolean, default: false}, + streak: {type: Boolean, default: false}, + }, + improvementCategories: { + type: Array, + validate: (categories) => { + const validCategories = ['work', 'exercise', 'healthWellness', 'school', 'teams', 'chores', 'creativity']; + let isValidCategory = categories.every(category => validCategories.indexOf(category) !== -1); + return isValidCategory; + }, + }, + }, + profile: { + blurb: String, + imageUrl: String, + name: String, + }, + stats: { + hp: {type: Number, default: shared.maxHealth}, + mp: {type: Number, default: 10}, + exp: {type: Number, default: 0}, + gp: {type: Number, default: 0}, + lvl: {type: Number, default: 1}, + + // Class System + class: {type: String, enum: ['warrior', 'rogue', 'wizard', 'healer'], default: 'warrior', required: true}, + points: {type: Number, default: 0}, + str: {type: Number, default: 0}, + con: {type: Number, default: 0}, + int: {type: Number, default: 0}, + per: {type: Number, default: 0}, + buffs: { + str: {type: Number, default: 0}, + int: {type: Number, default: 0}, + per: {type: Number, default: 0}, + con: {type: Number, default: 0}, + stealth: {type: Number, default: 0}, + streaks: {type: Boolean, default: false}, + snowball: {type: Boolean, default: false}, + spookySparkles: {type: Boolean, default: false}, + shinySeed: {type: Boolean, default: false}, + seafoam: {type: Boolean, default: false}, + }, + training: { + int: {type: Number, default: 0}, + per: {type: Number, default: 0}, + str: {type: Number, default: 0}, + con: {type: Number, default: 0}, + }, + }, + + tags: [TagSchema], + + inbox: { + newMessages: {type: Number, default: 0}, + blocks: {type: Array, default: () => []}, + messages: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + optOut: {type: Boolean, default: false}, + }, + tasksOrder: { + habits: [{type: String, ref: 'Task'}], + dailys: [{type: String, ref: 'Task'}], + todos: [{type: String, ref: 'Task'}], + rewards: [{type: String, ref: 'Task'}], + }, + extra: {type: Schema.Types.Mixed, default: () => { + return {}; + }}, + pushDevices: { + type: [{ + regId: {type: String}, + type: {type: String}, + }], + default: () => [], + }, +}, { + strict: true, + minimize: false, // So empty objects are returned +}); + +schema.plugin(baseModel, { + // noSet is not used as updating uses a whitelist and creating only accepts specific params (password, email, username, ...) + noSet: [], + private: ['auth.local.hashed_password', 'auth.local.salt', '_cronSignature'], + toJSONTransform: function userToJSON (plainObj, originalDoc) { + // plainObj.filters = {}; // TODO Not saved, remove? + plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs + + return plainObj; + }, +}); + +// A list of publicly accessible fields (not everything from preferences because there are also a lot of settings tha should remain private) +export let publicFields = `preferences.size preferences.hair preferences.skin preferences.shirt + preferences.chair preferences.costume preferences.sleep preferences.background profile stats + achievements party backer contributor auth.timestamps items`; + +// The minimum amount of data needed when populating multiple users +export let nameFields = 'profile.name'; + +schema.post('init', function postInitUser (doc) { + shared.wrap(doc); +}); + +function _populateDefaultTasks (user, taskTypes) { + let tagsI = taskTypes.indexOf('tag'); + + if (tagsI !== -1) { + user.tags = _.map(shared.content.userDefaults.tags, (tag) => { + let newTag = _.cloneDeep(tag); + + // tasks automatically get _id=helpers.uuid() from TaskSchema id.default, but tags are Schema.Types.Mixed - so we need to manually invoke here + newTag.id = shared.uuid(); + // Render tag's name in user's language + newTag.name = newTag.name(user.preferences.language); + return newTag; + }); + } + + let tasksToCreate = []; + + if (tagsI !== -1) { + taskTypes = _.clone(taskTypes); + taskTypes.splice(tagsI, 1); + } + + _.each(taskTypes, (taskType) => { + let tasksOfType = _.map(shared.content.userDefaults[`${taskType}s`], (taskDefaults) => { + let newTask = new Tasks[taskType](taskDefaults); + + newTask.userId = user._id; + newTask.text = taskDefaults.text(user.preferences.language); + if (newTask.notes) newTask.notes = taskDefaults.notes(user.preferences.language); + if (taskDefaults.checklist) { + newTask.checklist = _.map(taskDefaults.checklist, (checklistItem) => { + checklistItem.text = checklistItem.text(user.preferences.language); + return checklistItem; + }); + } + + return newTask.save(); + }); + + tasksToCreate.push(...tasksOfType); + }); + + return Bluebird.all(tasksToCreate) + .then((tasksCreated) => { + _.each(tasksCreated, (task) => { + user.tasksOrder[`${task.type}s`].push(task._id); + }); + }); +} + +function _populateDefaultsForNewUser (user) { + let taskTypes; + let iterableFlags = user.flags.toObject(); + + if (user.registeredThrough === 'habitica-web' || user.registeredThrough === 'habitica-android') { + taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag']; + + _.each(iterableFlags.tutorial.common, (val, section) => { + user.flags.tutorial.common[section] = true; + }); + } else { + taskTypes = ['todo', 'tag']; + user.flags.showTour = false; + + _.each(iterableFlags.tour, (val, section) => { + user.flags.tour[section] = -2; + }); + } + + return _populateDefaultTasks(user, taskTypes); +} + +function _setProfileName (user) { + let fb = user.auth.facebook; + + let localUsername = user.auth.local && user.auth.local.username; + let facebookUsername = fb && (fb.displayName || fb.name || fb.username || `${fb.first_name && fb.first_name} ${fb.last_name}`); + let anonymous = 'Anonymous'; + + return localUsername || facebookUsername || anonymous; +} + +schema.pre('save', true, function preSaveUser (next, done) { + next(); + + if (_.isNaN(this.preferences.dayStart) || this.preferences.dayStart < 0 || this.preferences.dayStart > 23) { + this.preferences.dayStart = 0; + } + + if (!this.profile.name) { + this.profile.name = _setProfileName(this); + } + + // Determines if Beast Master should be awarded + let beastMasterProgress = shared.count.beastMasterProgress(this.items.pets); + + if (beastMasterProgress >= 90 || this.achievements.beastMasterCount > 0) { + this.achievements.beastMaster = true; + } + + // Determines if Mount Master should be awarded + let mountMasterProgress = shared.count.mountMasterProgress(this.items.mounts); + + if (mountMasterProgress >= 90 || this.achievements.mountMasterCount > 0) { + this.achievements.mountMaster = true; + } + + // Determines if Triad Bingo should be awarded + + let dropPetCount = shared.count.dropPetsCurrentlyOwned(this.items.pets); + let qualifiesForTriad = dropPetCount >= 90 && mountMasterProgress >= 90; + + if (qualifiesForTriad || this.achievements.triadBingoCount > 0) { + this.achievements.triadBingo = true; + } + + // Enable weekly recap emails for old users who sign in + if (this.flags.lastWeeklyRecapDiscriminator) { + // Enable weekly recap emails in 24 hours + this.flags.lastWeeklyRecap = moment().subtract(6, 'days').toDate(); + // Unset the field so this is run only once + this.flags.lastWeeklyRecapDiscriminator = undefined; + } + + // EXAMPLE CODE for allowing all existing and new players to be + // automatically granted an item during a certain time period: + // if (!this.items.pets['JackOLantern-Base'] && moment().isBefore('2014-11-01')) + // this.items.pets['JackOLantern-Base'] = 5; + + // our own version incrementer + if (_.isNaN(this._v) || !_.isNumber(this._v)) this._v = 0; + this._v++; + + // Populate new users with default content + if (this.isNew) { + _populateDefaultsForNewUser(this) + .then(() => done()) + .catch(done); + } else { + done(); + } +}); + +schema.pre('update', function preUpdateUser () { + this.update({}, {$inc: {_v: 1}}); +}); + +schema.methods.isSubscribed = function isSubscribed () { + return !!this.purchased.plan.customerId; // eslint-disable-line no-implicit-coercion +}; + +// Get an array of groups ids the user is member of +schema.methods.getGroups = function getUserGroups () { + let userGroups = this.guilds.slice(0); // clone user.guilds so we don't modify the original + if (this.party._id) userGroups.push(this.party._id); + userGroups.push(TAVERN_ID); + return userGroups; +}; + +schema.methods.sendMessage = async function sendMessage (userToReceiveMessage, message) { + let sender = this; + + shared.refPush(userToReceiveMessage.inbox.messages, chatDefaults(message, sender)); + userToReceiveMessage.inbox.newMessages++; + userToReceiveMessage._v++; + userToReceiveMessage.markModified('inbox.messages'); + + shared.refPush(sender.inbox.messages, defaults({sent: true}, chatDefaults(message, userToReceiveMessage))); + sender.markModified('inbox.messages'); + + let promises = [userToReceiveMessage.save(), sender.save()]; + await Bluebird.all(promises); +}; + +// Methods to adapt the new schema to API v2 responses (mostly tasks inside the user model) +// These will be removed once API v2 is discontinued + +// Get all the tasks belonging to a user, +schema.methods.getTasks = function getUserTasks () { + let args = Array.from(arguments); + let cb; + let type; + + if (args.length === 1) { + cb = args[0]; + } else { + type = args[0]; + cb = args[1]; + } + + let query = { + userId: this._id, + }; + + if (type) query.type = type; + + Tasks.Task.find(query, cb); +}; + +// Given user and an array of tasks, return an API compatible user + tasks obj +schema.methods.addTasksToUser = function addTasksToUser (tasks) { + let obj = this.toJSON(); + + obj.id = obj._id; + obj.filters = {}; + + obj.tags = obj.tags.map(tag => { + return { + id: tag.id, + name: tag.name, + challenge: tag.challenge, + }; + }); + + let tasksOrder = obj.tasksOrder; // Saving a reference because we won't return it + + obj.habits = []; + obj.dailys = []; + obj.todos = []; + obj.rewards = []; + + obj.tasksOrder = undefined; + let unordered = []; + + tasks.forEach((task) => { + // We want to push the task at the same position where it's stored in tasksOrder + let pos = tasksOrder[`${task.type}s`].indexOf(task._id); + if (pos === -1) { // Should never happen, it means the lists got out of sync + unordered.push(task.toJSONV2()); + } else { + obj[`${task.type}s`][pos] = task.toJSONV2(); + } + }); + + // Reconcile unordered items + unordered.forEach((task) => { + obj[`${task.type}s`].push(task); + }); + + // Remove null values that can be created when inserting tasks at an index > length + ['habits', 'dailys', 'rewards', 'todos'].forEach((type) => { + obj[type] = _.compact(obj[type]); + }); + + return obj; +}; + +// Return the data maintaining backward compatibility +schema.methods.getTransformedData = function getTransformedData (cb) { + let self = this; + this.getTasks((err, tasks) => { + if (err) return cb(err); + cb(null, self.addTasksToUser(tasks)); + }); +}; + +// END of API v2 methods +export let model = mongoose.model('User', schema); + +// Initially export an empty object so external requires will get +// the right object by reference when it's defined later +// Otherwise it would remain undefined if requested before the query executes +export let mods = []; + +mongoose.model('User') + .find({'contributor.admin': true}) + .sort('-contributor.level -backer.npc profile.name') + .select('profile contributor backer') + .exec() + .then((foundMods) => { + // Using push to maintain the reference to mods + mods.push(...foundMods); + }); // In case of failure we don't want this to crash the whole server diff --git a/website/server/routes/api-v2/auth.js b/website/server/routes/api-v2/auth.js new file mode 100644 index 0000000000..f8af1b4338 --- /dev/null +++ b/website/server/routes/api-v2/auth.js @@ -0,0 +1,21 @@ +var auth = require('../../controllers/api-v2/auth'); +var express = require('express'); +var i18n = require('../../libs/api-v2/i18n'); +var router = express.Router(); +import { + getUserLanguage +} from '../../middlewares/api-v3/language'; + +/* auth.auth*/ +// auth.setupPassport(router); //TODO make this consistent with the others +router.post('/register', getUserLanguage, auth.registerUser); +router.post('/user/auth/local', getUserLanguage, auth.loginLocal); +router.post('/user/auth/social', getUserLanguage, auth.loginSocial); +router.delete('/user/auth/social', getUserLanguage, auth.auth, auth.deleteSocial); +router.post('/user/reset-password', getUserLanguage, auth.resetPassword); +router.post('/user/change-password', getUserLanguage, auth.auth, auth.changePassword); +router.post('/user/change-username', getUserLanguage, auth.auth, auth.changeUsername); +router.post('/user/change-email', getUserLanguage, auth.auth, auth.changeEmail); +// router.post('/user/auth/firebase', i18n.getUserLanguage, auth.auth, auth.getFirebaseToken); + +module.exports = router; diff --git a/website/server/routes/api-v2/coupon.js b/website/server/routes/api-v2/coupon.js new file mode 100644 index 0000000000..7caee3f815 --- /dev/null +++ b/website/server/routes/api-v2/coupon.js @@ -0,0 +1,15 @@ +var nconf = require('nconf'); +var express = require('express'); +var router = express.Router(); +var auth = require('../../controllers/api-v2/auth'); +var coupon = require('../../controllers/api-v2/coupon'); +var i18n = require('../../libs/api-v2/i18n'); +import { + getUserLanguage +} from '../../middlewares/api-v3/language'; + +router.get('/coupons', auth.authWithUrl, getUserLanguage, coupon.ensureAdmin, coupon.getCoupons); +router.post('/coupons/generate/:event', auth.auth, getUserLanguage, coupon.ensureAdmin, coupon.generateCoupons); +router.post('/user/coupon/:code', auth.auth, getUserLanguage, coupon.enterCode); + +module.exports = router; diff --git a/website/src/routes/api-v2/swagger.js b/website/server/routes/api-v2/swagger.js similarity index 91% rename from website/src/routes/api-v2/swagger.js rename to website/server/routes/api-v2/swagger.js index a1500ac39a..c60d8364b6 100644 --- a/website/src/routes/api-v2/swagger.js +++ b/website/server/routes/api-v2/swagger.js @@ -13,12 +13,15 @@ var members = require("../../controllers/api-v2/members"); var auth = require("../../controllers/api-v2/auth"); var hall = require("../../controllers/api-v2/hall"); var challenges = require("../../controllers/api-v2/challenges"); -var dataexport = require("../../controllers/dataexport"); +var dataexport = require("../../controllers/api-v2/dataexport"); var nconf = require("nconf"); var cron = user.cron; var _ = require('lodash'); var content = require('../../../../common').content; -var i18n = require('../../libs/i18n'); +var i18n = require('../../libs/api-v2/i18n'); +import { + getUserLanguage +} from '../../middlewares/api-v3/language'; var forceRefresh = require('../../middlewares/forceRefresh').middleware; module.exports = function(swagger, v2) { @@ -60,7 +63,7 @@ module.exports = function(swagger, v2) { description: "Export user history", method: 'GET' }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: dataexport.history }, "/user/tasks/{id}/{direction}": { @@ -134,7 +137,7 @@ module.exports = function(swagger, v2) { description: 'Unlink a task from its challenge', parameters: [path("id", "Task ID", "string"), query('keep', "When unlinking a challenge task, how to handle the orphans?", 'string', ['keep', 'keep-all', 'remove', 'remove-all'])] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.unlink }, "/user/inventory/buy": { @@ -235,7 +238,7 @@ module.exports = function(swagger, v2) { method: 'DELETE', description: "Delete a user object entirely, USE WITH CAUTION!" }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: user["delete"] }, "/user/revive": { @@ -311,7 +314,7 @@ module.exports = function(swagger, v2) { description: "This is an advanced route which is useful for apps which might for example need offline support. You can send a whole batch of user-based operations, which allows you to queue them up offline and send them all at once. The format is {op:'nameOfOperation',parameters:{},body:{},query:{}}", parameters: [body('', 'The array of batch-operations to perform', 'object')] }, - middleware: [forceRefresh, auth.auth, i18n.getUserLanguage, cron, user.sessionPartyInvite], + middleware: [forceRefresh, auth.auth, getUserLanguage, cron, user.sessionPartyInvite], action: user.batchUpdate }, "/user/tags/{id}:GET": { @@ -406,7 +409,7 @@ module.exports = function(swagger, v2) { description: "Get a list of groups", parameters: [query('type', "Comma-separated types of groups to return, eg 'party,guilds,public,tavern'", 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: groups.list }, "/groups:POST": { @@ -416,7 +419,7 @@ module.exports = function(swagger, v2) { description: 'Create a group', parameters: [body('', 'Group object (see GroupSchema)', 'object')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: groups.create }, "/groups/{gid}:GET": { @@ -425,7 +428,7 @@ module.exports = function(swagger, v2) { description: "Get a group. The party the user currently is in can be accessed with the gid 'party'.", parameters: [path('gid', 'Group ID', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: groups.get }, "/groups/{gid}:POST": { @@ -435,7 +438,7 @@ module.exports = function(swagger, v2) { description: "Edit a group", parameters: [body('', 'Group object (see GroupSchema)', 'object')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.update }, "/groups/{gid}/join": { @@ -444,7 +447,7 @@ module.exports = function(swagger, v2) { description: 'Join a group', parameters: [path('gid', 'Id of the group to join', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.join }, "/groups/{gid}/leave": { @@ -453,7 +456,7 @@ module.exports = function(swagger, v2) { description: 'Leave a group', parameters: [path('gid', 'ID of the group to leave', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.leave }, "/groups/{gid}/invite": { @@ -462,7 +465,7 @@ module.exports = function(swagger, v2) { description: "Invite a user to a group", parameters: [path('gid', 'Group id', 'string'), body('', 'a payload of invites either under body.uuids or body.emails, only one of them!', 'object')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.invite }, "/groups/{gid}/removeMember": { @@ -471,7 +474,7 @@ module.exports = function(swagger, v2) { description: "Remove / boot a member from a group", parameters: [path('gid', 'Group id', 'string'), query('uuid', 'User id to boot', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.removeMember }, "/groups/{gid}/questAccept": { @@ -480,7 +483,7 @@ module.exports = function(swagger, v2) { description: "Accept a quest invitation", parameters: [path('gid', "Group id", 'string'), query('key', "optional. if provided, trigger new invite, if not, accept existing invite", 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.questAccept }, "/groups/{gid}/questReject": { @@ -489,7 +492,7 @@ module.exports = function(swagger, v2) { description: 'Reject quest invitation', parameters: [path('gid', 'Group id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.questReject }, "/groups/{gid}/questCancel": { @@ -498,7 +501,7 @@ module.exports = function(swagger, v2) { description: 'Cancel quest before it starts (in invitation stage)', parameters: [path('gid', 'Group to cancel quest in', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.questCancel }, "/groups/{gid}/questAbort": { @@ -507,7 +510,7 @@ module.exports = function(swagger, v2) { description: 'Abort quest after it has started (all progress will be lost)', parameters: [path('gid', 'Group to abort quest in', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.questAbort }, "/groups/{gid}/questLeave": { @@ -516,7 +519,7 @@ module.exports = function(swagger, v2) { description: 'Leave an active quest (Quest leaders cannot leave active quests. They must abort the quest to leave)', parameters: [path('gid', 'Group to leave quest in', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.questLeave }, "/groups/{gid}/chat:GET": { @@ -525,7 +528,7 @@ module.exports = function(swagger, v2) { description: "Get all chat messages", parameters: [path('gid', 'Group to return the chat from ', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.getChat }, "/groups/{gid}/chat:POST": { @@ -535,7 +538,7 @@ module.exports = function(swagger, v2) { description: "Send a chat message", parameters: [query('message', 'Chat message', 'string'), path('gid', 'Group id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.postChat }, "/groups/{gid}/chat/seen": { @@ -552,7 +555,7 @@ module.exports = function(swagger, v2) { description: 'Delete a chat message in a given group', parameters: [path('gid', 'ID of the group containing the message to be deleted', 'string'), path('messageId', 'ID of message to be deleted', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.deleteChatMessage }, "/groups/{gid}/chat/{mid}/like": { @@ -561,7 +564,7 @@ module.exports = function(swagger, v2) { description: "Like a chat message", parameters: [path('gid', 'Group id', 'string'), path('mid', 'Message id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.likeChatMessage }, "/groups/{gid}/chat/{mid}/flag": { @@ -570,7 +573,7 @@ module.exports = function(swagger, v2) { description: "Flag a chat message", parameters: [path('gid', 'Group id', 'string'), path('mid', 'Message id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.flagChatMessage }, "/groups/{gid}/chat/{mid}/clearflags": { @@ -579,7 +582,7 @@ module.exports = function(swagger, v2) { description: "Clear flag count from message and unhide it", parameters: [path('gid', 'Group id', 'string'), path('mid', 'Message id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup], + middleware: [auth.auth, getUserLanguage, groups.attachGroup], action: groups.clearFlagCount }, "/members/{uuid}:GET": { @@ -588,7 +591,7 @@ module.exports = function(swagger, v2) { description: "Get a member.", parameters: [path('uuid', 'Member ID', 'string')] }, - middleware: [i18n.getUserLanguage], + middleware: [getUserLanguage], action: members.getMember }, "/members/{uuid}/message": { @@ -620,14 +623,14 @@ module.exports = function(swagger, v2) { }, "/hall/heroes": { spec: {}, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: hall.getHeroes }, "/hall/heroes/{uid}:GET": { spec: { path: "/hall/heroes/{uid}" }, - middleware: [auth.auth, i18n.getUserLanguage, hall.ensureAdmin], + middleware: [auth.auth, getUserLanguage, hall.ensureAdmin], action: hall.getHero }, "/hall/heroes/{uid}:POST": { @@ -635,14 +638,14 @@ module.exports = function(swagger, v2) { method: 'POST', path: "/hall/heroes/{uid}" }, - middleware: [auth.auth, i18n.getUserLanguage, hall.ensureAdmin], + middleware: [auth.auth, getUserLanguage, hall.ensureAdmin], action: hall.updateHero }, "/hall/patrons": { spec: { parameters: [query('page', 'Page number to fetch (this list is long)', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: hall.getPatrons }, "/challenges:GET": { @@ -650,7 +653,7 @@ module.exports = function(swagger, v2) { path: '/challenges', description: "Get a list of challenges" }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.list }, "/challenges:POST": { @@ -660,7 +663,7 @@ module.exports = function(swagger, v2) { description: "Create a challenge", parameters: [body('', 'Challenge object (see ChallengeSchema)', 'object')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.create }, "/challenges/{cid}:GET": { @@ -669,7 +672,7 @@ module.exports = function(swagger, v2) { description: 'Get a challenge', parameters: [path('cid', 'Challenge id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.get }, "/challenges/{cid}/csv": { @@ -686,7 +689,7 @@ module.exports = function(swagger, v2) { description: "Update a challenge", parameters: [path('cid', 'Challenge id', 'string'), body('', 'Challenge object (see ChallengeSchema)', 'object')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.update }, "/challenges/{cid}:DELETE": { @@ -696,7 +699,7 @@ module.exports = function(swagger, v2) { description: "Delete a challenge", parameters: [path('cid', 'Challenge id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges["delete"] }, "/challenges/{cid}/close": { @@ -705,7 +708,7 @@ module.exports = function(swagger, v2) { description: 'Close a challenge', parameters: [path('cid', 'Challenge id', 'string'), query('uid', 'User ID of the winner', 'string', true)] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.selectWinner }, "/challenges/{cid}/join": { @@ -714,7 +717,7 @@ module.exports = function(swagger, v2) { description: "Join a challenge", parameters: [path('cid', 'Challenge id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.join }, "/challenges/{cid}/leave": { @@ -723,7 +726,7 @@ module.exports = function(swagger, v2) { description: 'Leave a challenge', parameters: [path('cid', 'Challenge id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.leave }, "/challenges/{cid}/member/{uid}": { @@ -731,7 +734,7 @@ module.exports = function(swagger, v2) { description: "Get a member's progress in a particular challenge", parameters: [path('cid', 'Challenge id', 'string'), path('uid', 'User id', 'string')] }, - middleware: [auth.auth, i18n.getUserLanguage], + middleware: [auth.auth, getUserLanguage], action: challenges.getMember } }; @@ -765,7 +768,7 @@ module.exports = function(swagger, v2) { method: 'GET' }); if (route.middleware == null) { - route.middleware = path.indexOf('/user') === 0 ? [auth.auth, i18n.getUserLanguage, cron] : [i18n.getUserLanguage]; + route.middleware = path.indexOf('/user') === 0 ? [auth.auth, getUserLanguage, cron] : [i18n.getUserLanguage]; } swagger["add" + route.spec.method](route); return true; diff --git a/website/server/routes/api-v2/unsubscription.js b/website/server/routes/api-v2/unsubscription.js new file mode 100644 index 0000000000..cbd2e16554 --- /dev/null +++ b/website/server/routes/api-v2/unsubscription.js @@ -0,0 +1,11 @@ +var express = require('express'); +var router = express.Router(); +var i18n = require('../../libs/api-v2/i18n'); +var unsubscription = require('../../controllers/api-v2/unsubscription'); +import { + getUserLanguage +} from '../../middlewares/api-v3/language'; + +router.get('/unsubscribe', getUserLanguage, unsubscription.unsubscribe); + +module.exports = router; diff --git a/website/server/routes/payments.js b/website/server/routes/payments.js new file mode 100644 index 0000000000..13e9ec9163 --- /dev/null +++ b/website/server/routes/payments.js @@ -0,0 +1,34 @@ +var nconf = require('nconf'); +var express = require('express'); +var router = express.Router(); +var auth = require('../controllers/api-v2/auth'); +var payments = require('../controllers/payments'); +var i18n = require('../libs/api-v2/i18n'); +import { + getUserLanguage +} from '../../middlewares/api-v3/language'; + +router.get('/paypal/checkout', auth.authWithUrl, getUserLanguage, payments.paypalCheckout); +router.get('/paypal/checkout/success', getUserLanguage, payments.paypalCheckoutSuccess); +router.get('/paypal/subscribe', auth.authWithUrl, getUserLanguage, payments.paypalSubscribe); +router.get('/paypal/subscribe/success', getUserLanguage, payments.paypalSubscribeSuccess); +router.get('/paypal/subscribe/cancel', auth.authWithUrl, getUserLanguage, payments.paypalSubscribeCancel); +router.post('/paypal/ipn', getUserLanguage, payments.paypalIPN); // misc ipn handling + +router.post('/stripe/checkout', auth.auth, getUserLanguage, payments.stripeCheckout); +router.post('/stripe/subscribe/edit', auth.auth, getUserLanguage, payments.stripeSubscribeEdit); +//router.get('/stripe/subscribe', auth.authWithUrl, getUserLanguage, payments.stripeSubscribe); // checkout route is used (above) with ?plan= instead +router.get('/stripe/subscribe/cancel', auth.authWithUrl, getUserLanguage, payments.stripeSubscribeCancel); + +router.post('/amazon/verifyAccessToken', auth.auth, getUserLanguage, payments.amazonVerifyAccessToken); +router.post('/amazon/createOrderReferenceId', auth.auth, getUserLanguage, payments.amazonCreateOrderReferenceId); +router.post('/amazon/checkout', auth.auth, getUserLanguage, payments.amazonCheckout); +router.post('/amazon/subscribe', auth.auth, getUserLanguage, payments.amazonSubscribe); +router.get('/amazon/subscribe/cancel', auth.authWithUrl, getUserLanguage, payments.amazonSubscribeCancel); + +router.post('/iap/android/verify', auth.authWithUrl, /*getUserLanguage, */payments.iapAndroidVerify); +router.post('/iap/ios/verify', auth.auth, /*getUserLanguage, */ payments.iapIosVerify); + +router.get('/api/v2/coupons/valid-discount/:code', /*auth.authWithUrl, getUserLanguage, */ payments.validCoupon); + +module.exports = router; diff --git a/website/server/server.js b/website/server/server.js new file mode 100644 index 0000000000..f86e6c63b7 --- /dev/null +++ b/website/server/server.js @@ -0,0 +1,35 @@ +import nconf from 'nconf'; +import logger from './libs/api-v3/logger'; +import express from 'express'; +import http from 'http'; +import attachMiddlewares from './middlewares/api-v3/index'; +import Bluebird from 'bluebird'; + +global.Promise = Bluebird; + +const server = http.createServer(); +const app = express(); + +app.set('port', nconf.get('PORT')); + +// Setup translations +import './libs/api-v3/i18n'; + +// Load config files +import './libs/api-v3/setupMongoose'; +import './libs/api-v3/firebase'; +import './libs/api-v3/setupPassport'; + +// Load some schemas & models +import './models/challenge'; +import './models/group'; +import './models/user'; + +attachMiddlewares(app, server); + +server.on('request', app); +server.listen(app.get('port'), () => { + logger.info(`Express server listening on port ${app.get('port')}`); +}); + +module.exports = server; diff --git a/website/src/controllers/api-v2/auth.js b/website/src/controllers/api-v2/auth.js deleted file mode 100644 index f63c652814..0000000000 --- a/website/src/controllers/api-v2/auth.js +++ /dev/null @@ -1,383 +0,0 @@ -var _ = require('lodash'); -var validator = require('validator'); -var passport = require('passport'); -var shared = require('../../../../common'); -var async = require('async'); -var utils = require('../../libs/utils'); -var nconf = require('nconf'); -var request = require('request'); -var FirebaseTokenGenerator = require('firebase-token-generator'); -var User = require('../../models/user').model; -var EmailUnsubscription = require('../../models/emailUnsubscription').model; -var analytics = utils.analytics; -var i18n = require('./../../libs/i18n'); - -var isProd = nconf.get('NODE_ENV') === 'production'; - -var api = module.exports; - -var NO_TOKEN_OR_UID = { err: shared.i18n.t('messageAuthMustIncludeTokens') }; -var NO_USER_FOUND = {err: shared.i18n.t('messageAuthNoUserFound') }; -var NO_SESSION_FOUND = { err: shared.i18n.t('messageAuthMustBeLoggedIn') }; -var accountSuspended = function(uuid){ - return { - err: 'Account has been suspended, please contact leslie@habitica.com with your UUID ('+uuid+') for assistance.', - code: 'ACCOUNT_SUSPENDED' - }; -} - -api.auth = function(req, res, next) { - var uid = req.headers['x-api-user']; - var token = req.headers['x-api-key']; - if (!(uid && token)) return res.status(401).json(NO_TOKEN_OR_UID); - User.findOne({_id: uid, apiToken: token}, function(err, user) { - if (err) return next(err); - if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); - if (user.auth.blocked) return res.status(401).json(accountSuspended(user._id)); - - res.locals.wasModified = req.query._v ? +user._v !== +req.query._v : true; - res.locals.user = user; - req.session.userId = user._id; - return next(); - }); -}; - -api.authWithSession = function(req, res, next) { //[todo] there is probably a more elegant way of doing this... - if (!(req.session && req.session.userId)) - return res.status(401).json(NO_SESSION_FOUND); - User.findOne({_id: req.session.userId}, function(err, user) { - if (err) return next(err); - if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); - res.locals.user = user; - next(); - }); -}; - -api.authWithUrl = function(req, res, next) { - User.findOne({_id:req.query._id, apiToken:req.query.apiToken}, function(err,user){ - if (err) return next(err); - if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); - res.locals.user = user; - next(); - }); -} - -api.registerUser = function(req, res, next) { - var email = req.body.email && req.body.email.toLowerCase(); - var username = req.body.username; - // Get the lowercase version of username to check that we do not have duplicates - // So we can search for it in the database and then reject the choosen username if 1 or more results are found - var lowerCaseUsername = username && username.toLowerCase(); - - async.auto({ - validate: function(cb) { - if (!(username && req.body.password && email)) - return cb({code:401, err: shared.i18n.t('messageAuthCredentialsRequired')}); - if (req.body.password !== req.body.confirmPassword) - return cb({code:401, err: shared.i18n.t('messageAuthPasswordMustMatch')}); - if (!validator.isEmail(email)) - return cb({code:401, err: ":email invalid"}); - cb(); - }, - findReg: function(cb) { - // Search for duplicates using lowercase version of username - User.findOne({$or:[{'auth.local.email': email}, {'auth.local.lowerCaseUsername': lowerCaseUsername}]}, {'auth.local':1}, cb); - }, - findFacebook: function(cb){ - User.findOne({_id: req.headers['x-api-user'], apiToken: req.headers['x-api-key']}, {auth:1}, cb); - }, - register: ['validate', 'findReg', 'findFacebook', function(cb, data) { - if (data.findReg) { - if (email === data.findReg.auth.local.email) return cb({code:401, err:"Email already taken"}); - // Check that the lowercase username isn't already used - if (lowerCaseUsername === data.findReg.auth.local.lowerCaseUsername) return cb({code:401, err: shared.i18n.t('messageAuthUsernameTaken')}); - } - var salt = utils.makeSalt(); - var newUser = { - auth: { - local: { - username: username, - lowerCaseUsername: lowerCaseUsername, // Store the lowercase version of the username - email: email, // Store email as lowercase - salt: salt, - hashed_password: utils.encryptPassword(req.body.password, salt) - }, - timestamps: {created: +new Date(), loggedIn: +new Date()} - } - }; - // existing user, allow them to add local authentication - if (data.findFacebook) { - data.findFacebook.auth.local = newUser.auth.local; - data.findFacebook.registeredThrough = newUser.registeredThrough; - data.findFacebook.save(cb); - // new user, register them - } else { - newUser.preferences = newUser.preferences || {}; - newUser.preferences.language = req.language; // User language detected from browser, not saved - var user = new User(newUser); - - user.registeredThrough = req.headers['x-client']; - var analyticsData = { - category: 'acquisition', - type: 'local', - gaLabel: 'local', - uuid: user._id, - }; - analytics.track('register', analyticsData) - - user.save(function(err, savedUser){ - // Clean previous email preferences - // TODO when emails added to EmailUnsubcription they should use lowercase version - EmailUnsubscription.remove({email: savedUser.auth.local.email}, function(){ - utils.txnEmail(savedUser, 'welcome'); - }); - cb.apply(cb, arguments); - }); - } - }] - }, function(err, data) { - if (err) return err.code ? res.status(err.code).json(err) : next(err); - res.status(200).json(data.register[0]); - }); -}; - -/* - Register new user with uname / password - */ - - -api.loginLocal = function(req, res, next) { - var username = req.body.username; - var password = req.body.password; - if (!(username && password)) return res.status(401).json({err:'Missing :username or :password in request body, please provide both'}); - var login = validator.isEmail(username) ? - {'auth.local.email':username.toLowerCase()} : // Emails are all lowercase - {'auth.local.username':username}; // Use the username as the user typed it - - User.findOne(login, {auth:1}, function(err, user){ - if (err) return next(err); - if (!user) return res.status(401).json({err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\" on the habitica.com website's login form."}); - if (user.auth.blocked) return res.status(401).json(accountSuspended(user._id)); - // We needed the whole user object first so we can get his salt to encrypt password comparison - User.findOne( - {$and: [login, {'auth.local.hashed_password': utils.encryptPassword(password, user.auth.local.salt)}]} - , {_id:1, apiToken:1} - , function(err, user){ - if (err) return next(err); - if (!user) return res.status(401).json({err:"Uh-oh - your username or password is incorrect.\n- Make sure your username or email is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login.\n- If you forgot your password, click \"Forgot Password\" on the habitica.com website's login form."}); - res.json({id: user._id,token: user.apiToken}); - password = null; - }); - }); -}; - -/* - POST /user/auth/social - */ -api.loginSocial = function(req, res, next) { - var access_token = req.body.authResponse.access_token, - network = req.body.network; - if (network!=='facebook') - return res.status(401).json({err:"Only Facebook supported currently."}); - async.auto({ - profile: function (cb) { - passport._strategies[network].userProfile(access_token, cb); - }, - user: ['profile', function (cb, results) { - var q = {}; - q['auth.' + network + '.id'] = results.profile.id; - User.findOne(q, {_id: 1, apiToken: 1, auth: 1}, cb); - }], - register: ['profile', 'user', function (cb, results) { - if (results.user) return cb(null, results.user); - // Create new user - var prof = results.profile; - var user = { - preferences: { - language: req.language // User language detected from browser, not saved - }, - auth: { - timestamps: {created: +new Date(), loggedIn: +new Date()} - } - }; - user.auth[network] = prof; - user = new User(user); - user.registeredThrough = req.headers['x-client']; - - user.save(function(err, savedUser){ - // Clean previous email preferences - if(savedUser.auth.facebook.emails && savedUser.auth.facebook.emails[0] && savedUser.auth.facebook.emails[0].value){ - EmailUnsubscription.remove({email: savedUser.auth.facebook.emails[0].value}, function(){ - utils.txnEmail(savedUser, 'welcome'); - }); - } - cb.apply(cb, arguments); - }); - - var analyticsData = { - category: 'acquisition', - type: network, - gaLabel: network, - uuid: user._id, - }; - analytics.track('register', analyticsData) - }] - }, function(err, results){ - if (err) return res.status(401).json({err: err.toString ? err.toString() : err}); - var acct = results.register[0] ? results.register[0] : results.register; - if (acct.auth.blocked) return res.status(401).json(accountSuspended(acct._id)); - return res.status(200).json({id:acct._id, token:acct.apiToken}); - }) -}; - -/** - * DELETE /user/auth/social - */ -api.deleteSocial = function(req,res,next){ - if (!res.locals.user.auth.local.username) - return res.status(401).json({err:"Account lacks another authentication method, can't detach Facebook"}); - //FIXME for some reason, the following gives https://gist.github.com/lefnire/f93eb306069b9089d123 - //res.locals.user.auth.facebook = null; - //res.locals.user.auth.save(function(err, saved){ - User.update({_id:res.locals.user._id}, {$unset:{'auth.facebook':1}}, function(err){ - if (err) return next(err); - res.sendStatus(200); - }) -} - -api.resetPassword = function(req, res, next){ - var email = req.body.email && req.body.email.toLowerCase(), // Emails are all lowercase - salt = utils.makeSalt(), - newPassword = utils.makeSalt(), // use a salt as the new password too (they'll change it later) - hashed_password = utils.encryptPassword(newPassword, salt); - - if(!email) return res.status(400).json({err: "Email not provided"}); - - User.findOne({'auth.local.email': email}, function(err, user){ - if (err) return next(err); - if (!user) return res.status(401).json({err:"Sorry, we can't find a user registered with email " + email + "\n- Make sure your email address is typed correctly.\n- You may have signed up with Facebook, not email. Double-check by trying Facebook login."}); - user.auth.local.salt = salt; - user.auth.local.hashed_password = hashed_password; - utils.sendEmail({ - from: "HabiticaImportant! Both username and password are case-sensitive -- you must enter both exactly as shown here. We recommend copying and pasting both instead of typing them.
Log in at " + nconf.get('BASE_URL') + ". After you've logged in, head to " + nconf.get('BASE_URL') + "/#/options/settings/settings and change your password." - }); - user.save(function(err){ - if(err) return next(err); - res.send('New password sent to '+ email); - email = salt = newPassword = hashed_password = null; - }); - }); -}; - -var invalidPassword = function(user, password){ - var hashed_password = utils.encryptPassword(password, user.auth.local.salt); - if (hashed_password !== user.auth.local.hashed_password) - return {code:401, err:"Incorrect password"}; - return false; -} - -api.changeUsername = function(req, res, next) { - var user = res.locals.user; - var username = req.body.username; - var lowerCaseUsername = username && username.toLowerCase(); // we search for the lowercased version to intercept duplicates - - if(!username) return res.status(400).json({err: "Username not provided"}); - async.waterfall([ - function(cb){ - User.findOne({'auth.local.lowerCaseUsername': lowerCaseUsername}, {auth:1}, cb); - }, - function(found, cb){ - if (found) return cb({code:401, err: "Username already taken"}); - if (invalidPassword(user, req.body.password)) return cb(invalidPassword(user, req.body.password)); - user.auth.local.username = username; - user.auth.local.lowerCaseUsername = lowerCaseUsername; - - user.save(cb); - } - ], function(err){ - if (err) return err.code ? res.status(err.code).json(err) : next(err); - res.sendStatus(200); - }) -} - -api.changeEmail = function(req, res, next){ - var email = req.body.email && req.body.email.toLowerCase(); // emails are all lowercase - if(!email) return res.status(400).json({err: "Email not provided"}); - - async.waterfall([ - function(cb){ - User.findOne({'auth.local.email': email}, {auth:1}, cb); - }, - function(found, cb){ - if(found) return cb({code:401, err: shared.i18n.t('messageAuthEmailTaken')}); - if (invalidPassword(res.locals.user, req.body.password)) return cb(invalidPassword(res.locals.user, req.body.password)); - res.locals.user.auth.local.email = email; - res.locals.user.save(cb); - } - ], function(err){ - if (err) return err.code ? res.status(err.code).json(err) : next(err); - res.sendStatus(200); - }) -} - -api.changePassword = function(req, res, next) { - var user = res.locals.user, - oldPassword = req.body.oldPassword, - newPassword = req.body.newPassword, - confirmNewPassword = req.body.confirmNewPassword; - - if (newPassword != confirmNewPassword) - return res.status(401).json({err: "Password & Confirm don't match"}); - - var salt = user.auth.local.salt, - hashed_old_password = utils.encryptPassword(oldPassword, salt), - hashed_new_password = utils.encryptPassword(newPassword, salt); - - if (hashed_old_password !== user.auth.local.hashed_password) - return res.status(401).json({err:"Old password doesn't match"}); - - user.auth.local.hashed_password = hashed_new_password; - user.save(function(err, saved){ - if (err) next(err); - res.sendStatus(200); - }) -}; - -var firebaseTokenGeneratorInstance = new FirebaseTokenGenerator(nconf.get('FIREBASE:SECRET')); -api.getFirebaseToken = function(req, res, next) { - var user = res.locals.user; - // Expires 24 hours after now (60*60*24*1000) (in milliseconds) - var expires = new Date(); - expires.setTime(expires.getTime() + 86400000); - - var token = firebaseTokenGeneratorInstance - .createToken({ - uid: user._id, - isHabiticaUser: true - }, { - expires: expires - }); - - res.status(200).json({ - token: token, - expires: expires - }); -}; - -/* - Registers a new user. Only accepting username/password registrations, no Facebook -*/ - -api.setupPassport = function(router) { - - router.get('/logout', i18n.getUserLanguage, function(req, res) { - req.logout(); - delete req.session.userId; - res.redirect('/'); - }) - -}; diff --git a/website/src/controllers/api-v2/challenges.js b/website/src/controllers/api-v2/challenges.js deleted file mode 100644 index 967f175213..0000000000 --- a/website/src/controllers/api-v2/challenges.js +++ /dev/null @@ -1,453 +0,0 @@ -// @see ../routes for routing - -var _ = require('lodash'); -var nconf = require('nconf'); -var async = require('async'); -var shared = require('../../../../common'); -var User = require('./../../models/user').model; -var Group = require('./../../models/group').model; -var Challenge = require('./../../models/challenge').model; -var logging = require('./../../libs/logging'); -var csvStringify = require('csv-stringify'); -var utils = require('../../libs/utils'); -var api = module.exports; -var pushNotify = require('./../pushNotifications'); - -/* - ------------------------------------------------------------------------ - Challenges - ------------------------------------------------------------------------ -*/ - -api.list = function(req, res, next) { - var user = res.locals.user; - async.waterfall([ - function(cb){ - // Get all available groups I belong to - Group.find({members: {$in: [user._id]}}).select('_id').exec(cb); - }, - function(gids, cb){ - // and their challenges - Challenge.find({ - $or:[ - {leader: user._id}, - {members:{$in:[user._id]}}, // all challenges I belong to (is this necessary? thought is a left a group, but not its challenge) - {group:{$in:gids}}, // all challenges in my groups - {group: 'habitrpg'} // public group - ], - _id:{$ne:'95533e05-1ff9-4e46-970b-d77219f199e9'} // remove the Spread the Word Challenge for now, will revisit when we fix the closing-challenge bug - }) - .select('name leader description group memberCount prize official') - .select({members:{$elemMatch:{$in:[user._id]}}}) - .sort('-official -timestamp') - .populate('group', '_id name type') - .populate('leader', 'profile.name') - .exec(cb); - } - ], function(err, challenges){ - if (err) return next(err); - _.each(challenges, function(c){ - c._isMember = c.members.length > 0; - }) - res.json(challenges); - user = null; - }); -} - -// GET -api.get = function(req, res, next) { - var user = res.locals.user; - // TODO use mapReduce() or aggregate() here to - // 1) Find the sum of users.tasks.values within the challnege (eg, {'profile.name':'tyler', 'sum': 100}) - // 2) Sort by the sum - // 3) Limit 30 (only show the 30 users currently in the lead) - Challenge.findById(req.params.cid) - .populate('members', 'profile.name _id') - .populate('group', '_id name type') - .populate('leader', 'profile.name') - .exec(function(err, challenge){ - if(err) return next(err); - if (!challenge) return res.status(404).json({err: 'Challenge ' + req.params.cid + ' not found'}); - challenge._isMember = !!(_.find(challenge.members, function(member) { - return member._id === user._id; - })); - res.json(challenge); - }); -} - -api.csv = function(req, res, next) { - var cid = req.params.cid; - var challenge; - async.waterfall([ - function(cb){ - Challenge.findById(cid,cb) - }, - function(_challenge,cb) { - challenge = _challenge; - if (!challenge) return cb('Challenge ' + cid + ' not found'); - User.aggregate([ - {$match:{'_id':{ '$in': challenge.members}}}, //yes, we want members - {$project:{'profile.name':1,tasks:{$setUnion:["$habits","$dailys","$todos","$rewards"]}}}, - {$unwind:"$tasks"}, - {$match:{"tasks.challenge.id":cid}}, - {$sort:{'tasks.type':1,'tasks.id':1}}, - {$group:{_id:"$_id", "tasks":{$push:"$tasks"},"name":{$first:"$profile.name"}}} - ], cb); - } - ],function(err,users){ - if(err) return next(err); - var output = ['UUID','name']; - _.each(challenge.tasks,function(t){ - //output.push(t.type+':'+t.text); - //not the right order yet - output.push('Task'); - output.push('Value'); - output.push('Notes'); - }) - output = [output]; - _.each(users, function(u){ - var uData = [u._id,u.name]; - _.each(u.tasks,function(t){ - uData = uData.concat([t.type+':'+t.text, t.value, t.notes]); - }) - output.push(uData); - }); - - res.set({ - 'Content-Type': 'text/csv', - 'Content-disposition': `attachment; filename=${cid}.csv`, - }); - - csvStringify(output, (err, csv) => { - if (err) return next(err); - res.status(200).send(csv); - challenge = cid = null; - }); - }) -} - -api.getMember = function(req, res, next) { - var cid = req.params.cid; - var uid = req.params.uid; - - // We need to start using the aggregation framework instead of in-app filtering, see http://docs.mongodb.org/manual/aggregation/ - // See code at 32c0e75 for unwind/group example - - //http://stackoverflow.com/questions/24027213/how-to-match-multiple-array-elements-without-using-unwind - var proj = {'profile.name':'$profile.name'}; - _.each(['habits','dailys','todos','rewards'], function(type){ - proj[type] = { - $setDifference: [{ - $map: { - input: '$'+type, - as: "el", - in: { - $cond: [{$eq: ["$$el.challenge.id", cid]}, '$$el', false] - } - } - }, [false]] - } - }); - User.aggregate() - .match({_id: uid}) - .project(proj) - .exec(function(err, member){ - if (err) return next(err); - if (!member) return res.status(404).json({err: 'Member '+uid+' for challenge '+cid+' not found'}); - res.json(member[0]); - uid = cid = null; - }); -} - -// CREATE -api.create = function(req, res, next){ - var user = res.locals.user; - - async.auto({ - get_group: function(cb){ - var q = {_id:req.body.group}; - if (req.body.group!='habitrpg') q.members = {$in:[user._id]}; // make sure they're a member of the group - Group.findOne(q, cb); - }, - save_chal: ['get_group', function(cb, results){ - var group = results.get_group, - prize = +req.body.prize; - if (!group) - return cb({code:404, err:"Group." + req.body.group + " not found"}); - if (group.leaderOnly && group.leaderOnly.challenges && group.leader !== user._id) - return cb({code:401, err: "Only the group leader can create challenges"}); - // If they're adding a prize, do some validation - if (prize < 0) - return cb({code:401, err: 'Challenge prize must be >= 0'}); - if (req.body.group=='habitrpg' && prize < 1) - return cb({code:401, err: 'Prize must be at least 1 Gem for public challenges.'}); - if (prize > 0) { - var groupBalance = ((group.balance && group.leader==user._id) ? group.balance : 0); - var prizeCost = prize/4; // I really should have stored user.balance as gems rather than dollars... stupid... - if (prizeCost > user.balance + groupBalance) - return cb("You can't afford this prize. Purchase more gems or lower the prize amount.") - - if (groupBalance >= prizeCost) { - // Group pays for all of prize - group.balance -= prizeCost; - } else if (groupBalance > 0) { - // User pays remainder of prize cost after group - var remainder = prizeCost - group.balance; - group.balance = 0; - user.balance -= remainder; - } else { - // User pays for all of prize - user.balance -= prizeCost; - } - } - req.body.leader = user._id; - req.body.official = user.contributor.admin && req.body.official; - var chal = new Challenge(req.body); // FIXME sanitize - chal.members.push(user._id); - chal.save(cb); - }], - save_group: ['save_chal', function(cb, results){ - results.get_group.challenges.push(results.save_chal[0]._id); - results.get_group.save(cb); - }], - sync_user: ['save_group', function(cb, results){ - // Auto-join creator to challenge (see members.push above) - results.save_chal[0].syncToUser(user, cb); - }] - }, function(err, results){ - if (err) return err.code? res.status(err.code).json(err) : next(err); - return res.json(results.save_chal[0]); - user = null; - }) -} - -// UPDATE -api.update = function(req, res, next){ - var cid = req.params.cid; - var user = res.locals.user; - var before; - async.waterfall([ - function(cb){ - // We first need the original challenge data, since we're going to compare against new & decide to sync users - Challenge.findById(cid, cb); - }, - function(_before, cb) { - if (!_before) return cb('Challenge ' + cid + ' not found'); - if (_before.leader != user._id && !user.contributor.admin) return cb(shared.i18n.t('noPermissionEditChallenge', req.language)); - // Update the challenge, since syncing will need the updated challenge. But store `before` we're going to do some - // before-save / after-save comparison to determine if we need to sync to users - before = _before; - var attrs = _.pick(req.body, 'name shortName description habits dailys todos rewards date'.split(' ')); - Challenge.findByIdAndUpdate(cid, {$set:attrs}, {new: true}, cb); - }, - function(saved, cb) { - - // Compare whether any changes have been made to tasks. If so, we'll want to sync those changes to subscribers - if (before.isOutdated(req.body)) { - User.find({_id: {$in: saved.members}}, function(err, users){ - logging.info('Challenge updated, sync to subscribers'); - if (err) throw err; - _.each(users, function(user){ - saved.syncToUser(user); - }) - }) - } - - // after saving, we're done as far as the client's concerned. We kick off syncing (heavy task) in the background - cb(null, saved); - } - ], function(err, saved){ - if(err) next(err); - res.json(saved); - cid = user = before = null; - }) -} - -/** - * Called by either delete() or selectWinner(). Will delete the challenge and set the "broken" property on all users' subscribed tasks - * @param {cid} the challenge id - * @param {broken} the object representing the broken status of the challenge. Eg: - * {broken: 'CHALLENGE_DELETED', id: CHALLENGE_ID} - * {broken: 'CHALLENGE_CLOSED', id: CHALLENGE_ID, winner: USER_NAME} - */ -function closeChal(cid, broken, cb) { - var removed; - async.waterfall([ - function(cb2){ - Challenge.findOneAndRemove({_id:cid}, cb2) - }, - function(_removed, cb2) { - removed = _removed; - var pull = {'$pull':{}}; pull['$pull'][_removed._id] = 1; - Group.findByIdAndUpdate(_removed.group, {new: true}, pull); - User.find({_id:{$in: removed.members}}, cb2); - }, - function(users, cb2) { - var parallel = []; - _.each(users, function(user){ - var tag = _.find(user.tags, {id:cid}); - if (tag) tag.challenge = undefined; - _.each(user.tasks, function(task){ - if (task.challenge && task.challenge.id == removed._id) { - _.merge(task.challenge, broken); - } - }) - parallel.push(function(cb3){ - user.save(cb3); - }) - }) - async.parallel(parallel, cb2); - removed = null; - } - ], cb); -} - -/** - * Delete & close - */ -api.delete = function(req, res, next){ - var user = res.locals.user; - var cid = req.params.cid; - - async.waterfall([ - function(cb){ - Challenge.findById(cid, cb); - }, - function(chal, cb){ - if (!chal) return cb('Challenge ' + cid + ' not found'); - if (chal.leader != user._id && !user.contributor.admin) return cb(shared.i18n.t('noPermissionDeleteChallenge', req.language)); - if (chal.group != 'habitrpg') user.balance += chal.prize/4; // Refund gems to user if a non-tavern challenge - user.save(cb); - }, - function(save, num, cb){ - closeChal(req.params.cid, {broken: 'CHALLENGE_DELETED'}, cb); - } - ], function(err){ - if (err) return next(err); - res.sendStatus(200); - user = cid = null; - }); -} - -/** - * Select Winner & Close - */ -api.selectWinner = function(req, res, next) { - if (!req.query.uid) return res.status(401).json({err: 'Must select a winner'}); - var user = res.locals.user; - var cid = req.params.cid; - var chal; - async.waterfall([ - function(cb){ - Challenge.findById(cid, cb); - }, - function(_chal, cb){ - chal = _chal; - if (!chal) return cb('Challenge ' + cid + ' not found'); - if (chal.leader != user._id && !user.contributor.admin) return cb(shared.i18n.t('noPermissionCloseChallenge', req.language)); - User.findById(req.query.uid, cb) - }, - function(winner, cb){ - if (!winner) return cb('Winner ' + req.query.uid + ' not found.'); - _.defaults(winner.achievements, {challenges: []}); - winner.achievements.challenges.push(chal.name); - winner.balance += chal.prize/4; - winner.save(cb); - }, - function(saved, num, cb) { - if(saved.preferences.emailNotifications.wonChallenge !== false){ - utils.txnEmail(saved, 'won-challenge', [ - {name: 'CHALLENGE_NAME', content: chal.name} - ]); - } - - pushNotify.sendNotify(saved, shared.i18n.t('wonChallenge'), chal.name); - - closeChal(cid, {broken: 'CHALLENGE_CLOSED', winner: saved.profile.name}, cb); - } - ], function(err){ - if (err) return next(err); - res.sendStatus(200); - user = cid = chal = null; - }) -} - -api.join = function(req, res, next){ - var user = res.locals.user; - var cid = req.params.cid; - - async.waterfall([ - function(cb) { - Challenge.findByIdAndUpdate(cid, {$addToSet:{members:user._id}}, {new: true}, cb); - }, - function(chal, cb) { - - // Trigger updating challenge member count in the background. We can't do it above because we don't have - // _.size(challenge.members). We can't do it in pre(save) because we're calling findByIdAndUpdate above. - Challenge.update({_id:cid}, {$set:{memberCount:_.size(chal.members)}}).exec(); - - if (!~user.challenges.indexOf(cid)) - user.challenges.unshift(cid); - // Add all challenge's tasks to user's tasks - chal.syncToUser(user, function(err){ - if (err) return cb(err); - cb(null, chal); // we want the saved challenge in the return results, due to ng-resource - }); - } - ], function(err, chal){ - if(err) return next(err); - chal._isMember = true; - res.json(chal); - user = cid = null; - }); -} - - -api.leave = function(req, res, next){ - var user = res.locals.user; - var cid = req.params.cid; - // whether or not to keep challenge's tasks. strictly default to true if "keep-all" isn't provided - var keep = (/^remove-all/i).test(req.query.keep) ? 'remove-all' : 'keep-all'; - - async.waterfall([ - function(cb){ - Challenge.findByIdAndUpdate(cid, {$pull:{members:user._id}}, {new: true}, cb); - }, - function(chal, cb){ - - // Trigger updating challenge member count in the background. We can't do it above because we don't have - // _.size(challenge.members). We can't do it in pre(save) because we're calling findByIdAndUpdate above. - if (chal) - Challenge.update({_id:cid}, {$set:{memberCount:_.size(chal.members)}}).exec(); - - var i = user.challenges.indexOf(cid) - if (~i) user.challenges.splice(i,1); - user.unlink({cid:cid, keep:keep}, function(err){ - if (err) return cb(err); - cb(null, chal); - }) - } - ], function(err, chal){ - if(err) return next(err); - if (chal) chal._isMember = false; - res.json(chal); - user = cid = keep = null; - }); -} - -api.unlink = function(req, res, next) { - // they're scoring the task - commented out, we probably don't need it due to route ordering in api.js - //var urlParts = req.originalUrl.split('/'); - //if (_.contains(['up','down'], urlParts[urlParts.length -1])) return next(); - - var user = res.locals.user; - var tid = req.params.id; - var cid = user.tasks[tid].challenge.id; - if (!req.query.keep) - return res.status(400).json({err: 'Provide unlink method as ?keep=keep-all (keep, keep-all, remove, remove-all)'}); - user.unlink({cid:cid, keep:req.query.keep, tid:tid}, function(err, saved){ - if (err) return next(err); - res.sendStatus(200); - user = tid = cid = null; - }); -} diff --git a/website/src/controllers/api-v2/coupon.js b/website/src/controllers/api-v2/coupon.js deleted file mode 100644 index a69c41e326..0000000000 --- a/website/src/controllers/api-v2/coupon.js +++ /dev/null @@ -1,45 +0,0 @@ -var _ = require('lodash'); -var Coupon = require('./../../models/coupon').model; -var api = module.exports; -var csvStringify = require('csv-stringify'); -var async = require('async'); - -api.ensureAdmin = function(req, res, next) { - if (!res.locals.user.contributor.sudo) return res.status(401).json({err:"You don't have admin access"}); - next(); -} - -api.generateCoupons = function(req,res,next) { - let count = Number(req.query.count); - Coupon.generate(req.params.event, count, function(err){ - if(err) return next(err); - res.sendStatus(200); - }); -} - -api.getCoupons = function(req,res,next) { - var options = {sort:'seq'}; - if (req.query.limit) options.limit = req.query.limit; - if (req.query.skip) options.skip = req.query.skip; - Coupon.find({},{}, options, function(err,coupons){ - let output = [['code']].concat(_.map(coupons, function(c){ - return [c._id]; - })) - - res.set({ - 'Content-Type': 'text/csv', - 'Content-disposition': `attachment; filename=habitica-coupons.csv`, - }); - csvStringify(output, (err, csv) => { - if (err) return next(err); - res.status(200).send(csv); - }); - }); -} - -api.enterCode = function(req,res,next) { - Coupon.apply(res.locals.user,req.params.code,function(err,user){ - if (err) return res.status(400).json({err:err}); - res.json(user); - }); -} diff --git a/website/src/controllers/api-v2/groups.js b/website/src/controllers/api-v2/groups.js deleted file mode 100644 index e117aa40ad..0000000000 --- a/website/src/controllers/api-v2/groups.js +++ /dev/null @@ -1,1106 +0,0 @@ -'use strict'; -// @see ../routes for routing - -function clone(a) { - return JSON.parse(JSON.stringify(a)); -} - -var _ = require('lodash'); -var nconf = require('nconf'); -var async = require('async'); -var Q = require('q'); -var utils = require('./../../libs/utils'); -var shared = require('../../../../common'); -var User = require('./../../models/user').model; -var Group = require('./../../models/group').model; -var Challenge = require('./../../models/challenge').model; -var EmailUnsubscription = require('./../../models/emailUnsubscription').model; -var isProd = nconf.get('NODE_ENV') === 'production'; -var api = module.exports; -var pushNotify = require('./../pushNotifications'); -var analytics = utils.analytics; -var firebase = require('../../libs/firebase'); - -/* - ------------------------------------------------------------------------ - Groups - ------------------------------------------------------------------------ -*/ - -var partyFields = api.partyFields = 'profile preferences stats achievements party backer contributor auth.timestamps items'; -var nameFields = 'profile.name'; -var challengeFields = '_id name'; -var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} }; -const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map(email => {return {email, canSend: true}}); - -/** - * For parties, we want a lot of member details so we can show their avatars in the header. For guilds, we want very - * limited fields - and only a sampling of the members, beacuse they can be in the thousands - * @param type: 'party' or otherwise - * @param q: the Mongoose query we're building up - * @param additionalFields: if we want to populate some additional field not fetched normally - * pass it as a string, parties only - */ -var populateQuery = function(type, q, additionalFields){ - if (type == 'party') - q.populate('members', partyFields + (additionalFields ? (' ' + additionalFields) : '')); - else - q.populate(guildPopulate); - q.populate('leader', nameFields); - q.populate('invites', nameFields); - q.populate({ - path: 'challenges', - match: (type=='habitrpg') ? {_id:{$ne:'95533e05-1ff9-4e46-970b-d77219f199e9'}} : undefined, // remove the Spread the Word Challenge for now, will revisit when we fix the closing-challenge bug - select: challengeFields, - options: {sort: {official: -1, timestamp: -1}} - }); - return q; -} - -/** - * Fetch groups list. This no longer returns party or tavern, as those can be requested indivdually - * as /groups/party or /groups/tavern - */ -api.list = function(req, res, next) { - var user = res.locals.user; - var groupFields = 'name description memberCount balance leader'; - var sort = '-memberCount'; - var type = req.query.type || 'party,guilds,public,tavern'; - - async.parallel({ - - // unecessary given our ui-router setup - party: function(cb){ - if (!~type.indexOf('party')) return cb(null, {}); - Group.findOne({type: 'party', members: {'$in': [user._id]}}) - .select(groupFields).exec(function(err, party){ - if (err) return cb(err); - cb(null, (party === null ? [] : [party])); // return as an array for consistent ngResource use - }); - }, - - guilds: function(cb) { - if (!~type.indexOf('guilds')) return cb(null, []); - Group.find({members: {'$in': [user._id]}, type:'guild'}) - .select(groupFields).sort(sort).exec(cb); - }, - - 'public': function(cb) { - if (!~type.indexOf('public')) return cb(null, []); - Group.find({privacy: 'public'}) - .select(groupFields + ' members') - .sort(sort) - .lean() - .exec(function(err, groups){ - if (err) return cb(err); - _.each(groups, function(g){ - // To save some client-side performance, don't send down the full members arr, just send down temp var _isMember - if (~g.members.indexOf(user._id)) g._isMember = true; - g.members = undefined; - }); - cb(null, groups); - }); - }, - - // unecessary given our ui-router setup - tavern: function(cb) { - if (!~type.indexOf('tavern')) return cb(null, {}); - Group.findById('habitrpg').select(groupFields).exec(function(err, tavern){ - if (err) return cb(err); - cb(null, [tavern]); // return as an array for consistent ngResource use - }); - } - - }, function(err, results){ - if (err) return next(err); - // ngResource expects everything as arrays. We used to send it down as a structured object: {public:[], party:{}, guilds:[], tavern:{}} - // but unfortunately ngResource top-level attrs are considered the ngModels in the list, so we had to do weird stuff and multiple - // requests to get it to work properly. Instead, we're not depending on the client to do filtering / organization, and we're - // just sending down a merged array. Revisit - var arr = _.reduce(results, function(m,v){ - if (_.isEmpty(v)) return m; - return m.concat(_.isArray(v) ? v : [v]); - }, []) - res.json(arr); - - user = groupFields = sort = type = null; - }) -}; - -/** - * Get group - * TODO: implement requesting fields ?fields=chat,members - */ -api.get = function(req, res, next) { - var user = res.locals.user; - var gid = req.params.gid; - - var q = (gid == 'party') - ? Group.findOne({type: 'party', members: {'$in': [user._id]}}) - : Group.findOne({$or:[ - {_id:gid, privacy:'public'}, - {_id:gid, privacy:'private', members: {$in:[user._id]}} // if the group is private, only return if they have access - ]}); - populateQuery(gid, q); - q.exec(function(err, group){ - if (err) return next(err); - if(!group){ - if(gid !== 'party') return res.status(404).json({err: shared.i18n.t('messageGroupNotFound')}); - - // Don't send a 404 when querying for a party even if it doesn't exist - // so that users with no party don't get a 404 on every access to the site - return res.json(group); - } - - if (!user.contributor.admin) { - _purgeFlagInfoFromChat(group, user); - } - - //Since we have a limit on how many members are populate to the group, we want to make sure the user is always in the group - var userInGroup = _.find(group.members, function(member){ return member._id == user._id; }); - //If the group is private or the group is a party, then the user must be a member of the group based on access restrictions above - if (group.privacy === 'private' || gid === 'party') { - //If the user is not in the group query, remove a user and add the current user - if (!userInGroup) { - group.members.splice(0,1); - group.members.push(user); - } - res.json(group); - } else if ( group.privacy === "public" ) { //The group is public, we must do an extra check to see if the user is already in the group query - //We must see how to check if a user is a member of a public group, so we requery - var q2 = Group.findOne({ _id: group._id, privacy:'public', members: {$in:[user._id]} }); - q2.exec(function(err, group2){ - if (err) return next(err); - if (group2 && !userInGroup) { - group.members.splice(0,1); - group.members.push(user); - } - res.json(group); - }); - } - - gid = null; - }); -}; - - -api.create = function(req, res, next) { - var group = new Group(req.body); - var user = res.locals.user; - group.members = [user._id]; - group.leader = user._id; - - if(group.type === 'guild'){ - if(user.balance < 1) return res.status(401).json({err: shared.i18n.t('messageInsufficientGems')}); - - group.balance = 1; - user.balance--; - - async.waterfall([ - function(cb){user.save(cb)}, - function(saved,ct,cb){group.save(cb)}, - function(saved,ct,cb){ - firebase.updateGroupData(saved); - firebase.addUserToGroup(saved._id, user._id); - saved.populate('members', nameFields, cb); - } - ],function(err,saved){ - if (err) return next(err); - res.json(saved); - group = user = null; - }); - - } else{ - async.waterfall([ - function(cb){ - Group.findOne({type:'party',members:{$in:[user._id]}},cb); - }, - function(found, cb){ - if (found) return cb(shared.i18n.t('messageGroupAlreadyInParty')); - group.save(cb); - }, - function(saved, count, cb){ - firebase.updateGroupData(saved); - firebase.addUserToGroup(saved._id, user._id); - saved.populate('members', nameFields, cb); - } - ], function(err, populated){ - if (err === shared.i18n.t('messageGroupAlreadyInParty')) return res.status(400).json({err:err}); - if (err) return next(err); - group = user = null; - return res.json(populated); - }) - } -} - -api.update = function(req, res, next) { - var group = res.locals.group; - var user = res.locals.user; - - if(group.leader !== user._id) - return res.status(401).json({err: shared.i18n.t('messageGroupOnlyLeaderCanUpdate')}); - - 'name description logo logo leaderMessage leader leaderOnly'.split(' ').forEach(function(attr){ - group[attr] = req.body[attr]; - }); - - group.save(function(err, saved){ - if (err) return next(err); - - firebase.updateGroupData(saved); - res.sendStatus(204); - }); -} - -// TODO remove from api object? -api.attachGroup = function(req, res, next) { - var user = res.locals.user; - var gid = req.params.gid; - var q = (gid == 'party') ? Group.findOne({type: 'party', members: {'$in': [res.locals.user._id]}}) : Group.findById(gid); - q.exec(function(err, group){ - if(err) return next(err); - if(!group) return res.status(404).json({err: shared.i18n.t('messageGroupNotFound')}); - - if (!user.contributor.admin) { - _purgeFlagInfoFromChat(group, user); - } - - res.locals.group = group; - next(); - }); -} - -api.getChat = function(req, res, next) { - // TODO: This code is duplicated from api.get - pull it out into a function to remove duplication. - var user = res.locals.user; - var gid = req.params.gid; - var q = (gid == 'party') - ? Group.findOne({type: 'party', members: {$in:[user._id]}}) - : Group.findOne({$or:[ - {_id:gid, privacy:'public'}, - {_id:gid, privacy:'private', members: {$in:[user._id]}} - ]}); - populateQuery(gid, q); - q.exec(function(err, group){ - if (err) return next(err); - if (!group && gid!=='party') return res.status(404).json({err: shared.i18n.t('messageGroupNotFound')}); - - res.json(res.locals.group.chat); - gid = null; - }); -}; - -/** - * TODO make this it's own ngResource so we don't have to send down group data with each chat post - */ -api.postChat = function(req, res, next) { - if(!req.query.message) { - return res.status(400).json({err: shared.i18n.t('messageGroupChatBlankMessage')}); - } else { - var user = res.locals.user - var group = res.locals.group; - if (group.type!='party' && user.flags.chatRevoked) return res.status(401).json({err:'Your chat privileges have been revoked.'}); - var lastClientMsg = req.query.previousMsg; - var chatUpdated = (lastClientMsg && group.chat && group.chat[0] && group.chat[0].id !== lastClientMsg) ? true : false; - - group.sendChat(req.query.message, user); // FIXME this should be body, but ngResource is funky - - if (group.type === 'party') { - user.party.lastMessageSeen = group.chat[0].id; - user.save(); - } - - group.save(function(err, saved){ - if (err) return next(err); - chatUpdated ? res.json({chat: group.chat}) : res.json({message: saved.chat[0]}); - group = chatUpdated = null; - }); - } -} - -api.deleteChatMessage = function(req, res, next){ - var user = res.locals.user - var group = res.locals.group; - var message = _.find(group.chat, {id: req.params.messageId}); - - if(!message) return res.status(404).json({err: "Message not found!"}); - - if(user._id !== message.uuid && !(user.backer && user.contributor.admin)) - return res.status(401).json({err: "Not authorized to delete this message!"}) - - var lastClientMsg = req.query.previousMsg; - var chatUpdated = (lastClientMsg && group.chat && group.chat[0] && group.chat[0].id !== lastClientMsg) ? true : false; - - Group.update({_id:group._id}, {$pull:{chat:{id: req.params.messageId}}}, function(err){ - if(err) return next(err); - chatUpdated ? res.json({chat: group.chat}) : res.sendStatus(204); - group = chatUpdated = null; - }); -} - -api.flagChatMessage = function(req, res, next){ - var user = res.locals.user - var group = res.locals.group; - var message = _.find(group.chat, {id: req.params.mid}); - - if(!message) return res.status(404).json({err: shared.i18n.t('messageGroupChatNotFound')}); - if(message.uuid == user._id) return res.status(401).json({err: shared.i18n.t('messageGroupChatFlagOwnMessage')}); - - User.findOne({_id: message.uuid}, {auth: 1}, function(err, author){ - if(err) return next(err); - - // Log user ids that have flagged the message - if(!message.flags) message.flags = {}; - if(message.flags[user._id] && !user.contributor.admin) return res.status(401).json({err: shared.i18n.t('messageGroupChatFlagAlreadyReported')}); - message.flags[user._id] = true; - - // Log total number of flags (publicly viewable) - if(!message.flagCount) message.flagCount = 0; - if(user.contributor.admin){ - // Arbitraty amount, higher than 2 - message.flagCount = 5; - } else { - message.flagCount++ - } - - Group.update({_id: group._id, 'chat.id': message.id}, {'$set': { - 'chat.$.flags': message.flags, - 'chat.$.flagCount': message.flagCount, - }}, function(err) { - if (err) return next(err); - - utils.txnEmail(FLAG_REPORT_EMAILS, 'flag-report-to-mods', [ - {name: "MESSAGE_TIME", content: (new Date(message.timestamp)).toString()}, - {name: "MESSAGE_TEXT", content: message.text}, - - {name: "REPORTER_USERNAME", content: user.profile.name}, - {name: "REPORTER_UUID", content: user._id}, - {name: "REPORTER_EMAIL", content: user.auth.local ? user.auth.local.email : ((user.auth.facebook && user.auth.facebook.emails && user.auth.facebook.emails[0]) ? user.auth.facebook.emails[0].value : null)}, - {name: "REPORTER_MODAL_URL", content: "/static/front/#?memberId=" + user._id}, - - {name: "AUTHOR_USERNAME", content: message.user}, - {name: "AUTHOR_UUID", content: message.uuid}, - {name: "AUTHOR_EMAIL", content: author.auth.local ? author.auth.local.email : ((author.auth.facebook && author.auth.facebook.emails && author.auth.facebook.emails[0]) ? author.auth.facebook.emails[0].value : null)}, - {name: "AUTHOR_MODAL_URL", content: "/static/front/#?memberId=" + message.uuid}, - - {name: "GROUP_NAME", content: group.name}, - {name: "GROUP_TYPE", content: group.type}, - {name: "GROUP_ID", content: group._id}, - {name: "GROUP_URL", content: group._id == 'habitrpg' ? '/#/options/groups/tavern' : (group.type === 'guild' ? ('/#/options/groups/guilds/' + group._id) : 'party')}, - ]); - - return res.sendStatus(204); - }); - }); -} - -api.clearFlagCount = function(req, res, next){ - var user = res.locals.user - var group = res.locals.group; - var message = _.find(group.chat, {id: req.params.mid}); - - if(!message) return res.status(404).json({err: shared.i18n.t('messageGroupChatNotFound')}); - - if(user.contributor.admin){ - message.flagCount = 0; - - Group.update({_id: group._id, 'chat.id': message.id}, {'$set': { - 'chat.$.flagCount': message.flagCount, - }}, function(err) { - if(err) return next(err); - return res.sendStatus(204); - }); - } else { - return res.status(401).json({err: shared.i18n.t('messageGroupChatAdminClearFlagCount')}) - } -} - -api.seenMessage = function(req,res,next){ - // Skip the auth step, we want this to be fast. If !found with uuid/token, then it just doesn't save - // Check for req.params.gid to exist - if(req.params.gid){ - var update = {$unset:{}}; - update['$unset']['newMessages.'+req.params.gid] = ''; - User.update({_id:req.headers['x-api-user'], apiToken:req.headers['x-api-key']},update).exec(); - } - res.sendStatus(200); -} - -api.likeChatMessage = function(req, res, next) { - var user = res.locals.user; - var group = res.locals.group; - var message = _.find(group.chat, {id: req.params.mid}); - - if (!message) return res.status(404).json({err: shared.i18n.t('messageGroupChatNotFound')}); - if (message.uuid == user._id) return res.status(401).json({err: shared.i18n.t('messageGroupChatLikeOwnMessage')}); - if (!message.likes) message.likes = {}; - if (message.likes[user._id]) { - delete message.likes[user._id]; - } else { - message.likes[user._id] = true; - } - - Group.update({_id: group._id, 'chat.id': message.id}, {'$set': { - 'chat.$.likes': message.likes - }}, function(err) { - if (err) return next(err); - return res.send(group.chat); - }); -} - -api.join = function(req, res, next) { - var user = res.locals.user, - group = res.locals.group, - isUserInvited = false; - - if (group.type == 'party' && group._id == (user.invitations && user.invitations.party && user.invitations.party.id)) { - User.update({_id:user.invitations.party.inviter}, {$inc:{'items.quests.basilist':1}}).exec(); // Reward inviter - user.invitations.party = undefined; // Clear invite - user.save(); - // invite new user to pending quest - if (group.quest.key && !group.quest.active) { - User.update({_id:user._id},{$set: {'party.quest.RSVPNeeded': true, 'party.quest.key': group.quest.key}}).exec(); - group.quest.members[user._id] = undefined; - group.markModified('quest.members'); - } - isUserInvited = true; - } else if (group.type == 'guild' && user.invitations && user.invitations.guilds) { - var i = _.findIndex(user.invitations.guilds, {id:group._id}); - if (~i){ - isUserInvited = true; - user.invitations.guilds.splice(i,1); - user.save(); - }else{ - isUserInvited = group.privacy === 'private' ? false : true; - } - } - - if(!isUserInvited) return res.status(401).json({err: shared.i18n.t('messageGroupRequiresInvite')}); - - if (!_.contains(group.members, user._id)){ - if (group.members.length === 0) { - group.leader = user._id; - } - - group.members.push(user._id); - - if (group.invites.length > 0) { - group.invites.splice(_.indexOf(group.invites, user._id), 1); - } - } - - async.series([ - function(cb){ - group.save(cb); - }, - function(cb){ - firebase.addUserToGroup(group._id, user._id); - // TODO why query group once again? - populateQuery(group.type, Group.findById(group._id)).exec(cb); - } - ], function(err, results){ - if (err) return next(err); - // Return the group? Or not? - res.json(results[1]); - group = null; - }); -} - -api.leave = function(req, res, next) { - var user = res.locals.user; - var group = res.locals.group; - - if (group.type === 'party') { - if (group.quest && group.quest.leader === user._id) { - return res.json(403, 'You cannot leave your party when you have started a quest. Abort the quest first.'); - } - - if (group.quest && group.quest.active && group.quest.members && group.quest.members[user._id]) { - return res.json(403, 'You cannot leave party during an active quest. Please leave the quest first.'); - } - } - - // When removing the user from challenges, should we keep the tasks? - var keep = (/^remove-all/i).test(req.query.keep) ? 'remove-all' : 'keep-all'; - - group.leave(user, keep, function(err){ - if (err) return next(err); - user = group = keep = null; - - return res.sendStatus(204); - }); -}; - -var inviteByUUIDs = function(uuids, group, req, res, next){ - async.each(uuids, function(uuid, cb){ - User.findById(uuid, function(err,invite){ - if (err) return cb(err); - if (!invite) - return cb({code:400,err:'User with id "' + uuid + '" not found'}); - if (group.type == 'guild') { - if (_.contains(group.members,uuid)) - return cb({code:400, err: "User already in that group"}); - if (invite.invitations && invite.invitations.guilds && _.find(invite.invitations.guilds, {id:group._id})) - return cb({code:400, err:"User already invited to that group"}); - sendInvite(); - } else if (group.type == 'party') { - if (invite.invitations && !_.isEmpty(invite.invitations.party)) - return cb({code: 400,err:"User already pending invitation."}); - Group.find({type: 'party', members: {$in: [uuid]}}, function(err, groups){ - if (err) return cb(err); - if (!_.isEmpty(groups) && groups[0].members.length > 1) { - return cb({code: 400, err: "User already in a party."}) - } - sendInvite(); - }); - } - - function sendInvite (){ - if(group.type === 'guild'){ - invite.invitations.guilds.push({id: group._id, name: group.name, inviter:res.locals.user._id}); - - pushNotify.sendNotify(invite, shared.i18n.t('invitedGuild'), group.name); - }else{ - //req.body.type in 'guild', 'party' - invite.invitations.party = {id: group._id, name: group.name, inviter:res.locals.user._id}; - - pushNotify.sendNotify(invite, shared.i18n.t('invitedParty'), group.name); - } - - group.invites.push(invite._id); - - async.series([ - function(cb){ - invite.save(cb); - } - ], function(err, results){ - if (err) return cb(err); - - if(invite.preferences.emailNotifications['invited' + (group.type == 'guild' ? 'Guild' : 'Party')] !== false){ - var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); - var emailVars = [ - {name: 'INVITER', content: inviterVars.name} - ]; - - if(group.type == 'guild'){ - emailVars.push( - {name: 'GUILD_NAME', content: group.name}, - {name: 'GUILD_URL', content: '/#/options/groups/guilds/public'} - ); - }else{ - emailVars.push( - {name: 'PARTY_NAME', content: group.name}, - {name: 'PARTY_URL', content: '/#/options/groups/party'} - ) - } - - utils.txnEmail(invite, ('invited-' + (group.type == 'guild' ? 'guild' : 'party')), emailVars); - } - - cb(); - }); - } - }); - }, function(err){ - if(err) return err.code ? res.status(err.code).json({err: err.err}) : next(err); - - async.series([ - function(cb) { - group.save(cb); - }, - function(cb) { - // TODO pass group from save above don't find it again, or you have to find it again in order to run populate? - populateQuery(group.type, Group.findById(group._id)).exec(function(err, populatedGroup){ - if(err) return next(err); - - res.json(populatedGroup); - }); - } - ]); - }); -}; - -var inviteByEmails = function(invites, group, req, res, next){ - var usersAlreadyRegistered = []; - - async.each(invites, function(invite, cb){ - if (invite.email) { - User.findOne({$or: [ - {'auth.local.email': invite.email}, - {'auth.facebook.emails.value': invite.email} - ]}).select({_id: true, 'preferences.emailNotifications': true}) - .exec(function(err, userToContact){ - if(err) return next(err); - - if(userToContact){ - usersAlreadyRegistered.push(userToContact._id); - return cb(); - } - - // yeah, it supports guild too but for backward compatibility we'll use partyInvite as query - - var link = '?partyInvite='+ utils.encrypt(JSON.stringify({id:group._id, inviter:res.locals.user._id, name:group.name})); - - var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); - var variables = [ - {name: 'LINK', content: link}, - {name: 'INVITER', content: req.body.inviter || inviterVars.name} - ]; - - if(group.type == 'guild'){ - variables.push({name: 'GUILD_NAME', content: group.name}); - } - - // TODO implement "users can only be invited once" - // Check for the email address not to be unsubscribed - EmailUnsubscription.findOne({email: invite.email}, function(err, unsubscribed){ - if(err) return cb(err); - if(unsubscribed) return cb(); - - utils.txnEmail(invite, ('invite-friend' + (group.type == 'guild' ? '-guild' : '')), variables); - - cb(); - }); - }); - }else{ - cb(); - } - }, function(err){ - if(err) return err.code ? res.status(err.code).json({err: err.err}) : next(err); - - if (usersAlreadyRegistered.length > 0){ - inviteByUUIDs(usersAlreadyRegistered, group, req, res, next); - } else{ - - // Send only status code down the line because it doesn't need - // info on invited users since they are not yet registered - res.status(200).json({}); - } - }); -}; - -api.invite = function(req, res, next){ - var group = res.locals.group; - - if (group.privacy === 'private' && !_.contains(group.members,res.locals.user._id)) { - return res.status(401).json({err: "Only a member can invite new members!"}); - } - if (req.body.uuids) { - inviteByUUIDs(req.body.uuids, group, req, res, next); - } else if (req.body.emails) { - inviteByEmails(req.body.emails, group, req, res, next) - } else { - return res.status(400).json({err: "Can only invite by email or uuid"}); - } -} - -api.removeMember = function(req, res, next){ - var group = res.locals.group; - var uuid = req.query.uuid; - var message = req.query.message; - var user = res.locals.user; - - // Send an email to the removed user with an optional message from the leader - var sendMessage = function(removedUser){ - if(removedUser.preferences.emailNotifications.kickedGroup !== false){ - utils.txnEmail(removedUser, ('kicked-from-' + group.type), [ - {name: 'GROUP_NAME', content: group.name}, - {name: 'MESSAGE', content: message}, - {name: 'GUILDS_LINK', content: '/#/options/groups/guilds/public'}, - {name: 'PARTY_WANTED_GUILD', content: '/#/options/groups/guilds/f2db2a7f-13c5-454d-b3ee-ea1f5089e601'} - ]); - } - } - - if(group.leader !== user._id){ - return res.status(401).json({err: "Only group leader can remove a member!"}); - } - - if(user._id === uuid){ - return res.status(401).json({err: "You cannot remove yourself!"}); - } - - if(_.contains(group.members, uuid)){ - var update = {$pull:{members:uuid}}; - if (group.quest && group.quest.leader === uuid) { - update['$set'] = { - quest: { key: null, leader: null } - }; - } else if(group.quest && group.quest.members){ - // remove member from quest - update['$unset'] = {}; - update['$unset']['quest.members.' + uuid] = ""; - } - update['$inc'] = {memberCount: -1}; - Group.update({_id:group._id},update, function(err, saved){ - if (err) return next(err); - - User.findById(uuid, function(err, removedUser){ - if(err) return next(err); - - sendMessage(removedUser); - - //Mark removed users messages as seen - var update = {$unset:{}}; - update.$unset['newMessages.' + group._id] = ''; - if (group.quest && group.quest.active && group.quest.leader === uuid) { - update['$inc'] = {}; - update['$inc']['items.quests.' + group.quest.key] = 1; - } - User.update({_id: removedUser._id, apiToken: removedUser.apiToken}, update).exec(); - - // Sending an empty 204 because Group.update doesn't return the group - // see http://mongoosejs.com/docs/api.html#model_Model.update - group = uuid = null; - return res.sendStatus(204); - }); - }); - }else if(_.contains(group.invites, uuid)){ - User.findById(uuid, function(err,invited){ - if(err) return next(err); - - var invitations = invited.invitations; - if(group.type === 'guild'){ - invitations.guilds.splice(_.indexOf(invitations.guilds, group._id), 1); - }else{ - invitations.party = undefined; - } - - async.series([ - function(cb){ - invited.save(cb); - }, - function(cb){ - Group.update({_id:group._id},{$pull:{invites:uuid}}, cb); - } - ], function(err, results){ - if (err) return next(err); - - // Sending an empty 204 because Group.update doesn't return the group - // see http://mongoosejs.com/docs/api.html#model_Model.update - sendMessage(invited); - group = uuid = null; - return res.sendStatus(204); - }); - - }); - }else{ - group = uuid = null; - return res.status(400).json({err: "User not found among group's members!"}); - } -} - -// ------------------------------------ -// Quests -// ------------------------------------ - -function questStart(req, res, next) { - var group = res.locals.group; - var force = req.query.force; - - // if (group.quest.active) return res.status(400).json({err:'Quest already began.'}); - // temporarily send error email, until we know more about this issue (then remove below, uncomment above). - if (group.quest.active) return next('Quest already began.'); - - group.markModified('quest'); - - // Not ready yet, wait till everyone's accepted, rejected, or we force-start - var statuses = _.values(group.quest.members); - if (!force && (~statuses.indexOf(undefined) || ~statuses.indexOf(null))) { - return group.save(function(err,saved){ - if (err) return next(err); - res.json(saved); - }) - } - - var parallel = [], - questMembers = {}, - key = group.quest.key, - quest = shared.content.quests[key], - collected = quest.collect ? _.transform(quest.collect, function(m,v,k){m[k]=0}) : {}; - - _.each(group.members, function(m){ - var updates = {$set:{},$inc:{'_v':1}}; - if (m == group.quest.leader) - updates['$inc']['items.quests.'+key] = -1; - if (group.quest.members[m] == true) { - // See https://github.com/HabitRPG/habitrpg/issues/2168#issuecomment-31556322 , we need to *not* reset party.quest.progress.up - //updates['$set']['party.quest'] = Group.cleanQuestProgress({key:key,progress:{collect:collected}}); - updates['$set']['party.quest.key'] = key; - updates['$set']['party.quest.progress.down'] = 0; - updates['$set']['party.quest.progress.collect'] = collected; - updates['$set']['party.quest.completed'] = null; - questMembers[m] = true; - - User.findOne({_id: m}, {pushDevices: 1}, function(err, user){ - pushNotify.sendNotify(user, "HabitRPG", shared.i18n.t('questStarted') + ": "+ quest.text() ); - }); - } else { - updates['$set']['party.quest'] = Group.cleanQuestProgress(); - } - - parallel.push(function(cb2){ - User.update({_id:m},updates,cb2); - }); - }); - - group.quest.active = true; - if (quest.boss) { - group.quest.progress.hp = quest.boss.hp; - if (quest.boss.rage) group.quest.progress.rage = 0; - } else { - group.quest.progress.collect = collected; - } - group.quest.members = questMembers; - group.markModified('quest'); // members & progress.collect are both Mixed types - parallel.push(function(cb2){group.save(cb2)}); - - parallel.push(function(cb){ - // Fetch user.auth to send email, then remove it from data sent to the client - populateQuery(group.type, Group.findById(group._id), 'auth.facebook auth.local').exec(cb); - }); - - async.parallel(parallel,function(err, results){ - if (err) return next(err); - - var lastIndex = results.length -1; - var groupClone = clone(group); - - groupClone.members = results[lastIndex].members; - - // Send quest started email - var usersToEmail = groupClone.members.filter(function(user){ - return ( - user.preferences.emailNotifications.questStarted !== false && - user._id !== res.locals.user._id && - group.quest.members[user._id] == true - ) - }); - - utils.txnEmail(usersToEmail, 'quest-started', [ - {name: 'PARTY_URL', content: '/#/options/groups/party'} - ]); - - _.each(groupClone.members, function(user){ - // Remove sensitive data from what is sent to the public - // but after having sent emails as they are needed - user.auth.facebook = undefined; - user.auth.local = undefined; - }); - - group = null; - - return res.json(groupClone); - }); -} - -api.questAccept = function(req, res, next) { - var group = res.locals.group; - var user = res.locals.user; - var key = req.query.key; - - if (!group || group.type !== 'party') return res.status(400).json({err: "Must be in a party to start quests."}); - - // If ?key=xxx is provided, we're starting a new quest and inviting the party. Otherwise, we're a party member accepting the invitation - if (key) { - var quest = shared.content.quests[key]; - if (!quest) return res.status(404).json({err:'Quest ' + key + ' not found'}); - if (quest.lvl && user.stats.lvl < quest.lvl) return res.status(400).json({err: "You must be level "+quest.lvl+" to begin this quest."}); - if (group.quest.key) return res.status(400).json({err: 'Your party is already on a quest. Try again when the current quest has ended.'}); - if (!user.items.quests[key]) return res.status(400).json({err: "You don't own that quest scroll"}); - group.quest.key = key; - group.quest.members = {}; - // Invite everyone. true means "accepted", false="rejected", undefined="pending". Once we click "start quest" - // or everyone has either accepted/rejected, then we store quest key in user object. - _.each(group.members, function(m){ - if (m == user._id) { - var analyticsData = { - category: 'behavior', - owner: true, - response: 'accept', - gaLabel: 'accept', - questName: key, - uuid: user._id, - }; - analytics.track('quest',analyticsData); - group.quest.members[m] = true; - group.quest.leader = user._id; - } else { - User.update({_id:m},{$set: {'party.quest.RSVPNeeded': true, 'party.quest.key': group.quest.key}}).exec(); - group.quest.members[m] = undefined; - } - }); - - User.find({ - _id: { - $in: _.without(group.members, user._id) - } - }, {auth: 1, preferences: 1, profile: 1, pushDevices: 1}, function(err, members){ - if(err) return next(err); - - var inviterVars = utils.getUserInfo(user, ['name', 'email']); - - var membersToEmail = members.filter(function(member){ - return member.preferences.emailNotifications.invitedQuest !== false; - }); - - utils.txnEmail(membersToEmail, ('invite-' + (quest.boss ? 'boss' : 'collection') + '-quest'), [ - {name: 'QUEST_NAME', content: quest.text()}, - {name: 'INVITER', content: inviterVars.name}, - {name: 'PARTY_URL', content: '/#/options/groups/party'} - ]); - - _.each(members, function(groupMember){ - pushNotify.sendNotify(groupMember, shared.i18n.t('questInvitationTitle'), shared.i18n.t('questInvitationInfo', { quest: quest.text() })); - }); - - questStart(req,res,next); - }); - - // Party member accepting the invitation - } else { - if (!group.quest.key) return res.status(400).json({err:'No quest invitation has been sent out yet.'}); - var analyticsData = { - category: 'behavior', - owner: false, - response: 'accept', - gaLabel: 'accept', - questName: group.quest.key, - uuid: user._id, - }; - analytics.track('quest',analyticsData); - group.quest.members[user._id] = true; - User.update({_id:user._id}, {$set: {'party.quest.RSVPNeeded': false}}).exec(); - questStart(req,res,next); - } -} - -api.questReject = function(req, res, next) { - var group = res.locals.group; - var user = res.locals.user; - - if (!group.quest.key) return res.status(400).json({err:'No quest invitation has been sent out yet.'}); - var analyticsData = { - category: 'behavior', - owner: false, - response: 'reject', - gaLabel: 'reject', - questName: group.quest.key, - uuid: user._id, - }; - analytics.track('quest',analyticsData); - group.quest.members[user._id] = false; - User.update({_id:user._id}, {$set: {'party.quest.RSVPNeeded': false, 'party.quest.key': null}}).exec(); - questStart(req,res,next); -} - -api.questCancel = function(req, res, next){ - // Cancel a quest BEFORE it has begun (i.e., in the invitation stage) - // Quest scroll has not yet left quest owner's inventory so no need to return it. - // Do not wipe quest progress for members because they'll want it to be applied to the next quest that's started. - var group = res.locals.group; - async.parallel([ - function(cb){ - if (! group.quest.active) { - // Do not cancel active quests because this function does - // not do the clean-up required for that. - // TODO: return an informative error when quest is active - group.quest = {key:null,progress:{},leader:null}; - group.markModified('quest'); - group.save(cb); - _.each(group.members, function(m){ - User.update({_id:m}, {$set: {'party.quest.RSVPNeeded': false, 'party.quest.key': null}}).exec(); - }); - } - } - ], function(err){ - if (err) return next(err); - res.json(group); - group = null; - }) -} - -api.questAbort = function(req, res, next){ - // Abort a quest AFTER it has begun (see questCancel for BEFORE) - var group = res.locals.group; - async.parallel([ - function(cb){ - User.update( - {_id:{$in: _.keys(group.quest.members)}}, - { - $set: {'party.quest':Group.cleanQuestProgress()}, - $inc: {_v:1} - }, - {multi:true}, - cb); - }, - // Refund party leader quest scroll - function(cb){ - if (group.quest.active) { - var update = {$inc:{}}; - update['$inc']['items.quests.' + group.quest.key] = 1; - User.update({_id:group.quest.leader}, update).exec(); - } - group.quest = {key:null,progress:{},leader:null}; - group.markModified('quest'); - group.save(cb); - }, function(cb){ - populateQuery(group.type, Group.findById(group._id)).exec(cb); - } - ], function(err, results){ - if (err) return next(err); - - var groupClone = clone(group); - - groupClone.members = results[2].members; - - res.json(groupClone); - group = null; - }) -} - -api.questLeave = function(req, res, next) { - // Non-member leave quest while still in progress - var group = res.locals.group; - var user = res.locals.user; - - if (!(group.quest && group.quest.active)) { - return res.status(404).json({ err: 'No active quest to leave' }); - } - - if (!(group.quest.members && group.quest.members[user._id])) { - return res.status(403).json({ err: 'You are not part of the quest' }); - } - - if (group.quest.leader === user._id) { - return res.status(403).json({ err: 'Quest leader cannot leave quest' }); - } - - delete group.quest.members[user._id]; - group.markModified('quest.members'); - - user.party.quest = Group.cleanQuestProgress(); - user.markModified('party.quest'); - - var groupSavePromise = Q.nbind(group.save, group); - var userSavePromise = Q.nbind(user.save, user); - - Q.all([groupSavePromise(), userSavePromise()]) - .done(function(values) { - return res.sendStatus(204); - }, function(error) { - return next(error); - }); -} - -function _purgeFlagInfoFromChat(group, user) { - group.chat = _.filter(group.chat, function(message) { return !message.flagCount || message.flagCount < 2; }); - _.each(group.chat, function (message) { - if (message.flags) { - var userHasFlagged = message.flags[user._id]; - message.flags = {}; - - if (userHasFlagged) message.flags[user._id] = userHasFlagged; - } - }); -} diff --git a/website/src/controllers/api-v2/hall.js b/website/src/controllers/api-v2/hall.js deleted file mode 100644 index ec88894c62..0000000000 --- a/website/src/controllers/api-v2/hall.js +++ /dev/null @@ -1,85 +0,0 @@ -var _ = require('lodash'); -var nconf = require('nconf'); -var async = require('async'); -var shared = require('../../../../common'); -var User = require('./../../models/user').model; -var Group = require('./../../models/group').model; -var api = module.exports; - -api.ensureAdmin = function(req, res, next) { - var user = res.locals.user; - if (!(user.contributor && user.contributor.admin)) return res.status(401).json({err:"You don't have admin access"}); - next(); -} - -api.getHeroes = function(req,res,next) { - User.find({'contributor.level':{$gt:0}}) - .select('contributor backer balance profile.name') - .sort('-contributor.level') - .exec(function(err, users){ - if (err) return next(err); - res.json(users); - }); -} - -api.getPatrons = function(req,res,next){ - var page = req.query.page || 0, - perPage = 50; - User.find({'backer.tier':{$gt:0}}) - .select('contributor backer profile.name') - .sort('-backer.tier') - .skip(page*perPage) - .limit(perPage) - .exec(function(err, users){ - if (err) return next(err); - res.json(users); - }); -} - -api.getHero = function(req,res,next) { - User.findById(req.params.uid) - .select('contributor balance profile.name purchased items') - .select('auth.local.username auth.local.email auth.facebook auth.blocked') - .exec(function(err, user){ - if (err) return next(err) - if (!user) return res.status(400).json({err:'User not found'}); - res.json(user); - }); -} - -api.updateHero = function(req,res,next) { - async.waterfall([ - function(cb){ - User.findById(req.params.uid, cb); - }, - function(member, cb){ - if (!member) return res.status(404).json({err: "User not found"}); - member.balance = req.body.balance || 0; - var newTier = req.body.contributor.level; // tier = level in this context - var oldTier = member.contributor && member.contributor.level || 0; - if (newTier > oldTier) { - member.flags.contributor = true; - var gemsPerTier = {1:3, 2:3, 3:3, 4:4, 5:4, 6:4, 7:4, 8:0, 9:0}; // e.g., tier 5 gives 4 gems. Tier 8 = moderator. Tier 9 = staff - var tierDiff = newTier - oldTier; // can be 2+ tier increases at once - while (tierDiff) { - member.balance += gemsPerTier[newTier] / 4; // balance is in $ - tierDiff--; - newTier--; // give them gems for the next tier down if they weren't aready that tier - } - } - member.contributor = req.body.contributor; - member.purchased.ads = req.body.purchased.ads; - if (member.contributor.level >= 6) member.items.pets['Dragon-Hydra'] = 5; - if (req.body.itemPath && req.body.itemVal - && req.body.itemPath.indexOf('items.') === 0 - && User.schema.paths[req.body.itemPath]) { - shared.dotSet(member, req.body.itemPath, req.body.itemVal); // Sanitization at 5c30944 (deemed unnecessary) - } - if (_.isBoolean(req.body.auth.blocked)) member.auth.blocked = req.body.auth.blocked; - member.save(cb); - } - ], function(err, saved){ - if (err) return next(err); - res.status(204).json({}); - }) -} diff --git a/website/src/controllers/api-v2/members.js b/website/src/controllers/api-v2/members.js deleted file mode 100644 index 01c136c472..0000000000 --- a/website/src/controllers/api-v2/members.js +++ /dev/null @@ -1,134 +0,0 @@ -var User = require('mongoose').model('User'); -var groups = require('../../models/group'); -var partyFields = require('./groups').partyFields -var api = module.exports; -var async = require('async'); -var _ = require('lodash'); -var shared = require('../../../../common'); -var utils = require('../../libs/utils'); -var nconf = require('nconf'); -var pushNotify = require('./../pushNotifications'); - -var fetchMember = function(uuid, restrict){ - return function(cb){ - var q = User.findById(uuid); - if (restrict) q.select(partyFields); - q.exec(function(err, member){ - if (err) return cb(err); - if (!member) return cb({code:404, err: 'User not found'}); - return cb(null, member); - }) - } -} - -var sendErr = function(err, res, next){ - err.code ? res.status(err.code).json({err: err.err}) : next(err); -} - -api.getMember = function(req, res, next) { - fetchMember(req.params.uuid, true)(function(err, member){ - if (err) return sendErr(err, res, next); - res.json(member); - }) -} - -api.sendMessage = function(user, member, data){ - var msg; - if (!data.type) { - msg = data.message - } else { - msg = "`Hello " + member.profile.name + ", " + user.profile.name + " has sent you "; - if (data.type == 'gems') { - var gemAmount = data.gems.amount; - var gemLabel = gemAmount > 1 ? "gems" : "gem"; - msg += gemAmount + " " + gemLabel + "!`"; - } else { - var monthAmount = shared.content.subscriptionBlocks[data.subscription.key].months; - var monthLabel = monthAmount > 1 ? "months" : "month"; - msg += monthAmount + " " + monthLabel + " of subscription!`"; - } - msg += data.message ? data.message : ''; - } - shared.refPush(member.inbox.messages, groups.chatDefaults(msg, user)); - member.inbox.newMessages++; - member._v++; - member.markModified('inbox.messages'); - - shared.refPush(user.inbox.messages, _.defaults({sent:true}, groups.chatDefaults(msg, member))); - user.markModified('inbox.messages'); -} - -api.sendPrivateMessage = function(req, res, next){ - var fetchedMember; - async.waterfall([ - fetchMember(req.params.uuid), - function(member, cb) { - fetchedMember = member; - if (~member.inbox.blocks.indexOf(res.locals.user._id) // can't send message if that user blocked me - || ~res.locals.user.inbox.blocks.indexOf(member._id) // or if I blocked them - || member.inbox.optOut) { // or if they've opted out of messaging - return cb({code: 401, err: "Can't send message to this user."}); - } - api.sendMessage(res.locals.user, member, {message:req.body.message}); - async.parallel([ - function (cb2) { member.save(cb2) }, - function (cb2) { res.locals.user.save(cb2) } - ], cb); - } - ], function(err){ - if (err) return sendErr(err, res, next); - - if(fetchedMember.preferences.emailNotifications.newPM !== false){ - utils.txnEmail(fetchedMember, 'new-pm', [ - {name: 'SENDER', content: utils.getUserInfo(res.locals.user, ['name']).name}, - {name: 'PMS_INBOX_URL', content: '/#/options/groups/inbox'} - ]); - } - - res.sendStatus(200); - }) -} - -api.sendGift = function(req, res, next){ - async.waterfall([ - fetchMember(req.params.uuid), - function(member, cb) { - // Gems - switch (req.body.type) { - case "gems": - var amt = req.body.gems.amount / 4, - user = res.locals.user; - if (member.id == user.id) - return cb({code: 401, err: "Cannot send gems to yourself. Try a subscription instead."}); - if (!amt || amt <=0 || user.balance < amt) - return cb({code: 401, err: "Amount must be within 0 and your current number of gems."}); - member.balance += amt; - user.balance -= amt; - api.sendMessage(user, member, req.body); - - var byUsername = utils.getUserInfo(user, ['name']).name; - - if(member.preferences.emailNotifications.giftedGems !== false){ - utils.txnEmail(member, 'gifted-gems', [ - {name: 'GIFTER', content: byUsername}, - {name: 'X_GEMS_GIFTED', content: req.body.gems.amount} - ]); - } - - pushNotify.sendNotify(member, shared.i18n.t('giftedGems'), shared.i18n.t('giftedGemsInfo', { amount: req.body.gems.amount, name: byUsername })); - - return async.parallel([ - function (cb2) { member.save(cb2) }, - function (cb2) { user.save(cb2) } - ], cb); - case "subscription": - return cb(); - default: - return cb({code:400, err:"Body must contain a gems:{amount,fromBalance} or subscription:{months} object"}); - } - } - ], function(err) { - if (err) return sendErr(err, res, next); - res.sendStatus(200); - }); -} diff --git a/website/src/controllers/api-v2/unsubscription.js b/website/src/controllers/api-v2/unsubscription.js deleted file mode 100644 index 2fecbef03f..0000000000 --- a/website/src/controllers/api-v2/unsubscription.js +++ /dev/null @@ -1,36 +0,0 @@ -var User = require('../../models/user').model; -var EmailUnsubscription = require('../../models/emailUnsubscription').model; -var utils = require('../../libs/utils'); -var i18n = require('../../../../common').i18n; - -var api = module.exports = {}; - -api.unsubscribe = function(req, res, next){ - if(!req.query.code) return res.status(500).json({err: 'Missing unsubscription code.'}); - - var data = JSON.parse(utils.decrypt(req.query.code)); - - if(data._id){ - User.update({_id: data._id}, { - $set: {'preferences.emailNotifications.unsubscribeFromAll': true} - }, {multi: false}, function(err, updateRes){ - if(err) return next(err); - if(updateRes !== 1) return res.status(404).json({err: 'User not found'}); - - res.send('
' + i18n.t('unsubscribedSuccessfully', null, req.language) + '
' + i18n.t('unsubscribedTextUsers', null, req.language)); - }); - }else{ - EmailUnsubscription.findOne({email: data.email}, function(err, doc){ - if(err) return next(err); - var okRes = '' + i18n.t('unsubscribedSuccessfully', null, req.language) + '
' + i18n.t('unsubscribedTextOthers', null, req.language); - - if(doc) return res.send(okRes); - - EmailUnsubscription.create({email: data.email}, function(err, doc){ - if(err) return next(err); - - res.send(okRes); - }) - }); - } -}; diff --git a/website/src/controllers/api-v2/user.js b/website/src/controllers/api-v2/user.js deleted file mode 100644 index da57347d15..0000000000 --- a/website/src/controllers/api-v2/user.js +++ /dev/null @@ -1,707 +0,0 @@ -var url = require('url'); -var ipn = require('paypal-ipn'); -var _ = require('lodash'); -var nconf = require('nconf'); -var async = require('async'); -var shared = require('../../../../common'); -var User = require('./../../models/user').model; -var utils = require('./../../libs/utils'); -var analytics = utils.analytics; -var Group = require('./../../models/group').model; -var Challenge = require('./../../models/challenge').model; -var moment = require('moment'); -var logging = require('./../../libs/logging'); -let acceptablePUTPaths; -let restrictedPUTSubPaths; - -var api = module.exports; -var firebase = require('../../libs/firebase'); -var webhook = require('../../libs/webhook'); - -// api.purchase // Shared.ops - -api.getContent = function(req, res, next) { - var language = 'en'; - - if (typeof req.query.language != 'undefined') - language = req.query.language.toString(); //|| 'en' in i18n - - var content = _.cloneDeep(shared.content); - var walk = function(obj, lang){ - _.each(obj, function(item, key, source){ - if (_.isPlainObject(item) || _.isArray(item)) return walk(item, lang); - if (_.isFunction(item) && item.i18nLangFunc) source[key] = item(lang); - }); - } - walk(content, language); - res.json(content); -} - -api.getModelPaths = function(req,res,next){ - res.json(_.reduce(User.schema.paths,function(m,v,k){ - m[k] = v.instance || 'Boolean'; - return m; - },{})); -} - -/* - ------------------------------------------------------------------------ - Tasks - ------------------------------------------------------------------------ -*/ - - -/* - Local Methods - --------------- -*/ - -var findTask = function(req, res) { - return res.locals.user.tasks[req.params.id]; -}; - -/* - API Routes - --------------- -*/ - -api.score = function(req, res, next) { - var id = req.params.id, - direction = req.params.direction, - user = res.locals.user, - task; - - var clearMemory = function(){user = task = id = direction = null;} - - // Send error responses for improper API call - if (!id) return res.status(400).json({err: ':id required'}); - if (direction !== 'up' && direction !== 'down') { - if (direction == 'unlink' || direction == 'sort') return next(); - return res.status(400).json({err: ":direction must be 'up' or 'down'"}); - } - // If exists already, score it - if (task = user.tasks[id]) { - // Set completed if type is daily or todo and task exists - if (task.type === 'daily' || task.type === 'todo') { - task.completed = direction === 'up'; - } - } else { - // If it doesn't exist, this is likely a 3rd party up/down - create a new one, then score it - // Defaults. Other defaults are handled in user.ops.addTask() - task = { - id: id, - type: req.body && req.body.type, - text: req.body && req.body.text, - notes: (req.body && req.body.notes) || "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task." - }; - - if (task.type === 'daily' || task.type === 'todo') - task.completed = direction === 'up'; - - task = user.ops.addTask({body:task}); - } - var delta = user.ops.score({params:{id:task.id, direction:direction}, language: req.language}); - - user.save(function(err, saved){ - if (err) return next(err); - - var userStats = saved.toJSON().stats; - var resJsonData = _.extend({ delta: delta, _tmp: user._tmp }, userStats); - res.status(200).json(resJsonData); - - var webhookData = _generateWebhookTaskData( - task, direction, delta, userStats, user - ); - webhook.sendTaskWebhook(user.preferences.webhooks, webhookData); - - if ( - (!task.challenge || !task.challenge.id || task.challenge.broken) // If it's a challenge task, sync the score. Do it in the background, we've already sent down a response and the user doesn't care what happens back there - || (task.type == 'reward') // we don't want to update the reward GP cost - ) return clearMemory(); - - Challenge.findById(task.challenge.id, 'habits dailys todos rewards', function(err, chal) { - if (err) return next(err); - if (!chal) { - task.challenge.broken = 'CHALLENGE_DELETED'; - user.save(); - return clearMemory(); - } - var t = chal.tasks[task.id]; - // this task was removed from the challenge, notify user - if (!t) { - chal.syncToUser(user); - return clearMemory(); - } - - t.value += delta; - if (t.type == 'habit' || t.type == 'daily') { - t.history.push({value: t.value, date: +new Date}); - } - chal.save(); - clearMemory(); - }); - }); -}; - -/** - * Get all tasks - */ -api.getTasks = function(req, res, next) { - var user = res.locals.user; - if (req.query.type) { - return res.json(user[req.query.type+'s']); - } else { - return res.json(_.toArray(user.tasks)); - } -}; - -/** - * Get Task - */ -api.getTask = function(req, res, next) { - var task = findTask(req,res); - if (!task) return res.status(404).json({err: shared.i18n.t('messageTaskNotFound')}); - return res.status(200).json(task); -}; - - -/* - Update Task -*/ - -//api.deleteTask // see Shared.ops -// api.updateTask // handled in Shared.ops -// api.addTask // handled in Shared.ops -// api.sortTask // handled in Shared.ops #TODO updated api, mention in docs - -/* - ------------------------------------------------------------------------ - Items - ------------------------------------------------------------------------ -*/ -// api.buy // handled in Shard.ops - -api.getBuyList = function (req, res, next) { - var list = shared.updateStore(res.locals.user); - return res.status(200).json(list); -}; - -/* - ------------------------------------------------------------------------ - User - ------------------------------------------------------------------------ -*/ - -/** - * Get User - */ -api.getUser = function(req, res, next) { - var user = res.locals.user.toJSON(); - user.stats.toNextLevel = shared.tnl(user.stats.lvl); - user.stats.maxHealth = shared.maxHealth; - user.stats.maxMP = res.locals.user._statsComputed.maxMP; - delete user.apiToken; - if (user.auth && user.auth.local) { - delete user.auth.local.hashed_password; - delete user.auth.local.salt; - } - return res.status(200).json(user); -}; - -/** - * Get anonymized User - */ -api.getUserAnonymized = function(req, res, next) { - var user = res.locals.user.toJSON(); - user.stats.toNextLevel = shared.tnl(user.stats.lvl); - user.stats.maxHealth = shared.maxHealth; - user.stats.maxMP = res.locals.user._statsComputed.maxMP; - - delete user.apiToken; - - if (user.auth) { - delete user.auth.local; - delete user.auth.facebook; - } - - delete user.newMessages; - - delete user.profile; - delete user.purchased.plan; - delete user.contributor; - delete user.invitations; - - delete user.items.special.nyeReceived; - delete user.items.special.valentineReceived; - - delete user.webhooks; - delete user.achievements.challenges; - - _.forEach(user.inbox.messages, function(msg){ - msg.text = "inbox message text"; - }); - - _.forEach(user.tags, function(tag){ - tag.name = "tag"; - tag.challenge = "challenge"; - }); - - function cleanChecklist(task){ - var checklistIndex = 0; - - _.forEach(task.checklist, function(c){ - c.text = "item" + checklistIndex++; - }); - } - - _.forEach(user.habits, function(task){ - task.text = "task text"; - task.notes = "task notes"; - }); - - _.forEach(user.rewards, function(task){ - task.text = "task text"; - task.notes = "task notes"; - }); - - _.forEach(user.dailys, function(task){ - task.text = "task text"; - task.notes = "task notes"; - - cleanChecklist(task); - }); - - _.forEach(user.todos, function(task){ - task.text = "task text"; - task.notes = "task notes"; - - cleanChecklist(task); - }); - - return res.status(200).json(user); -}; - -/** - * This tells us for which paths users can call `PUT /user` (or batch-update equiv, which use `User.set()` on our client). - * The trick here is to only accept leaf paths, not root/intermediate paths (see http://goo.gl/OEzkAs) - * FIXME - one-by-one we want to widdle down this list, instead replacing each needed set path with API operations - */ -acceptablePUTPaths = _.reduce(require('./../../models/user').schema.paths, (m, v, leaf) => { - let updatablePaths = 'achievements filters flags invitations lastCron party preferences profile stats inbox'.split(' '); - let found = _.find(updatablePaths, (rootPath) => { - return leaf.indexOf(rootPath) === 0; - }); - - if (found) m[leaf] = true; - - return m; -}, {}); - -restrictedPUTSubPaths = 'stats.class'.split(' '); - -_.each(restrictedPUTSubPaths, (removePath) => { - delete acceptablePUTPaths[removePath]; -}); - -let requiresPurchase = { - 'preferences.background': 'background', - 'preferences.shirt': 'shirt', - 'preferences.size': 'size', - 'preferences.skin': 'skin', - 'preferences.chair': 'chair', - 'preferences.hair.bangs': 'hair.bangs', - 'preferences.hair.base': 'hair.base', - 'preferences.hair.beard': 'hair.beard', - 'preferences.hair.color': 'hair.color', - 'preferences.hair.flower': 'hair.flower', - 'preferences.hair.mustache': 'hair.mustache', -}; - -let checkPreferencePurchase = (user, path, item) => { - let itemPath = `${path}.${item}`; - let appearance = _.get(shared.content.appearances, itemPath) - if (!appearance) return false; - if (appearance.price === 0) return true; - - return _.get(user.purchased, itemPath); -}; - -/** - * Update user - * Send up PUT /user as `req.body={path1:val, path2:val, etc}`. Example: - * PUT /user {'stats.hp':50, 'tasks.TASK_ID.repeat.m':false} - * See acceptablePUTPaths for which user paths are supported -*/ -api.update = (req, res, next) => { - let user = res.locals.user; - let errors = []; - - if (_.isEmpty(req.body)) return res.status(200).json(user); - - _.each(req.body, (v, k) => { - let purchasable = requiresPurchase[k]; - - if (purchasable && !checkPreferencePurchase(user, purchasable, v)) { - return errors.push(`Must purchase ${v} to set it on ${k}`); - } - - if (acceptablePUTPaths[k]) { - user.fns.dotSet(k, v); - } else { - errors.push(shared.i18n.t('messageUserOperationProtected', { operation: k })); - } - return true; - }); - - user.save((err) => { - if (!_.isEmpty(errors)) return res.status(401).json({err: errors}); - if (err) { - if (err.name == 'ValidationError') { - let errorMessages = _.map(_.values(err.errors), (error) => { - return error.message; - }); - return res.status(400).json({err: errorMessages}); - } - return next(err); - } - - res.status(200).json(user); - user = errors = null; - }); -}; - -api.cron = function(req, res, next) { - var user = res.locals.user, - progress = user.fns.cron({analytics:utils.analytics, timezoneOffset:req.headers['x-user-timezoneoffset']}), - ranCron = user.isModified(), - quest = shared.content.quests[user.party.quest.key]; - - if (ranCron) res.locals.wasModified = true; - if (!ranCron) return next(null,user); - Group.tavernBoss(user,progress); - if (!quest) return user.save(next); - - // If user is on a quest, roll for boss & player, or handle collections - // FIXME this saves user, runs db updates, loads user. Is there a better way to handle this? - async.waterfall([ - function(cb){ - user.save(cb); // make sure to save the cron effects - }, - function(saved, count, cb){ - var type = quest.boss ? 'boss' : 'collect'; - Group[type+'Quest'](user,progress,cb); - }, - function(){ - var cb = arguments[arguments.length-1]; - // User has been updated in boss-grapple, reload - User.findById(user._id, cb); - } - ], function(err, saved) { - res.locals.user = saved; - next(err,saved); - user = progress = quest = null; - }); -}; - -// api.reroll // Shared.ops -// api.reset // Shared.ops - -api.delete = function(req, res, next) { - var user = res.locals.user; - var plan = user.purchased.plan; - - if (plan && plan.customerId && !plan.dateTerminated){ - return res.status(400).json({err:"You have an active subscription, cancel your plan before deleting your account."}); - } - - Group.find({ - members: { - '$in': [user._id] - } - }, function(err, groups){ - if(err) return next(err); - - async.each(groups, function(group, cb){ - group.leave(user, 'remove-all', cb); - }, function(err){ - if(err) return next(err); - - user.remove(function(err){ - if(err) return next(err); - - firebase.deleteUser(user._id); - res.sendStatus(200); - }); - }); - }); -} - -/* - ------------------------------------------------------------------------ - Development Only Operations - ------------------------------------------------------------------------ - */ -if (nconf.get('NODE_ENV') === 'development') { - - api.addTenGems = function(req, res, next) { - var user = res.locals.user; - - user.balance += 2.5; - - user.save(function(err){ - if (err) return next(err); - res.sendStatus(204); - }); - }; - - api.addHourglass = function(req, res, next) { - var user = res.locals.user; - - user.purchased.plan.consecutive.trinkets += 1; - - user.save(function(err){ - if (err) return next(err); - res.sendStatus(204); - }); - }; -} - -/* - ------------------------------------------------------------------------ - Tags - ------------------------------------------------------------------------ - */ -// api.deleteTag // handled in Shared.ops -// api.addTag // handled in Shared.ops -// api.updateTag // handled in Shared.ops -// api.sortTag // handled in Shared.ops - -/* - ------------------------------------------------------------------------ - Spells - ------------------------------------------------------------------------ - */ -api.cast = function(req, res, next) { - var user = res.locals.user, - targetType = req.query.targetType, - targetId = req.query.targetId, - klass = shared.content.spells.special[req.params.spell] ? 'special' : user.stats.class, - spell = shared.content.spells[klass][req.params.spell]; - - if (!spell) return res.status(404).json({err: 'Spell "' + req.params.spell + '" not found.'}); - if (spell.mana > user.stats.mp) return res.status(400).json({err: 'Not enough mana to cast spell'}); - - var done = function(){ - var err = arguments[0]; - var saved = _.size(arguments == 3) ? arguments[2] : arguments[1]; - if (err) return next(err); - res.json(saved); - user = targetType = targetId = klass = spell = null; - } - - switch (targetType) { - case 'task': - if (!user.tasks[targetId]) return res.status(404).json({err: 'Task "' + targetId + '" not found.'}); - spell.cast(user, user.tasks[targetId]); - user.save(done); - break; - - case 'self': - spell.cast(user); - user.save(done); - break; - - case 'party': - case 'user': - async.waterfall([ - function(cb){ - Group.findOne({type: 'party', members: {'$in': [user._id]}}).populate('members', 'profile.name stats achievements items.special').exec(cb); - }, - function(group, cb) { - // Solo player? let's just create a faux group for simpler code - var g = group ? group : {members:[user]}; - var series = [], found; - if (targetType == 'party') { - spell.cast(user, g.members); - series = _.transform(g.members, function(m,v,k){ - m.push(function(cb2){v.save(cb2)}); - }); - } else { - found = _.find(g.members, {_id: targetId}) - spell.cast(user, found); - series.push(function(cb2){found.save(cb2)}); - } - - if (group && !spell.silent) { - series.push(function(cb2){ - var message = '`'+user.profile.name+' casts '+spell.text() + (targetType=='user' ? ' on '+found.profile.name : ' for the party')+'.`'; - group.sendChat(message); - group.save(cb2); - }) - } - - series.push(function(cb2){g = group = series = found = null;cb2();}) - - async.series(series, cb); - }, - function(whatever, cb){ - user.save(cb); - } - ], done); - break; - } -} - -// It supports guild too now but we'll stick to partyInvite for backward compatibility -api.sessionPartyInvite = function(req,res,next){ - if (!req.session.partyInvite) return next(); - var inv = res.locals.user.invitations; - if (inv.party && inv.party.id) return next(); // already invited to a party - async.waterfall([ - function(cb){ - Group.findOne({_id:req.session.partyInvite.id, members:{$in:[req.session.partyInvite.inviter]}}) - .select('invites members type').exec(cb); - }, - function(group, cb){ - if (!group){ - // Don't send error as it will prevent users from using the site - delete req.session.partyInvite; - return cb(); - } - - if (group.type == 'guild'){ - inv.guilds.push(req.session.partyInvite); - } else{ - //req.body.type in 'guild', 'party' - inv.party = req.session.partyInvite; - } - inv.party = req.session.partyInvite; - delete req.session.partyInvite; - if (!~group.invites.indexOf(res.locals.user._id)) - group.invites.push(res.locals.user._id); //$addToSt - group.save(cb); - }, - function(saved, cb){ - res.locals.user.save(cb); - } - ], next); -} - -/** - * All other user.ops which can easily be mapped to common/script/index.js, not requiring custom API-wrapping - */ -_.each(shared.wrap({}).ops, function(op,k){ - if (!api[k]) { - api[k] = function(req, res, next) { - res.locals.user.ops[k](req,function(err, response){ - // If we want to send something other than 500, pass err as {code: 200, message: "Not enough GP"} - if (err) { - if (!err.code) return next(err); - if (err.code >= 400) return res.status(err.code).json({err:err.message}); - // In the case of 200s, they're friendly alert messages like "You're pet has hatched!" - still send the op - } - res.locals.user.save(function(err){ - if (err) return next(err); - res.status(200).json(response); - }) - }, analytics); - } - } -}) - -/* - ------------------------------------------------------------------------ - Batch Update - Run a bunch of updates all at once - ------------------------------------------------------------------------ -*/ -api.batchUpdate = function(req, res, next) { - if (_.isEmpty(req.body)) req.body = []; // cases of {} or null - if (req.body[0] && req.body[0].data) - return res.status(501).json({err: "API has been updated, please refresh your browser or upgrade your mobile app."}) - - var user = res.locals.user; - var oldSend = res.send; - var oldJson = res.json; - - // Stash user.save, we'll queue the save op till the end (so we don't overload the server) - var oldSave = user.save; - user.save = function(cb){cb(null,user)} - - // Setup the array of functions we're going to call in parallel with async - res.locals.ops = []; - var ops = _.transform(req.body, function(m,_req){ - if (_.isEmpty(_req)) return; - _req.language = req.language; - - m.push(function() { - var cb = arguments[arguments.length-1]; - res.locals.ops.push(_req); - res.send = res.json = function(code, data) { - if (_.isNumber(code) && code >= 500) - return cb(code+": "+ (data.message ? data.message : data.err ? data.err : JSON.stringify(data))); - return cb(); - }; - if(!api[_req.op]) { return cb(shared.i18n.t('messageUserOperationNotFound', { operation: _req.op })); } - api[_req.op](_req, res, cb); - }); - }) - // Finally, save user at the end - .concat(function(){ - user.save = oldSave; - user.save(arguments[arguments.length-1]); - }); - - // call all the operations, then return the user object to the requester - async.waterfall(ops, function(err,_user) { - res.json = oldJson; - res.send = oldSend; - if (err) return next(err); - - var response = _user.toJSON(); - response.wasModified = res.locals.wasModified; - - user.fns.nullify(); - user = res.locals.user = oldSend = oldJson = oldSave = null; - - // return only drops & streaks - if (response._tmp && response._tmp.drop){ - res.status(200).json({_tmp: {drop: response._tmp.drop}, _v: response._v}); - - // Fetch full user object - } else if (response.wasModified){ - // Preen 3-day past-completed To-Dos from Angular & mobile app - response.todos = shared.preenTodos(response.todos); - res.status(200).json(response); - - // return only the version number - } else{ - res.status(200).json({_v: response._v}); - } - }); -}; - -function _generateWebhookTaskData(task, direction, delta, stats, user) { - var extendedStats = _.extend(stats, { - toNextLevel: shared.tnl(user.stats.lvl), - maxHealth: shared.maxHealth, - maxMP: user._statsComputed.maxMP - }); - - var userData = { - _id: user._id, - _tmp: user._tmp, - stats: extendedStats - }; - - var taskData = { - details: task, - direction: direction, - delta: delta - } - - return { - task: taskData, - user: userData - } -} diff --git a/website/src/controllers/dataexport.js b/website/src/controllers/dataexport.js deleted file mode 100644 index 8c16b9864f..0000000000 --- a/website/src/controllers/dataexport.js +++ /dev/null @@ -1,151 +0,0 @@ -var _ = require('lodash'); -var express = require('express'); -var csvStringify = require('csv-stringify'); -var nconf = require('nconf'); -var moment = require('moment'); -var js2xmlparser = require("js2xmlparser"); -var pd = require('pretty-data').pd; -var User = require('../models/user').model; - -// Avatar screenshot/static-page includes -var Pageres = require('pageres'); //https://github.com/sindresorhus/pageres -var AWS = require('aws-sdk'); -AWS.config.update({accessKeyId: nconf.get("S3:accessKeyId"), secretAccessKey: nconf.get("S3:secretAccessKey")}); -var s3Stream = require('s3-upload-stream')(new AWS.S3()); //https://github.com/nathanpeck/s3-upload-stream -var bucket = nconf.get("S3:bucket"); -var request = require('request'); - -/* - ------------------------------------------------------------------------ - Data export - ------------------------------------------------------------------------ -*/ - -var dataexport = module.exports; - -dataexport.history = function(req, res) { - var user = res.locals.user; - var output = [ - ["Task Name", "Task ID", "Task Type", "Date", "Value"] - ]; - _.each(user.tasks, function(task) { - _.each(task.history, function(history) { - output.push([ - task.text, - task.id, - task.type, - moment(history.date).format("MM-DD-YYYY HH:mm:ss"), - history.value - ]); - }); - }); - - res.set({ - 'Content-Type': 'text/csv', - 'Content-disposition': `attachment; filename=habitica-tasks-history.csv`, - }); - - csvStringify(output, (err, csv) => { - if (err) return next(err); - res.status(200).send(csv); - }); -}; - -var userdata = function(user) { - if(user.auth && user.auth.local) { - delete user.auth.local.salt; - delete user.auth.local.hashed_password; - } - return user; -} - -dataexport.leanuser = function(req, res, next) { - User.findOne({_id: res.locals.user._id}).lean().exec(function(err, user) { - if (err) return res.status(500).json({err: err}); - if (_.isEmpty(user)) return res.status(401).json(NO_USER_FOUND); - res.locals.user = user; - return next(); - }); -}; - -dataexport.userdata = { - xml: function(req, res) { - var user = userdata(res.locals.user); - return res.xml({data: JSON.stringify(user), rootname: 'user'}); - }, - json: function(req, res) { - var user = userdata(res.locals.user); - return res.jsonstring(user); - } -} - -/* - ------------------------------------------------------------------------ - Express Extensions (should be refactored into a module) - ------------------------------------------------------------------------ -*/ - -var expressres = express.response || http.ServerResponse.prototype; - -expressres.xml = function(obj, headers, status) { - var body = ''; - this.charset = this.charset || 'utf-8'; - this.header('Content-Type', 'text/xml'); - this.header('Content-Disposition', 'attachment'); - body = pd.xml(js2xmlparser(obj.rootname,obj.data)); - return this.send(body, headers, status); -}; - -expressres.jsonstring = function(obj, headers, status) { - var body = ''; - this.charset = this.charset || 'utf-8'; - this.header('Content-Type', 'application/json'); - this.header('Content-Disposition', 'attachment'); - body = pd.json(JSON.stringify(obj)); - return this.send(body, headers, status); -}; - -/* - ------------------------------------------------------------------------ - Static page and image screenshot of avatar - ------------------------------------------------------------------------ - */ - - -dataexport.avatarPage = function(req, res) { - User.findById(req.params.uuid).select('stats profile items achievements preferences backer contributor').exec(function(err, user){ - res.render('avatar-static', { - title: user.profile.name, - env: _.defaults({user:user}, res.locals.habitrpg) - }); - }) -}; - -dataexport.avatarImage = function(req, res, next) { - var filename = 'avatars/'+req.params.uuid+'.png'; - request.head('https://'+bucket+'.s3.amazonaws.com/'+filename, function(err,response,body) { - // cache images for 10 minutes on aws, else upload a new one - if (response.statusCode==200 && moment().diff(response.headers['last-modified'], 'minutes') < 10) - return res.redirect(301, 'https://' + bucket + '.s3.amazonaws.com/' + filename); - new Pageres()//{delay:1} - .src(nconf.get('BASE_URL') + '/export/avatar-' + req.params.uuid + '.html', ['140x147'], {crop: true, filename: filename.replace('.png', '')}) - .run() - .then(function (file) { - var upload = s3Stream.upload({ - Bucket: bucket, - Key: filename, - ACL: "public-read", - StorageClass: "REDUCED_REDUNDANCY", - ContentType: "image/png", - Expires: +moment().add({minutes: 3}) - }); - upload.on('error', function (err) { - next(err); - }); - upload.on('uploaded', function (details) { - res.redirect(details.Location); - }); - file[0].pipe(upload); - }).catch(next); - }) -}; diff --git a/website/src/controllers/payments/amazon.js b/website/src/controllers/payments/amazon.js deleted file mode 100644 index 8c01663c10..0000000000 --- a/website/src/controllers/payments/amazon.js +++ /dev/null @@ -1,271 +0,0 @@ -var amazonPayments = require('amazon-payments'); -var mongoose = require('mongoose'); -var moment = require('moment'); -var nconf = require('nconf'); -var async = require('async'); -var User = require('mongoose').model('User'); -var shared = require('../../../../common'); -var payments = require('./index'); -var cc = require('coupon-code'); -var isProd = nconf.get('NODE_ENV') === 'production'; - -var amzPayment = amazonPayments.connect({ - environment: amazonPayments.Environment[isProd ? 'Production' : 'Sandbox'], - sellerId: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), - mwsAccessKey: nconf.get('AMAZON_PAYMENTS:MWS_KEY'), - mwsSecretKey: nconf.get('AMAZON_PAYMENTS:MWS_SECRET'), - clientId: nconf.get('AMAZON_PAYMENTS:CLIENT_ID') -}); - -exports.verifyAccessToken = function(req, res, next){ - if(!req.body || !req.body['access_token']){ - return res.status(400).json({err: 'Access token not supplied.'}); - } - - amzPayment.api.getTokenInfo(req.body['access_token'], function(err, tokenInfo){ - if(err) return res.status(400).json({err:err}); - - res.sendStatus(200); - }); -}; - -exports.createOrderReferenceId = function(req, res, next){ - if(!req.body || !req.body.billingAgreementId){ - return res.status(400).json({err: 'Billing Agreement Id not supplied.'}); - } - - amzPayment.offAmazonPayments.createOrderReferenceForId({ - Id: req.body.billingAgreementId, - IdType: 'BillingAgreement', - ConfirmNow: false - }, function(err, response){ - if(err) return next(err); - if(!response.OrderReferenceDetails || !response.OrderReferenceDetails.AmazonOrderReferenceId){ - return next(new Error('Missing attributes in Amazon response.')); - } - - res.json({ - orderReferenceId: response.OrderReferenceDetails.AmazonOrderReferenceId - }); - }); -}; - -exports.checkout = function(req, res, next){ - if(!req.body || !req.body.orderReferenceId){ - return res.status(400).json({err: 'Billing Agreement Id not supplied.'}); - } - - var gift = req.body.gift; - var user = res.locals.user; - var orderReferenceId = req.body.orderReferenceId; - var amount = 5; - - if(gift){ - if(gift.type === 'gems'){ - amount = gift.gems.amount/4; - }else if(gift.type === 'subscription'){ - amount = shared.content.subscriptionBlocks[gift.subscription.key].price; - } - } - - async.series({ - setOrderReferenceDetails: function(cb){ - amzPayment.offAmazonPayments.setOrderReferenceDetails({ - AmazonOrderReferenceId: orderReferenceId, - OrderReferenceAttributes: { - OrderTotal: { - CurrencyCode: 'USD', - Amount: amount - }, - SellerNote: 'HabitRPG Payment', - SellerOrderAttributes: { - SellerOrderId: shared.uuid(), - StoreName: 'HabitRPG' - } - } - }, cb); - }, - - confirmOrderReference: function(cb){ - amzPayment.offAmazonPayments.confirmOrderReference({ - AmazonOrderReferenceId: orderReferenceId - }, cb); - }, - - authorize: function(cb){ - amzPayment.offAmazonPayments.authorize({ - AmazonOrderReferenceId: orderReferenceId, - AuthorizationReferenceId: shared.uuid().substring(0, 32), - AuthorizationAmount: { - CurrencyCode: 'USD', - Amount: amount - }, - SellerAuthorizationNote: 'HabitRPG Payment', - TransactionTimeout: 0, - CaptureNow: true - }, function(err, res){ - if(err) return cb(err); - - if(res.AuthorizationDetails.AuthorizationStatus.State === 'Declined'){ - return cb(new Error('The payment was not successfull.')); - } - - return cb(); - }); - }, - - closeOrderReference: function(cb){ - amzPayment.offAmazonPayments.closeOrderReference({ - AmazonOrderReferenceId: orderReferenceId - }, cb); - }, - - executePayment: function(cb){ - async.waterfall([ - function(cb2){ User.findById(gift ? gift.uuid : undefined, cb2); }, - function(member, cb2){ - var data = {user:user, paymentMethod:'Amazon Payments'}; - var method = 'buyGems'; - - if (gift){ - if (gift.type == 'subscription') method = 'createSubscription'; - gift.member = member; - data.gift = gift; - data.paymentMethod = 'Gift'; - } - - payments[method](data, cb2); - } - ], cb); - } - }, function(err, results){ - if(err) return next(err); - - res.sendStatus(200); - }); - -}; - -exports.subscribe = function(req, res, next){ - if(!req.body || !req.body['billingAgreementId']){ - return res.status(400).json({err: 'Billing Agreement Id not supplied.'}); - } - - var billingAgreementId = req.body.billingAgreementId; - var sub = req.body.subscription ? shared.content.subscriptionBlocks[req.body.subscription] : false; - var coupon = req.body.coupon; - var user = res.locals.user; - - if(!sub){ - return res.status(400).json({err: 'Subscription plan not found.'}); - } - - async.series({ - applyDiscount: function(cb){ - if (!sub.discount) return cb(); - if (!coupon) return cb(new Error('Please provide a coupon code for this plan.')); - mongoose.model('Coupon').findOne({_id:cc.validate(coupon), event:sub.key}, function(err, coupon){ - if(err) return cb(err); - if(!coupon) return cb(new Error('Coupon code not found.')); - cb(); - }); - }, - - setBillingAgreementDetails: function(cb){ - amzPayment.offAmazonPayments.setBillingAgreementDetails({ - AmazonBillingAgreementId: billingAgreementId, - BillingAgreementAttributes: { - SellerNote: 'HabitRPG Subscription', - SellerBillingAgreementAttributes: { - SellerBillingAgreementId: shared.uuid(), - StoreName: 'HabitRPG', - CustomInformation: 'HabitRPG Subscription' - } - } - }, cb); - }, - - confirmBillingAgreement: function(cb){ - amzPayment.offAmazonPayments.confirmBillingAgreement({ - AmazonBillingAgreementId: billingAgreementId - }, cb); - }, - - authorizeOnBillingAgreeement: function(cb){ - amzPayment.offAmazonPayments.authorizeOnBillingAgreement({ - AmazonBillingAgreementId: billingAgreementId, - AuthorizationReferenceId: shared.uuid().substring(0, 32), - AuthorizationAmount: { - CurrencyCode: 'USD', - Amount: sub.price - }, - SellerAuthorizationNote: 'HabitRPG Subscription Payment', - TransactionTimeout: 0, - CaptureNow: true, - SellerNote: 'HabitRPG Subscription Payment', - SellerOrderAttributes: { - SellerOrderId: shared.uuid(), - StoreName: 'HabitRPG' - } - }, function(err, res){ - if(err) return cb(err); - - if(res.AuthorizationDetails.AuthorizationStatus.State === 'Declined'){ - return cb(new Error('The payment was not successfull.')); - } - - return cb(); - }); - }, - - createSubscription: function(cb){ - payments.createSubscription({ - user: user, - customerId: billingAgreementId, - paymentMethod: 'Amazon Payments', - sub: sub - }, cb); - } - }, function(err, results){ - if(err) return next(err); - - res.sendStatus(200); - }); -}; - -exports.subscribeCancel = function(req, res, next){ - var user = res.locals.user; - if (!user.purchased.plan.customerId) - return res.status(401).json({err: 'User does not have a plan subscription'}); - - var billingAgreementId = user.purchased.plan.customerId; - - async.series({ - closeBillingAgreement: function(cb){ - amzPayment.offAmazonPayments.closeBillingAgreement({ - AmazonBillingAgreementId: billingAgreementId - }, cb); - }, - - cancelSubscription: function(cb){ - var data = { - user: user, - // Date of next bill - nextBill: moment(user.purchased.plan.lastBillingDate).add({days: 30}), - paymentMethod: 'Amazon Payments' - }; - - payments.cancelSubscription(data, cb); - } - }, function(err, results){ - if (err) return next(err); // don't json this, let toString() handle errors - - if(req.query.noRedirect){ - res.sendStatus(200); - }else{ - res.redirect('/'); - } - - user = null; - }); -}; diff --git a/website/src/controllers/payments/iap.js b/website/src/controllers/payments/iap.js deleted file mode 100644 index 829482ed67..0000000000 --- a/website/src/controllers/payments/iap.js +++ /dev/null @@ -1,155 +0,0 @@ -var iap = require('in-app-purchase'); -var async = require('async'); -var payments = require('./index'); -var nconf = require('nconf'); - -var inAppPurchase = require('in-app-purchase'); -inAppPurchase.config({ - // this is the path to the directory containing iap-sanbox/iap-live files - googlePublicKeyPath: nconf.get('IAP_GOOGLE_KEYDIR') -}); - -// Validation ERROR Codes -var INVALID_PAYLOAD = 6778001; -var CONNECTION_FAILED = 6778002; -var PURCHASE_EXPIRED = 6778003; - -exports.androidVerify = function(req, res, next) { - var iapBody = req.body; - var user = res.locals.user; - - iap.setup(function (error) { - if (error) { - var resObj = { - ok: false, - data: 'IAP Error' - }; - - return res.json(resObj); - - } - - /* - google receipt must be provided as an object - { - "data": "{stringified data object}", - "signature": "signature from google" - } - */ - var testObj = { - data: iapBody.transaction.receipt, - signature: iapBody.transaction.signature - }; - - // iap is ready - iap.validate(iap.GOOGLE, testObj, function (err, googleRes) { - if (err) { - var resObj = { - ok: false, - data: { - code: INVALID_PAYLOAD, - message: err.toString() - } - }; - - return res.json(resObj); - } - - if (iap.isValidated(googleRes)) { - var resObj = { - ok: true, - data: googleRes - }; - - payments.buyGems({user:user, paymentMethod:'IAP GooglePlay', amount: 5.25}); - - return res.json(resObj); - } - }); - }); -}; - -exports.iosVerify = function(req, res, next) { - var iapBody = req.body; - var user = res.locals.user; - - iap.setup(function (error) { - if (error) { - var resObj = { - ok: false, - data: 'IAP Error' - }; - - return res.json(resObj); - - } - - //iap is ready - iap.validate(iap.APPLE, iapBody.transaction.receipt, function (err, appleRes) { - if (err) { - var resObj = { - ok: false, - data: { - code: INVALID_PAYLOAD, - message: err.toString() - } - }; - - return res.json(resObj); - } - - if (iap.isValidated(appleRes)) { - var purchaseDataList = iap.getPurchaseData(appleRes); - if (purchaseDataList.length > 0) { - var correctReceipt = true; - for (var index in purchaseDataList) { - switch (purchaseDataList[index].productId) { - case 'com.habitrpg.ios.Habitica.4gems': - payments.buyGems({user:user, paymentMethod:'IAP AppleStore', amount: 1}); - break; - case 'com.habitrpg.ios.Habitica.8gems': - payments.buyGems({user:user, paymentMethod:'IAP AppleStore', amount: 2}); - break; - case 'com.habitrpg.ios.Habitica.20gems': - case 'com.habitrpg.ios.Habitica.21gems': - payments.buyGems({user:user, paymentMethod:'IAP AppleStore', amount: 5.25}); - break; - case 'com.habitrpg.ios.Habitica.42gems': - payments.buyGems({user:user, paymentMethod:'IAP AppleStore', amount: 10.5}); - break; - default: - correctReceipt = false; - } - } - if (correctReceipt) { - var resObj = { - ok: true, - data: appleRes - }; - // yay good! - return res.json(resObj); - } - } - //wrong receipt content - var resObj = { - ok: false, - data: { - code: INVALID_PAYLOAD, - message: 'Incorrect receipt content' - } - }; - return res.json(resObj); - } - //invalid receipt - var resObj = { - ok: false, - data: { - code: INVALID_PAYLOAD, - message: 'Invalid receipt' - } - }; - - return res.json(resObj); - }); - }); -}; diff --git a/website/src/controllers/payments/index.js b/website/src/controllers/payments/index.js deleted file mode 100644 index dad53feb13..0000000000 --- a/website/src/controllers/payments/index.js +++ /dev/null @@ -1,207 +0,0 @@ -var _ = require('lodash'); -var shared = require('../../../../common'); -var nconf = require('nconf'); -var utils = require('./../../libs/utils'); -var moment = require('moment'); -var isProduction = nconf.get("NODE_ENV") === "production"; -var stripe = require('./stripe'); -var paypal = require('./paypal'); -var amazon = require('./amazon'); -var members = require('../api-v2/members') -var async = require('async'); -var iap = require('./iap'); -var mongoose= require('mongoose'); -var cc = require('coupon-code'); -var pushNotify = require('./../pushNotifications'); - -function revealMysteryItems(user) { - _.each(shared.content.gear.flat, function(item) { - if ( - item.klass === 'mystery' && - moment().isAfter(shared.content.mystery[item.mystery].start) && - moment().isBefore(shared.content.mystery[item.mystery].end) && - !user.items.gear.owned[item.key] && - !~user.purchased.plan.mysteryItems.indexOf(item.key) - ) { - user.purchased.plan.mysteryItems.push(item.key); - } - }); -} - -exports.createSubscription = function(data, cb) { - var recipient = data.gift ? data.gift.member : data.user; - //if (!recipient.purchased.plan) recipient.purchased.plan = {}; // FIXME double-check, this should never be the case - var p = recipient.purchased.plan; - var block = shared.content.subscriptionBlocks[data.gift ? data.gift.subscription.key : data.sub.key]; - var months = +block.months; - - if (data.gift) { - if (p.customerId && !p.dateTerminated) { // User has active plan - p.extraMonths += months; - } else { - p.dateTerminated = moment(p.dateTerminated).add({months: months}).toDate(); - if (!p.dateUpdated) p.dateUpdated = new Date(); - } - if (!p.customerId) p.customerId = 'Gift'; // don't override existing customer, but all sub need a customerId - } else { - _(p).merge({ // override with these values - planId: block.key, - customerId: data.customerId, - dateUpdated: new Date(), - gemsBought: 0, - paymentMethod: data.paymentMethod, - extraMonths: +p.extraMonths - + +(p.dateTerminated ? moment(p.dateTerminated).diff(new Date(),'months',true) : 0), - dateTerminated: null, - // Specify a lastBillingDate just for Amazon Payments - // Resetted every time the subscription restarts - lastBillingDate: data.paymentMethod === 'Amazon Payments' ? new Date() : undefined - }).defaults({ // allow non-override if a plan was previously used - dateCreated: new Date(), - mysteryItems: [] - }).value(); - } - - // Block sub perks - var perks = Math.floor(months/3); - if (perks) { - p.consecutive.offset += months; - p.consecutive.gemCapExtra += perks*5; - if (p.consecutive.gemCapExtra > 25) p.consecutive.gemCapExtra = 25; - p.consecutive.trinkets += perks; - } - revealMysteryItems(recipient); - if(isProduction) { - if (!data.gift) utils.txnEmail(data.user, 'subscription-begins'); - - var analyticsData = { - uuid: data.user._id, - itemPurchased: 'Subscription', - sku: data.paymentMethod.toLowerCase() + '-subscription', - purchaseType: 'subscribe', - paymentMethod: data.paymentMethod, - quantity: 1, - gift: !!data.gift, // coerced into a boolean - purchaseValue: block.price - } - utils.analytics.trackPurchase(analyticsData); - } - data.user.purchased.txnCount++; - if (data.gift){ - members.sendMessage(data.user, data.gift.member, data.gift); - - var byUserName = utils.getUserInfo(data.user, ['name']).name; - - if(data.gift.member.preferences.emailNotifications.giftedSubscription !== false){ - utils.txnEmail(data.gift.member, 'gifted-subscription', [ - {name: 'GIFTER', content: byUserName}, - {name: 'X_MONTHS_SUBSCRIPTION', content: months} - ]); - } - - if (data.gift.member._id != data.user._id) { // Only send push notifications if sending to a user other than yourself - pushNotify.sendNotify(data.gift.member, shared.i18n.t('giftedSubscription'), months + " months - by "+ byUserName); - } - } - async.parallel([ - function(cb2){data.user.save(cb2)}, - function(cb2){data.gift ? data.gift.member.save(cb2) : cb2(null);} - ], cb); -} - -/** - * Sets their subscription to be cancelled later - */ -exports.cancelSubscription = function(data, cb) { - var p = data.user.purchased.plan, - now = moment(), - remaining = data.nextBill ? moment(data.nextBill).diff(new Date, 'days') : 30; - - p.dateTerminated = - moment( now.format('MM') + '/' + moment(p.dateUpdated).format('DD') + '/' + now.format('YYYY') ) - .add({days: remaining}) // end their subscription 1mo from their last payment - .add({months: Math.ceil(p.extraMonths)})// plus any extra time (carry-over, gifted subscription, etc) they have. FIXME: moment can't add months in fractions... - .toDate(); - p.extraMonths = 0; // clear extra time. If they subscribe again, it'll be recalculated from p.dateTerminated - - data.user.save(cb); - utils.txnEmail(data.user, 'cancel-subscription'); - var analyticsData = { - uuid: data.user._id, - gaCategory: 'commerce', - gaLabel: data.paymentMethod, - paymentMethod: data.paymentMethod - } - utils.analytics.track('unsubscribe', analyticsData); -} - -exports.buyGems = function(data, cb) { - var amt = data.amount || 5; - amt = data.gift ? data.gift.gems.amount/4 : amt; - (data.gift ? data.gift.member : data.user).balance += amt; - data.user.purchased.txnCount++; - if(isProduction) { - if (!data.gift) utils.txnEmail(data.user, 'donation'); - - var analyticsData = { - uuid: data.user._id, - itemPurchased: 'Gems', - sku: data.paymentMethod.toLowerCase() + '-checkout', - purchaseType: 'checkout', - paymentMethod: data.paymentMethod, - quantity: 1, - gift: !!data.gift, // coerced into a boolean - purchaseValue: amt - } - utils.analytics.trackPurchase(analyticsData); - } - - if (data.gift){ - var byUsername = utils.getUserInfo(data.user, ['name']).name; - var gemAmount = data.gift.gems.amount || 20; - - members.sendMessage(data.user, data.gift.member, data.gift); - if(data.gift.member.preferences.emailNotifications.giftedGems !== false){ - utils.txnEmail(data.gift.member, 'gifted-gems', [ - {name: 'GIFTER', content: byUsername}, - {name: 'X_GEMS_GIFTED', content: gemAmount} - ]); - } - - if (data.gift.member._id != data.user._id) { // Only send push notifications if sending to a user other than yourself - pushNotify.sendNotify(data.gift.member, shared.i18n.t('giftedGems'), gemAmount + ' Gems - by '+byUsername); - } - } - async.parallel([ - function(cb2){data.user.save(cb2)}, - function(cb2){data.gift ? data.gift.member.save(cb2) : cb2(null);} - ], cb); -} - -exports.validCoupon = function(req, res, next){ - mongoose.model('Coupon').findOne({_id:cc.validate(req.params.code), event:'google_6mo'}, function(err, coupon){ - if (err) return next(err); - if (!coupon) return res.status(401).json({err:"Invalid coupon code"}); - return res.sendStatus(200); - }); -} - -exports.stripeCheckout = stripe.checkout; -exports.stripeSubscribeCancel = stripe.subscribeCancel; -exports.stripeSubscribeEdit = stripe.subscribeEdit; - -exports.paypalSubscribe = paypal.createBillingAgreement; -exports.paypalSubscribeSuccess = paypal.executeBillingAgreement; -exports.paypalSubscribeCancel = paypal.cancelSubscription; -exports.paypalCheckout = paypal.createPayment; -exports.paypalCheckoutSuccess = paypal.executePayment; -exports.paypalIPN = paypal.ipn; - -exports.amazonVerifyAccessToken = amazon.verifyAccessToken; -exports.amazonCreateOrderReferenceId = amazon.createOrderReferenceId; -exports.amazonCheckout = amazon.checkout; -exports.amazonSubscribe = amazon.subscribe; -exports.amazonSubscribeCancel = amazon.subscribeCancel; - -exports.iapAndroidVerify = iap.androidVerify; -exports.iapIosVerify = iap.iosVerify; diff --git a/website/src/controllers/payments/paypal.js b/website/src/controllers/payments/paypal.js deleted file mode 100644 index 3c5258c222..0000000000 --- a/website/src/controllers/payments/paypal.js +++ /dev/null @@ -1,216 +0,0 @@ -var nconf = require('nconf'); -var moment = require('moment'); -var async = require('async'); -var _ = require('lodash'); -var url = require('url'); -var User = require('mongoose').model('User'); -var payments = require('./index'); -var logger = require('../../libs/logging'); -var ipn = require('paypal-ipn'); -var paypal = require('paypal-rest-sdk'); -var shared = require('../../../../common'); -var mongoose = require('mongoose'); -var cc = require('coupon-code'); - -// This is the plan.id for paypal subscriptions. You have to set up billing plans via their REST sdk (they don't have -// a web interface for billing-plan creation), see ./paypalBillingSetup.js for how. After the billing plan is created -// there, get it's plan.id and store it in config.json -_.each(shared.content.subscriptionBlocks, function(block){ - block.paypalKey = nconf.get("PAYPAL:billing_plans:"+block.key); -}); - -paypal.configure({ - 'mode': nconf.get("PAYPAL:mode"), //sandbox or live - 'client_id': nconf.get("PAYPAL:client_id"), - 'client_secret': nconf.get("PAYPAL:client_secret") -}); - -var parseErr = function(res, err){ - //var error = err.response ? err.response.message || err.response.details[0].issue : err; - var error = JSON.stringify(err); - return res.status(400).json({err:error}); -} - -exports.createBillingAgreement = function(req,res,next){ - var sub = shared.content.subscriptionBlocks[req.query.sub]; - async.waterfall([ - function(cb){ - if (!sub.discount) return cb(null, null); - if (!req.query.coupon) return cb('Please provide a coupon code for this plan.'); - mongoose.model('Coupon').findOne({_id:cc.validate(req.query.coupon), event:sub.key}, cb); - }, - function(coupon, cb){ - if (sub.discount && !coupon) return cb('Invalid coupon code.'); - var billingPlanTitle = "HabitRPG Subscription" + ' ($'+sub.price+' every '+sub.months+' months, recurring)'; - var billingAgreementAttributes = { - "name": billingPlanTitle, - "description": billingPlanTitle, - "start_date": moment().add({minutes:5}).format(), - "plan": { - "id": sub.paypalKey - }, - "payer": { - "payment_method": "paypal" - } - }; - paypal.billingAgreement.create(billingAgreementAttributes, cb); - } - ], function(err, billingAgreement){ - if (err) return parseErr(res, err); - // For approving subscription via Paypal, first redirect user to: approval_url - req.session.paypalBlock = req.query.sub; - var approval_url = _.find(billingAgreement.links, {rel:'approval_url'}).href; - res.redirect(approval_url); - }); -} - -exports.executeBillingAgreement = function(req,res,next){ - var block = shared.content.subscriptionBlocks[req.session.paypalBlock]; - delete req.session.paypalBlock; - async.auto({ - exec: function (cb) { - paypal.billingAgreement.execute(req.query.token, {}, cb); - }, - get_user: function (cb) { - User.findById(req.session.userId, cb); - }, - create_sub: ['exec', 'get_user', function (cb, results) { - payments.createSubscription({ - user: results.get_user, - customerId: results.exec.id, - paymentMethod: 'Paypal', - sub: block - }, cb); - }] - },function(err){ - if (err) return parseErr(res, err); - res.redirect('/'); - }) -} - -exports.createPayment = function(req, res) { - // if we're gifting to a user, put it in session for the `execute()` - req.session.gift = req.query.gift || undefined; - var gift = req.query.gift ? JSON.parse(req.query.gift) : undefined; - var price = !gift ? 5.00 - : gift.type=='gems' ? Number(gift.gems.amount/4).toFixed(2) - : Number(shared.content.subscriptionBlocks[gift.subscription.key].price).toFixed(2); - var description = !gift ? "HabitRPG Gems" - : gift.type=='gems' ? "HabitRPG Gems (Gift)" - : shared.content.subscriptionBlocks[gift.subscription.key].months + "mo. HabitRPG Subscription (Gift)"; - var create_payment = { - "intent": "sale", - "payer": { - "payment_method": "paypal" - }, - "redirect_urls": { - "return_url": nconf.get('BASE_URL') + '/paypal/checkout/success', - "cancel_url": nconf.get('BASE_URL') - }, - "transactions": [{ - "item_list": { - "items": [{ - "name": description, - //"sku": "1", - "price": price, - "currency": "USD", - "quantity": 1 - }] - }, - "amount": { - "currency": "USD", - "total": price - }, - "description": description - }] - }; - paypal.payment.create(create_payment, function (err, payment) { - if (err) return parseErr(res, err); - var link = _.find(payment.links, {rel: 'approval_url'}).href; - res.redirect(link); - }); -} - -exports.executePayment = function(req, res) { - var paymentId = req.query.paymentId, - PayerID = req.query.PayerID, - gift = req.session.gift ? JSON.parse(req.session.gift) : undefined; - delete req.session.gift; - async.waterfall([ - function(cb){ - paypal.payment.execute(paymentId, {payer_id: PayerID}, cb); - }, - function(payment, cb){ - async.parallel([ - function(cb2){ User.findById(req.session.userId, cb2); }, - function(cb2){ User.findById(gift ? gift.uuid : undefined, cb2); } - ], cb); - }, - function(results, cb){ - if (_.isEmpty(results[0])) return cb("User not found when completing paypal transaction"); - var data = {user:results[0], customerId:PayerID, paymentMethod:'Paypal', gift:gift} - var method = 'buyGems'; - if (gift) { - gift.member = results[1]; - if (gift.type=='subscription') method = 'createSubscription'; - data.paymentMethod = 'Gift'; - } - payments[method](data, cb); - } - ],function(err){ - if (err) return parseErr(res, err); - res.redirect('/'); - }) -} - -exports.cancelSubscription = function(req, res, next){ - var user = res.locals.user; - if (!user.purchased.plan.customerId) - return res.status(401).json({err: "User does not have a plan subscription"}); - async.auto({ - get_cus: function(cb){ - paypal.billingAgreement.get(user.purchased.plan.customerId, cb); - }, - verify_cus: ['get_cus', function(cb, results){ - var hasntBilledYet = results.get_cus.agreement_details.cycles_completed == "0"; - if (hasntBilledYet) - return cb("The plan hasn't activated yet (due to a PayPal bug). It will begin "+results.get_cus.agreement_details.next_billing_date+", after which you can cancel to retain your full benefits"); - cb(); - }], - del_cus: ['verify_cus', function(cb, results){ - paypal.billingAgreement.cancel(user.purchased.plan.customerId, {note: "Canceling the subscription"}, cb); - }], - cancel_sub: ['get_cus', 'verify_cus', function(cb, results){ - var data = {user: user, paymentMethod: 'Paypal', nextBill: results.get_cus.agreement_details.next_billing_date}; - payments.cancelSubscription(data, cb) - }] - }, function(err){ - if (err) return parseErr(res, err); - res.redirect('/'); - user = null; - }); -} - -/** - * General IPN handler. We catch cancelled HabitRPG subscriptions for users who manually cancel their - * recurring paypal payments in their paypal dashboard. Remove this when we can move to webhooks or some other solution - */ -exports.ipn = function(req, res, next) { - console.log('IPN Called'); - res.sendStatus(200); // Must respond to PayPal IPN request with an empty 200 first - ipn.verify(req.body, function(err, msg) { - if (err) return logger.error(msg); - switch (req.body.txn_type) { - // TODO what's the diff b/w the two data.txn_types below? The docs recommend subscr_cancel, but I'm getting the other one instead... - case 'recurring_payment_profile_cancel': - case 'subscr_cancel': - User.findOne({'purchased.plan.customerId':req.body.recurring_payment_id},function(err, user){ - if (err) return logger.error(err); - if (_.isEmpty(user)) return; // looks like the cancellation was already handled properly above (see api.paypalSubscribeCancel) - payments.cancelSubscription({user:user, paymentMethod: 'Paypal'}); - }); - break; - } - }); -}; - diff --git a/website/src/controllers/payments/stripe.js b/website/src/controllers/payments/stripe.js deleted file mode 100644 index 1a1085227c..0000000000 --- a/website/src/controllers/payments/stripe.js +++ /dev/null @@ -1,123 +0,0 @@ -var nconf = require('nconf'); -var stripe = require('stripe')(nconf.get('STRIPE_API_KEY')); -var async = require('async'); -var payments = require('./index'); -var User = require('mongoose').model('User'); -var shared = require('../../../../common'); -var mongoose = require('mongoose'); -var cc = require('coupon-code'); - -/* - Setup Stripe response when posting payment - */ -exports.checkout = function(req, res, next) { - var token = req.body.id; - var user = res.locals.user; - var gift = req.query.gift ? JSON.parse(req.query.gift) : undefined; - var sub = req.query.sub ? shared.content.subscriptionBlocks[req.query.sub] : false; - - async.waterfall([ - function(cb){ - if (sub) { - async.waterfall([ - function(cb2){ - if (!sub.discount) return cb2(null, null); - if (!req.query.coupon) return cb2('Please provide a coupon code for this plan.'); - mongoose.model('Coupon').findOne({_id:cc.validate(req.query.coupon), event:sub.key}, cb2); - }, - function(coupon, cb2){ - if (sub.discount && !coupon) return cb2('Invalid coupon code.'); - var customer = { - email: req.body.email, - metadata: {uuid: user._id}, - card: token, - plan: sub.key - }; - stripe.customers.create(customer, cb2); - } - ], cb); - } else { - stripe.charges.create({ - amount: !gift ? '500' //"500" = $5 - : gift.type=='subscription' ? ''+shared.content.subscriptionBlocks[gift.subscription.key].price*100 - : ''+gift.gems.amount/4*100, - currency: 'usd', - card: token - }, cb); - } - }, - function(response, cb) { - if (sub) return payments.createSubscription({user:user, customerId:response.id, paymentMethod:'Stripe', sub:sub}, cb); - async.waterfall([ - function(cb2){ User.findById(gift ? gift.uuid : undefined, cb2); }, - function(member, cb2){ - var data = {user:user, customerId:response.id, paymentMethod:'Stripe', gift:gift}; - var method = 'buyGems'; - if (gift) { - gift.member = member; - if (gift.type=='subscription') method = 'createSubscription'; - data.paymentMethod = 'Gift'; - } - payments[method](data, cb2); - } - ], cb); - } - ], function(err){ - if (err) return res.send(500, err.toString()); // don't json this, let toString() handle errors - res.sendStatus(200); - user = token = null; - }); -}; - -exports.subscribeCancel = function(req, res, next) { - var user = res.locals.user; - if (!user.purchased.plan.customerId) - return res.status(401).json({err: 'User does not have a plan subscription'}); - - async.auto({ - get_cus: function(cb){ - stripe.customers.retrieve(user.purchased.plan.customerId, cb); - }, - del_cus: ['get_cus', function(cb, results){ - stripe.customers.del(user.purchased.plan.customerId, cb); - }], - cancel_sub: ['get_cus', function(cb, results) { - var data = { - user: user, - nextBill: results.get_cus.subscription.current_period_end*1000, // timestamp is in seconds - paymentMethod: 'Stripe' - }; - payments.cancelSubscription(data, cb); - }] - }, function(err, results){ - if (err) return res.send(500, err.toString()); // don't json this, let toString() handle errors - res.redirect('/'); - user = null; - }); -}; - -exports.subscribeEdit = function(req, res, next) { - var token = req.body.id; - var user = res.locals.user; - var user_id = user.purchased.plan.customerId; - var sub_id; - - async.waterfall([ - function(cb){ - stripe.customers.listSubscriptions(user_id, cb); - }, - function(response, cb) { - sub_id = response.data[0].id; - console.warn(sub_id); - console.warn([user_id, sub_id, { card: token }]); - stripe.customers.updateSubscription(user_id, sub_id, { card: token }, cb); - }, - function(response, cb) { - user.save(cb); - } - ], function(err, saved){ - if (err) return res.send(500, err.toString()); // don't json this, let toString() handle errors - res.sendStatus(200); - token = user = user_id = sub_id; - }); -}; diff --git a/website/src/controllers/pushNotifications.js b/website/src/controllers/pushNotifications.js deleted file mode 100644 index d1c728f365..0000000000 --- a/website/src/controllers/pushNotifications.js +++ /dev/null @@ -1,57 +0,0 @@ -var api = module.exports; -var _ = require('lodash'); -var nconf = require('nconf'); - -var pushNotify = require('push-notify'); - -var gcmApiKey = nconf.get("PUSH_CONFIGS:GCM_SERVER_API_KEY"); - -var gcm = gcmApiKey ? pushNotify.gcm({ - apiKey: gcmApiKey, - retries: 3 -}) : undefined; - -if(gcm){ - gcm.on('transmitted', function (result, message, registrationId) { - //console.info("transmitted", result, message, registrationId); - }); - - gcm.on('transmissionError', function (error, message, registrationId) { - //console.info("transmissionError", error, message, registrationId); - }); - gcm.on('updated', function (result, registrationId) { - //console.info("updated", result, registrationId); - }); -} - -api.sendNotify = function(user, title, msg, timeToLive){ - timeToLive = timeToLive || 15; - - // need investigation: - // https://github.com/HabitRPG/habitrpg/issues/5252 - if(!user) - return; - - _.forEach(user.pushDevices, function(pushDevice){ - switch(pushDevice.type){ - case "android": - if(gcm){ - gcm.send({ - registrationId: pushDevice.regId, - //collapseKey: 'COLLAPSE_KEY', - delayWhileIdle: true, - timeToLive: timeToLive, - data: { - title: title, - message: msg - } - }); - } - - break; - - case "ios": - break; - } - }); -}; diff --git a/website/src/libs/analytics.js b/website/src/libs/analytics.js deleted file mode 100644 index dffa7c2a9b..0000000000 --- a/website/src/libs/analytics.js +++ /dev/null @@ -1,205 +0,0 @@ -require('./i18n'); - -var _ = require('lodash'); -var Content = require('../../../common').content; -var Amplitude = require('amplitude'); -var googleAnalytics = require('universal-analytics'); - -var ga; -var amplitude; - -var analytics = { - trackPurchase: trackPurchase, - track: track -} - -function init(options) { - if(!options) { throw 'No options provided' } - - amplitude = new Amplitude(options.amplitudeToken); - ga = googleAnalytics(options.googleAnalytics); - - return analytics; -} - -function track(eventType, data) { - _sendDataToAmplitude(eventType, data); - _sendDataToGoogle(eventType, data); -} - -function _sendDataToAmplitude(eventType, data) { - var amplitudeData = _formatDataForAmplitude(data); - amplitudeData.event_type = eventType; - amplitude.track(amplitudeData).catch(function(error) { - // @TODO log error with new relic - }); -} - -function _sendDataToGoogle(eventType, data) { - var eventData = { - ec: data.category, - ea: eventType - } - - var label = _generateLabelForGoogleAnalytics(data); - if(label) { eventData.el = label; } - - var value = _generateValueForGoogleAnalytics(data); - if(value) { eventData.ev = value; } - - ga.event(eventData).send(); -} - -function _generateLabelForGoogleAnalytics(data) { - var label; - var POSSIBLE_LABELS = ['gaLabel', 'itemKey']; - - _(POSSIBLE_LABELS).each(function(key) { - if(data[key]) { - label = data[key]; - return false; // exit _.each early - } - }).value(); - - return label; -} - -function _generateValueForGoogleAnalytics(data) { - var value; - var POSSIBLE_VALUES = ['gaValue', 'gemCost', 'goldCost']; - - _(POSSIBLE_VALUES).each(function(key) { - if(data[key]) { - value = data[key]; - return false; // exit _.each early - } - }).value(); - - return value; -} - -function trackPurchase(data) { - _sendPurchaseDataToAmplitude(data); - _sendPurchaseDataToGoogle(data); -} - -function _sendPurchaseDataToAmplitude(data) { - var amplitudeData = _formatDataForAmplitude(data); - amplitudeData.event_type = 'purchase'; - amplitudeData.revenue = data.purchaseValue; - - amplitude.track(amplitudeData).catch(function(error) { - // @TODO log error with new relic - }); -} - -function _formatDataForAmplitude(data) { - var PROPERTIES_TO_SCRUB = ['uuid', 'user', 'purchaseValue', 'gaLabel', 'gaValue']; - var event_properties = _.omit(data, PROPERTIES_TO_SCRUB); - - var ampData = { - user_id: data.uuid || 'no-user-id-was-provided', - platform: 'server', - event_properties: event_properties - } - - if(data.user) { - ampData.user_properties = _formatUserData(data.user); - } - - var itemName = _lookUpItemName(data.itemKey); - if(itemName) { - event_properties.itemName = itemName; - } - - return ampData; -} - -function _lookUpItemName(itemKey) { - if (!itemKey) return; - - var gear = Content.gear.flat[itemKey]; - var egg = Content.eggs[itemKey]; - var food = Content.food[itemKey]; - var hatchingPotion = Content.hatchingPotions[itemKey]; - var quest = Content.quests[itemKey]; - var spell = Content.special[itemKey]; - - var itemName; - - if (gear) { - itemName = gear.text(); - } else if (egg) { - itemName = egg.text() + ' Egg'; - } else if (food) { - itemName = food.text(); - } else if (hatchingPotion) { - itemName = hatchingPotion.text() + " Hatching Potion"; - } else if (quest) { - itemName = quest.text(); - } else if (spell) { - itemName = spell.text(); - } - - return itemName; -} - -function _formatUserData(user) { - var properties = {}; - - if (user.stats) { - properties.Class = user.stats.class; - properties.Experience = Math.floor(user.stats.exp); - properties.Gold = Math.floor(user.stats.gp); - properties.Health = Math.ceil(user.stats.hp); - properties.Level = user.stats.lvl; - properties.Mana = Math.floor(user.stats.mp); - } - - properties.tutorialComplete = user.flags && user.flags.tour && user.flags.tour.intro === -2; - - if (user.habits && user.dailys && user.todos && user.rewards) { - properties["Number Of Tasks"] = { - habits: user.habits.length, - dailys: user.dailys.length, - todos: user.todos.length, - rewards: user.rewards.length - }; - } - - if (user.contributor && user.contributor.level) { - properties.contributorLevel = user.contributor.level; - } - - if (user.purchased && user.purchased.plan.planId) { - properties.subscription = user.purchased.plan.planId; - } - - return properties; -} - -function _sendPurchaseDataToGoogle(data) { - var label = data.paymentMethod; - var type = data.purchaseType; - var price = data.purchaseValue; - var qty = data.quantity; - var sku = data.sku; - var itemKey = data.itemPurchased; - var variation = type; - if(data.gift) variation += ' - Gift'; - - var eventData = { - ec: 'commerce', - ea: type, - el: label, - ev: price - }; - - ga.event(eventData).send(); - - ga.transaction(data.uuid, price) - .item(price, qty, sku, itemKey, variation) - .send(); -} - -module.exports = init; diff --git a/website/src/libs/buildManifest.js b/website/src/libs/buildManifest.js deleted file mode 100644 index e2b337860f..0000000000 --- a/website/src/libs/buildManifest.js +++ /dev/null @@ -1,59 +0,0 @@ -var fs = require('fs'); -var path = require('path'); -var nconf = require('nconf'); -var _ = require('lodash'); -var manifestFiles = require("../../public/manifest.json"); - -var IS_PROD = nconf.get('NODE_ENV') === 'production'; -var buildFiles = []; - -var walk = function(folder){ - var res = fs.readdirSync(folder); - - res.forEach(function(fileName){ - var file = folder + '/' + fileName; - if(fs.statSync(file).isDirectory()){ - walk(file); - }else{ - var relFolder = path.relative(path.join(__dirname, "/../../build"), folder); - var old = fileName.replace(/-.{8}(\.[\d\w]+)$/, '$1'); - - if(relFolder){ - old = relFolder + '/' + old; - fileName = relFolder + '/' + fileName; - } - - buildFiles[old] = fileName; - } - }); -}; - -walk(path.join(__dirname, "/../../build")); - -var getBuildUrl = module.exports.getBuildUrl = function(url){ - if(buildFiles[url]) return '/' + buildFiles[url]; - - return '/' + url; -}; - -module.exports.getManifestFiles = function(page){ - var files = manifestFiles[page]; - - if(!files) throw new Error("Page not found!"); - - var code = ''; - - if(IS_PROD){ - code += ''; - code += ''; - }else{ - _.each(files.css, function(file){ - code += ''; - }); - _.each(files.js, function(file){ - code += ''; - }); - } - - return code; -}; \ No newline at end of file diff --git a/website/src/libs/firebase.js b/website/src/libs/firebase.js deleted file mode 100644 index 84a90b22d4..0000000000 --- a/website/src/libs/firebase.js +++ /dev/null @@ -1,81 +0,0 @@ -var Firebase = require('firebase'); -var nconf = require('nconf'); -var isProd = nconf.get('NODE_ENV') === 'production'; -var firebaseConfig = nconf.get('FIREBASE'); - -var firebaseRef; -var isFirebaseEnabled = (nconf.get('NODE_ENV') === 'production') && (firebaseConfig.ENABLED === 'true'); - -// Setup -if(isFirebaseEnabled){ - firebaseRef = new Firebase('https://' + firebaseConfig.APP + '.firebaseio.com'); - - // TODO what happens if an op is sent before client is authenticated? - firebaseRef.authWithCustomToken(firebaseConfig.SECRET, function(err, authData){ - // TODO it's ok to kill the server here? what if FB is offline? - if(err) throw new Error('Impossible to authenticate Firebase'); - }); -} - -var api = module.exports = {}; - -api.updateGroupData = function(group){ - if(!isFirebaseEnabled) return; - // TODO is throw ok? we don't have callbacks - if(!group) throw new Error('group is required.'); - // Return in case of tavern (comparison working because we use string for _id) - if(group._id === 'habitrpg') return; - - firebaseRef.child('rooms/' + group._id) - .set({ - name: group.name - }); -}; - -api.addUserToGroup = function(groupId, userId){ - if(!isFirebaseEnabled) return; - if(!userId || !groupId) throw new Error('groupId, userId are required.'); - if(groupId === 'habitrpg') return; - - firebaseRef.child('members/' + groupId + '/' + userId) - .set(true); - - firebaseRef.child('users/' + userId + '/rooms/' + groupId) - .set(true); -}; - -api.removeUserFromGroup = function(groupId, userId){ - if(!isFirebaseEnabled) return; - if(!userId || !groupId) throw new Error('groupId, userId are required.'); - if(groupId === 'habitrpg') return; - - firebaseRef.child('members/' + groupId + '/' + userId) - .remove(); - - firebaseRef.child('users/' + userId + '/rooms/' + groupId) - .remove(); -}; - -api.deleteGroup = function(groupId){ - if(!isFirebaseEnabled) return; - if(!groupId) throw new Error('groupId is required.'); - if(groupId === 'habitrpg') return; - - firebaseRef.child('rooms/' + groupId) - .remove(); - - // FIXME not really necessary as long as we only store room data, - // as empty objects are automatically deleted (/members/... in future...) - firebaseRef.child('members/' + groupId) - .remove(); -}; - -// FIXME not really necessary as long as we only store room data, -// as empty objects are automatically deleted -api.deleteUser = function(userId){ - if(!isFirebaseEnabled) return; - if(!userId) throw new Error('userId is required.'); - - firebaseRef.child('users/' + userId) - .remove(); -}; \ No newline at end of file diff --git a/website/src/libs/i18n.js b/website/src/libs/i18n.js deleted file mode 100644 index 3edf901279..0000000000 --- a/website/src/libs/i18n.js +++ /dev/null @@ -1,177 +0,0 @@ -var fs = require('fs'), - path = require('path'), - _ = require('lodash'), - User = require('../models/user').model, - shared = require('../../../common'), - translations = {}; - -var localePath = path.join(__dirname, "/../../../common/locales/") - -var loadTranslations = function(locale){ - var files = fs.readdirSync(path.join(localePath, locale)); - translations[locale] = {}; - _.each(files, function(file){ - if(path.extname(file) !== '.json') return; - _.merge(translations[locale], require(path.join(localePath, locale, file))); - }); -}; - -// First fetch english so we can merge with missing strings in other languages -loadTranslations('en'); - -fs.readdirSync(localePath).forEach(function(file) { - if(file === 'en' || fs.statSync(path.join(localePath, file)).isDirectory() === false) return; - loadTranslations(file); - // Merge missing strings from english - _.defaults(translations[file], translations.en); -}); - -var langCodes = Object.keys(translations); - -var avalaibleLanguages = _.map(langCodes, function(langCode){ - return { - code: langCode, - name: translations[langCode].languageName - } -}); - -// Load MomentJS localization files -var momentLangs = {}; - -// Handle different language codes from MomentJS and /locales -var momentLangsMapping = { - 'en': 'en-gb', - 'en_GB': 'en-gb', - 'no': 'nn', - 'zh': 'zh-cn', - 'es_419': 'es' -}; - -var momentLangs = {}; - -_.each(langCodes, function(code){ - var lang = _.find(avalaibleLanguages, {code: code}); - lang.momentLangCode = (momentLangsMapping[code] || code); - try{ - // MomentJS lang files are JS files that has to be executed in the browser so we load them as plain text files - var f = fs.readFileSync(path.join(__dirname, '/../../../node_modules/moment/locale/' + lang.momentLangCode + '.js'), 'utf8'); - momentLangs[code] = f; - }catch (e){} -}); - -// Remove en_GB from langCodes checked by browser to avaoi it being -// used in place of plain original 'en' -var defaultLangCodes = _.without(langCodes, 'en_GB'); - -// A list of languages that have different versions -var multipleVersionsLanguages = ['es', 'zh']; - -var latinAmericanSpanishes = { - 'es-419': 'es_419', - 'es-mx': 'es_419', - 'es-gt': 'es_419', - 'es-cr': 'es_419', - 'es-pa': 'es_419', - 'es-do': 'es_419', - 'es-ve': 'es_419', - 'es-co': 'es_419', - 'es-pe': 'es_419', - 'es-ar': 'es_419', - 'es-ec': 'es_419', - 'es-cl': 'es_419', - 'es-uy': 'es_419', - 'es-py': 'es_419', - 'es-bo': 'es_419', - 'es-sv': 'es_419', - 'es-hn': 'es_419', - 'es-ni': 'es_419', - 'es-pr': 'es_419', -}; - -var chineseVersions = { - 'zh-tw': 'zh_TW', -}; - -var getUserLanguage = function(req, res, next){ - var getFromBrowser = function(){ - var acceptable = _(req.acceptedLanguages).map(function(lang){ - return lang.slice(0, 2); - }).uniq().value(); - - var matches = _.intersection(acceptable, defaultLangCodes); - - var iAcceptedCompleteLang = (matches.length > 0) ? multipleVersionsLanguages.indexOf(matches[0].toLowerCase()) : -1; - - if(iAcceptedCompleteLang !== -1){ - var acceptedCompleteLang = _.find(req.acceptedLanguages, function(accepted){ - return accepted.slice(0, 2) == multipleVersionsLanguages[iAcceptedCompleteLang]; - }); - - if(acceptedCompleteLang){ - acceptedCompleteLang = acceptedCompleteLang.toLowerCase(); - }else{ - return 'en'; - } - - if(matches[0] === 'es'){ - return latinAmericanSpanishes[acceptedCompleteLang] || 'es'; - }else if(matches[0] === 'zh'){ - return chineseVersions[acceptedCompleteLang] || 'zh'; - }else{ - return en; - } - - }else if(matches.length > 0){ - return matches[0].toLowerCase(); - }else{ - return 'en'; - } - }; - - var getFromUser = function(user){ - var lang; - if(user && user.preferences.language && translations[user.preferences.language]){ - lang = user.preferences.language; - }else{ - var preferred = getFromBrowser(); - lang = translations[preferred] ? preferred : 'en'; - } - req.language = lang; - next(); - }; - - if(req.query.lang){ - req.language = translations[req.query.lang] ? (req.query.lang) : 'en'; - next(); - }else if(req.locals && req.locals.user){ - getFromUser(req.locals.user); - }else if(req.session && req.session.userId){ - User.findOne({_id: req.session.userId}, 'preferences.language', function(err, user){ - if(err) return next(err); - getFromUser(user); - }); - }else{ - getFromUser(null); - } -}; - -shared.i18n.translations = translations; - -module.exports = { - translations: translations, - avalaibleLanguages: avalaibleLanguages, - langCodes: langCodes, - getUserLanguage: getUserLanguage, - momentLangs: momentLangs -}; - - -// Export en strings only, temporary solution for mobile -// This is copied from middlewares/locals#t() -module.exports.enTranslations = function(){ // stringName and vars are the allowed parameters - var language = _.find(avalaibleLanguages, {code: 'en'}); - //language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); - var args = Array.prototype.slice.call(arguments, 0); - args.push(language.code); - return shared.i18n.t.apply(null, args); -}; diff --git a/website/src/libs/logging.js b/website/src/libs/logging.js deleted file mode 100644 index f832adb6d5..0000000000 --- a/website/src/libs/logging.js +++ /dev/null @@ -1,57 +0,0 @@ -var nconf = require('nconf'); -var winston = require('winston'); - -var logger, loggly; - -// Currently disabled -if (nconf.get('LOGGLY:enabled')){ - loggly = require('loggly').createClient({ - token: nconf.get('LOGGLY:token'), - subdomain: nconf.get('LOGGLY:subdomain'), - auth: { - username: nconf.get('LOGGLY:username'), - password: nconf.get('LOGGLY:password') - }, - // - // Optional: Tag to send with EVERY log message - // - tags: [('heroku-'+nconf.get('BASE_URL'))], - json: true - }); -} - -if (!logger) { - logger = new (winston.Logger)({}); - - if (nconf.get('NODE_ENV') !== 'production') { - logger.add(winston.transports.Console, {colorize:true}); - logger.add(winston.transports.File, {filename: 'habitrpg.log'}); - } -} - -// A custom log function that wraps Winston. Makes it easy to instrument code -// and still possible to replace Winston in the future. -module.exports.log = function(/* variable args */) { - if (logger) - logger.log.apply(logger, arguments); -}; - -module.exports.info = function(/* variable args */) { - if (logger) - logger.info.apply(logger, arguments); -}; - -module.exports.warn = function(/* variable args */) { - if (logger) - logger.warn.apply(logger, arguments); -}; - -module.exports.error = function(/* variable args */) { - if (logger) - logger.error.apply(logger, arguments); -}; - -module.exports.loggly = function(/* variable args */){ - if (loggly) - loggly.log.apply(loggly, arguments); -}; diff --git a/website/src/middlewares/apiThrottle.js b/website/src/middlewares/apiThrottle.js deleted file mode 100644 index 8de298106c..0000000000 --- a/website/src/middlewares/apiThrottle.js +++ /dev/null @@ -1,24 +0,0 @@ -var nconf = require('nconf'); -var limiter = require('connect-ratelimit'); - -var IS_PROD = nconf.get('NODE_ENV') === 'production'; - -module.exports = function(app) { - // TODO review later - // disable the rate limiter middleware - if (/*!IS_PROD || */true) return; - app.use(limiter({ - end:false, - categories:{ - normal: { - // 2 req/s, but split as minutes - totalRequests: 80, - every: 60000 - } - } - })).use(function(req,res,next){ - //logging.info(res.ratelimit); - if (res.ratelimit.exceeded) return res.status(429).json({err:'Rate limit exceeded'}); - next(); - }); -}; diff --git a/website/src/middlewares/cors.js b/website/src/middlewares/cors.js deleted file mode 100644 index e72db26981..0000000000 --- a/website/src/middlewares/cors.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = function(req, res, next) { - res.header("Access-Control-Allow-Origin", req.headers.origin || "*"); - res.header("Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE"); - res.header("Access-Control-Allow-Headers", "Content-Type,Accept,Content-Encoding,X-Requested-With,x-api-user,x-api-key"); - if (req.method === 'OPTIONS') return res.sendStatus(200); - return next(); -}; diff --git a/website/src/middlewares/domain.js b/website/src/middlewares/domain.js deleted file mode 100644 index 55677ad693..0000000000 --- a/website/src/middlewares/domain.js +++ /dev/null @@ -1,49 +0,0 @@ -var nconf = require('nconf'); -var moment = require('moment'); -var domainMiddleware = require('domain-middleware'); -var os = require('os'); -var request = require('request'); - -var IS_PROD = nconf.get('NODE_ENV') === 'production'; - -module.exports = function(server,mongoose) { - if (IS_PROD) { - var mins = 3, // how often to run this check - useAvg = false, // use average over 3 minutes, or simply the last minute's report - url = 'https://api.newrelic.com/v2/applications/'+nconf.get('NEW_RELIC_APPLICATION_ID')+'/metrics/data.json?names[]=Apdex&values[]=score'; - setInterval(function(){ - // see https://docs.newrelic.com/docs/apm/apis/api-v2-examples/average-response-time-examples-api-v2, https://rpm.newrelic.com/api/explore/applications/data - request({ - url: useAvg ? url+'&from='+moment().subtract({minutes:mins}).utc().format()+'&to='+moment().utc().format()+'&summarize=true' : url, - headers: {'X-Api-Key': nconf.get('NEW_RELIC_API_KEY')} - }, function(err, response, body){ - var ts = JSON.parse(body).metric_data.metrics[0].timeslices, - score = ts[ts.length-1].values.score, - memory = os.freemem() / os.totalmem(), - memoryHigh = memory < 0.1; - - if (memoryHigh) { - var newRelicMemoryLeakMessage = '[Memory Leak] Apdex='+score+' Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format(); - throw newRelicMemoryLeakMessage; - } - }); - - var memory = os.freemem() / os.totalmem(), - memoryHigh = memory < 0.1; - if (memoryHigh) { - var memoryLeakMessage = '[Memory Leak] Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format(); - throw memoryLeakMessage; - } - }, mins*60*1000); - } - - return domainMiddleware({ - server: { - close:function(){ - server.close(); - mongoose.connection.close(); - } - }, - killTimeout: 10000 - }); -}; diff --git a/website/src/middlewares/errorHandler.js b/website/src/middlewares/errorHandler.js deleted file mode 100644 index 2b06824dce..0000000000 --- a/website/src/middlewares/errorHandler.js +++ /dev/null @@ -1,24 +0,0 @@ -var logging = require('../libs/logging'); - -module.exports = function(err, req, res, next) { - //res.locals.domain.emit('error', err); - // when we hit an error, send it to admin as an email. If no ADMIN_EMAIL is present, just send it to yourself (SMTP_USER) - var stack = (err.stack ? err.stack : err.message ? err.message : err) + - "\n ----------------------------\n" + - "\n\noriginalUrl: " + req.originalUrl + - "\n\nauth: " + req.headers['x-api-user'] + ' | ' + req.headers['x-api-key'] + - "\n\nheaders: " + JSON.stringify(req.headers) + - "\n\nbody: " + JSON.stringify(req.body) + - (res.locals.ops ? "\n\ncompleted ops: " + JSON.stringify(res.locals.ops) : ""); - logging.error(stack); - /*logging.loggly({ - error: "Uncaught error", - stack: (err.stack || err.message || err), - body: req.body, headers: req.header, - auth: req.headers['x-api-user'], - originalUrl: req.originalUrl - });*/ - var message = err.message ? err.message : err; - message = (message.length < 200) ? message : message.substring(0,100) + message.substring(message.length-100,message.length); - res.status(500).json({err:message}); //res.end(err.message); -}; diff --git a/website/src/middlewares/locals.js b/website/src/middlewares/locals.js deleted file mode 100644 index 2f238a6a99..0000000000 --- a/website/src/middlewares/locals.js +++ /dev/null @@ -1,70 +0,0 @@ -var nconf = require('nconf'); -var _ = require('lodash'); -var utils = require('../libs/utils'); -var shared = require('../../../common'); -var i18n = require('../libs/i18n'); -var buildManifest = require('../libs/buildManifest'); -var shared = require('../../../common'); -var forceRefresh = require('./forceRefresh'); -var tavernQuest = require('../models/group').tavernQuest; -var mods = require('../models/user').mods; - -// To avoid stringifying more data then we need, -// items from `env` used on the client will have to be specified in this array -var clientVars = ['language', 'isStaticPage', 'avalaibleLanguages', 'translations', - 'FACEBOOK_KEY', 'NODE_ENV', 'BASE_URL', 'GA_ID', - 'AMAZON_PAYMENTS', 'STRIPE_PUB_KEY', 'AMPLITUDE_KEY', - 'worldDmg', 'mods', 'IS_MOBILE']; - -var env = { - getManifestFiles: buildManifest.getManifestFiles, - getBuildUrl: buildManifest.getBuildUrl, - _: _, - clientVars: clientVars, - mods: mods, - Content: shared.content, - siteVersion: forceRefresh.siteVersion, - avalaibleLanguages: i18n.avalaibleLanguages, - AMAZON_PAYMENTS: { - SELLER_ID: nconf.get('AMAZON_PAYMENTS:SELLER_ID'), - CLIENT_ID: nconf.get('AMAZON_PAYMENTS:CLIENT_ID') - } -}; - -'NODE_ENV BASE_URL GA_ID STRIPE_PUB_KEY FACEBOOK_KEY AMPLITUDE_KEY'.split(' ').forEach(function(key){ - env[key] = nconf.get(key); -}); - -module.exports = function(req, res, next) { - var language = _.find(i18n.avalaibleLanguages, {code: req.language}); - var isStaticPage = req.url.split('/')[1] === 'static'; // If url contains '/static/' - - // Load moment.js language file only when not on static pages - language.momentLang = ((!isStaticPage && i18n.momentLangs[language.code]) || undefined); - - res.locals.habitrpg = _.assign(env, { - IS_MOBILE: /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')), - language: language, - isStaticPage: isStaticPage, - translations: i18n.translations[language.code], - t: function(){ // stringName and vars are the allowed parameters - var args = Array.prototype.slice.call(arguments, 0); - args.push(language.code); - return shared.i18n.t.apply(null, args); - }, - // Defined here and not outside of the middleware because tavernQuest might be an - // empty object until the query to fetch it finishes - worldDmg: (tavernQuest && tavernQuest.extra && tavernQuest.extra.worldDmg) || {}, - }); - - // Put query-string party (& guild but use partyInvite for backward compatibility) - // invitations into session to be handled later - // TODO once we have proper logging in place, log errors here - if(req.query.partyInvite){ - try{ - req.session.partyInvite = JSON.parse(utils.decrypt(req.query.partyInvite)); - } catch(e){} - } - - next(); -}; diff --git a/website/src/middlewares/redirects.js b/website/src/middlewares/redirects.js deleted file mode 100644 index ddc135beab..0000000000 --- a/website/src/middlewares/redirects.js +++ /dev/null @@ -1,41 +0,0 @@ -var nconf = require('nconf'); -var IS_PROD = nconf.get('NODE_ENV') === 'production'; -var ignoreRedirect = nconf.get('IGNORE_REDIRECT'); -var BASE_URL = nconf.get('BASE_URL'); - -function isHTTP(req) { - return ( - req.headers['x-forwarded-proto'] && - req.headers['x-forwarded-proto'] !== 'https' && - IS_PROD && - BASE_URL.indexOf('https') === 0 - ); -} - -function isProxied(req) { - return ( - req.headers['x-habitica-lb'] && - req.headers['x-habitica-lb'] === 'Yes' - ); -} - -module.exports.forceSSL = function(req, res, next){ - if(isHTTP(req) && !isProxied(req)) { - return res.redirect(BASE_URL + req.url); - } - - next(); -}; - -// Redirect to habitica for non-api urls - -function nonApiUrl(req) { - return req.url.search(/\/api\//) === -1; -} - -module.exports.forceHabitica = function(req, res, next) { - if (IS_PROD && !ignoreRedirect && !isProxied(req) && nonApiUrl(req)) { - return res.redirect(301, BASE_URL + req.url); - } - next(); -}; diff --git a/website/src/models/challenge.js b/website/src/models/challenge.js deleted file mode 100644 index d44b798bc0..0000000000 --- a/website/src/models/challenge.js +++ /dev/null @@ -1,120 +0,0 @@ -var mongoose = require("mongoose"); -var Schema = mongoose.Schema; -var shared = require('../../../common'); -var _ = require('lodash'); -var TaskSchemas = require('./task'); - -var ChallengeSchema = new Schema({ - _id: {type: String, 'default': shared.uuid}, - name: String, - shortName: String, - description: String, - official: {type: Boolean,'default':false}, - habits: [TaskSchemas.HabitSchema], - dailys: [TaskSchemas.DailySchema], - todos: [TaskSchemas.TodoSchema], - rewards: [TaskSchemas.RewardSchema], - leader: {type: String, ref: 'User'}, - group: {type: String, ref: 'Group'}, - timestamp: {type: Date, 'default': Date.now}, - members: [{type: String, ref: 'User'}], - memberCount: {type: Number, 'default': 0}, - prize: {type: Number, 'default': 0} -}); - -ChallengeSchema.virtual('tasks').get(function () { - var tasks = this.habits.concat(this.dailys).concat(this.todos).concat(this.rewards); - var tasks = _.object(_.pluck(tasks,'id'), tasks); - return tasks; -}); - -ChallengeSchema.methods.toJSON = function(){ - var doc = this.toObject(); - doc._isMember = this._isMember; - return doc; -} - -// -------------- -// Syncing logic -// -------------- - -function syncableAttrs(task) { - var t = (task.toObject) ? task.toObject() : task; // lodash doesn't seem to like _.omit on EmbeddedDocument - // only sync/compare important attrs - var omitAttrs = 'challenge history tags completed streak notes'.split(' '); - if (t.type != 'reward') omitAttrs.push('value'); - return _.omit(t, omitAttrs); -} - -/** - * Compare whether any changes have been made to tasks. If so, we'll want to sync those changes to subscribers - */ -function comparableData(obj) { - return JSON.stringify( - _(obj.habits.concat(obj.dailys).concat(obj.todos).concat(obj.rewards)) - .sortBy('id') // we don't want to update if they're sort-order is different - .transform(function(result, task){ - result.push(syncableAttrs(task)); - }) - .value()) -} - -ChallengeSchema.methods.isOutdated = function(newData) { - return comparableData(this) !== comparableData(newData); -} - -/** - * Syncs all new tasks, deleted tasks, etc to the user object - * @param user - * @return nothing, user is modified directly. REMEMBER to save the user! - */ -ChallengeSchema.methods.syncToUser = function(user, cb) { - if (!user) return; - var self = this; - self.shortName = self.shortName || self.name; - - // Add challenge to user.challenges - if (!_.contains(user.challenges, self._id)) { - user.challenges.push(self._id); - } - - // Sync tags - var tags = user.tags || []; - var i = _.findIndex(tags, {id: self._id}) - if (~i) { - if (tags[i].name !== self.shortName) { - // update the name - it's been changed since - user.tags[i].name = self.shortName; - } - } else { - user.tags.push({ - id: self._id, - name: self.shortName, - challenge: true - }); - } - - // Sync new tasks and updated tasks - _.each(self.tasks, function(task){ - var list = user[task.type+'s']; - var userTask = user.tasks[task.id] || (list.push(syncableAttrs(task)), list[list.length-1]); - if (!userTask.notes) userTask.notes = task.notes; // don't override the notes, but provide it if not provided - userTask.challenge = {id:self._id}; - userTask.tags = userTask.tags || {}; - userTask.tags[self._id] = true; - _.merge(userTask, syncableAttrs(task)); - }) - - // Flag deleted tasks as "broken" - _.each(user.tasks, function(task){ - if (task.challenge && task.challenge.id==self._id && !self.tasks[task.id]) { - task.challenge.broken = 'TASK_DELETED'; - } - }) - - user.save(cb); -}; - - -module.exports.schema = ChallengeSchema; -module.exports.model = mongoose.model("Challenge", ChallengeSchema); diff --git a/website/src/models/coupon.js b/website/src/models/coupon.js deleted file mode 100644 index 3b0afb3f2a..0000000000 --- a/website/src/models/coupon.js +++ /dev/null @@ -1,59 +0,0 @@ -var mongoose = require("mongoose"); -var shared = require('../../../common'); -var _ = require('lodash'); -var async = require('async'); -var cc = require('coupon-code'); -var autoinc = require('mongoose-id-autoinc'); - -var CouponSchema = new mongoose.Schema({ - _id: {type: String, 'default': cc.generate}, - event: {type:String, enum:['wondercon','google_6mo']}, - user: {type: 'String', ref: 'User'} -}); - -CouponSchema.statics.generate = function(event, count, callback) { - async.times(count, function(n,cb){ - mongoose.model('Coupon').create({event: event}, cb); - }, callback); -} - -CouponSchema.statics.apply = function(user, code, next){ - async.auto({ - get_coupon: function (cb) { - mongoose.model('Coupon').findById(cc.validate(code), cb); - }, - apply_coupon: ['get_coupon', function (cb, results) { - if (!results.get_coupon) return cb("Invalid coupon code"); - if (results.get_coupon.user) return cb("Coupon already used"); - switch (results.get_coupon.event) { - case 'wondercon': - user.items.gear.owned.eyewear_special_wondercon_red = true; - user.items.gear.owned.eyewear_special_wondercon_black = true; - user.items.gear.owned.back_special_wondercon_black = true; - user.items.gear.owned.back_special_wondercon_red = true; - user.items.gear.owned.body_special_wondercon_red = true; - user.items.gear.owned.body_special_wondercon_black = true; - user.items.gear.owned.body_special_wondercon_gold = true; - user.extra = {signupEvent: 'wondercon'}; - user.save(cb); - break; - } - }], - expire_coupon: ['apply_coupon', function (cb, results) { - results.get_coupon.user = user._id; - results.get_coupon.save(cb); - }] - }, function(err, results){ - if (err) return next(err); - next(null,results.apply_coupon[0]); - }) -} - -CouponSchema.plugin(autoinc.plugin, { - model: 'Coupon', - field: 'seq' -}); - -module.exports.schema = CouponSchema; -module.exports.model = mongoose.model("Coupon", CouponSchema); - diff --git a/website/src/models/emailUnsubscription.js b/website/src/models/emailUnsubscription.js deleted file mode 100644 index 144417f3fc..0000000000 --- a/website/src/models/emailUnsubscription.js +++ /dev/null @@ -1,14 +0,0 @@ -var mongoose = require("mongoose"); -var shared = require('../../../common'); - -// A collection used to store mailing list unsubscription for non registered email addresses -var EmailUnsubscriptionSchema = new mongoose.Schema({ - _id: { - type: String, - 'default': shared.uuid - }, - email: String -}); - -module.exports.schema = EmailUnsubscriptionSchema; -module.exports.model = mongoose.model('EmailUnsubscription', EmailUnsubscriptionSchema); \ No newline at end of file diff --git a/website/src/models/group.js b/website/src/models/group.js deleted file mode 100644 index caed72331e..0000000000 --- a/website/src/models/group.js +++ /dev/null @@ -1,501 +0,0 @@ -var mongoose = require("mongoose"); -var Schema = mongoose.Schema; -var User = require('./user').model; -var shared = require('../../../common'); -var _ = require('lodash'); -var async = require('async'); -var logging = require('../libs/logging'); -var Challenge = require('./../models/challenge').model; -var firebase = require('../libs/firebase'); - -// NOTE any change to groups' members in MongoDB will have to be run through the API -// changes made directly to the db will cause Firebase to get out of sync -var GroupSchema = new Schema({ - _id: {type: String, 'default': shared.uuid}, - name: String, - description: String, - leader: {type: String, ref: 'User'}, - members: [{type: String, ref: 'User'}], - invites: [{type: String, ref: 'User'}], - type: {type: String, "enum": ['guild', 'party']}, - privacy: {type: String, "enum": ['private', 'public'], 'default':'private'}, - //_v: {type: Number,'default': 0}, - chat: Array, - /* - # [{ - # timestamp: Date - # user: String - # text: String - # contributor: String - # uuid: String - # id: String - # }] - */ - leaderOnly: { // restrict group actions to leader (members can't do them) - challenges: {type:Boolean, 'default':false}, - //invites: {type:Boolean, 'default':false} - }, - memberCount: {type: Number, 'default': 0}, - challengeCount: {type: Number, 'default': 0}, - balance: Number, - logo: String, - leaderMessage: String, - challenges: [{type:'String', ref:'Challenge'}], // do we need this? could depend on back-ref instead (Challenge.find({group:GID})) - quest: { - key: String, - active: {type:Boolean, 'default':false}, - leader: {type:String, ref:'User'}, - progress:{ - hp: Number, - collect: {type:Schema.Types.Mixed, 'default':{}}, // {feather: 5, ingot: 3} - rage: Number, // limit break / "energy stored in shell", for explosion-attacks - }, - - //Shows boolean for each party-member who has accepted the quest. Eg {UUID: true, UUID: false}. Once all users click - //'Accept', the quest begins. If a false user waits too long, probably a good sign to prod them or boot them. - //TODO when booting user, remove from .joined and check again if we can now start the quest - members: Schema.Types.Mixed, - extra: Schema.Types.Mixed - } -}, { - strict: 'throw', - minimize: false // So empty objects are returned -}); - -/** - * Derby duplicated stuff. This is a temporary solution, once we're completely off derby we'll run an mongo migration - * to remove duplicates, then take these fucntions out - */ -function removeDuplicates(doc){ - // Remove duplicate members - if (doc.members) { - var uniqMembers = _.uniq(doc.members); - if (uniqMembers.length != doc.members.length) { - doc.members = uniqMembers; - } - } -} - -// FIXME this isn't always triggered, since we sometimes use update() or findByIdAndUpdate() -// @see https://github.com/LearnBoost/mongoose/issues/964 -GroupSchema.pre('save', function(next){ - removeDuplicates(this); - this.memberCount = _.size(this.members); - this.challengeCount = _.size(this.challenges); - next(); -}) - -GroupSchema.pre('remove', function(next) { - var group = this; - async.waterfall([ - function(cb) { - var invitationQuery = {}; - var groupType = group.type; - //Add an 's' to group type guild because the model has the plural version - if (group.type == "guild") groupType += "s"; - invitationQuery['invitations.' + groupType + '.id'] = group._id; - User.find(invitationQuery, cb); - }, - function(users, cb) { - if (users) { - users.forEach(function (user, index, array) { - if ( group.type == "party" ) { - user.invitations.party = {}; - } else { - var i = _.findIndex(user.invitations.guilds, {id: group._id}); - user.invitations.guilds.splice(i, 1); - } - user.save(); - }); - } - cb(); - } - ], next); -}); - -GroupSchema.post('remove', function(group) { - firebase.deleteGroup(group._id); -}); - -GroupSchema.methods.toJSON = function(){ - var doc = this.toObject(); - removeDuplicates(doc); - doc._isMember = this._isMember; - - //fix(groups): temp fix to remove chat entries stored as strings (not sure why that's happening..). - // Required as angular 1.3 is strict on dupes, and no message.id to `track by` - _.remove(doc.chat,function(msg){return !msg.id}); - - // @see pre('save') comment above - this.memberCount = _.size(this.members); - this.challengeCount = _.size(this.challenges); - - return doc; -} - -var chatDefaults = module.exports.chatDefaults = function(msg,user){ - var message = { - id: shared.uuid(), - text: msg, - timestamp: +new Date, - likes: {}, - flags: {}, - flagCount: 0 - }; - if (user) { - _.defaults(message, { - uuid: user._id, - contributor: user.contributor && user.contributor.toObject(), - backer: user.backer && user.backer.toObject(), - user: user.profile.name - }); - } else { - message.uuid = 'system'; - } - return message; -} - -var NO_CHAT_NOTIFICATIONS = ['habitrpg'] - -GroupSchema.methods.sendChat = function(message, user){ - var group = this; - group.chat.unshift(chatDefaults(message,user)); - group.chat.splice(200); - // Kick off chat notifications in the background. - var lastSeenUpdate = {$set:{}, $inc:{_v:1}}; - lastSeenUpdate['$set']['newMessages.'+group._id] = {name:group.name,value:true}; - if (NO_CHAT_NOTIFICATIONS.indexOf(group._id) !== -1 || group.memberCount > 5000) { - // TODO For Tavern, only notify them if their name was mentioned - // var profileNames = [] // get usernames from regex of @xyz. how to handle space-delimited profile names? - // User.update({'profile.name':{$in:profileNames}},lastSeenUpdate,{multi:true}).exec(); - } else { - mongoose.model('User').update({_id:{$in:group.members, $ne: user ? user._id : ''}},lastSeenUpdate,{multi:true}).exec(); - } -} - -var cleanQuestProgress = function(merge){ - var clean = { - key: null, - progress: { - up: 0, - down: 0, - collect: {} - }, - completed: null, - RSVPNeeded: false - }; - merge = merge || {progress:{}}; - _.merge(clean, _.omit(merge,'progress')); - _.merge(clean.progress, merge.progress); - return clean; -} -GroupSchema.statics.cleanQuestProgress = cleanQuestProgress; - -// Participants: Grant rewards & achievements, finish quest -GroupSchema.methods.finishQuest = function(quest, cb) { - var group = this; - var questK = quest.key; - var updates = {$inc:{},$set:{}}; - - updates['$inc']['achievements.quests.' + questK] = 1; - updates['$inc']['stats.gp'] = +quest.drop.gp; - updates['$inc']['stats.exp'] = +quest.drop.exp; - updates['$inc']['_v'] = 1; - if (group._id == 'habitrpg') { - updates['$set']['party.quest.completed'] = questK; // Just show the notif - } else { - updates['$set']['party.quest'] = cleanQuestProgress({completed: questK}); // clear quest progress - } - - _.each(quest.drop.items, function(item){ - var dropK = item.key; - switch (item.type) { - case 'gear': - // TODO This means they can lose their new gear on death, is that what we want? - updates['$set']['items.gear.owned.'+dropK] = true; - break; - case 'eggs': - case 'food': - case 'hatchingPotions': - case 'quests': - updates['$inc']['items.'+item.type+'.'+dropK] = _.where(quest.drop.items,{type:item.type,key:item.key}).length; - break; - case 'pets': - updates['$set']['items.pets.'+dropK] = 5; - break; - case 'mounts': - updates['$set']['items.mounts.'+dropK] = true; - break; - } - }) - var q = group._id === 'habitrpg' ? {} : {_id:{$in:_.keys(group.quest.members)}}; - group.quest = {};group.markModified('quest'); - mongoose.model('User').update(q, updates, {multi:true}, cb); -} - -function isOnQuest(user,progress,group){ - return group && progress && group.quest && group.quest.active && group.quest.members[user._id] === true; -} - -GroupSchema.statics.collectQuest = function(user, progress, cb) { - this.findOne({type: 'party', members: {'$in': [user._id]}},function(err, group){ - if (!isOnQuest(user,progress,group)) return cb(null); - var quest = shared.content.quests[group.quest.key]; - - _.each(progress.collect,function(v,k){ - group.quest.progress.collect[k] += v; - }); - - var foundText = _.reduce(progress.collect, function(m,v,k){ - m.push(v + ' ' + quest.collect[k].text('en')); - return m; - }, []); - foundText = foundText ? foundText.join(', ') : 'nothing'; - group.sendChat("`" + user.profile.name + " found "+foundText+".`"); - group.markModified('quest.progress.collect'); - - // Still needs completing - if (_.find(shared.content.quests[group.quest.key].collect, function(v,k){ - return group.quest.progress.collect[k] < v.count; - })) return group.save(cb); - - async.series([ - function(cb2){ - group.finishQuest(quest,cb2); - }, - function(cb2){ - group.sendChat('`All items found! Party has received their rewards.`'); - group.save(cb2); - } - ],cb); - }) -} - -// to set a boss: `db.groups.update({_id:'habitrpg'},{$set:{quest:{key:'dilatory',active:true,progress:{hp:1000,rage:1500}}}})` -module.exports.tavernQuest = {}; -var tavernQ = {_id:'habitrpg','quest.key':{$ne:null}}; -process.nextTick(function(){ - mongoose.model('Group').findOne(tavernQ, function(err,tavern){ - if (!tavern) return; // No tavern quest - - var quest = tavern.quest.toObject(); - // Using _assign so we don't lose the reference to the exported tavernQuest - _.assign(module.exports.tavernQuest, quest); - }); -}); - -GroupSchema.statics.tavernBoss = function(user,progress) { - if (!progress) return; - - // hack: prevent crazy damage to world boss - var dmg = Math.min(900, Math.abs(progress.up||0)), - rage = -Math.min(900, Math.abs(progress.down||0)); - - async.waterfall([ - function(cb){ - mongoose.model('Group').findOne(tavernQ,cb); - }, - function(tavern,cb){ - if (!(tavern && tavern.quest && tavern.quest.key)) return cb(true); - - var quest = shared.content.quests[tavern.quest.key]; - if (tavern.quest.progress.hp <= 0) { - tavern.sendChat(quest.completionChat('en')); - tavern.finishQuest(quest, function(){}); - tavern.save(cb); - _.assign(module.exports.tavernQuest, {extra: null}); - } else { - // Deal damage. Note a couple things here, str & def are calculated. If str/def are defined in the database, - // use those first - which allows us to update the boss on the go if things are too easy/hard. - if (!tavern.quest.extra) tavern.quest.extra = {}; - tavern.quest.progress.hp -= dmg / (tavern.quest.extra.def || quest.boss.def); - tavern.quest.progress.rage -= rage * (tavern.quest.extra.str || quest.boss.str); - if (tavern.quest.progress.rage >= quest.boss.rage.value) { - if (!tavern.quest.extra.worldDmg) tavern.quest.extra.worldDmg = {}; - var wd = tavern.quest.extra.worldDmg; - var scene = wd.market ? wd.stables ? wd.bailey ? false : 'bailey' : 'stables' : 'market'; // Be-Wilder attacks Alex, Matt, Bailey - if (!scene) { - tavern.sendChat('`'+quest.boss.name('en')+' tries to unleash '+quest.boss.rage.title('en')+', but is too tired.`'); - tavern.quest.progress.rage = 0 //quest.boss.rage.value; - } else { - tavern.sendChat(quest.boss.rage[scene]('en')); - tavern.quest.extra.worldDmg[scene] = true; - tavern.quest.extra.worldDmg.recent = scene; - tavern.markModified('quest.extra.worldDmg'); - tavern.quest.progress.rage = 0; - if (quest.boss.rage.healing) { - tavern.quest.progress.hp += (quest.boss.rage.healing * tavern.quest.progress.hp); - } - } - } - if (quest.boss.desperation && (tavern.quest.progress.hp < quest.boss.desperation.threshold) && !tavern.quest.extra.desperate) { - tavern.sendChat(quest.boss.desperation.text('en')); - tavern.quest.extra.desperate = true; - tavern.quest.extra.def = quest.boss.desperation.def; - tavern.quest.extra.str = quest.boss.desperation.str; - tavern.markModified('quest.extra'); - } - - _.assign(module.exports.tavernQuest, tavern.quest.toObject()); - tavern.save(cb); - } - } - ],function(err,res){ - if (err === true) return; // no current quest - if (err) return logging.error(err); - dmg = rage = null; - }) -} - -GroupSchema.statics.bossQuest = function(user, progress, cb) { - this.findOne({type: 'party', members: {'$in': [user._id]}},function(err, group){ - if (!isOnQuest(user,progress,group)) return cb(null); - var quest = shared.content.quests[group.quest.key]; - if (!progress || !quest) return cb(null); // FIXME why is this ever happening, progress should be defined at this point - var down = progress.down * quest.boss.str; // multiply by boss strength - - group.quest.progress.hp -= progress.up; - group.sendChat("`" + user.profile.name + " attacks " + quest.boss.name('en') + " for " + (progress.up.toFixed(1)) + " damage.` `" + quest.boss.name('en') + " attacks party for " + Math.abs(down).toFixed(1) + " damage.`"); //TODO Create a party preferred language option so emits like this can be localized - - // If boss has Rage, increment Rage as well - if (quest.boss.rage) { - group.quest.progress.rage += Math.abs(down); - if (group.quest.progress.rage >= quest.boss.rage.value) { - group.sendChat(quest.boss.rage.effect('en')); - group.quest.progress.rage = 0; - if (quest.boss.rage.healing) group.quest.progress.hp += (group.quest.progress.hp * quest.boss.rage.healing); //TODO To make Rage effects more expandable, let's turn these into functions in quest.boss.rage - if (group.quest.progress.hp > quest.boss.hp) group.quest.progress.hp = quest.boss.hp; - } - } - // Everyone takes damage - var series = [ - function(cb2){ - mongoose.models.User.update({_id:{$in: _.keys(group.quest.members)}}, {$inc:{'stats.hp':down, _v:1}}, {multi:true}, cb2); - } - ] - - // Boss slain, finish quest - if (group.quest.progress.hp <= 0) { - group.sendChat('`You defeated ' + quest.boss.name('en') + '! Questing party members receive the rewards of victory.`'); - // Participants: Grant rewards & achievements, finish quest - series.push(function(cb2){ - group.finishQuest(quest,cb2); - }); - } - - series.push(function(cb2){group.save(cb2)}); - async.series(series,cb); - }) -} - -// Remove user from this group -GroupSchema.methods.leave = function(user, keep, mainCb){ - if(!user) return mainCb(new Error('Missing user.')); - - if(keep && typeof keep === 'function'){ - mainCb = keep; - keep = null; - } - if(typeof keep !== 'string') keep = 'keep-all'; // can be also 'remove-all' - - var group = this; - - async.parallel([ - // Remove user from group challenges - function(cb){ - async.waterfall([ - // Find relevant challenges - function(cb2) { - Challenge.find({ - _id: {$in: user.challenges}, // Challenges I am in - group: group._id // that belong to the group I am leaving - }, cb2); - }, - - // Update each challenge - function(challenges, cb2) { - Challenge.update( - {_id: {$in: _.pluck(challenges, '_id')}}, - {$pull: {members: user._id}}, - {multi: true}, - function(err) { - cb2(err, challenges); // pass `challenges` above to cb - } - ); - }, - - // Unlink the challenge tasks from user - function(challenges, cb2) { - async.waterfall(challenges.map(function(chal) { - return function(cb3) { - var i = user.challenges.indexOf(chal._id) - if (~i) user.challenges.splice(i,1); - user.unlink({cid: chal._id, keep: keep}, cb3); - } - }), cb2); - } - ], cb); - }, - - // Update the group - function(cb){ - // If user is the last one in group and group is private, delete it - if(group.members.length === 1 && ( - group.type === 'party' || - (group.type === 'guild' && group.privacy === 'private') - )){ - group.remove(cb) - }else{ // otherwise just remove a member - var update = {$pull: {members: user._id}}; - - // If the leader is leaving (or if the leader previously left, and this wasn't accounted for) - var leader = group.leader; - - if(leader == user._id || !~group.members.indexOf(leader)){ - var seniorMember = _.find(group.members, function (m) {return m != user._id}); - - // could not exist in case of public guild with 1 member who is leaving - if(seniorMember){ - if (leader == user._id || !~group.members.indexOf(leader)) { - update['$set'] = update['$set'] || {}; - update['$set'].leader = seniorMember; - } - } - } - - update['$inc'] = {memberCount: -1}; - Group.update({_id: group._id}, update, cb); - } - } - ], function(err){ - if(err) return mainCb(err); - - firebase.removeUserFromGroup(group._id, user._id); - return mainCb(); - }); -}; - - -GroupSchema.methods.toJSON = function() { - var doc = this.toObject(); - - return doc; -}; - - -module.exports.schema = GroupSchema; -var Group = module.exports.model = mongoose.model("Group", GroupSchema); - -// initialize tavern if !exists (fresh installs) -Group.count({_id: 'habitrpg'}, function(err, ct){ - if (ct > 0) return; - - new Group({ - _id: 'habitrpg', - chat: [], - leader: '9', - name: 'HabitRPG', - type: 'guild', - privacy: 'public' - }).save(); -}); diff --git a/website/src/models/task.js b/website/src/models/task.js deleted file mode 100644 index 97a0e1e7c6..0000000000 --- a/website/src/models/task.js +++ /dev/null @@ -1,113 +0,0 @@ -// User.js -// ======= -// Defines the user data model (schema) for use via the API. - -// Dependencies -// ------------ -var mongoose = require("mongoose"); -var Schema = mongoose.Schema; -var shared = require('../../../common'); -var _ = require('lodash'); -var moment = require('moment'); - -// Task Schema -// ----------- - -var TaskSchema = { - //_id:{type: String,'default': helpers.uuid}, - id: {type: String,'default': shared.uuid}, - dateCreated: {type:Date, 'default':Date.now}, - text: String, - notes: {type: String, 'default': ''}, - tags: {type: Schema.Types.Mixed, 'default': {}}, //{ "4ddf03d9-54bd-41a3-b011-ca1f1d2e9371" : true }, - value: {type: Number, 'default': 0}, // redness - priority: {type: Number, 'default': '1'}, - attribute: {type: String, 'default': "str", enum: ['str','con','int','per']}, - challenge: { - id: {type: 'String', ref:'Challenge'}, - broken: String, // CHALLENGE_DELETED, TASK_DELETED, UNSUBSCRIBED, CHALLENGE_CLOSED - winner: String // user.profile.name - // group: {type: 'Strign', ref: 'Group'} // if we restore this, rename `id` above to `challenge` - }, - reminders: [{ - id: {type:String,'default':shared.uuid}, - startDate: Date, - time: Date - }] -}; - -var HabitSchema = new Schema( - _.defaults({ - type: {type:String, 'default': 'habit'}, - history: Array, // [{date:Date, value:Number}], // this causes major performance problems - up: {type: Boolean, 'default': true}, - down: {type: Boolean, 'default': true} - }, TaskSchema) - , { _id: false, minimize:false } -); - -var collapseChecklist = {type:Boolean, 'default':false}; -var checklist = [{ - completed:{type:Boolean,'default':false}, - text: String, - _id:false, - id: {type:String,'default':shared.uuid} -}]; - -var DailySchema = new Schema( - _.defaults({ - type: {type: String, 'default': 'daily'}, - frequency: {type: String, 'default': 'weekly', enum: ['daily', 'weekly']}, - everyX: {type: Number, 'default': 1}, // e.g. once every X weeks - startDate: {type: Date, 'default': moment().startOf('day').toDate()}, - history: Array, - completed: {type: Boolean, 'default': false}, - repeat: { // used only for 'weekly' frequency, - m: {type: Boolean, 'default': true}, - t: {type: Boolean, 'default': true}, - w: {type: Boolean, 'default': true}, - th: {type: Boolean, 'default': true}, - f: {type: Boolean, 'default': true}, - s: {type: Boolean, 'default': true}, - su: {type: Boolean, 'default': true} - }, - collapseChecklist:collapseChecklist, - checklist:checklist, - streak: {type: Number, 'default': 0} - }, TaskSchema) - , { _id: false, minimize:false } -) - -var TodoSchema = new Schema( - _.defaults({ - type: {type:String, 'default': 'todo'}, - completed: {type: Boolean, 'default': false}, - dateCompleted: Date, - date: String, // due date for todos // FIXME we're getting parse errors, people have stored as "today" and "3/13". Need to run a migration & put this back to type: Date - collapseChecklist:collapseChecklist, - checklist:checklist - }, TaskSchema) - , { _id: false, minimize:false } -); - -var RewardSchema = new Schema( - _.defaults({ - type: {type:String, 'default': 'reward'} - }, TaskSchema) - , { _id: false, minimize:false } -); - -/** - * Workaround for bug when _id & id were out of sync, we can remove this after challenges has been running for a while - */ -//_.each([HabitSchema, DailySchema, TodoSchema, RewardSchema], function(schema){ -// schema.post('init', function(doc){ -// if (!doc.id && doc._id) doc.id = doc._id; -// }) -//}) - -module.exports.TaskSchema = TaskSchema; -module.exports.HabitSchema = HabitSchema; -module.exports.DailySchema = DailySchema; -module.exports.TodoSchema = TodoSchema; -module.exports.RewardSchema = RewardSchema; diff --git a/website/src/models/user.js b/website/src/models/user.js deleted file mode 100644 index 895fd834d2..0000000000 --- a/website/src/models/user.js +++ /dev/null @@ -1,697 +0,0 @@ -// User.js -// ======= -// Defines the user data model (schema) for use via the API. - -// Dependencies -// ------------ -var mongoose = require("mongoose"); -var Schema = mongoose.Schema; -var shared = require('../../../common'); -var _ = require('lodash'); -var TaskSchemas = require('./task'); -var Challenge = require('./challenge').model; -var moment = require('moment'); - -// User Schema -// ----------- - -var UserSchema = new Schema({ - // ### UUID and API Token - _id: { - type: String, - 'default': shared.uuid - }, - apiToken: { - type: String, - 'default': shared.uuid - }, - - // ### Mongoose Update Object - // We want to know *every* time an object updates. Mongoose uses __v to designate when an object contains arrays which - // have been updated (http://goo.gl/gQLz41), but we want *every* update - _v: { type: Number, 'default': 0 }, - achievements: { - originalUser: Boolean, - habitSurveys: Number, - ultimateGearSets: Schema.Types.Mixed, - beastMaster: Boolean, - beastMasterCount: Number, - mountMaster: Boolean, - mountMasterCount: Number, - triadBingo: Boolean, - triadBingoCount: Number, - veteran: Boolean, - snowball: Number, - spookDust: Number, - shinySeed: Number, - seafoam: Number, - streak: Number, - challenges: Array, - quests: Schema.Types.Mixed, - rebirths: Number, - rebirthLevel: Number, - perfect: Number, - habitBirthdays: Number, - valentine: Number, - costumeContest: Boolean, // Superseded by costumeContests - nye: Number, - habiticaDays: Number, - greeting: Number, - thankyou: Number, - costumeContests: Number, - birthday: Number, - partyUp: Boolean, - partyOn: Boolean - }, - auth: { - blocked: Boolean, - facebook: Schema.Types.Mixed, - local: { - email: String, - hashed_password: String, - salt: String, - username: String, - lowerCaseUsername: String // Store a lowercase version of username to check for duplicates - }, - timestamps: { - created: {type: Date,'default': Date.now}, - loggedin: {type: Date,'default': Date.now} - } - }, - - backer: { - tier: Number, - npc: String, - tokensApplied: Boolean - }, - - contributor: { - level: Number, // 1-9, see https://trello.com/c/wkFzONhE/277-contributor-gear https://github.com/HabitRPG/habitrpg/issues/3801 - admin: Boolean, - sudo: Boolean, - text: String, // Artisan, Friend, Blacksmith, etc - contributions: String, // a markdown textarea to list their contributions + links - critical: String - }, - - balance: {type: Number, 'default':0}, - filters: {type: Schema.Types.Mixed, 'default': {}}, - - purchased: { - ads: {type: Boolean, 'default': false}, - skin: {type: Schema.Types.Mixed, 'default': {}}, // eg, {skeleton: true, pumpkin: true, eb052b: true} - hair: {type: Schema.Types.Mixed, 'default': {}}, - shirt: {type: Schema.Types.Mixed, 'default': {}}, - background: {type: Schema.Types.Mixed, 'default': {}}, - txnCount: {type: Number, 'default':0}, - mobileChat: Boolean, - plan: { - planId: String, - paymentMethod: String, //enum: ['Paypal','Stripe', 'Gift', 'Amazon Payments', '']} - customerId: String, // Billing Agreement Id in case of Amazon Payments - dateCreated: Date, - dateTerminated: Date, - dateUpdated: Date, - extraMonths: {type:Number, 'default':0}, - gemsBought: {type: Number, 'default': 0}, - mysteryItems: {type: Array, 'default': []}, - lastBillingDate: Date, // Used only for Amazon Payments to keep track of billing date - consecutive: { - count: {type:Number, 'default':0}, - offset: {type:Number, 'default':0}, // when gifted subs, offset++ for each month. offset-- each new-month (cron). count doesn't ++ until offset==0 - gemCapExtra: {type:Number, 'default':0}, - trinkets: {type:Number, 'default':0} - } - } - }, - - flags: { - customizationsNotification: {type: Boolean, 'default': false}, - showTour: {type: Boolean, 'default': true}, - tour: { - // -1 indicates "uninitiated", -2 means "complete", any other number is the current tour step (0-index) - intro: {type: Number, 'default': -1}, - classes: {type: Number, 'default': -1}, - stats: {type: Number, 'default': -1}, - tavern: {type: Number, 'default': -1}, - party: {type: Number, 'default': -1}, - guilds: {type: Number, 'default': -1}, - challenges: {type: Number, 'default': -1}, - market: {type: Number, 'default': -1}, - pets: {type: Number, 'default': -1}, - mounts: {type: Number, 'default': -1}, - hall: {type: Number, 'default': -1}, - equipment: {type: Number, 'default': -1} - }, - tutorial: { - common: { - habits: {type: Boolean, 'default': false}, - dailies: {type: Boolean, 'default': false}, - todos: {type: Boolean, 'default': false}, - rewards: {type: Boolean, 'default': false}, - party: {type: Boolean, 'default': false}, - pets: {type: Boolean, 'default': false}, - gems: {type: Boolean, 'default': false}, - skills: {type: Boolean, 'default': false}, - classes: {type: Boolean, 'default': false}, - tavern: {type: Boolean, 'default': false}, - equipment: {type: Boolean, 'default': false}, - items: {type: Boolean, 'default': false}, - }, - ios: { - addTask: {type: Boolean, 'default': false}, - editTask: {type: Boolean, 'default': false}, - deleteTask: {type: Boolean, 'default': false}, - filterTask: {type: Boolean, 'default': false}, - groupPets: {type: Boolean, 'default': false}, - inviteParty: {type: Boolean, 'default': false}, - } - }, - dropsEnabled: {type: Boolean, 'default': false}, - itemsEnabled: {type: Boolean, 'default': false}, - newStuff: {type: Boolean, 'default': false}, - rewrite: {type: Boolean, 'default': true}, - contributor: Boolean, - classSelected: {type: Boolean, 'default': false}, - mathUpdates: Boolean, - rebirthEnabled: {type: Boolean, 'default': false}, - levelDrops: {type:Schema.Types.Mixed, 'default':{}}, - chatRevoked: Boolean, - // Used to track the status of recapture emails sent to each user, - // can be 0 - no email sent - 1, 2, 3 or 4 - 4 means no more email will be sent to the user - recaptureEmailsPhase: {type: Number, 'default': 0}, - // Needed to track the tip to send inside the email - weeklyRecapEmailsPhase: {type: Number, 'default': 0}, - // Used to track when the next weekly recap should be sent - lastWeeklyRecap: {type: Date, 'default': Date.now}, - // Used to enable weekly recap emails as users login - lastWeeklyRecapDiscriminator: Boolean, - communityGuidelinesAccepted: {type: Boolean, 'default': false}, - cronCount: {type:Number, 'default':0}, - welcomed: {type: Boolean, 'default': false}, - armoireEnabled: {type: Boolean, 'default': false}, - armoireOpened: {type: Boolean, 'default': false}, - armoireEmpty: {type: Boolean, 'default': false}, - cardReceived: {type: Boolean, 'default': false}, - warnedLowHealth: {type: Boolean, 'default': false} - }, - history: { - exp: Array, // [{date: Date, value: Number}], // big peformance issues if these are defined - todos: Array //[{data: Date, value: Number}] // big peformance issues if these are defined - }, - - invitations: { - guilds: {type: Array, 'default': []}, - party: Schema.Types.Mixed - }, - items: { - gear: { - owned: _.transform(shared.content.gear.flat, function(m,v,k){ - m[v.key] = {type: Boolean}; - if (v.key.match(/[armor|head|shield]_warrior_0/)) - m[v.key]['default'] = true; - }), - - equipped: { - weapon: String, - armor: {type: String, 'default': 'armor_base_0'}, - head: {type: String, 'default': 'head_base_0'}, - shield: {type: String, 'default': 'shield_base_0'}, - back: String, - headAccessory: String, - eyewear: String, - body: String - }, - costume: { - weapon: String, - armor: {type: String, 'default': 'armor_base_0'}, - head: {type: String, 'default': 'head_base_0'}, - shield: {type: String, 'default': 'shield_base_0'}, - back: String, - headAccessory: String, - eyewear: String, - body: String - } - }, - - special:{ - snowball: {type: Number, 'default': 0}, - spookDust: {type: Number, 'default': 0}, - shinySeed: {type: Number, 'default': 0}, - seafoam: {type: Number, 'default': 0}, - valentine: Number, - valentineReceived: Array, // array of strings, by sender name - nye: Number, - nyeReceived: Array, - greeting: Number, - greetingReceived: Array, - thankyou: Number, - thankyouReceived: Array, - birthday: Number, - birthdayReceived: Array - }, - - // -------------- Animals ------------------- - // Complex bit here. The result looks like: - // pets: { - // 'Wolf-Desert': 0, // 0 means does not own - // 'PandaCub-Red': 10, // Number represents "Growth Points" - // etc... - // } - pets: - _.defaults( - // First transform to a 1D eggs/potions mapping - _.transform(shared.content.pets, function(m,v,k){ m[k] = Number; }), - // Then add additional pets (quest, backer, contributor, premium) - _.transform(shared.content.questPets, function(m,v,k){ m[k] = Number; }), - _.transform(shared.content.specialPets, function(m,v,k){ m[k] = Number; }), - _.transform(shared.content.premiumPets, function(m,v,k){ m[k] = Number; }) - ), - currentPet: String, // Cactus-Desert - - // eggs: { - // 'PandaCub': 0, // 0 indicates "doesn't own" - // 'Wolf': 5 // Number indicates "stacking" - // } - eggs: _.transform(shared.content.eggs, function(m,v,k){ m[k] = Number; }), - - // hatchingPotions: { - // 'Desert': 0, // 0 indicates "doesn't own" - // 'CottonCandyBlue': 5 // Number indicates "stacking" - // } - hatchingPotions: _.transform(shared.content.hatchingPotions, function(m,v,k){ m[k] = Number; }), - - // Food: { - // 'Watermelon': 0, // 0 indicates "doesn't own" - // 'RottenMeat': 5 // Number indicates "stacking" - // } - food: _.transform(shared.content.food, function(m,v,k){ m[k] = Number; }), - - // mounts: { - // 'Wolf-Desert': true, - // 'PandaCub-Red': false, - // etc... - // } - mounts: _.defaults( - // First transform to a 1D eggs/potions mapping - _.transform(shared.content.pets, function(m,v,k){ m[k] = Boolean; }), - // Then add quest and premium pets - _.transform(shared.content.questPets, function(m,v,k){ m[k] = Boolean; }), - _.transform(shared.content.premiumPets, function(m,v,k){ m[k] = Boolean; }), - // Then add additional mounts (backer, contributor) - _.transform(shared.content.specialMounts, function(m,v,k){ m[k] = Boolean; }) - ), - currentMount: String, - - // Quests: { - // 'boss_0': 0, // 0 indicates "doesn't own" - // 'collection_honey': 5 // Number indicates "stacking" - // } - quests: _.transform(shared.content.quests, function(m,v,k){ m[k] = Number; }), - - lastDrop: { - date: {type: Date, 'default': Date.now}, - count: {type: Number, 'default': 0} - } - }, - - lastCron: {type: Date, 'default': Date.now}, - - // {GROUP_ID: Boolean}, represents whether they have unseen chat messages - newMessages: {type: Schema.Types.Mixed, 'default': {}}, - - party: { - // id // FIXME can we use a populated doc instead of fetching party separate from user? - order: {type:String, 'default':'level'}, - orderAscending: {type:String, 'default':'ascending'}, - quest: { - key: String, - progress: { - up: {type: Number, 'default': 0}, - down: {type: Number, 'default': 0}, - collect: {type: Schema.Types.Mixed, 'default': {}} // {feather:1, ingot:2} - }, - completed: String, // When quest is done, we move it from key => completed, and it's a one-time flag (for modal) that they unset by clicking "ok" in browser - RSVPNeeded: {type: Boolean, 'default': false} // Set to true when invite is pending, set to false when quest invite is accepted or rejected, quest starts, or quest is cancelled - } - }, - preferences: { - dayStart: {type:Number, 'default': 0, min: 0, max: 23}, - size: {type:String, enum: ['broad','slim'], 'default': 'slim'}, - hair: { - color: {type: String, 'default': 'red'}, - base: {type: Number, 'default': 3}, - bangs: {type: Number, 'default': 1}, - beard: {type: Number, 'default': 0}, - mustache: {type: Number, 'default': 0}, - flower: {type: Number, 'default': 1} - }, - chair: {type: String, 'default': 'none'}, - hideHeader: {type:Boolean, 'default':false}, - skin: {type:String, 'default':'915533'}, - shirt: {type: String, 'default': 'blue'}, - timezoneOffset: Number, - timezoneOffsetAtLastCron: Number, - sound: {type:String, 'default':'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']}, - language: String, - automaticAllocation: Boolean, - allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'}, - autoEquip: {type: Boolean, 'default': true}, - costume: Boolean, - dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy', 'yyyy/MM/dd'], 'default': 'MM/dd/yyyy'}, - sleep: {type: Boolean, 'default': false}, - stickyHeader: {type: Boolean, 'default': true}, - disableClasses: {type: Boolean, 'default': false}, - newTaskEdit: {type: Boolean, 'default': false}, - dailyDueDefaultView: {type: Boolean, 'default': false}, - tagsCollapsed: {type: Boolean, 'default': false}, - advancedCollapsed: {type: Boolean, 'default': false}, - toolbarCollapsed: {type:Boolean, 'default':false}, - reverseChatOrder: {type:Boolean, 'default':false}, - background: String, - displayInviteToPartyWhenPartyIs1: { type:Boolean, 'default':true}, - webhooks: {type: Schema.Types.Mixed, 'default': {}}, - // For this fields make sure to use strict comparison when searching for falsey values (=== false) - // As users who didn't login after these were introduced may have them undefined/null - emailNotifications: { - unsubscribeFromAll: {type: Boolean, 'default': false}, - newPM: {type: Boolean, 'default': true}, - kickedGroup: {type: Boolean, 'default': true}, - wonChallenge: {type: Boolean, 'default': true}, - giftedGems: {type: Boolean, 'default': true}, - giftedSubscription: {type: Boolean, 'default': true}, - invitedParty: {type: Boolean, 'default': true}, - invitedGuild: {type: Boolean, 'default': true}, - questStarted: {type: Boolean, 'default': true}, - invitedQuest: {type: Boolean, 'default': true}, - //remindersToLogin: {type: Boolean, 'default': true}, - // Those importantAnnouncements are in fact the recapture emails - importantAnnouncements: {type: Boolean, 'default': true}, - weeklyRecaps: {type: Boolean, 'default': true} - }, - suppressModals: { - levelUp: {type: Boolean, 'default': false}, - hatchPet: {type: Boolean, 'default': false}, - raisePet: {type: Boolean, 'default': false}, - streak: {type: Boolean, 'default': false} - }, - improvementCategories: { - type: Array, - validate: (categories) => { - const validCategories = ['work', 'exercise', 'healthWellness', 'school', 'teams', 'chores', 'creativity']; - let isValidCategory = categories.every(category => validCategories.indexOf(category) !== -1); - return isValidCategory; - }} - }, - profile: { - blurb: String, - imageUrl: String, - name: String - }, - stats: { - hp: {type: Number, 'default': shared.maxHealth}, - mp: {type: Number, 'default': 10}, - exp: {type: Number, 'default': 0}, - gp: {type: Number, 'default': 0}, - lvl: {type: Number, 'default': 1}, - - // Class System - 'class': {type: String, enum: ['warrior','rogue','wizard','healer'], 'default': 'warrior'}, - points: {type: Number, 'default': 0}, - str: {type: Number, 'default': 0}, - con: {type: Number, 'default': 0}, - int: {type: Number, 'default': 0}, - per: {type: Number, 'default': 0}, - buffs: { - str: {type: Number, 'default': 0}, - int: {type: Number, 'default': 0}, - per: {type: Number, 'default': 0}, - con: {type: Number, 'default': 0}, - stealth: {type: Number, 'default': 0}, - streaks: {type: Boolean, 'default': false}, - snowball: {type: Boolean, 'default': false}, - spookDust: {type: Boolean, 'default': false}, - shinySeed: {type: Boolean, 'default': false}, - seafoam: {type: Boolean, 'default': false} - }, - training: { - int: {type: Number, 'default': 0}, - per: {type: Number, 'default': 0}, - str: {type: Number, 'default': 0}, - con: {type: Number, 'default': 0} - } - }, - - tags: {type: [{ - _id: false, - id: { type: String, 'default': shared.uuid }, - name: String, - challenge: String - }]}, - - challenges: [{type: 'String', ref:'Challenge'}], - - inbox: { - newMessages: {type:Number, 'default':0}, - blocks: {type:Array, 'default':[]}, - messages: {type:Schema.Types.Mixed, 'default':{}}, //reflist - optOut: {type:Boolean, 'default':false} - }, - - habits: {type:[TaskSchemas.HabitSchema]}, - dailys: {type:[TaskSchemas.DailySchema]}, - todos: {type:[TaskSchemas.TodoSchema]}, - rewards: {type:[TaskSchemas.RewardSchema]}, - - extra: Schema.Types.Mixed, - - pushDevices: {type: [{ - regId: {type: String}, - type: {type: String} - }],'default': []} - -}, { - strict: true, - minimize: false // So empty objects are returned -}); - -UserSchema.methods.deleteTask = function(tid) { - this.ops.deleteTask({params:{id:tid}},function(){}); // TODO remove this whole method, since it just proxies, and change all references to this method -} - -UserSchema.methods.toJSON = function() { - var doc = this.toObject(); - doc.id = doc._id; - - // FIXME? Is this a reference to `doc.filters` or just disabled code? Remove? - doc.filters = {}; - doc._tmp = this._tmp; // be sure to send down drop notifs - - return doc; -}; - -//UserSchema.virtual('tasks').get(function () { -// var tasks = this.habits.concat(this.dailys).concat(this.todos).concat(this.rewards); -// var tasks = _.object(_.pluck(tasks,'id'), tasks); -// return tasks; -//}); - -UserSchema.post('init', function(doc){ - shared.wrap(doc); -}) - -UserSchema.pre('save', function(next) { - - // Populate new users with default content - if (this.isNew){ - _populateDefaultsForNewUser(this); - } - - //this.markModified('tasks'); - if (_.isNaN(this.preferences.dayStart) || this.preferences.dayStart < 0 || this.preferences.dayStart > 23) { - this.preferences.dayStart = 0; - } - - if (!this.profile.name) { - var fb = this.auth.facebook; - this.profile.name = - (this.auth.local && this.auth.local.username) || - (fb && (fb.displayName || fb.name || fb.username || (fb.first_name && fb.first_name + ' ' + fb.last_name))) || - 'Anonymous'; - } - - // Determines if Beast Master should be awarded - var beastMasterProgress = shared.count.beastMasterProgress(this.items.pets); - if (beastMasterProgress >= 90 || this.achievements.beastMasterCount > 0) { - this.achievements.beastMaster = true; - } - - // Determines if Mount Master should be awarded - var mountMasterProgress = shared.count.mountMasterProgress(this.items.mounts); - - if (mountMasterProgress >= 90 || this.achievements.mountMasterCount > 0) { - this.achievements.mountMaster = true; - } - - // Determines if Triad Bingo should be awarded - - var dropPetCount = shared.count.dropPetsCurrentlyOwned(this.items.pets); - var qualifiesForTriad = dropPetCount >= 90 && mountMasterProgress >= 90; - - if (qualifiesForTriad || this.achievements.triadBingoCount > 0) { - this.achievements.triadBingo = true; - } - - // Enable weekly recap emails for old users who sign in - if(this.flags.lastWeeklyRecapDiscriminator){ - // Enable weekly recap emails in 24 hours - this.flags.lastWeeklyRecap = moment().subtract(6, 'days').toDate(); - // Unset the field so this is run only once - this.flags.lastWeeklyRecapDiscriminator = undefined; - } - - // EXAMPLE CODE for allowing all existing and new players to be - // automatically granted an item during a certain time period: - // if (!this.items.pets['JackOLantern-Base'] && moment().isBefore('2014-11-01')) - // this.items.pets['JackOLantern-Base'] = 5; - - //our own version incrementer - if (_.isNaN(this._v) || !_.isNumber(this._v)) this._v = 0; - this._v++; - - next(); -}); - -UserSchema.methods.unlink = function(options, cb) { - var cid = options.cid, keep = options.keep, tid = options.tid; - if (!cid) { - return cb("Could not remove challenge tasks. Please delete them manually."); - } - var self = this; - switch (keep) { - case 'keep': - self.tasks[tid].challenge = {}; - break; - case 'remove': - self.deleteTask(tid); - break; - case 'keep-all': - _.each(self.tasks, function(t){ - if (t.challenge && t.challenge.id == cid) { - t.challenge = {}; - } - }); - break; - case 'remove-all': - _.each(self.tasks, function(t){ - if (t.challenge && t.challenge.id == cid) { - self.deleteTask(t.id); - } - }) - break; - } - self.markModified('habits'); - self.markModified('dailys'); - self.markModified('todos'); - self.markModified('rewards'); - self.save(cb); -} - -function _populateDefaultsForNewUser(user) { - var taskTypes; - - if (user.registeredThrough === "habitica-web" || user.registeredThrough === "habitica-android") { - taskTypes = ['habits', 'dailys', 'todos', 'rewards', 'tags']; - - var tutorialCommonSections = [ - 'habits', - 'dailies', - 'todos', - 'rewards', - 'party', - 'pets', - 'gems', - 'skills', - 'classes', - 'tavern', - 'equipment', - 'items', - 'inviteParty', - ]; - - _.each(tutorialCommonSections, function(section) { - user.flags.tutorial.common[section] = true; - }); - } else { - taskTypes = ['todos', 'tags'] - - user.flags.showTour = false; - - var tourSections = [ - 'showTour', - 'intro', - 'classes', - 'stats', - 'tavern', - 'party', - 'guilds', - 'challenges', - 'market', - 'pets', - 'mounts', - 'hall', - 'equipment', - ]; - - _.each(tourSections, function(section) { - user.flags.tour[section] = -2; - }); - } - - _populateDefaultTasks(user, taskTypes); -} - -function _populateDefaultTasks (user, taskTypes) { - _.each(taskTypes, function(taskType){ - user[taskType] = _.map(shared.content.userDefaults[taskType], function(task){ - var newTask = _.cloneDeep(task); - - // Render task's text and notes in user's language - if(taskType === 'tags'){ - // tasks automatically get id=helpers.uuid() from TaskSchema id.default, but tags are Schema.Types.Mixed - so we need to manually invoke here - newTask.id = shared.uuid(); - newTask.name = newTask.name(user.preferences.language); - }else{ - newTask.text = newTask.text(user.preferences.language); - if(newTask.notes) { - newTask.notes = newTask.notes(user.preferences.language); - } - - if(newTask.checklist){ - newTask.checklist = _.map(newTask.checklist, function(checklistItem){ - checklistItem.text = checklistItem.text(user.preferences.language); - return checklistItem; - }); - } - } - - return newTask; - }); - }); -} - -module.exports.schema = UserSchema; -module.exports.model = mongoose.model("User", UserSchema); -// Initially export an empty object so external requires will get -// the right object by reference when it's defined later -// Otherwise it would remain undefined if requested before the query executes -module.exports.mods = []; - -mongoose.model("User") - .find({'contributor.admin':true}) - .sort('-contributor.level -backer.npc profile.name') - .select('profile contributor backer') - .exec(function(err,mods){ - // Using push to maintain the reference to mods - module.exports.mods.push.apply(module.exports.mods, mods); -}); diff --git a/website/src/routes/api-v1.js b/website/src/routes/api-v1.js deleted file mode 100644 index b3408f523d..0000000000 --- a/website/src/routes/api-v1.js +++ /dev/null @@ -1,173 +0,0 @@ -var express = require('express'); -var router = express.Router(); -var _ = require('lodash'); -var async = require('async'); -var icalendar = require('icalendar'); -var api = require('./../controllers/api-v2/user'); -var auth = require('./../controllers/api-v2/auth'); -var logging = require('./../libs/logging'); -var i18n = require('./../libs/i18n'); -var forceRefresh = require('../middlewares/forceRefresh').middleware; - -/* ---------- Deprecated API ------------*/ - -var initDeprecated = function(req, res, next) { - req.headers['x-api-user'] = req.params.uid; - req.headers['x-api-key'] = req.body.apiToken; - return next(); -}; - -router.post('/v1/users/:uid/tasks/:taskId/:direction', initDeprecated, auth.auth, i18n.getUserLanguage, api.score); - -// FIXME add this back in -router.get('/v1/users/:uid/calendar.ics', i18n.getUserLanguage, function(req, res, next) { - return next() //disable for now - - var apiToken, model, query, uid; - uid = req.params.uid; - apiToken = req.query.apiToken; - model = req.getModel(); - query = model.query('users').withIdAndToken(uid, apiToken); - return query.fetch(function(err, result) { - var formattedIcal, ical, tasks, tasksWithDates; - if (err) { - return res.send(500, err); - } - tasks = result.get('tasks'); - /* tasks = result[0].tasks*/ - - tasksWithDates = _.filter(tasks, function(task) { - return !!task.date; - }); - if (_.isEmpty(tasksWithDates)) { - return res.send(500, "No events found"); - } - ical = new icalendar.iCalendar(); - ical.addProperty('NAME', 'HabitRPG'); - _.each(tasksWithDates, function(task) { - var d, event; - event = new icalendar.VEvent(task.id); - event.setSummary(task.text); - d = new Date(task.date); - d.date_only = true; - event.setDate(d); - ical.addComponent(event); - return true; - }); - res.type('text/calendar'); - formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:'); - return res.send(200, formattedIcal); - }); -}); - -/* - ------------------------------------------------------------------------ - Batch Update - This is super-deprecated, and will be removed once apiv2 is running against mobile for a while - ------------------------------------------------------------------------ - */ -var batchUpdate = function(req, res, next) { - var user = res.locals.user; - var oldSend = res.send; - var oldJson = res.json; - var performAction = function(action, cb) { - - // req.body=action.data; delete action.data; _.defaults(req.params, action) - // Would require changing action.dir on mobile app - req.params.id = action.data && action.data.id; - req.params.direction = action.dir; - req.params.type = action.type; - req.body = action.data; - res.send = res.json = function(code, data) { - if (_.isNumber(code) && code >= 400) { - logging.error({ - code: code, - data: data - }); - } - //FIXME send error messages down - return cb(); - }; - switch (action.op) { - case "score": - api.score(req, res); - break; - case "addTask": - api.addTask(req, res); - break; - case "delTask": - api.deleteTask(req, res); - break; - case "revive": - api.revive(req, res); - break; - default: - cb(); - break; - } - }; - - // Setup the array of functions we're going to call in parallel with async - var actions = _.transform(req.body || [], function(result, action) { - if (!_.isEmpty(action)) { - result.push(function(cb) { - performAction(action, cb); - }); - } - }); - - // call all the operations, then return the user object to the requester - async.series(actions, function(err) { - res.json = oldJson; - res.send = oldSend; - if (err) return res.json(500, {err: err}); - var response = user.toJSON(); - response.wasModified = res.locals.wasModified; - if (response._tmp && response._tmp.drop){ - res.json(200, {_tmp: {drop: response._tmp.drop}, _v: response._v}); - }else if(response.wasModified){ - res.json(200, response); - }else{ - res.json(200, {_v: response._v}); - } - }); -}; - -/* - ------------------------------------------------------------------------ - API v1 Routes - ------------------------------------------------------------------------ - */ - - -var cron = api.cron; - -router.get('/status', i18n.getUserLanguage, function(req, res) { - return res.json({ - status: 'up' - }); -}); - -// Scoring -router.post('/user/task/:id/:direction', auth.auth, i18n.getUserLanguage, cron, api.score); -router.post('/user/tasks/:id/:direction', auth.auth, i18n.getUserLanguage, cron, api.score); - -// Tasks -router.get('/user/tasks', auth.auth, i18n.getUserLanguage, cron, api.getTasks); -router.get('/user/task/:id', auth.auth, i18n.getUserLanguage, cron, api.getTask); -router.delete('/user/task/:id', auth.auth, i18n.getUserLanguage, cron, api.deleteTask); -router.post('/user/task', auth.auth, i18n.getUserLanguage, cron, api.addTask); - -// User -router.get('/user', auth.auth, i18n.getUserLanguage, cron, api.getUser); -router.post('/user/revive', auth.auth, i18n.getUserLanguage, cron, api.revive); -router.post('/user/batch-update', forceRefresh, auth.auth, i18n.getUserLanguage, cron, batchUpdate); - -function deprecated(req, res) { - res.json(404, {err:'API v1 is no longer supported, please use API v2 instead (https://github.com/HabitRPG/habitrpg/blob/develop/API.md)'}); -} -router.get('*', i18n.getUserLanguage, deprecated); -router.post('*', i18n.getUserLanguage, deprecated); -router.put('*', i18n.getUserLanguage, deprecated); - -module.exports = router; diff --git a/website/src/routes/api-v2/auth.js b/website/src/routes/api-v2/auth.js deleted file mode 100644 index 62e506d097..0000000000 --- a/website/src/routes/api-v2/auth.js +++ /dev/null @@ -1,21 +0,0 @@ -var auth = require('../../controllers/api-v2/auth'); -var express = require('express'); -var i18n = require('../../libs/i18n'); -var router = express.Router(); - -/* auth.auth*/ -auth.setupPassport(router); //FIXME make this consistent with the others -router.post('/api/v2/register', i18n.getUserLanguage, auth.registerUser); -router.post('/api/v2/user/auth/local', i18n.getUserLanguage, auth.loginLocal); -router.post('/api/v2/user/auth/social', i18n.getUserLanguage, auth.loginSocial); -router.delete('/api/v2/user/auth/social', i18n.getUserLanguage, auth.auth, auth.deleteSocial); -router.post('/api/v2/user/reset-password', i18n.getUserLanguage, auth.resetPassword); -router.post('/api/v2/user/change-password', i18n.getUserLanguage, auth.auth, auth.changePassword); -router.post('/api/v2/user/change-username', i18n.getUserLanguage, auth.auth, auth.changeUsername); -router.post('/api/v2/user/change-email', i18n.getUserLanguage, auth.auth, auth.changeEmail); -router.post('/api/v2/user/auth/firebase', i18n.getUserLanguage, auth.auth, auth.getFirebaseToken); - -router.post('/api/v1/register', i18n.getUserLanguage, auth.registerUser); -router.post('/api/v1/user/auth/local', i18n.getUserLanguage, auth.loginLocal); -router.post('/api/v1/user/auth/social', i18n.getUserLanguage, auth.loginSocial); -module.exports = router; diff --git a/website/src/routes/api-v2/coupon.js b/website/src/routes/api-v2/coupon.js deleted file mode 100644 index 9057758d3a..0000000000 --- a/website/src/routes/api-v2/coupon.js +++ /dev/null @@ -1,12 +0,0 @@ -var nconf = require('nconf'); -var express = require('express'); -var router = express.Router(); -var auth = require('../../controllers/api-v2/auth'); -var coupon = require('../../controllers/api-v2/coupon'); -var i18n = require('../../libs/i18n'); - -router.get('/api/v2/coupons', auth.authWithUrl, i18n.getUserLanguage, coupon.ensureAdmin, coupon.getCoupons); -router.post('/api/v2/coupons/generate/:event', auth.auth, i18n.getUserLanguage, coupon.ensureAdmin, coupon.generateCoupons); -router.post('/api/v2/user/coupon/:code', auth.auth, i18n.getUserLanguage, coupon.enterCode); - -module.exports = router; diff --git a/website/src/routes/api-v2/unsubscription.js b/website/src/routes/api-v2/unsubscription.js deleted file mode 100644 index 882fb10392..0000000000 --- a/website/src/routes/api-v2/unsubscription.js +++ /dev/null @@ -1,8 +0,0 @@ -var express = require('express'); -var router = express.Router(); -var i18n = require('../../libs/i18n'); -var unsubscription = require('../../controllers/api-v2/unsubscription'); - -router.get('/unsubscribe', i18n.getUserLanguage, unsubscription.unsubscribe); - -module.exports = router; diff --git a/website/src/routes/dataexport.js b/website/src/routes/dataexport.js deleted file mode 100644 index 9dd8511e3d..0000000000 --- a/website/src/routes/dataexport.js +++ /dev/null @@ -1,16 +0,0 @@ -var express = require('express'); -var router = express.Router(); -var dataexport = require('../controllers/dataexport'); -var auth = require('../controllers/api-v2/auth'); -var nconf = require('nconf'); -var i18n = require('../libs/i18n'); -var locals = require('../middlewares/locals'); - -/* Data export */ -router.get('/history.csv',auth.authWithSession,i18n.getUserLanguage,dataexport.history); //[todo] encode data output options in the data controller and use these to build routes -router.get('/userdata.xml',auth.authWithSession,i18n.getUserLanguage,dataexport.leanuser,dataexport.userdata.xml); -router.get('/userdata.json',auth.authWithSession,i18n.getUserLanguage,dataexport.leanuser,dataexport.userdata.json); -router.get('/avatar-:uuid.html', i18n.getUserLanguage, locals, dataexport.avatarPage); -router.get('/avatar-:uuid.png', i18n.getUserLanguage, locals, dataexport.avatarImage); - -module.exports = router; diff --git a/website/src/routes/pages.js b/website/src/routes/pages.js deleted file mode 100644 index 3c8ee639a4..0000000000 --- a/website/src/routes/pages.js +++ /dev/null @@ -1,55 +0,0 @@ -var nconf = require('nconf'); -var express = require('express'); -var router = express.Router(); -var _ = require('lodash'); -var locals = require('../middlewares/locals'); -var i18n = require('../libs/i18n'); - -const TOTAL_USER_COUNT = '1,100,000'; - -// -------- App -------- -router.get('/', i18n.getUserLanguage, locals, function(req, res) { - if (!req.headers['x-api-user'] && !req.headers['x-api-key'] && !(req.session && req.session.userId)) - return res.redirect('/static/front'); - - return res.render('index', { - title: 'Habitica | Your Life The Role Playing Game', - env: res.locals.habitrpg - }); -}); - -// -------- Static Pages -------- - -var pages = ['front', 'privacy', 'terms', 'api', 'features', 'videos', 'contact', 'plans', 'new-stuff', 'community-guidelines', 'old-news', 'press-kit', 'faq', 'overview', 'apps', 'clear-browser-data', 'merch']; - -_.each(pages, function(name){ - router.get('/static/' + name, i18n.getUserLanguage, locals, function(req, res) { - res.render( 'static/' + name, { - env: res.locals.habitrpg, - marked: require('marked'), - userCount: TOTAL_USER_COUNT - }); - }); -}); - -// -------- Social Media Sharing -------- - -var shareables = ['level-up','hatch-pet','raise-pet','unlock-quest','won-challenge','achievement']; - -_.each(shareables, function(name){ - router.get('/social/' + name, i18n.getUserLanguage, locals, function(req, res) { - res.render( 'social/' + name, { - env: res.locals.habitrpg, - marked: require('marked'), - userCount: TOTAL_USER_COUNT - }); - }); -}); - -// --------- Redirects -------- - -router.get('/static/extensions', function(req, res) { - res.redirect('http://habitica.wikia.com/wiki/App_and_Extension_Integrations'); -}); - -module.exports = router; diff --git a/website/src/routes/payments.js b/website/src/routes/payments.js deleted file mode 100644 index c385c835c7..0000000000 --- a/website/src/routes/payments.js +++ /dev/null @@ -1,31 +0,0 @@ -var nconf = require('nconf'); -var express = require('express'); -var router = express.Router(); -var auth = require('../controllers/api-v2/auth'); -var payments = require('../controllers/payments'); -var i18n = require('../libs/i18n'); - -router.get('/paypal/checkout', auth.authWithUrl, i18n.getUserLanguage, payments.paypalCheckout); -router.get('/paypal/checkout/success', i18n.getUserLanguage, payments.paypalCheckoutSuccess); -router.get('/paypal/subscribe', auth.authWithUrl, i18n.getUserLanguage, payments.paypalSubscribe); -router.get('/paypal/subscribe/success', i18n.getUserLanguage, payments.paypalSubscribeSuccess); -router.get('/paypal/subscribe/cancel', auth.authWithUrl, i18n.getUserLanguage, payments.paypalSubscribeCancel); -router.post('/paypal/ipn', i18n.getUserLanguage, payments.paypalIPN); // misc ipn handling - -router.post('/stripe/checkout', auth.auth, i18n.getUserLanguage, payments.stripeCheckout); -router.post('/stripe/subscribe/edit', auth.auth, i18n.getUserLanguage, payments.stripeSubscribeEdit); -//router.get('/stripe/subscribe', auth.authWithUrl, i18n.getUserLanguage, payments.stripeSubscribe); // checkout route is used (above) with ?plan= instead -router.get('/stripe/subscribe/cancel', auth.authWithUrl, i18n.getUserLanguage, payments.stripeSubscribeCancel); - -router.post('/amazon/verifyAccessToken', auth.auth, i18n.getUserLanguage, payments.amazonVerifyAccessToken); -router.post('/amazon/createOrderReferenceId', auth.auth, i18n.getUserLanguage, payments.amazonCreateOrderReferenceId); -router.post('/amazon/checkout', auth.auth, i18n.getUserLanguage, payments.amazonCheckout); -router.post('/amazon/subscribe', auth.auth, i18n.getUserLanguage, payments.amazonSubscribe); -router.get('/amazon/subscribe/cancel', auth.authWithUrl, i18n.getUserLanguage, payments.amazonSubscribeCancel); - -router.post('/iap/android/verify', auth.authWithUrl, /*i18n.getUserLanguage, */payments.iapAndroidVerify); -router.post('/iap/ios/verify', auth.auth, /*i18n.getUserLanguage, */ payments.iapIosVerify); - -router.get('/api/v2/coupons/valid-discount/:code', /*auth.authWithUrl, i18n.getUserLanguage, */ payments.validCoupon); - -module.exports = router; diff --git a/website/src/server.js b/website/src/server.js deleted file mode 100644 index 86349fcdcd..0000000000 --- a/website/src/server.js +++ /dev/null @@ -1,178 +0,0 @@ -if (process.env.NODE_ENV !== 'production') { - require('babel-register'); -} -// Only do the minimal amount of work before forking just in case of a dyno restart -var cluster = require("cluster"); -var _ = require('lodash'); -var nconf = require('nconf'); -var utils = require('./libs/utils'); -utils.setupConfig(); -var logging = require('./libs/logging'); -var isProd = nconf.get('NODE_ENV') === 'production'; -var isDev = nconf.get('NODE_ENV') === 'development'; -var DISABLE_LOGGING = nconf.get('DISABLE_REQUEST_LOGGING'); -var cores = +nconf.get("WEB_CONCURRENCY") || 0; -var moment = require('moment'); - -if (cores!==0 && cluster.isMaster && (isDev || isProd)) { - // Fork workers. If config.json has CORES=x, use that - otherwise, use all cpus-1 (production) - _.times(cores, function () { - cluster.fork(); - }); - - cluster.on('disconnect', function(worker, code, signal) { - var w = cluster.fork(); // replace the dead worker - logging.info('[%s] [master:%s] worker:%s disconnect! new worker:%s fork', new Date(), process.pid, worker.process.pid, w.process.pid); - }); - -} else { - var express = require("express"); - var bodyParser = require('body-parser'); - var session = require('cookie-session'); - var logger = require('morgan'); - var compression = require('compression'); - var favicon = require('serve-favicon'); - - var BODY_PARSER_LIMIT = '1mb'; - - var http = require("http"); - var path = require("path"); - var swagger = require("swagger-node-express"); - var autoinc = require('mongoose-id-autoinc'); - var shared = require('../../common'); - - // Setup translations - var i18n = require('./libs/i18n'); - - var TWO_WEEKS = 1000 * 60 * 60 * 24 * 14; - var app = express(); - var server = http.createServer(); - - // ------------ MongoDB Configuration ------------ - var mongoose = require('mongoose'); - var mongooseOptions = !isProd ? {} : { - replset: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } }, - server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } } - }; - var db = mongoose.connect(nconf.get('NODE_DB_URI'), mongooseOptions, function(err) { - if (err) throw err; - logging.info('Connected with Mongoose'); - }); - autoinc.init(db); - - require('./libs/firebase'); - - // load schemas & models - require('./models/challenge'); - require('./models/group'); - require('./models/user'); - - // ------------ Passport Configuration ------------ - var passport = require('passport') - var util = require('util') - var FacebookStrategy = require('passport-facebook').Strategy; - // Passport session setup. - // To support persistent login sessions, Passport needs to be able to - // serialize users into and deserialize users out of the session. Typically, - // this will be as simple as storing the user ID when serializing, and finding - // the user by ID when deserializing. However, since this example does not - // have a database of user records, the complete Facebook profile is serialized - // and deserialized. - passport.serializeUser(function(user, done) { - done(null, user); - }); - - passport.deserializeUser(function(obj, done) { - done(null, obj); - }); - - // FIXME - // This auth strategy is no longer used. It's just kept around for auth.js#loginFacebook() (passport._strategies.facebook.userProfile) - // The proper fix would be to move to a general OAuth module simply to verify accessTokens - passport.use(new FacebookStrategy({ - clientID: nconf.get("FACEBOOK_KEY"), - clientSecret: nconf.get("FACEBOOK_SECRET"), - //callbackURL: nconf.get("BASE_URL") + "/auth/facebook/callback" - }, - function(accessToken, refreshToken, profile, done) { - done(null, profile); - } - )); - - // ------------ Server Configuration ------------ - var publicDir = path.join(__dirname, "/../public"); - - app.set("port", nconf.get('PORT')); - - // Setup two different Express apps, one that matches everything except '/api/v3' - // and the other for /api/v3 routes, so we can keep the old an new api versions completely separate - // not sharing a single middleware if we don't want to - var oldApp = express(); // api v1 and v2, and not scoped routes - var newApp = express(); // api v3 - - // Matches all request except the ones going to /api/v3/** - app.all(/^(?!\/api\/v3).+/i, oldApp); - // Matches all requests going to /api/v3 - app.all('/api/v3', newApp); - - require('./middlewares/apiThrottle')(oldApp); - oldApp.use(require('./middlewares/domain')(server,mongoose)); - if (!isProd && !DISABLE_LOGGING) oldApp.use(logger("dev")); - oldApp.use(compression()); - oldApp.set("views", __dirname + "/../views"); - oldApp.set("view engine", "jade"); - oldApp.use(favicon(publicDir + '/favicon.ico')); - oldApp.use(require('./middlewares/cors')); - - var redirects = require('./middlewares/redirects'); - oldApp.use(redirects.forceHabitica); - oldApp.use(redirects.forceSSL); - oldApp.use(bodyParser.urlencoded({ - extended: true, - limit: BODY_PARSER_LIMIT, - })); - oldApp.use(bodyParser.json({ - limit: BODY_PARSER_LIMIT, - })); - oldApp.use(require('method-override')()); - oldApp.use(session({ - name: 'connect:sess', // Used to keep backward compatibility with Express 3 cookies - secret: nconf.get('SESSION_SECRET'), - httpOnly: false, - maxAge: TWO_WEEKS - })); - - // Initialize Passport! Also use passport.session() middleware, to support - // persistent login sessions (recommended). - oldApp.use(passport.initialize()); - oldApp.use(passport.session()); - - var maxAge = isProd ? 31536000000 : 0; - // Cache emojis without copying them to build, they are too many - oldApp.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge })); - oldApp.use('/common/dist', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge })); - oldApp.use('/common/audio', express['static'](publicDir + "/../../common/audio", { maxAge: maxAge })); - oldApp.use('/common/script/public', express['static'](publicDir + "/../../common/script/public", { maxAge: maxAge })); - oldApp.use('/common/img', express['static'](publicDir + "/../../common/img", { maxAge: maxAge })); - oldApp.use(express['static'](publicDir)); - - // Custom Directives - oldApp.use('/', require('./routes/pages')); - oldApp.use('/', require('./routes/payments')); - oldApp.use('/', require('./routes/api-v2/auth')); - oldApp.use('/', require('./routes/api-v2/coupon')); - oldApp.use('/', require('./routes/api-v2/unsubscription')); - var v2 = express(); - oldApp.use('/api/v2', v2); - oldApp.use('/api/', require('./routes/api-v1')); - oldApp.use('/export', require('./routes/dataexport')); - require('./routes/api-v2/swagger')(swagger, v2); - oldApp.use(require('./middlewares/errorHandler')); - - server.on('request', app); - server.listen(app.get("port"), function() { - return logging.info("Express server listening on port " + app.get("port")); - }); - - module.exports = server; -} diff --git a/website/views/avatar-static.jade b/website/views/avatar-static.jade index 9a3532f726..58e11ae31a 100644 --- a/website/views/avatar-static.jade +++ b/website/views/avatar-static.jade @@ -9,7 +9,7 @@ html(ng-app="habitrpg") meta(name='apple-mobile-web-app-capable', content='yes') // .slice(0).push('user') is to clone the array, - // to be surethat `user` is never avalaible to other requests' env + // to be surethat `user` is never available to other requests' env // TODO does it need only `user` in clientVars, not the others? - clientVars = env.clientVars.slice(0); diff --git a/website/views/main/filters.jade b/website/views/main/filters.jade index b72d424364..40e11817a8 100644 --- a/website/views/main/filters.jade +++ b/website/views/main/filters.jade @@ -31,7 +31,7 @@ li.filters-edit(ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', bindonce='user.tags') form.hrpg-input-group input(type='text', ng-model='tag.name', ui-keyup="{13: 'saveOrEdit()'}") - button(type='button', ng-click='user.ops.deleteTag({params:{id:tag.id}})') + button(type='button', ng-click='User.deleteTag({params:{id:tag.id}})') span.glyphicon.glyphicon-trash ul(ng-if='!_editing', hrpg-sort-tags) li.filters-tags(ng-class='{active: user.filters[tag.id], challenge: tag.challenge}', ng-repeat='tag in user.tags', bindonce='user.tags') diff --git a/website/views/main/index.jade b/website/views/main/index.jade index 3a8ac8d03c..634af85e1b 100644 --- a/website/views/main/index.jade +++ b/website/views/main/index.jade @@ -1,4 +1,4 @@ script(id='partials/main.html', type="text/ng-template") include ./filters - div(ng-controller='TasksCtrl', ng-mouseenter="hoverIn()", ng-mouseleave="hoverout()") + div(ng-controller='TasksCtrl', ng-mouseenter="hoverIn()", ng-mouseleave="hoverOut()") habitrpg-tasks(main='true', obj='user') diff --git a/website/views/options/inventory/drops.jade b/website/views/options/inventory/drops.jade index 0062c5ac02..67c2b80d4e 100644 --- a/website/views/options/inventory/drops.jade +++ b/website/views/options/inventory/drops.jade @@ -57,7 +57,7 @@ ng-click='castStart(Content.special.#{k})') .badge.badge-info.stack-count {{user.items.special.#{k}}} +specialItem('snowball') - +specialItem('spookDust') + +specialItem('spookySparkles') +specialItem('shinySeed') +specialItem('seafoam') @@ -65,7 +65,7 @@ button.customize-option(class='inventory_present inventory_present_{{moment().format("MM")}}', popover=env.t('subscriberItemText'), popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', - ng-click="user.ops.openMysteryItem({})") + ng-click="User.openMysteryItem({})") .badge.badge-info.stack-count {{user.purchased.plan.mysteryItems.length}} div(ng-if='user.purchased.plan.consecutive.trinkets') @@ -137,7 +137,7 @@ span.Pet_Currency_Gem1x.inline-gems // li.customize-menu - menu.pets-menu!=env.t('magicHatchingPotions') + " - " + env.t('winterEventAvailability') + menu.pets-menu!=env.t('magicHatchingPotions') + " - " + env.t('springEventAvailability') p.muted=env.t('premiumPotionNoDropExplanation') div(ng-repeat='pot in Content.hatchingPotions', ng-if='pot.premium && pot.canBuy(user)') button.customize-option(class='Pet_HatchingPotion_{{::pot.key}}', @@ -199,7 +199,7 @@ button.customize-option(popover=env.t('subGemPop'), popover-title=env.t('subGemName'), popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', - ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') + ng-click='User.purchase({params:{type:"gems",key:"gem"}})') span.Pet_Currency_Gem.inline-gems .badge.badge-success.stack-count {{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}} p diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade index 7af0c14740..2c8030ac50 100644 --- a/website/views/options/inventory/seasonal-shop.jade +++ b/website/views/options/inventory/seasonal-shop.jade @@ -1,16 +1,16 @@ .container-fluid .stable.row: .col-xs-12 - div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered + div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_closed'}").pull-left-sm.col-centered .popover.static-popover.fade.right.in.pull-left-sm.col-centered .arrow.hidden-xs - h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"", linkEnd: ""}) + h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"", linkEnd: ""}) .popover-content - p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopText') - p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopText') + p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText') + p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText') - .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') + // .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') - li.customize-menu.inventory-gear + // li.customize-menu.inventory-gear menu.pets-menu(label=env.t('quests')) div(ng-repeat='quest in ::getSeasonalShopQuests()') button.customize-option(ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"' @@ -30,7 +30,7 @@ ng-click='purchase("special", Content.spells.special.shinySeed)') p {{::Content.spells.special.shinySeed.value}} span(class='shop_gold') - // div + div button.customize-option(class='Pet_HatchingPotion_Peppermint', popover='{{::Content.hatchingPotions.Peppermint.notes()}}', popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions.Peppermint.text()}}"}), @@ -39,7 +39,7 @@ ng-click='purchase("hatchingPotions", Content.hatchingPotions.Peppermint)') p {{::Content.hatchingPotions.Peppermint.value}} span.Pet_Currency_Gem1x.inline-gems - // div + div button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye') p {{Content.spells.special.nye.value}} span(class='shop_gold') diff --git a/website/views/options/inventory/time-travelers.jade b/website/views/options/inventory/time-travelers.jade index 66fc530bd0..be0c3ea7dd 100644 --- a/website/views/options/inventory/time-travelers.jade +++ b/website/views/options/inventory/time-travelers.jade @@ -35,4 +35,4 @@ popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', - ng-click='user.ops.buyMysterySet({params:{key:set.key}})') + ng-click='User.buyMysterySet({params:{key:set.key}})') diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index 4777cd033c..036d0cf529 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -56,6 +56,22 @@ mixin customizeProfile(mobile) each num in [1,2,3,4,5,6] button(class='hair_flower_#{num} customize-option', type='button', ng-click='set({"preferences.hair.flower":#{num}})', ng-class='{selectableInventory: user.preferences.hair.flower == "#{num}"}') + // Eyeglasses + li.customize-menu + menu(label=env.t('eyewear')) + button.customize-option(ng-repeat='item in ::getGearArray("glasses")', class='{{::item.key}}', + ng-class="{selectableInventory: user.preferences.costume ? user.items.gear.costume.eyewear === item.key : user.items.gear.equipped.eyewear === item.key}", + popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', + popover-placement='right', popover-append-to-body='true', + ng-click='equip(item.key)') + + // Wheelchair + li.customize-menu + menu(label=env.t('wheelchair')) + button.customize-option(ng-repeat='item in ::["black","blue","green","pink","red","yellow"]', class='button_chair_{{::item}}', + ng-class="{selectableInventory: user.preferences.chair == item}", + ng-click='user.preferences.chair != item ? set({"preferences.chair":item}) : set({"preferences.chair":"none"})') + // Animal Ears li.customize-menu menu(label=env.t('animalEars')) @@ -68,13 +84,6 @@ mixin customizeProfile(mobile) popover-placement='right', popover-append-to-body='true', ng-click='user.items.gear.owned[item.key] ? equip(item.key) : purchase(item.type,item)') - // Wheelchair - li.customize-menu - menu(label=env.t('wheelchair')) - button.customize-option(ng-repeat='item in ::["black"]', class='button_chair_{{::item}}', - ng-class="{selectableInventory: user.preferences.chair == item}", - ng-click='user.preferences.chair != item ? set({"preferences.chair":item}) : set({"preferences.chair":"none"})') - .col-md-4 h3(class=mobile?'item item-divider':'')=env.t('bodyHead') menu(type='list') @@ -90,7 +99,7 @@ mixin customizeProfile(mobile) each color in ['pblue','pgreen','porange','ppink','ppurple','pyellow'] button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")', ng-class='{selectableInventory: user.preferences.hair.color == "#{color}"}') +buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors') - +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors') + +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors', 'disabled') +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled') +buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors', 'disabled') @@ -157,7 +166,7 @@ mixin customizeProfile(mobile) +buyPref('skin', ['bear','cactus','fox','lion','panda','pig','tiger','wolf'], 'animalSkins') // Seasonal event skins. Note that Spooky Skins are a legacy set and should always be disabled for purchase - +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins') + +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled') +buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled') +buyPref('skin', ['candycorn','ogre','pumpkin2','reptile','shadow2','skeleton2','transparent','zombie2'], 'supernaturalSkins', 'disabled') +buyPref('skin', ['clownfish','deepocean','merblue','mergold','mergreen','merruby','shark','tropicalwater'], 'splashySkins', 'disabled') @@ -210,7 +219,7 @@ mixin profileStats input(type='radio', name='allocationMode', value='taskbased', ng-model='user.preferences.allocationMode', ng-change='set({"preferences.allocationMode": "taskbased"})') span.hint(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskAllocationPop'))=env.t('taskAllocation') div(ng-show='user.preferences.automaticAllocation && !(user.preferences.allocationMode === "taskbased") && (user.stats.points > 0)') - a.btn.btn-primary.btn-xs(ng-click='user.ops.allocateNow({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('distributePointsPop')) + a.btn.btn-primary.btn-xs(ng-click='User.allocateNow({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('distributePointsPop')) span.glyphicon.glyphicon-download | =env.t('distributePoints') @@ -218,7 +227,7 @@ mixin profileStats div(ng-class='user.flags.classSelected && !user.preferences.disableClasses ? "col-md-4" : "col-md-6"') - button.btn.btn-default(ng-if='user.preferences.disableClasses', ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass') + button.btn.btn-default(ng-if='user.preferences.disableClasses', ng-click='User.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass') hr(ng-if='user.preferences.disableClasses') include ../shared/profiles/achievements @@ -256,8 +265,9 @@ script(id='partials/options.profile.profile.html', type='text/ng-template') //{{profile.profile.blurb | linky:'_blank'}} form.col-md-4(ng-show='_editing.profile', ng-submit='save()') + .alert.alert-info.alert-sm + !=env.t("communityGuidelinesWarning") input.btn.btn-primary(type='submit', value=env.t('save')) - // TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak .form-group label=env.t('displayName') diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index aad9b8b476..754dd8dcda 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -32,7 +32,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .form-horizontal h5=env.t('language') - select.form-control(ng-model='language.code', ng-options='lang.code as lang.name for lang in avalaibleLanguages', ng-change='changeLanguage()') + select.form-control(ng-model='language.code', ng-options='lang.code as lang.name for lang in availableLanguages', ng-change='changeLanguage()') small !=env.t('americanEnglishGovern') br @@ -92,7 +92,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') button.btn.btn-default(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('showBaileyPop'))= env.t('showBailey') button.btn.btn-default(ng-click='openRestoreModal()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('fixValPop'))= env.t('fixVal') - button.btn.btn-default(ng-if='user.preferences.disableClasses==true', ng-click='user.ops.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass') + button.btn.btn-default(ng-if='user.preferences.disableClasses==true', ng-click='User.changeClass({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('enableClassPop'))= env.t('enableClass') hr @@ -133,11 +133,11 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') .panel-body div(ng-if='user.auth.facebook.id') button.btn.btn-primary(disabled='disabled', ng-if='!user.auth.local.username')=env.t('registeredWithFb') - button.btn.btn-danger(ng-click='http("delete","/api/v2/user/auth/social",null,"detachedFacebook")', ng-if='user.auth.local.username')=env.t('detachFacebook') + button.btn.btn-danger(ng-click='http("delete", "/api/v3/user/auth/social/facebook", null, "detachedFacebook")', ng-if='user.auth.local.username')=env.t('detachFacebook') hr div(ng-if='!user.auth.local.username') p=env.t('addLocalAuth') - form(ng-submit='http("post","/api/v2/register",localAuth,"addedLocalAuth")', ng-init='localAuth={}', name='localAuth', novalidate) + form(ng-submit='http("post", "/api/v3/user/auth/local/register", localAuth, "addedLocalAuth")', ng-init='localAuth={}', name='localAuth', novalidate) //-.alert.alert-danger(ng-messages='changeUsername.$error && changeUsername.submitted')=env.t('fillAll') .form-group input.form-control(type='text', placeholder=env.t('username'), ng-model='localAuth.username', required) @@ -175,7 +175,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') h5=env.t('changeEmail') form(ng-submit='changeUser("email", emailUpdates)', ng-show='user.auth.local', name='changeEmail', novalidate) .form-group - input.form-control(type='text', placeholder=env.t('newEmail'), ng-model='emailUpdates.email', required) + input.form-control(type='text', placeholder=env.t('newEmail'), ng-model='emailUpdates.newEmail', required) .form-group input.form-control(type='password', placeholder=env.t('password'), ng-model='emailUpdates.password', required) input.btn.btn-default(type='submit', ng-disabled='changeEmail.$invalid', value=env.t('submit')) @@ -183,11 +183,11 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') h5=env.t('changePass') form(ng-submit='changeUser("password", passwordUpdates)', ng-show='user.auth.local', name='changePassword', novalidate) .form-group - input.form-control(type='password', placeholder=env.t('oldPass'), ng-model='passwordUpdates.oldPassword', required) + input.form-control(type='password', placeholder=env.t('oldPass'), ng-model='passwordUpdates.password', required) .form-group input.form-control(type='password', placeholder=env.t('newPass'), ng-model='passwordUpdates.newPassword', required) .form-group - input.form-control(type='password', placeholder=env.t('confirmPass'), ng-model='passwordUpdates.confirmNewPassword', required) + input.form-control(type='password', placeholder=env.t('confirmPass'), ng-model='passwordUpdates.confirmPassword', required) input.btn.btn-default(type='submit', ng-disabled='changePassword.$invalid', value=env.t('submit')) @@ -218,7 +218,7 @@ script(type='text/ng-template', id='partials/options.settings.promo.html') input.form-control(type='number',ng-model='_codes.count',placeholder="Number of codes to generate (eg, 250)") .form-group button.btn.btn-primary(type='submit')=env.t('generate') - a.btn.btn-default(href='/api/v2/coupons?_id={{user._id}}&apiToken={{user.apiToken}}')=env.t('getCodes') + a.btn.btn-default(href='/api/v3/coupons?_id={{user._id}}&apiToken={{User.settings.auth.apiToken}}')=env.t('getCodes') script(type='text/ng-template', id='partials/options.settings.api.html') .container-fluid @@ -229,9 +229,28 @@ script(type='text/ng-template', id='partials/options.settings.api.html') h6=env.t('userId') pre.prettyprint {{user.id}} h6=env.t('APIToken') - pre.prettyprint {{user.apiToken}} + pre.prettyprint {{User.settings.auth.apiToken}} h6=env.t('qrCode') - img.img-rendering-auto(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7B%22address%22%3A%22https%3A%2F%2Fhabitrpg.com%22%2C%22user%22%3A%22{{user.id}}%22%2C%22key%22%3A%22{{user.apiToken}}%22%7D&choe=UTF-8&chld=L', alt='qrcode') + img.img-rendering-auto(src='https://chart.googleapis.com/chart?cht=qr&chs=200x200&chl=%7B%22address%22%3A%22https%3A%2F%2Fhabitrpg.com%22%2C%22user%22%3A%22{{user.id}}%22%2C%22key%22%3A%22{{User.settings.auth.apiToken}}%22%7D&choe=UTF-8&chld=L', alt='qrcode') + br + h3=env.t('thirdPartyApps') + ul + li + a(target='_blank' href='https://www.beeminder.com/habitica')=env.t('beeminder') + br + =env.t('beeminderDesc') + li + a(target='_blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb')=env.t('chromeChatExtension') + br + =env.t('chromeChatExtensionDesc') + li + a(target='_blank' ng-href='http://data.habitrpg.com?uuid={{user._id}}')=env.t('dataTool') + br + =env.t('dataToolDesc') + li + !=env.t('otherExtensions') + br + =env.t('otherDesc') hr @@ -370,7 +389,7 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template') input.form-control(type='text', ng-model='_subscription.coupon', placeholder= env.t('couponPlaceholder')) .form-group button.pull-right.btn.btn-small(type='button',ng-click='applyCoupon(_subscription.coupon)')= env.t("apply") - + div(ng-if='user.purchased.plan.customerId') .btn.btn-primary(ng-if='!user.purchased.plan.dateTerminated && user.purchased.plan.paymentMethod=="Stripe"', ng-click='Payments.showStripeEdit()')=env.t('subUpdateCard') .btn.btn-sm.btn-danger(ng-if='!user.purchased.plan.dateTerminated', ng-click='Payments.cancelSubscription()')=env.t('cancelSub') @@ -381,9 +400,8 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template') .col-xs-4 a.purchase.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card') .col-xs-4 - a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') + a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{User.settings.auth.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt=env.t('paypal')) .col-xs-4 a.purchase(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})") img(src='https://payments.amazon.com/gp/cba/button',alt=env.t('amazonPayments')) - diff --git a/website/views/options/social/challenge-box.jade b/website/views/options/social/challenge-box.jade index 9a7df490d8..177e049e4d 100644 --- a/website/views/options/social/challenge-box.jade +++ b/website/views/options/social/challenge-box.jade @@ -12,7 +12,7 @@ td a(ui-sref='options.social.challenges.detail({cid:challenge._id, groupIdFilter: group._id})') markdown(text='challenge.name') - div(ng-if='group.challenges.length == 0') + div(ng-if='!group.challenges || group.challenges.length == 0') p | =env.t('noChallenges') diff --git a/website/views/options/social/challenges.jade b/website/views/options/social/challenges.jade index 3fd8dba61e..ab84189f6f 100644 --- a/website/views/options/social/challenges.jade +++ b/website/views/options/social/challenges.jade @@ -55,7 +55,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht // Member List div(bindonce='challenge', ng-if='challenge.members.length > 0') - a.btn.btn-primary.btn-sm.pull-right(ng-href='/api/v2/challenges/{{challenge._id}}/csv') + a.btn.btn-primary.btn-sm.pull-right(ng-href='/api/v3/challenges/{{challenge._id}}/export/csv') =env.t('exportChallengeCSV') h3=env.t('hows') menu @@ -145,7 +145,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') .row .form-group.col-md-6.col-sm-12 - input.form-control(type='text', minlength="3", + input.form-control(type='text', ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required ng-disabled='insufficientGemsForTavernChallenge()') | @@ -160,12 +160,12 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') .Pet_Currency_Gem1x input.form-control(type='number', placeholder=env.t('prize'), ng-disabled='insufficientGemsForTavernChallenge()' - min="{{newChallenge.group=='habitrpg' ? 1 : 0}}", + min="{{newChallenge.group==TAVERN_ID ? 1 : 0}}", max="{{maxPrize}}", ng-model='newChallenge.prize') - a.hint(popover="{{newChallenge.group=='habitrpg' ? env.t('prizePopTavern') : env.t('prizePop')}}", + a.hint(popover="{{newChallenge.group==TAVERN_ID ? env.t('prizePopTavern') : env.t('prizePop')}}", popover-trigger='mouseenter', popover-placement='right') =env.t('moreInfo') - div(ng-show='newChallenge.group=="habitrpg"') + div(ng-show='newChallenge.group==TAVERN_ID') !=env.t('publicChallenges') .form-group(ng-if='user.contributor.admin') @@ -178,7 +178,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') // Challenges list .panel-group - .panel.panel-default(ng-repeat='challenge in challenges|filter:filterChallenges track by challenge._id ') + .panel.panel-default(ng-repeat='challenge in challenges | filter:filterChallenges track by challenge._id ') .panel-heading ul.pull-right.challenge-accordion-header-specs li.bg-transparent(ng-if='challenge.official') @@ -199,10 +199,10 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') p!=env.t('prizeValue', {gemcount: "{{challenge.prize}}", gemicon: ""}) li.bg-transparent // leave / join - a.btn.btn-sm.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)') + a.btn.btn-sm.btn-danger(ng-show='isUserMemberOf(challenge)', ng-click='clickLeave(challenge, $event)') span.glyphicon.glyphicon-ban-circle =env.t('leave') - a.btn.btn-sm.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)') + a.btn.btn-sm.btn-success(ng-hide='isUserMemberOf(challenge)', ng-click='join(challenge)') span.glyphicon.glyphicon-ok =env.t('join') a.accordion-toggle(id="{{challenge._id}}" ng-click='toggle(challenge._id)') diff --git a/website/views/options/social/chat-box.jade b/website/views/options/social/chat-box.jade index 74fc071dfe..3792070706 100644 --- a/website/views/options/social/chat-box.jade +++ b/website/views/options/social/chat-box.jade @@ -8,7 +8,7 @@ div.chat-form.guidelines-not-accepted(ng-if='!user.flags.communityGuidelinesAcce form.chat-form(ng-if='user.flags.communityGuidelinesAccepted' ng-submit='postChat(group,message.content)') div(ng-controller='AutocompleteCtrl') - textarea.form-control(rows=4, ui-keydown='{"meta-enter":"postChat(group,message.content)"}', ui-keypress='{13:"postChat(group,message.content)"}', ng-model='message.content', updateinterval='250', flag='@', at-user, auto-complete placeholder="{{group._id == 'habitrpg' ? env.t('tavernCommunityGuidelinesPlaceholder') : ''}}", ng-disabled='_sending == true') + textarea.form-control(rows=4, ui-keydown='{"meta-enter":"postChat(group,message.content)"}', ui-keypress='{13:"postChat(group,message.content)"}', ng-model='message.content', updateinterval='250', flag='@', at-user, auto-complete placeholder="{{group._id == TAVERN_ID ? env.t('tavernCommunityGuidelinesPlaceholder') : ''}}", ng-disabled='_sending == true') span.user-list ul.list-at-user(ng-show="query") li(ng-repeat='msg in response | filter:filterUser | limitTo: 5', ng-click='performCompletion(msg)') diff --git a/website/views/options/social/chat-message.jade b/website/views/options/social/chat-message.jade index 3231726e82..07447b483c 100644 --- a/website/views/options/social/chat-message.jade +++ b/website/views/options/social/chat-message.jade @@ -29,7 +29,7 @@ mixin chatMessages(inbox) a(ng-click="quickReply(message.uuid)") span.glyphicon.glyphicon-share-alt(tooltip=env.t('pm-reply')) span(ng-if='#{inbox ? "true" : ":: user.contributor.admin || message.uuid == user.id"}') - a(ng-click='#{inbox? "user.ops.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}') + a(ng-click='#{inbox? "User.deletePM({params:{id:message.$key}})" : "deleteChatMessage(group, message)"}') span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) span(ng-if=':: user.contributor.admin || (!message.sent && user.flags.communityGuidelinesAccepted && message.uuid != user.id && message.uuid != "system")') a(ng-click="flagChatMessage(group._id, message)") diff --git a/website/views/options/social/group.jade b/website/views/options/social/group.jade index 3630ca3d2e..6232990915 100644 --- a/website/views/options/social/group.jade +++ b/website/views/options/social/group.jade @@ -18,10 +18,10 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter h3.panel-title span {{group.name}} span.group-leave-join(ng-if='group') - a.btn.btn-sm.btn-danger.pull-right(ng-if=":: isMemberOfGroup(User.user._id, group)", ng-hide='group._editing', ng-click='clickLeave(group, $event)') + a.btn.btn-sm.btn-danger.pull-right(ng-if="isMemberOfGroup(User.user._id, group)", ng-hide='group._editing', ng-click='clickLeave(group, $event)') span.glyphicon.glyphicon-ban-circle =env.t('leave') - a.btn.btn-success.pull-right(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join') + a.btn.btn-success.pull-right(ng-if='!isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join') span(ng-if='group.leader._id == user.id') button.btn.btn-sm.btn-primary.pull-right(ng-click='cancelEdit(group)', ng-hide='!group._editing')=env.t('cancel') button.btn.btn-sm.btn-primary.pull-right(ng-click='saveEdit(group)', ng-show='group._editing')=env.t('save') @@ -60,7 +60,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter .text-center(ng-if='group.type === "party"') .row.row-margin: .col-sm-6.col-sm-offset-3 button.btn.btn-success.btn-block( - ng-if='!party.quest.key', + ng-if='!group.quest.key', ng-click='clickStartQuest();' )=env.t('startAQuest') diff --git a/website/views/options/social/hall.jade b/website/views/options/social/hall.jade index 7e17980117..c5d0201666 100644 --- a/website/views/options/social/hall.jade +++ b/website/views/options/social/hall.jade @@ -50,7 +50,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') h4 Update Item .form-group.well input.form-control(type='text',placeholder='Path (eg, items.pets.BearCub-Base)',ng-model='hero.itemPath') - small.muted Enter the item path. E.g.,items.pets.BearCub-Zombie or items.gear.owned.head_special_0 or items.gear.equipped.head. See all paths here. When in doubt, ask Tyler.
+ small.muted Enter the item path. E.g., items.pets.BearCub-Zombie or items.gear.owned.head_special_0 or items.gear.equipped.head. See all paths here. When in doubt, ask Tyler.
br
input.form-control(type='text',placeholder='Value (eg, 5)',ng-model='hero.itemVal')
small.muted Enter the item value. E.g., 5 or false or head_warrior_3 (respectively from above examples).
@@ -88,7 +88,7 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html')
span(ng-class='userAdminGlyphiconStyle(hero)')
span(ng-if='!hero.contributor.admin')
a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') {{hero.profile.name}}
- td(ng-if='user.contributor.admin', ng-click='populateContributorInput(hero._id)').btn-link {{hero._id}}
+ td(ng-if='user.contributor.admin', ng-click='populateContributorInput(hero._id, $index)').btn-link {{hero._id}}
td {{hero.contributor.level}}
td {{hero.contributor.text}}
td
diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade
index f4c3a7043a..754d3d08f6 100644
--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -45,10 +45,10 @@ script(type='text/ng-template', id='partials/options.social.guilds.public.html')
li='{{::group.memberCount}} ' + env.t('members')
// join / leave
li.bg-transparent
- a.btn.btn-sm.btn-danger(ng-if="::group._isMember", ng-click='clickLeave(group, $event)')
+ a.btn.btn-sm.btn-danger(ng-if="isMemberOfGroup(User.user._id, group)", ng-click='clickLeave(group, $event)')
span.glyphicon.glyphicon-ban-circle
=env.t('leave')
- a.btn.btn-sm.btn-success(ng-if="::!group._isMember", ng-click='join(group)')
+ a.btn.btn-sm.btn-success(ng-if="!isMemberOfGroup(User.user._id, group)", ng-click='join(group)')
span.glyphicon.glyphicon-ok
=env.t('join')
h4: a(href='/#/options/groups/guilds/{{::group._id}}') {{::group.name}}
diff --git a/website/views/options/social/party/leave-party-and-join-another.jade b/website/views/options/social/party/leave-party-and-join-another.jade
index 438feb3786..b6ff6c7862 100644
--- a/website/views/options/social/party/leave-party-and-join-another.jade
+++ b/website/views/options/social/party/leave-party-and-join-another.jade
@@ -1,5 +1,5 @@
- var newParty = 'User.user.invitations.party'
-.containter-fluid(ng-if='#{newParty}.id && party._id')
+.containter-fluid(ng-if='#{newParty}.id && group._id')
.row.text-center
.col-sm-6.col-sm-offset-3.alert.alert-warning
p {{::env.t('invitedToNewParty', { partyName: #{newParty}.name })}}
diff --git a/website/views/options/social/party/party-invitation.jade b/website/views/options/social/party/party-invitation.jade
index f4972e6e41..0bfd72b6d8 100644
--- a/website/views/options/social/party/party-invitation.jade
+++ b/website/views/options/social/party/party-invitation.jade
@@ -5,5 +5,4 @@
data-type='party',
ng-click='join(user.invitations.party)'
)=env.t('accept')
- a.btn.btn-danger(ng-click='reject()')=env.t('reject')
-
+ a.btn.btn-danger(ng-click='reject(user.invitations.party)')=env.t('reject')
diff --git a/website/views/options/social/quests/questActive.jade b/website/views/options/social/quests/questActive.jade
index 969861e8c1..b457f8d0e3 100644
--- a/website/views/options/social/quests/questActive.jade
+++ b/website/views/options/social/quests/questActive.jade
@@ -23,7 +23,7 @@ div(ng-if='group.quest.active===true')
include ./ianQuestInfo
unless tavern
- button.btn.btn-sm.btn-warning(ng-if='::canEditQuest(party)',
+ button.btn.btn-sm.btn-warning(ng-if='::canEditQuest()',
ng-click='questAbort()')=env.t('abort')
button.btn.btn-sm.btn-warning(ng-if='!(group.quest.leader && group.quest.leader === user._id) && isMemberOfRunningQuest(user._id,group)',
ng-click='questLeave()')=env.t('leaveQuest')
diff --git a/website/views/options/social/quests/questNotActive.jade b/website/views/options/social/quests/questNotActive.jade
index 3472011e29..c20ae5a226 100644
--- a/website/views/options/social/quests/questNotActive.jade
+++ b/website/views/options/social/quests/questNotActive.jade
@@ -26,6 +26,6 @@ div(ng-if='group.quest.active===false')
button.btn.btn-sm.btn-success(ng-click='questAccept()')=env.t('accept')
button.btn.btn-sm.btn-danger(ng-click='questReject()')=env.t('reject')
- span(ng-if='::canEditQuest(party)')
- button.btn.btn-sm.btn-warning(ng-click='party.$startQuest({"force":true})')=env.t('begin')
+ span(ng-if='::canEditQuest()')
+ button.btn.btn-sm.btn-warning(ng-click='questForceStart()')=env.t('begin')
button.btn.btn-sm.btn-danger(ng-click='questCancel()')=env.t('cancel')
diff --git a/website/views/options/social/tavern.jade b/website/views/options/social/tavern.jade
index ed7e4ef6c3..c03503256a 100644
--- a/website/views/options/social/tavern.jade
+++ b/website/views/options/social/tavern.jade
@@ -16,7 +16,7 @@
.popover-content
span(ng-if='!env.worldDmg.tavern') {{user.preferences.sleep ? env.t('innText',{name: user.profile.name}) : env.t('danielText')}}
span(ng-if='env.worldDmg.tavern') {{user.preferences.sleep ? env.t('innTextBroken',{name: user.profile.name}) : env.t('danielTextBroken')}}
- button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})')
+ button.btn-block.btn.btn-lg.btn-success(ng-click='User.sleep({})')
| {{user.preferences.sleep ? env.t('innCheckOut') : env.t('innCheckIn')}}
span(ng-if='!user.preferences.sleep && !env.worldDmg.tavern')=env.t('danielText2')
span(ng-if='!user.preferences.sleep && env.worldDmg.tavern')=env.t('danielText2Broken')
@@ -51,7 +51,7 @@
a(target='_blank', href='https://oldgods.net/habitrpg/habitrpg_user_data_display.html')=env.t('dataTool')
tr
td
- a(target='_blank', href='https://github.com/HabitRPG/habitrpg/issues/2760')=env.t('reportAP')
+ a(target='_blank', href='https://habitica.com/#/options/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac')=env.t('reportAP')
tr
td
a(target='_blank', href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')= ' ' + env.t('requestAF')
@@ -148,7 +148,7 @@
h3=env.t('tavernTalk')
include ./chat-box
.alert.alert-info.alert-sm
- != ' ' + env.t('tavernAlert1') + ' ' + env.t('tavernAlert2') + '.' + env.t('moderatorIntro1') + != ' ' + env.t('tavernAlert1') + ' ' + env.t('tavernAlert2') + '!
' + env.t('moderatorIntro1') //- FIXME this could be rendered server-side? span(ng-repeat='mod in env.mods') | diff --git a/website/views/shared/avatar/appearance.jade b/website/views/shared/avatar/appearance.jade index 7b28273996..14f69414a0 100644 --- a/website/views/shared/avatar/appearance.jade +++ b/website/views/shared/avatar/appearance.jade @@ -11,13 +11,13 @@ mixin avatar(opts) span(ng-if='profile.items.currentMount', class='Mount_Body_{{profile.items.currentMount}}') // Buffs that cause visual changes to avatar: Snowman, Ghost, Flower, etc - - var visualBuffs = { snowball: 'snowman', spookDust: 'spookman', shinySeed: 'avatar_floral_{{profile.stats.class}}', seafoam: 'seafoam_star' } + - var visualBuffs = { snowball: 'snowman', spookySparkles: 'ghost', shinySeed: 'avatar_floral_{{profile.stats.class}}', seafoam: 'seafoam_star' } each klass, item in visualBuffs span(ng-if='profile.stats.buffs.#{item}', class='#{klass}') // Show avatar only if not currently affected by visual buff - var buffs = '!profile.stats.buffs' - span(ng-if='#{buffs}.snowball && #{buffs}.spookDust && #{buffs}.shinySeed && #{buffs}.seafoam') + span(ng-if='#{buffs}.snowball && #{buffs}.spookySparkles && #{buffs}.shinySeed && #{buffs}.seafoam') +generatedAvatar // Mount Head diff --git a/website/views/shared/footer.jade b/website/views/shared/footer.jade index 0f5bc5c041..aaa14f8b42 100644 --- a/website/views/shared/footer.jade +++ b/website/views/shared/footer.jade @@ -44,11 +44,9 @@ footer.footer(ng-controller='FooterCtrl') li a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines') li - a(target='_blank', href='/static/clear-browser-data')=env.t('communityBug') + a(target='_blank', href='https://habitica.com/#/options/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac')=env.t('communityBug') li a(target='_blank', href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('communityFeature') - li - a(target='_blank', href='https://habitica.com/static/api')=env.t('API') li a(href='http://habitica.wikia.com/wiki/App_and_Extension_Integrations', target='_blank')=env.t('communityExtensions') li @@ -59,6 +57,14 @@ footer.footer(ng-controller='FooterCtrl') a(target='_blank', href='https://www.facebook.com/Habitica')=env.t('communityFacebook') li a(target='_blank', href='http://www.reddit.com/r/habitrpg/')=env.t('communityReddit') + h4=env.t('footerDevs') + ul.list-unstyled + li + a(target='_blank', href='http://devs.habitica.com')=env.t('devBlog') + ' - The Forge' + li + a(target='_blank', href='/apidoc')=env.t('APIv3') + li + a(target='_blank', href='/static/api-v2')=env.t('APIv2') .col-sm-3 if (env.NODE_ENV === 'production' && !env.IS_MOBILE) h4=env.t('footerSocial') @@ -79,7 +85,7 @@ footer.footer(ng-controller='FooterCtrl') tr td iframe(src='/bower_components/github-buttons/github-btn.html?user=habitrpg&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px') - else if (env.NODE_ENV==='development' || env.NODE_ENV==='test') && !env.isStaticPage + if (env.NODE_ENV==='development' || env.NODE_ENV==='test') && !env.isStaticPage h4 Debug .btn-group-vertical a.btn.btn-default(ng-click='setHealthLow()') Health = 1 @@ -91,7 +97,9 @@ footer.footer(ng-controller='FooterCtrl') a.btn.btn-default(ng-click='addMana()') +MP a.btn.btn-default(ng-click='addLevelsAndGold()') +Exp +GP +MP a.btn.btn-default(ng-click='addOneLevel()') +1 Level - a.btn.btn-default(ng-click='addBossQuestProgressUp()') +1000 Boss Quest Progress Up + a.btn.btn-default(ng-click='addQuestProgress()' tooltip="+1000 to boss quests. 300 items to collection quests") Quest Progress Up + a.btn.btn-default(ng-click='makeAdmin()') Make Admin + a.btn.btn-default(ng-click='openModifyInventoryModal()') Modify Inventory div(ng-init='deferredScripts()') diff --git a/website/views/shared/header/header.jade b/website/views/shared/header/header.jade index 5c0b847849..6535bb217f 100644 --- a/website/views/shared/header/header.jade +++ b/website/views/shared/header/header.jade @@ -25,13 +25,13 @@ .meter-label(tooltip='Mana', ng-if='user.flags.classSelected && !user.preferences.disableClasses') span.glyphicon.glyphicon-fire .meter.mana(ng-if='user.flags.classSelected && !user.preferences.disableClasses', tooltip='{{Math.round(user.stats.mp * 100) / 100}}') - .bar(ng-style='{"width": (user.stats.mp / user._statsComputed.maxMP * 100) + "%"}') + .bar(ng-style='{"width": (user.stats.mp / user.fns.statsComputed().maxMP * 100) + "%"}') span.meter-text.value span - | {{Math.floor(user.stats.mp)}} / {{user._statsComputed.maxMP}} + | {{Math.floor(user.stats.mp)}} / {{user.fns.statsComputed().maxMP}} // party .party(ng-controller='PartyCtrl') - button.party-invite.btn.btn-primary(ng-click="inviteOrStartParty(group)", + button.party-invite.btn.btn-primary(ng-click="inviteOrStartParty(party)", ng-if="(!party.members || party.memberCount === 1) && user.preferences.displayInviteToPartyWhenPartyIs1", popover="{{!party.members ? env.t('startAParty') : env.t('addToParty')}}", popover-placement="left", popover-trigger="mouseenter") span=env.t("battleWithFriends") diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade index 78f60557ca..93841f80d8 100644 --- a/website/views/shared/header/menu.jade +++ b/website/views/shared/header/menu.jade @@ -60,7 +60,7 @@ nav.toolbar(ng-controller='MenuCtrl') li a(target='_blank' href='https://habitica.com/static/overview')=env.t('overview') li - a(target='_blank' href='https://github.com/HabitRPG/habitrpg/issues/2760')=env.t('reportBug') + a(target='_blank' href='https://habitica.com/#/options/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac')=env.t('reportBug') li a(target='_blank' href='https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestion') li @@ -161,7 +161,7 @@ nav.toolbar(ng-controller='MenuCtrl') li a(target='_blank' href='https://habitica.com/static/overview')=env.t('overview') li - a(target='_blank' href='https://github.com/HabitRPG/habitrpg/issues/2760')=env.t('reportBug') + a(target='_blank' href='https://habitica.com/#/options/groups/guilds/a29da26b-37de-4a71-b0c6-48e72a900dac')=env.t('reportBug') li a(target='_blank' href='https://habitica.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestion') li @@ -205,7 +205,7 @@ nav.toolbar(ng-controller='MenuCtrl') span.glyphicon.glyphicon-plus-sign span=env.t('haveUnallocated', {points: '{{user.stats.points}}'}) li(ng-repeat='(k,v) in user.newMessages', ng-if='v.value') - a(ng-click='k === party._id ? $state.go("options.social.party") : $state.go("options.social.guilds.detail",{gid:k}); ', data-close-menu) + a(ng-click='(k === party._id || k === user.party._id) ? $state.go("options.social.party") : $state.go("options.social.guilds.detail",{gid:k}); ', data-close-menu) span.glyphicon.glyphicon-comment span {{v.name}} a(ng-click='clearMessages(k)', popover=env.t('clear'),popover-placement='right',popover-trigger='mouseenter',popover-append-to-body='true') diff --git a/website/views/shared/modals/achievements.jade b/website/views/shared/modals/achievements.jade index 6f03746a07..19eb529c4e 100644 --- a/website/views/shared/modals/achievements.jade +++ b/website/views/shared/modals/achievements.jade @@ -106,7 +106,6 @@ script(id='modals/achievements/triadBingo.html', type='text/ng-template') +achievementFooter // Contributor -// activated by user.flags.contributor script(id='modals/achievements/contributor.html', type='text/ng-template') .modal-content(style='min-width:28em') .modal-body.text-center @@ -115,7 +114,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template') !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) + ' ' a(href='http://habitica.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink') br - button.btn.btn-primary(style='margin-top:1em' ng-click='set({"flags.contributor":false}); $close()')=env.t('huzzah') + button.btn.btn-primary(style='margin-top:1em' ng-click='$close()')=env.t('huzzah') +achievementFooter //Rebirth diff --git a/website/views/shared/modals/buy-gems.jade b/website/views/shared/modals/buy-gems.jade index d071450cab..4ebebf57ea 100644 --- a/website/views/shared/modals/buy-gems.jade +++ b/website/views/shared/modals/buy-gems.jade @@ -10,7 +10,7 @@ mixin buyGemsDropdown() p small.muted=env.t('paymentMethods') a.purchase.btn.btn-primary(ng-click='Payments.showStripe({})')=env.t('card') - a.purchase(href='/paypal/checkout?_id={{user._id}}&apiToken={{user.apiToken}}') + a.purchase(href='/paypal/checkout?_id={{user._id}}&apiToken={{User.settings.auth.apiToken}}') img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt='Pay now with Paypal') a.purchase(ng-click="Payments.amazonPayments.init({type: 'single'})") img(src='https://payments.amazon.com/gp/cba/button',alt='Pay now with Amazon Payments') @@ -34,7 +34,7 @@ script(id='modals/buyGems.html', type='text/ng-template') .container-fluid .row .col-md-3 - button.customize-option(ng-click='user.ops.purchase({params:{type:"gems",key:"gem"}})') + button.customize-option(ng-click='User.purchase({params:{type:"gems",key:"gem"}})') span.Pet_Currency_Gem.inline-gems .badge.badge-success.stack-count {{Shared.planGemLimits.convCap + User.user.purchased.plan.consecutive.gemCapExtra - User.user.purchased.plan.gemsBought}} p diff --git a/website/views/shared/modals/classes.jade b/website/views/shared/modals/classes.jade index 6484626318..754d6f31f0 100644 --- a/website/views/shared/modals/classes.jade +++ b/website/views/shared/modals/classes.jade @@ -68,6 +68,6 @@ script(type='text/ng-template', id='modals/chooseClass.html') .modal-footer span(popover-placement='left', popover-trigger='mouseenter', popover=env.t('optOutOfClassesText')) - button.btn.btn-danger(ng-click='user.ops.disableClasses({}); $close()')=env.t('optOutOfClasses') + button.btn.btn-danger(ng-click='User.disableClasses({}); $close()')=env.t('optOutOfClasses') button.btn.btn-primary(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select') .pull-left!=env.t('chooseClassLearn') diff --git a/website/views/shared/modals/death.jade b/website/views/shared/modals/death.jade index cfdbced16e..386cd42133 100644 --- a/website/views/shared/modals/death.jade +++ b/website/views/shared/modals/death.jade @@ -5,21 +5,22 @@ script(type='text/ng-template', id='modals/death.html') h3.text-center=env.t('lostAllHealth') .modal-body .container-fluid(ng-controller='UserCtrl') - .col-md-6 - .hero-stats - .meter-label(tooltip=env.t('health')) - span.glyphicon.glyphicon-heart - .meter.health(tooltip='{{Math.round(user.stats.hp * 100) / 100}}') - .bar(ng-style='{"width": Shared.percent(user.stats.hp, Shared.maxHealth)+"%"}') - span.meter-text.value - | {{Math.ceil(user.stats.hp)}} / {{::Shared.maxHealth}} - figure.herobox.text-center - .character-sprites - +generatedAvatar({sleep:true}) - span(class='knockout') - .col-md-6 - h4(style='margin-top:1.5em')=env.t('dontDespair') - p(style='margin-top:1.5em')=env.t('deathPenaltyDetails') + .row + .col-sm-6.col-xs-12 + .hero-stats + .meter-label(tooltip=env.t('health')) + span.glyphicon.glyphicon-heart + .meter.health(tooltip='{{Math.round(user.stats.hp * 100) / 100}}') + .bar(ng-style='{"width": Shared.percent(user.stats.hp, Shared.maxHealth)+"%"}') + span.meter-text.value + | {{Math.ceil(user.stats.hp)}} / {{::Shared.maxHealth}} + figure.herobox.text-center + .character-sprites + +generatedAvatar({sleep:true}) + span(class='knockout') + .col-sm-6.col-xs-12 + h4(style='margin-top:1.5em')=env.t('dontDespair') + p(style='margin-top:1.5em')=env.t('deathPenaltyDetails') .modal-footer - a.btn.btn-danger.btn-lg.flex-column(ng-click='user.ops.revive({}); $close()')=env.t('refillHealthTryAgain') + a.btn.btn-danger.btn-lg.flex-column.btn-wrap(ng-click='User.revive(); $close()')=env.t('refillHealthTryAgain') h4.text-center!=env.t('dyingOftenTips') diff --git a/website/views/shared/modals/index.jade b/website/views/shared/modals/index.jade index a57ee62189..c492e09ee1 100644 --- a/website/views/shared/modals/index.jade +++ b/website/views/shared/modals/index.jade @@ -19,6 +19,7 @@ include ./level-up.jade include ./hatch-pet.jade include ./raise-pet.jade include ./won-challenge.jade +include ./modify-inventory.jade //- Settings script(type='text/ng-template', id='modals/change-day-start.html') diff --git a/website/views/shared/modals/limited.jade b/website/views/shared/modals/limited.jade index 158fd5a647..0f68a2dcad 100644 --- a/website/views/shared/modals/limited.jade +++ b/website/views/shared/modals/limited.jade @@ -9,4 +9,4 @@ script(id='modals/cards.html', type='text/ng-template') markdown(text='::cardMessage') .modal-footer small.pull-left {{::env.t(cardType + 'CardExplanation')}} - button.btn.btn-default(ng-click='user.ops.readCard({params: {cardType: cardType}}); $close()')=env.t('ok') + button.btn.btn-default(ng-click='User.readCard({params: {cardType: cardType}}); $close()')=env.t('ok') diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index b40a56eea5..c4741156f8 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -33,9 +33,9 @@ script(type='text/ng-template', id='modals/member.html') include ../profiles/achievements .modal-footer .btn-group.pull-left(ng-if='::user') - button.btn.btn-md.btn-default(ng-if='user.inbox.blocks | contains:profile._id', tooltip=env.t('unblock'), ng-click="user.ops.blockUser({params:{uuid:profile._id}})", tooltip-placement='right') + button.btn.btn-md.btn-default(ng-if='user.inbox.blocks | contains:profile._id', tooltip=env.t('unblock'), ng-click="User.blockUser({params:{uuid:profile._id}})", tooltip-placement='right') span.glyphicon.glyphicon-plus - button.btn.btn-md.btn-default(ng-if='profile._id != user._id && !profile.contributor.admin && !(user.inbox.blocks | contains:profile._id)', tooltip=env.t('block'), ng-click="user.ops.blockUser({params:{uuid:profile._id}})", tooltip-placement='right') + button.btn.btn-md.btn-default(ng-if='profile._id != user._id && !profile.contributor.admin && !(user.inbox.blocks | contains:profile._id)', tooltip=env.t('block'), ng-click="User.blockUser({params:{uuid:profile._id}})", tooltip-placement='right') span.glyphicon.glyphicon-ban-circle button.btn.btn-md.btn-default(tooltip=env.t('sendPM'), ng-click="openModal('private-message',{controller:'MemberModalCtrl'})", tooltip-placement='right') span.glyphicon.glyphicon-envelope @@ -94,9 +94,9 @@ script(type='text/ng-template', id='modals/send-gift.html') .modal-footer - var fromBal = "gift.type=='gems' && gift.gems.fromBalance" - button.btn.btn-primary(ng-show=fromBal, ng-click='sendGift(profile._id, gift)')=env.t("send") + button.btn.btn-primary(ng-show=fromBal, ng-click='sendGift(profile._id)')=env.t("send") a.btn.btn-primary(ng-hide=fromBal, ng-click='Payments.showStripe({gift:gift, uuid:profile._id})')=env.t('card') - a.btn.btn-warning(ng-hide=fromBal, href='/paypal/checkout?_id={{::user._id}}&apiToken={{::user.apiToken}}&gift={{Payments.encodeGift(profile._id, gift)}}') PayPal + a.btn.btn-warning(ng-hide=fromBal, href='/paypal/checkout?_id={{::user._id}}&apiToken={{::User.settings.auth.apiToken}}&gift={{Payments.encodeGift(profile._id, gift)}}') PayPal .btn.btn-success(ng-hide=fromBal, ng-click="Payments.amazonPayments.init({type: 'single', gift: gift, giftedTo: profile._id})") Amazon Payments button.btn.btn-default(ng-click='$close()')=env.t('cancel') diff --git a/website/views/shared/modals/modify-inventory.jade b/website/views/shared/modals/modify-inventory.jade new file mode 100644 index 0000000000..fd7ae0c61f --- /dev/null +++ b/website/views/shared/modals/modify-inventory.jade @@ -0,0 +1,252 @@ +script(type='text/ng-template', id='modals/modify-inventory.html') + .modal-header + h4 Modify Inventory for {{::user.profile.name}} + .modal-body + .container-fluid + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.gear", ng-click="showInv.gear = true") Show Gear + button.btn.btn-default.pull-right(ng-if="showInv.gear", ng-click="showInv.gear = false") Hide Gear + h4 Gear + div(ng-if="showInv.gear") + button.btn.btn-default(ng-click="setAllItems('gear', true)") Own All + button.btn.btn-default(ng-click="setAllItems('gear', false)") Previously Own All + button.btn.btn-default(ng-click="setAllItems('gear', undefined)") Never Own All + + hr + + ul.list-group + li.list-group-item(ng-repeat="item in Content.gear.flat" ng-init="inv.gear[item.key] = user.items.gear.owned[item.key]") + .pull-left(class="shop_{{::item.key}}" style="margin-right: 10px") + | {{::item.text()}} + + .clearfix + label.radio-inline + input(type="radio" name="gear-{{::item.key}}" ng-model="inv.gear[item.key]" ng-value="true") + | Owned + label.radio-inline + input(type="radio" name="gear-{{::item.key}}" ng-model="inv.gear[item.key]" ng-value="false") + | Previously Owned + label.radio-inline + input(type="radio" name="gear-{{::item.key}}" ng-model="inv.gear[item.key]" ng-value="undefined") + | Never Owned + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.special", ng-click="showInv.special = true") Show Special Items + button.btn.btn-default.pull-right(ng-if="showInv.special", ng-click="showInv.special = false") Hide Special Items + h4 Special Items + div(ng-if="showInv.special") + button.btn.btn-default(ng-click="setAllItems('special', 999)") Set All to 999 + button.btn.btn-default(ng-click="setAllItems('special', 0)") Set All to 0 + button.btn.btn-default(ng-click="setAllItems('special', undefined)") Set All to undefined + + hr + + ul.list-group + li.list-group-item(ng-repeat="item in Content.special" ng-init="inv.special[item.key] = user.items.special[item.key]" ng-if="item.value === 15") + .form-inline.clearfix + .pull-left(class="inventory_special_{{::item.key}}" style="margin-right: 10px") + p {{::item.text()}} + input.form-control(type="number" ng-model="inv.special[item.key]") + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.pets", ng-click="showInv.pets = true") Show Pets + button.btn.btn-default.pull-right(ng-if="showInv.pets", ng-click="showInv.pets = false") Hide Pets + h4 Pets + div(ng-if="showInv.pets") + button.btn.btn-default(ng-click="setAllItems('pets', 45)") Set All to 45 + button.btn.btn-default(ng-click="setAllItems('pets', 0)") Set All to 0 + button.btn.btn-default(ng-click="setAllItems('pets', -1)") Set All to -1 + button.btn.btn-default(ng-click="setAllItems('pets', undefined)") Set All to undefined + + hr + + h5 Drop Pets + ul.list-group + li.list-group-item(ng-repeat="(pet, value) in Content.pets" ng-init="inv.pets[pet] = user.items.pets[pet]") + .form-inline.clearfix + .pull-left(class="Pet-{{::pet}}" style="margin-right: 10px") + p {{::pet}} + input.form-control(type="number" ng-model="inv.pets[pet]") + + h5 Quest Pets + ul.list-group + li.list-group-item(ng-repeat="(pet, value) in Content.questPets" ng-init="inv.pets[pet] = user.items.pets[pet]") + .form-inline.clearfix + .pull-left(class="Pet-{{::pet}}" style="margin-right: 10px") + p {{::pet}} + input.form-control(type="number" ng-model="inv.pets[pet]") + + h5 Special Pets + ul.list-group + li.list-group-item(ng-repeat="(pet, value) in Content.specialPets" ng-init="inv.pets[pet] = user.items.pets[pet]") + .form-inline.clearfix + .pull-left(class="Pet-{{::pet}}" style="margin-right: 10px") + p {{::pet}} + input.form-control(type="number" ng-model="inv.pets[pet]") + + h5 Premium Pets + ul.list-group + li.list-group-item(ng-repeat="(pet, value) in Content.premiumPets" ng-init="inv.pets[pet] = user.items.pets[pet]") + .form-inline.clearfix + .pull-left(class="Pet-{{::pet}}" style="margin-right: 10px") + p {{::pet}} + input.form-control(type="number" ng-model="inv.pets[pet]") + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.mounts", ng-click="showInv.mounts = true") Show Mounts + button.btn.btn-default.pull-right(ng-if="showInv.mounts", ng-click="showInv.mounts = false") Hide Mounts + h4 Mounts + div(ng-if="showInv.mounts") + button.btn.btn-default(ng-click="setAllItems('mounts', true)") Set all to Owned + button.btn.btn-default(ng-click="setAllItems('mounts', undefined)") Set all to Not Owned + + hr + + h5 Drop Mounts + ul.list-group + li.list-group-item(ng-repeat="(mount, value) in Content.mounts" ng-init="inv.mounts[mount] = user.items.mounts[mount]") + .pull-left(class="Mount_Icon_{{::mount}}" style="margin-right: 10px") + | {{::mount}} + .clearfix + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="true") + | Owned + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="undefined") + | Not Owned + + h5 Quest Mounts + ul.list-group + li.list-group-item(ng-repeat="(mount, value) in Content.questMounts" ng-init="inv.mounts[mount] = user.items.mounts[mount]") + .pull-left(class="Mount_Icon_{{::mount}}" style="margin-right: 10px") + | {{::mount}} + .clearfix + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="true") + | Owned + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="undefined") + | Not Owned + + h5 Special Mounts + ul.list-group + li.list-group-item(ng-repeat="(mount, value) in Content.specialMounts" ng-init="inv.mounts[mount] = user.items.mounts[mount]") + .pull-left(class="Mount_Icon_{{::mount}}" style="margin-right: 10px") + | {{::mount}} + .clearfix + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="true") + | Owned + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="undefined") + | Not Owned + + h5 Premium Mounts + ul.list-group + li.list-group-item(ng-repeat="(mount, value) in Content.premiumMounts" ng-init="inv.mounts[mount] = user.items.mounts[mount]") + .pull-left(class="Mount_Icon_{{::mount}}" style="margin-right: 10px") + | {{::mount}} + .clearfix + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="true") + | Owned + label.radio-inline + input(type="radio" name="mounts-{{::mount}}" ng-model="inv.mounts[mount]" ng-value="undefined") + | Not Owned + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.hatchingPotions", ng-click="showInv.hatchingPotions = true") Show Hatching Potions + button.btn.btn-default.pull-right(ng-if="showInv.hatchingPotions", ng-click="showInv.hatchingPotions = false") Hide Hatching Potions + h4 Hatching Potions + div(ng-if="showInv.hatchingPotions") + button.btn.btn-default(ng-click="setAllItems('hatchingPotions', 999)") Set All to 999 + button.btn.btn-default(ng-click="setAllItems('hatchingPotions', 0)") Set All to 0 + button.btn.btn-default(ng-click="setAllItems('hatchingPotions', undefined)") Set All to undefined + + hr + + ul.list-group + li.list-group-item(ng-repeat="item in Content.hatchingPotions" ng-init="inv.hatchingPotions[item.key] = user.items.hatchingPotions[item.key]") + .form-inline.clearfix + .pull-left(class="Pet_HatchingPotion_{{::item.key}}" style="margin-right: 10px") + p {{::item.text()}} + input.form-control(type="number" ng-model="inv.hatchingPotions[item.key]") + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.eggs", ng-click="showInv.eggs = true") Show Eggs + button.btn.btn-default.pull-right(ng-if="showInv.eggs", ng-click="showInv.eggs = false") Hide Eggs + h4 Eggs + div(ng-if="showInv.eggs") + button.btn.btn-default(ng-click="setAllItems('eggs', 999)") Set All to 999 + button.btn.btn-default(ng-click="setAllItems('eggs', 0)") Set All to 0 + button.btn.btn-default(ng-click="setAllItems('eggs', undefined)") Set All to undefined + + hr + + ul.list-group + li.list-group-item(ng-repeat="item in Content.eggs" ng-init="inv.eggs[item.key] = user.items.eggs[item.key]") + .form-inline.clearfix + .pull-left(class="Pet_Egg_{{::item.key}}" style="margin-right: 10px") + p {{::item.text()}} + input.form-control(type="number" ng-model="inv.eggs[item.key]") + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.food", ng-click="showInv.food = true") Show Food + button.btn.btn-default.pull-right(ng-if="showInv.food", ng-click="showInv.food = false") Hide Food + h4 Food + div(ng-if="showInv.food") + button.btn.btn-default(ng-click="setAllItems('food', 999)") Set All to 999 + button.btn.btn-default(ng-click="setAllItems('food', 0)") Set All to 0 + button.btn.btn-default(ng-click="setAllItems('food', undefined)") Set All to undefined + + hr + + ul.list-group + li.list-group-item(ng-repeat="item in Content.food" ng-init="inv.food[item.key] = user.items.food[item.key]") + .form-inline.clearfix + .pull-left(class="Pet_Food_{{::item.key}}" style="margin-right: 10px") + p {{::item.text()}} + input.form-control(type="number" ng-model="inv.food[item.key]") + + hr + + .row + .col-xs-12 + button.btn.btn-default.pull-right(ng-if="!showInv.quests", ng-click="showInv.quests = true") Show Quests + button.btn.btn-default.pull-right(ng-if="showInv.quests", ng-click="showInv.quests = false") Hide Quests + h4 Quests + div(ng-if="showInv.quests") + button.btn.btn-default(ng-click="setAllItems('quests', 999)") Set All to 999 + button.btn.btn-default(ng-click="setAllItems('quests', 0)") Set All to 0 + button.btn.btn-default(ng-click="setAllItems('quests', undefined)") Set All to undefined + + hr + + ul.list-group + li.list-group-item(ng-repeat="item in Content.quests" ng-init="inv.quests[item.key] = user.items.quests[item.key]" ng-if="item.category !== 'world'") + .form-inline.clearfix + .pull-left(class="inventory_quest_scroll_{{::item.key}}" style="margin-right: 10px") + p {{::item.text()}} + input.form-control(type="number" ng-model="inv.quests[item.key]") + .modal-footer + button.btn.btn-default(ng-click="$close()")=env.t('close') + button.btn.btn-primary(ng-click="$close();modifyInventory()") Apply Changes diff --git a/website/views/shared/modals/quests.jade b/website/views/shared/modals/quests.jade index a9dbf6a991..40efa3b5c4 100644 --- a/website/views/shared/modals/quests.jade +++ b/website/views/shared/modals/quests.jade @@ -57,7 +57,7 @@ script(type='text/ng-template', id='modals/buyQuest.html') .modal-footer button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('neverMind') button.btn.btn-primary(ng-if='::selectedQuest.category !== "gold"', ng-click='purchase("quests", quest); closeQuest(); $close()')=env.t('buyQuest') + ': {{::selectedQuest.value}} ' + env.t('gems') - button.btn.btn-primary(ng-if='::selectedQuest.category === "gold"', ng-click='user.ops.buyQuest({params:{key:selectedQuest.key}}); closeQuest(); $close()')=env.t('buyQuest') + ': {{::selectedQuest.goldValue}} ' + env.t('gold') + button.btn.btn-primary(ng-if='::selectedQuest.category === "gold"', ng-click='User.buyQuest({params:{key:selectedQuest.key}}); closeQuest(); $close()')=env.t('buyQuest') + ': {{::selectedQuest.goldValue}} ' + env.t('gold') script(type='text/ng-template', id='modals/questInvitation.html') .modal-header @@ -104,7 +104,8 @@ script(type='text/ng-template', id='modals/questDrop.html') .quest-icon(class='inventory_quest_scroll_{{::selectedQuest.key}}') h4!=env.t('leveledUpReceivedQuest', {level:'{{user.stats.lvl}}'}) .row(style='margin-top:2em') - button.btn.btn-primary(ng-click='inviteOrStartParty(group); $close()', ng-if='!party.members')=env.t('startAParty') + button.btn.btn-primary(ng-click='inviteOrStartParty(party); $close()', ng-if='!User.user.party._id')=env.t('startAParty') + button.btn.btn-primary(ng-click='inviteOrStartParty(party); $close()', ng-if='!User.user.party._id && !party.members')=env.t('battleWithFriends') button.btn.btn-primary(ng-click='questInit(); $close()', ng-if='party.members')=env.t('inviteParty') button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('questLater') .modal-footer(style='margin-top:0', ng-init='loadWidgets()') diff --git a/website/views/shared/modals/settings.jade b/website/views/shared/modals/settings.jade index 8a263f2df0..cb3f3eac5e 100644 --- a/website/views/shared/modals/settings.jade +++ b/website/views/shared/modals/settings.jade @@ -16,34 +16,40 @@ script(type='text/ng-template', id='modals/restore.html') p=env.t('fixValuesText2') form.form-horizontal h3=env.t('stats') - .form-group - .col-md-6 + .form-group.row + .col-sm-3 + label.control-label=env.t('health') + .col-sm-9 input.form-control(type='number', step="any", data-for='stats.hp', ng-model='$parent.restoreValues.stats.hp') - label.control-label=env.t('health') - .form-group - .col-md-6 + .form-group.row + .col-sm-3 + label.control-label=env.t('experience') + .col-sm-9 input.form-control(type='number', step="any", data-for='stats.exp', ng-model='$parent.restoreValues.stats.exp') - label.control-label=env.t('experience') - .form-group - .col-md-6 + .form-group.row + .col-sm-3 + label.control-label=env.t('gold') + .col-sm-9 input.form-control(type='number', step="any", data-for='stats.gp', ng-model='$parent.restoreValues.stats.gp') //input.form-control(type='number', step="any", data-for='stats.gp', ng-model='restoreValues.stats.gp',disabled) - label.control-label=env.t('gold') //-p.alert small=env.t('disabledWinterEvent') - .form-group - .col-md-6 + .form-group.row + .col-sm-3 + label.control-label=env.t('mana') + .col-sm-9 input.form-control(type='number', step="any", data-for='stats.mp', ng-model='$parent.restoreValues.stats.mp') - label.control-label=env.t('mana') - .form-group - .col-md-6 + .form-group.row + .col-sm-3 + label.control-label=env.t('level') + .col-sm-9 input.form-control(type='number', data-for='stats.lvl', ng-model='$parent.restoreValues.stats.lvl') - label.control-label=env.t('level') h3=env.t('achievements') - .form-group - .col-md-6 + .form-group.row + .col-sm-3 + label.control-label=env.t('fix21Streaks') + .col-sm-9 input.form-control(type='number', data-for='achievements.streak', ng-model='$parent.restoreValues.achievements.streak') - label.control-label=env.t('fix21Streaks') //- This is causing too many problems for users h3=env.t('other') a.btn.btn-sm.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay(1)')=env.t('triggerDay') @@ -55,11 +61,11 @@ script(type='text/ng-template', id='modals/delete.html') .modal-header h4=env.t('deleteAccount') .modal-body - p!=env.t('deleteText', {deleteWord: 'DELETE'}) + p!=env.t('deleteText', {deleteWord: 'Your password'}) br .row .col-md-6 - input.form-control(type='text', ng-model='_deleteAccount') + input.form-control(type='password', ng-model='_deleteAccount') .modal-footer button.btn.btn-default(ng-click='$close()')=env.t('neverMind') - button.btn.btn-danger(ng-disabled='_deleteAccount != "DELETE"', ng-click='$close(); delete()')=env.t('deleteDo') + button.btn.btn-danger(ng-disabled='!_deleteAccount', ng-click='$close(); delete(_deleteAccount)')=env.t('deleteDo') diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 1a720a0216..d28aec3642 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,20 +1,300 @@ -h2 4/8/2016 - WORLD BOSS ATTACK: BEGUILEMENT STRIKE! +h2 6/2/2016 - JUNE BACKGROUNDS AND ARMOIRE ITEMS REVEALED! PLUS, JUNE CHALLENGE SPOTLIGHT hr tr - tr - .npc_alex_broken.pull-right - h3 Beguilement Strike on Alex the Merchant! - p Oh no! The Be-Wilder has used its Beguilement Strike! + td + .promo_backgrounds_armoire_201606.pull-right + h3 June Backgrounds + p There are three new avatar backgrounds in the Background Shop! Now your avatar can hop on a Lilypad, splash on a Waterfall Rock, or stroll down the Lighthouse Shore! + p.small.muted by Witticaster, KusSv, and shellcollector + tr + td + h3 June Armoire Items Revealed + p There is new equipment in Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear! br - p Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure. + p Click on the Enchanted Armoire for a random chance at special Equipment, including the Seaside Set and the Green Floppy Hat! It may also give you random XP or food items. We'll be adding new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP. br - p Hurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else. + p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you... + p.small.muted by Lemoness and SabreCat + p.small.muted Art by shellcollector and starsystemic + tr + td + h3 Challenge Spotlight: Small Improvements Add Up + p There's a new Challenge Spotlight on our blog! Check it out for some great Challenges that can help you improve your life one little step at a time. + br + p Have you made a Challenge that you think deserves to be in the spotlight? Submit it to be featured on our blog! Any Challenge with a Gem prize and a concrete end date is eligible. And feel free to tell us what you think about this month's spotlight in the comments, or on Twitter, Facebook, or Tumblr. Enjoy! + p.small.muted by redphoenix + p.small.muted Challenges by Accio Books, Cheers, and Freelancecynic if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 5/30/2016 - LAST CHANCE FOR MARCHING BARD ITEM SET AND FLORAL POTIONS + tr + td + .promo_mystery_201605.pull-right + .promo_floral_potions.pull-left.slight-right-margin + h3 Last Chance for Marching Bard Item Set + p Reminder: this is the final day to subscribe and receive the Marching Bard Item Set! If you want the Marching Bard Hat or the Marching Bard Uniform, now's the time. Thanks so much for your support -- we hope you enjoy your Gems. + p.small.muted by Lemoness + tr + td + h3 Last Chance for Floral Hatching Potions + p Reminder: this is the final day to buy Floral Hatching Potions! If they come back, it won't be until next year at the earliest, so don't delay! + p.small.muted by Mako413 + h2 5/25/2016 - iOS UPDATE, ANDROID UPDATE, AND MAY SUBSCRIBER ITEMS + tr + td + h3 iOS App Update Available + p We've released a new iOS app update that contains tons of bug fixes, including for the pet feeding crash and the annoying fake death popups! Be sure to download it now for a more stable Habitica. + br + p Thank you so much to everyone who reported bugs that cropped up after our massive code overhaul! It was very helpful. And if you have a spare moment, we'd love it if you could review this app. It really helps us out! iOS hides all old reviews, but if you've already written one, it's very easy to repost with a single button click. + p.small.muted by viirus + tr + td + h3 Android Update: Bug Fixes + p We've released a new Android update with fixes for lots of bugs and crashes. Download it now for a more stable experience! + br + p Thank you for your patience as we worked out some of the hiccups that came with our major code overhaul this weekend. If you like the direction that we're taking the app, we'd love it if you could take the time to leave us a review :) It really helps us out! + p.small.muted by viirus + tr + td + .promo_mystery_201605.pull-right + h3 May Subscriber Items + p The May Subscriber Items have been revealed: the Marching Bard Item Set! You still have six days to subscribe and receive the item set. + br + p Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe, the more Gems you can buy per month! There are other perks as well, such as longer access to uncompressed data. Best of all, your support directly keeps Habitica running. Thank you very much -- it means a lot to us! + p.small.muted by Lemoness + h2 5/21/2016 - WELCOME BACK, HABITICA! + tr + td + h3 Welcome Back, Everyone! + p Hurrah! After many hours of toil, our valiant blacksmiths were able to complete our planned maintenance ahead of schedule. The site should be working normally again! If you notice any issues or have any questions, please feel free to email us at admin@habitica.com and we will be happy to help. + tr + td + h3 Important Mobile App Updates + p We’ve released an iOS update and an Android update that contain the new code. It’s very important to download these updates immediately, or you may encounter significant bugs! + tr + td + .Pet-Wolf-Veteran.pull-right + h3 Veteran Pets + p To thank you for your patience during the maintenance, we have awarded everyone a special Veteran Pet! You can see it under Inventory > Pets, at the bottom of the screen. If it hasn’t appeared yet, never fear: because there are so many Habiticans, it can sometimes take an hour or two for everyone to receive their pet. You will have it soon! Thanks again for bearing with us during the downtime. + tr + td + h3 Daily Safe Mode + p To protect the accounts of Habiticans in different time zones across the world, we enabled Cron Daily Safe Mode during the maintenance, which will prevent you from taking any damage or losing any streaks for the rest of the weekend. Let us know at admin@habitica.com if you have any questions or concerns! + h2 5/19/2016 - IMPORTANT: UPCOMING MAINTENANCE! + tr + td + h3 Maintenance to Take Place May 21 + p This Saturday, we will be performing important maintenance on Habitica to build out the groundwork for some exciting upcoming features! We'll be doing everything we can to make this as smooth as possible, but unfortunately, there will be significant downtime for much of the day. + br + p.strong We expect that on Saturday, May 21st, Habitica will be unavailable between 1 PM and 10 PM Pacific Time (8 pm - 5 am UTC). + ul + li Don't worry, you will NOT lose any streaks or take any damage during this weekend, not even from Bosses! This maintenance will not harm your accounts. + li If you will need to see your task list on Saturday, we recommend taking a screenshot of your tasks before the maintenance begins so that you can use them as a reference during downtime. + li At the end of the maintenance, to thank people for their patience, everyone will receive a rare Veteran pet! + li This maintenance should not result in any major visible differences to the site; it's all behind-the-scenes work. However, at the end of it, we will release new updates to the mobile apps, which will be required in order for the apps to work properly with the new changes! Be sure to download those updates on Saturday as soon as they are released. + li For more information, please check out our detailed info page about the maintenance! And if you have any further questions or concerns, feel free to reach out to Leslie (leslie@habitica.com), and she will be happy to help you. + p We understand that it's very frustrating to have Habitica unavailable for such a long part of the day. Rest assured that we'll be doing everything we can to make the maintenance go as quickly as possible, but with over a million Habitican accounts to migrate, this is a hefty task! During the maintenance on Saturday we will be posting regular status reports on our Twitter account, so you can follow us for the most accurate updates. + br + p Thank you for your patience, and for using Habitica! + h2 5/17/2016 - TREELING PET QUEST AND CHALLENGE SPOTLIGHT! + tr + td + .Pet-Treeling-Base.pull-right + h3 New Pet Quest: The Tangle Tree (Treelings) + p We've released a new Pet Quest: The Tangle Tree! The Garden Competition has been disrupted by a terrible multi-tasking tree. Can you defeat this wooden warrior? If so, you'll earn some treeling eggs! + p.small.muted by Lemoness and SabreCat + p.small.muted Art by fuzzytrees, PainterProphet, plumilla, and aurakami + p.small.muted Writing by Flutter Bee + tr + td + h3 Challenge Spotlight + p There's a new Challenge Spotlight on our blog! Check it out for some great Challenges that can help you simplify your digital life. + br + p Have you made a Challenge that you think deserves to be in the spotlight? Submit it to be featured on our blog! Any Challenge with a Gem prize and a concrete end date is eligible. And feel free to tell us what you think about this month's spotlight in the comments, or on Twitter, Facebook, or Tumblr. Enjoy! + p.small.muted by redphoenix + p.small.muted Challenges by ArynChris, Janelle Rowe, and BeanieB + h2 5/14/2016 - IMPORTANT ANDROID UPDATE AND HABITICA ON SOCIAL MEDIA + tr + td + .scene_phone_peek.pull-right + h3 Android Update + p We've released a new Android update which includes the ability to choose a class at level 10! We've also fixed a bunch of bugs, and enabled social media sharing. Want to show off your new pet or fancy avatar to your friends? Now you can! + tr + td + .scene_coding.pull-right + h3 Habitica on Social Media + p Speaking of social media.... you should come follow Habitica on Twitter, Facebook, and Tumblr! We post important announcements and weekly updates, and we even share fun things like Habitica fanart and cosplay on our blog. Come chat with us! + h2 5/11/2016 - NEW AVATAR CUSTOMIZATIONS AND CHALLENGE SPOTLIGHT SUBMISSIONS + tr + td + .promo_chairs_glasses.pull-right + h3 Glasses and New Wheelchair Colors for Avatars + p We have two new sets of free avatar customizations available: glasses, and additional wheelchair colors! We hope that Habiticans who wear glasses and/or use wheelchairs will enjoy these options. + p.small.muted by Breadstrings and Balduranne + tr + td + h3 Challenge Spotlight Submissions + p Do you have a broadly-applicable Challenge that you would like to promote to all of Habitica? Now you can submit Challenges to be featured on our official blog! To qualify, the Challenge must have a fixed end date and a Gem prize of any amount. To submit a Challenge for consideration, just fill out this form. + p.small.muted by redphoenix + h2 5/3/2016 - iOS UPDATE, MAY BACKGROUNDS, AND MAY ARMOIRE ITEMS + tr + td + h3 iOS Update + p We've released a new iOS update which includes social media sharing and the ability to change your class from the app, as well as some bug fixes. Be sure to download it now for a better Habitica experience! + br + p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Old reviews get hidden, but if you go to the review section you can re-post it again with a single tap. We hope you enjoy the update! + p.small.muted by viirus + tr + td + .promo_backgrounds_armoire_201605.pull-right + h3 May Backgrounds + p There are three new avatar backgrounds in the Background Shop! Now your avatar can buzz in a Beehive, explore the Tree Roots, or battle a Gazebo. + p.small.muted by James Danger and DialFForFunky + tr + td + h3 May Armoire Items Revealed + p There is new equipment in the Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear! + br + p Click on the Enchanted Armoire for a random chance at special Equipment, including the Graduate Set and the Bouquet of Flowers! It may also give you random XP or food items. We'll be adding new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP. + br + p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you... + p.small.muted by Breadstrings + h2 4/29/2016 - LAST CHANCE FOR APRIL SUBSCRIBER ITEMS AND SPRING FLING ITEMS! + tr + td + .promo_mystery_201604.pull-right + h3 Last Chance for April Item Set + p Reminder: this is the final day to subscribe and receive the Leaf Warrior Item Set! If you want the Crown o' Flowers or the Armor o' Leaves, now's the time. Thanks so much for your support <3 + tr + td + .promo_spring_classes_2016.pull-right + h3 Last Chance for Spring Fling Items and Customizations + p On May 1st, everything will be back to normal in Habitica, so if you still have any remaining Spring Fling Items that you want to buy from the Rewards Column or the Seasonal Shop, you'd better do it now! The Seasonal Edition items and Hair/Skin Colors won't be back until next March, and if the Limited Edition items return they will have increased prices or changed art, so strike while the iron is hot! + h2 4/27/2016 - WORLD BOSS DEFEATED! + tr + td + h3 The Be-Wilder World Boss is Defeated! + p We've done it! The Be-Wilder lets out a ululating cry as it twists in the air, shedding feathers like falling rain. Slowly, gradually, it coils into a cloud of sparkling mist. As the newly-revealed sun pierces the fog, it burns away, revealing the coughing, mercifully human forms of Bailey, Matt, Alex.... and the April Fool himself. + tr + td + h3 Mistiflying is Saved! + p The April Fool has enough shame to look a bit sheepish. “Oh, hm,” he says. “Perhaps I got a little…. carried away.” + br + p The crowd mutters. Sodden flowers wash up on sidewalks. Somewhere in the distance, a roof collapses with a spectacular splash. + br + p “Er, yes,” the April Fool says. “That is. What I meant to say was, I’m dreadfully sorry.” He heaves a sigh. “I suppose it can’t all be fun and games, after all. It might not hurt to focus occasionally. Maybe I’ll get a head start on next year’s pranking.” + br + p Redphoenix coughs meaningfully. + br + p “I mean, get a head start on this year’s spring cleaning!” the April Fool says. “Nothing to fear, I’ll have Habit City in spit-shape soon. Luckily nobody is better than I at dual-wielding mops.” + br + p Encouraged, the marching band starts up. + br + .Pet-MagicalBee-Base.pull-right + p It isn’t long before all is back to normal in Habit City. Plus, now that the Be-Wilder has evaporated, the magical bees of Mistiflying bustle back to work, and soon the flowers are blooming and the city is floating once more. + br + p As Habiticans cuddle the magical fuzzy bees, the April Fool’s eyes light up. “Oho, I’ve had a thought! Why don’t you all keep some of these Magical Bee Pets and Mounts? It’s a gift that perfectly symbolizes the balance between hard work and sweet rewards, if I’m going to get all boring and allegorical on you.” He winks. “Besides, they don’t have stingers! Fool’s honor.” + h2 4/25/2016 - APRIL SUBSCRIBER ITEMS AND FLORAL HATCHING POTIONS! + tr + td + .promo_mystery_201604.pull-right + h3 April Subscriber Items + p The April Subscriber Item has been revealed: the Leaf Warrior Item Set! You still have five days to subscribe and receive the item set. + br + p Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe, the more Gems you can buy per month! There are other perks as well, such as longer access to uncompressed data. Best of all, your support directly keeps Habitica running. Thank you very much -- it means a lot to us! + p.small.muted by Lemoness + tr + td + .promo_floral_potions.pull-left.slight-right-margin + h3 Floral Hatching Potions + p Between now and May 31st, you can buy Floral Hatching Potions from the Market and use them to hatch any standard pet egg! (Magic Hatching Potions do not work on Quest Pet eggs.) + br + p Floral Hatching Potions are a Seasonal Edition item, so they will not be available again before next spring! Be sure to get them while you can. + p.small.muted by Mako413 + h2 4/23/2016 - THE BE-WILDER STRIKES AGAIN! + tr + td + h3 World Boss: Third Beguilement Strike! + p Look out! In the middle of reporting the news, Bailey the Town Crier has been possessed by the Be-Wilder! She lets out an evil, uninformative screech as she rises into the air. Now how will we know what’s going on? + br + p Don't give up... we're so close to defeating this bothersome bird for once and for all! + h2 4/15/2016 - iOS AND ANDROID UPDATES, AND ANOTHER BEGUILEMENT STRIKE! + tr + td + h3 iOS Update: Fixes Galore + p We've released a new iOS update focusing on stability and bug fixes! + br + p It includes multiple crash fixes, most notably for iOS 7 and for quests with rage bars, and clears up frustrating bugs such as the issues with timezones, the duplicating items bug, and the fact that completed to-dos used to still cause reminders. Be sure to download it now for a better Habitica experience! + br + p Thank you very much for your patience! If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Also, old reviews get hidden, but if you go to the review section you can re-post it again with a single tap. We hope you enjoy the update! + p.small.muted by viirus, schrockblock, a-ayyash, and nivl4 + tr + td + .Pet-Wolf-Base.pull-left.slight-right-margin + h3 Android App Update: Pets, Enchanted Armoire, and More! + p In case you missed it, yesterday we updated the Android app to include a ton of features, including: + br + ul + li Pets and Mounts! Now you can use the app to hatch pets, feed them, and equip pets and mounts. + li The World Boss! Now you can view the World Boss Battle from the Tavern on the app! + li The Enchanted Armoire! Tap right from the app for a chance at equipment, Experience, or food. + li Edit Task Attributes! Assign attributes to tasks for use with task-based point allocation. + li Crash and Bug Fixes! Including fixes for incorrectly-locked backgrounds, date display, editing task attribution allocation, and more. + br + p If you like what we're doing with the app, please consider leaving a review! It means a lot to us. + p.small.muted by viirus, saranlert, schrockblock, ablx and jeubank12 + tr + td + .npc_matt_broken.pull-right + h3 World Boss: Second Beguilement Strike! + p In more frightening news, the Be-Wilder has used another Beguilement Strike! + br + p Once again the Be-Wilder has dazzled us into neglecting our Dailies, and now it has attacked Matt the Beast Master! With a swirl of mist, Matt transforms into a terrifying winged creature, and all the pets and mounts howl sadly in their stables. Quickly, stay focused on your tasks to defeat this dastardly distraction! + h2 4/14/2016 - ANDROID APP UPDATES! + tr + td + .Pet-Wolf-Base.pull-left.slight-right-margin + h3 Android App Update: Pets, Enchanted Armoire, and More! + p We've updated the Android app to include a ton of features, including: + br + ul + li Pets and Mounts! Now you can use the app to hatch pets, feed them, and equip pets and mounts. + li The World Boss! Now you can view the World Boss Battle from the Tavern on the app! + li The Enchanted Armoire! Tap right from the app for a chance at equipment, Experience, or food. + li Edit Task Attributes! Assign attributes to tasks for use with task-based point allocation. + li Crash and Bug Fixes! Including fixes for incorrectly-locked backgrounds, date display, editing task attribution allocation, and more. + br + p If you like what we're doing with the app, please consider leaving a review! It means a lot to us. + p.small.muted by viirus, saranlert, schrockblock, ablx and jeubank12 + h2 4/12/2016 - APRIL PET QUEST: FALCON! + tr + td + .Pet-Falcon-Base.pull-right + h3 April Pet Quest: The Birds of Preycrastination + p The Birds of Preycrastination are making it hard for Habiticans to meet their goals! Can you defeat your tasks? If so, you'll earn a batch of Falcon Eggs! Get The Birds of Preycrastination from the Quest Shop. + p.small.muted Writing by Bartelmy + p.small.muted Art by JonArinbjorn, Squish, Onheiron, and Trogdorina + tr + td + .shop_valorousPresence.pull-left.slight-right-margin + h3 Skill Icons + p Now skills have a beautiful set of icons associated with them, thanks to our artist contributors! + p.small.muted by Accio Books! + p.small.muted Art by Draayder, Siriocra, Evyx, RosemonkeyCT, LlamaHobbit, Inventrix, Pfeffernusse, TinyCoke, and intune + h2 4/8/2016 - WORLD BOSS ATTACK: BEGUILEMENT STRIKE! + tr + tr + .npc_alex_broken.pull-right + h3 Beguilement Strike on Alex the Merchant! + p Oh no! The Be-Wilder has used its Beguilement Strike! + br + p Despite our best efforts, we've gotten distracted by the Be-Wilder’s charming illusions and have forgotten to do some of our Dailies! With a cackling cry, the shining bird beats its wings, raising a swarm of mist around Alex the Merchant. When the fog clears, he has been possessed! “Have some free samples!” he shouts gleefully, and begins to hurl exploding eggs and potions at fleeing Habiticans. Not the most favorable of sales, to be sure. + br + p Hurry! Let's stay focused on our Dailies to defeat this monster before it possesses someone else. h2 4/5/2016 - APRIL BACKGROUNDS, ARMOIRE ITEMS, AND SHINY SEEDS! tr td @@ -124,7 +404,7 @@ mixin oldNews tr td .promo_spring_classes_2016.pull-right - h3 Limited Edition Class Outfits + h3 Limited Edition Class Outfits p From now until April 30th, limited edition outfits are available in the Rewards column! Depending on your class, you can be a Springing Bunny, Clever Dog, Grand Malkin, or Brave Mouse. You'd better get productive to earn enough Gold before your time runs out... p.small.muted by PainterProphet and Balduranne tr @@ -678,7 +958,7 @@ mixin oldNews p Exciting news - for the next three weeks, we are offering Habitica T-shirts via Teespring! Show your Habitica pride in purple or black. We are also offering an EU run for cheaper shipping to Europe! br p Whether you're getting them for yourself or as a holiday gift, we hope you enjoy these limited-run T-shirts! As always, thanks for supporting Habitica. - + h2 11/5/2015 - HUGE IOS UPDATE AND ANDROID MAILING LIST tr td @@ -708,7 +988,7 @@ mixin oldNews tr td h3 Android Mailing List - p For those of you anxious for news about the new native Android app, we've created a mailing list so that you can be notified about important updates for the Android app. You can sign up here! + p For those of you anxious for news about the new native Android app, we've created a mailing list so that you can be notified about important updates for the Android app. You can sign up here! br p Our staff has been working very hard on it and testing out a new build each week, so progress is definitely advancing. When the beta is ready we will announce it on social media and on the site, but the mailing list is the easiest way to make sure you don't miss it! Thanks very much for your patience. h2 11/3/2015 - NOVEMBER BACKGROUNDS AND ARMOIRE ITEMS, AND AUTO-EQUIP NEW GEAR @@ -769,14 +1049,14 @@ mixin oldNews td .promo_mystery_201510.pull-right h3 Last Chance for Horned Goblin Set - p Reminder: this is the final day to subscribe and receive the Horned Goblin Item Set! If you want the Goblin Horns or the Goblin Tail, now's the time! + p Reminder: this is the final day to subscribe and receive the Horned Goblin Item Set! If you want the Goblin Horns or the Goblin Tail, now's the time! br - p Thanks so much for your supporting the site -- you're helping us keep Habitica alive. + p Thanks so much for your supporting the site -- you're helping us keep Habitica alive. tr td .npc_justin.pull-right h3 Happy Habitoween! - p Burnout is nearly defeated, so what could be a better way to speed the celebration than to have some fun? In honor of Habitoween and defiance of the looming threat, all of the remaining NPCs have dressed up as monsters from the Flourishing Fields! Be sure to visit them on the site to admire their outfits. If only the three Exhaust Spirits could join them... + p Burnout is nearly defeated, so what could be a better way to speed the celebration than to have some fun? In honor of Habitoween and defiance of the looming threat, all of the remaining NPCs have dressed up as monsters from the Flourishing Fields! Be sure to visit them on the site to admire their outfits. If only the three Exhaust Spirits could join them... h2 10/27/2015 - BURNOUT STRIKES AGAIN! PLUS, SPOOKY POTIONS VANISHING SOON tr @@ -2480,9 +2760,9 @@ mixin oldNews td h3 Spooky Sparkles .pull-right - .inventory_special_spookDust - .achievement-spookDust - .spookman + .inventory_special_spookySparkles + .achievement-spookySparkles + .ghost p There's a new gold-purchasable item in the Market: Spooky Sparkles! Buy some and then cast it on your friends. I wonder what it will do? br p If you have Spooky Sparkles cast on you, you will receive the "Alarming Friends" badge! Don't worry, any mysterious effects will wear off the next day.... or you can cancel them early by buying an Opaque Potion! diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 1b3659a863..cb75e0db32 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -183,11 +183,11 @@ div(ng-if='::profile.achievements.snowball') =env.t('annoyingFriendsText', {snowballs: "{{::profile.achievements.snowball}}"}) hr -div(ng-if='::profile.achievements.spookDust') - .achievement.achievement-spookDust +div(ng-if='::profile.achievements.spookySparkles') + .achievement.achievement-spookySparkles h5=env.t('alarmingFriends') small - =env.t('alarmingFriendsText', {spookDust: "{{::profile.achievements.spookDust}}"}) + =env.t('alarmingFriendsText', {spookySparkles: "{{::profile.achievements.spookySparkles}}"}) hr div(ng-if='::profile.achievements.shinySeed') diff --git a/website/views/shared/profiles/stats/attributes.jade b/website/views/shared/profiles/stats/attributes.jade index 0d222a42b4..bf5b1dbcba 100644 --- a/website/views/shared/profiles/stats/attributes.jade +++ b/website/views/shared/profiles/stats/attributes.jade @@ -7,7 +7,7 @@ table.table.table-striped span.hint(popover-title=env.t(statInfo.title), popover-placement='right', popover=env.t(statInfo.popover), popover-trigger='mouseenter') strong=env.t(statInfo.title) - strong : {{profile._statsComputed.#{stat}}} + strong : {{profile.fns.statsComputed().#{stat}}} td: ul.list-unstyled +statList('statCalc.levelBonus(profile.stats.lvl)', 'levelBonus', 'level', true) diff --git a/website/views/shared/tasks/edit/habits/plus_minus.jade b/website/views/shared/tasks/edit/habits/plus_minus.jade index bbe17b7d4e..0a67ff9001 100644 --- a/website/views/shared/tasks/edit/habits/plus_minus.jade +++ b/website/views/shared/tasks/edit/habits/plus_minus.jade @@ -1,8 +1,8 @@ fieldset.option-group.plusminus(ng-if='task.type=="habit" && !task.challenge.id') legend.option-title=env.t('direction/Actions') span.task-checker - input.visuallyhidden.focusable(id='{{obj._id}}_{{task.id}}-option-plus', type='checkbox', ng-model='task.up') - label(for='{{obj._id}}_{{task.id}}-option-plus') + input.visuallyhidden.focusable(id='{{obj._id}}_{{task._id}}-option-plus', type='checkbox', ng-model='task.up') + label(for='{{obj._id}}_{{task._id}}-option-plus') span.task-checker - input.visuallyhidden.focusable(id='{{obj._id}}_{{task.id}}-option-minus', type='checkbox', ng-model='task.down') - label(for='{{obj._id}}_{{task.id}}-option-minus') + input.visuallyhidden.focusable(id='{{obj._id}}_{{task._id}}-option-minus', type='checkbox', ng-model='task.down') + label(for='{{obj._id}}_{{task._id}}-option-minus') diff --git a/website/views/shared/tasks/edit/index.jade b/website/views/shared/tasks/edit/index.jade index ce29ee8896..1ed0f4f3f8 100644 --- a/website/views/shared/tasks/edit/index.jade +++ b/website/views/shared/tasks/edit/index.jade @@ -3,12 +3,12 @@ div(ng-if='task._editing') // Broken Challenge .well(ng-if='task.challenge.broken') - div(ng-if='task.challenge.broken=="TASK_DELETED"') + div(ng-if='task.challenge.broken=="TASK_DELETED" || task.challenge.broken=="CHALLENGE_TASK_NOT_FOUND"') p=env.t('brokenTask') p a(ng-click='unlink(task, "keep")')=env.t('keepIt') | - a(ng-click="removeTask(task, obj[list.type+'s'])")=env.t('removeIt') + a(ng-click="removeTask(task, obj)")=env.t('removeIt') div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"') p | diff --git a/website/views/shared/tasks/edit/tags.jade b/website/views/shared/tasks/edit/tags.jade index 089aa0c408..8abcedc355 100644 --- a/website/views/shared/tasks/edit/tags.jade +++ b/website/views/shared/tasks/edit/tags.jade @@ -1,5 +1,5 @@ fieldset.option-group(ng-if='!$state.includes("options.social.challenges")') p.option-title.mega(ng-class='{active: task._tags}', ng-click='task._tags = !task._tags', tooltip=env.t('expandCollapse'))=env.t('tags') label.checkbox(ng-repeat='tag in user.tags', ng-if='task._tags') - input(type='checkbox', ng-model='task.tags[tag.id]') + input(type='checkbox', ng-checked="task.tags.indexOf(tag.id) !== -1", ng-click="updateTaskTags(tag.id, task)") markdown(text='tag.name') diff --git a/website/views/shared/tasks/index.jade b/website/views/shared/tasks/index.jade index fc3223b888..f128b0b322 100644 --- a/website/views/shared/tasks/index.jade +++ b/website/views/shared/tasks/index.jade @@ -23,7 +23,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") i.glyphicon.glyphicon-warning-sign =env.t('dailiesRestingInInn') - button.btn-block.btn.btn-lg.btn-success(ng-click='User.user.ops.sleep({})') + button.btn-block.btn.btn-lg.btn-success(ng-click='User.sleep({})') | {{env.t('innCheckOut')}} +taskColumnTabs('top') diff --git a/website/views/shared/tasks/meta_controls.jade b/website/views/shared/tasks/meta_controls.jade index 733b37d23a..3feaef0d87 100644 --- a/website/views/shared/tasks/meta_controls.jade +++ b/website/views/shared/tasks/meta_controls.jade @@ -23,15 +23,15 @@ |{{checklistCompletion(task.checklist)}}/{{task.checklist.length}} span.glyphicon.glyphicon-tags(tooltip='{{Shared.appliedTags(user.tags, task.tags)}}', ng-hide='Shared.noTags(task.tags)') // edit - a(ng-hide='task._editing', ng-click='editTask(task)', tooltip=env.t('edit')) + a(ng-hide='task._editing', ng-click='editTask(task, user)', tooltip=env.t('edit')) | span.glyphicon.glyphicon-pencil(ng-hide='task._editing') | - a(ng-hide='!task._editing', ng-click='editTask(task)', tooltip=env.t('cancel')) + a(ng-hide='!task._editing', ng-click='editTask(task, user)', tooltip=env.t('cancel')) span.glyphicon.glyphicon-remove(ng-hide='!task._editing') | // save - a(ng-hide='!task._editing', ng-click='editTask(task);saveTask(task)', tooltip=env.t('save')) + a(ng-hide='!task._editing', ng-click='editTask(task, user);saveTask(task)', tooltip=env.t('save')) span.glyphicon.glyphicon-ok(ng-hide='!task._editing') | //challenges @@ -43,12 +43,12 @@ span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge')) | // delete - a(ng-if='!task.challenge.id', ng-click='removeTask(task, obj[list.type+"s"])', tooltip=env.t('delete')) + a(ng-if='!task.challenge.id || obj.leader._id === User.user._id', ng-click='removeTask(task, obj)', tooltip=env.t('delete')) span.glyphicon.glyphicon-trash | // chart - a(ng-show='task.history', ng-click='toggleChart(obj._id+task.id, task)', tooltip=env.t('progress')) + a(ng-show='task.history', ng-click='toggleChart(obj._id+task._id, task)', tooltip=env.t('progress')) span.glyphicon.glyphicon-signal | // notes diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade index 3a69e1f760..ad8ee4ffe5 100644 --- a/website/views/shared/tasks/task.jade +++ b/website/views/shared/tasks/task.jade @@ -1,4 +1,4 @@ -li(id='task-{{::task.id}}', +li(id='task-{{::task._id}}', ng-repeat='task in obj[list.type+"s"] | filterByTaskInfo: obj.filterQuery | conditionalOrderBy: list.view=="dated":"date"', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', @@ -14,4 +14,4 @@ li(id='task-{{::task.id}}', include ./edit/index - div(class='{{obj._id}}{{task.id}}-chart', ng-show='charts[obj._id+task.id]') + div(class='{{obj._id}}{{task._id}}-chart', ng-show='charts[obj._id+task._id]') diff --git a/website/views/shared/tasks/task_view/add_new.jade b/website/views/shared/tasks/task_view/add_new.jade index f9baf76499..2d4fd1c869 100644 --- a/website/views/shared/tasks/task_view/add_new.jade +++ b/website/views/shared/tasks/task_view/add_new.jade @@ -1,4 +1,4 @@ -form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)', novalidate) +form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"], list, obj)', novalidate) textarea(rows='6', focus-element='list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required) input(type='text', focus-element='!list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required) button(type='submit', ng-disabled='new{{list.type}}form.$invalid') diff --git a/website/views/shared/tasks/task_view/graph.jade b/website/views/shared/tasks/task_view/graph.jade index 82f062dfde..be2fba13a8 100644 --- a/website/views/shared/tasks/task_view/graph.jade +++ b/website/views/shared/tasks/task_view/graph.jade @@ -1,7 +1,7 @@ span.option-box.pull-right(ng-if='::main') a.option-action(ng-if='list.type=="todo"', ng-show='obj.history.todos', ng-click='toggleChart("todos")', tooltip=env.t('progress'), style='margin-right:5px;') span.glyphicon.glyphicon-signal - //a.option-action(ng-href='/v1/users/{{user.id}}/calendar.ics?apiToken={{user.apiToken}}', tooltip='iCal') + //a.option-action(ng-href='/v1/users/{{user.id}}/calendar.ics?apiToken={{User.settings.auth.apiToken}}', tooltip='iCal') //-a.option-action(ng-if='list.type=="todo"', ng-click='notPorted()', tooltip='iCal', ng-show='false') span.glyphicon.glyphicon-calendar // diff --git a/website/views/shared/tasks/task_view/index.jade b/website/views/shared/tasks/task_view/index.jade index 1d151ebd07..16628bfa5d 100644 --- a/website/views/shared/tasks/task_view/index.jade +++ b/website/views/shared/tasks/task_view/index.jade @@ -28,13 +28,13 @@ // Daily & Todos span.task-checker.action-yesno(ng-if='::task.type=="daily" || task.type=="todo"') - input.task-input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox', + input.task-input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task._id}}', type='checkbox', ng-model='task.completed', ng-if='$state.includes("tasks")', - ng-change='task.type=="todo" && pushTask(task,$index,"bottom"); changeCheck(task)' + ng-change='changeCheck(task)' ui-keypress='{13:"task.completed = !task.completed; changeCheck(task)"}' ) - input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task.id}}', type='checkbox', + input.visuallyhidden.focusable(id='box-{{::obj._id}}_{{::task._id}}', type='checkbox', ng-if='!$state.includes("tasks")') - label(for='box-{{::obj._id}}_{{::task.id}}') + label(for='box-{{::obj._id}}_{{::task._id}}') // main content .task-text(ng-dblclick='task._editing ? saveTask(task) : editTask(task)') diff --git a/website/views/shared/tasks/task_view/mixins.jade b/website/views/shared/tasks/task_view/mixins.jade index 398813d5ad..2c71074d71 100644 --- a/website/views/shared/tasks/task_view/mixins.jade +++ b/website/views/shared/tasks/task_view/mixins.jade @@ -24,7 +24,7 @@ mixin taskColumnTabs(position) div(ng-show='list.view == "complete"') .alert =env.t('lotOfToDos') - button.task-action-btn.tile.spacious.bright(ng-click='user.ops.clearCompleted({})',popover=env.t('deleteToDosExplanation'),popover-trigger='mouseenter')=env.t('clearCompleted') + button.task-action-btn.tile.spacious.bright(ng-click='User.clearCompleted({})',popover=env.t('deleteToDosExplanation'),popover-trigger='mouseenter')=env.t('clearCompleted') // remaining/completed tabs ul.task-filter li(ng-class='{active: list.view == "remaining"}') @@ -32,7 +32,7 @@ mixin taskColumnTabs(position) li(ng-class='{active: list.view == "dated"}') a(ng-click='list.view = "dated"')=env.t('dated') li(ng-class='{active: list.view == "complete"}') - a(ng-click='list.view = "complete"')=env.t('complete') + a(ng-click='list.view = "complete";loadedCompletedTodos()')=env.t('complete') // Rewards Tabs div(ng-if='::main && list.type=="reward"', class='tabbable tabs-below') ul.task-filter diff --git a/website/views/shared/tasks/task_view/skills.jade b/website/views/shared/tasks/task_view/skills.jade index da8cabef47..dccd6d1233 100644 --- a/website/views/shared/tasks/task_view/skills.jade +++ b/website/views/shared/tasks/task_view/skills.jade @@ -1,5 +1,5 @@ // Events -- var seasonalSkills = {'snowball':'salt', 'spookDust':'opaquePotion', 'shinySeed':'petalFreePotion', 'seafoam':'sand'} +- var seasonalSkills = {'snowball':'salt', 'spookySparkles':'opaquePotion', 'shinySeed':'petalFreePotion', 'seafoam':'sand'} ul.items.rewards each dispel,skill in seasonalSkills span(ng-if='main && list.type=="reward" && (user.items.special.#{skill}>0 || user.stats.buffs.#{skill})') diff --git a/website/views/shared/tasks/task_view/static_rewards.jade b/website/views/shared/tasks/task_view/static_rewards.jade index 3ce7ab78b8..668c8de4ff 100644 --- a/website/views/shared/tasks/task_view/static_rewards.jade +++ b/website/views/shared/tasks/task_view/static_rewards.jade @@ -1,4 +1,6 @@ -mixin reward(item) +mixin reward(item, action) + - action = action || "buy(" + item + ")" + li.task.reward-item(popover-trigger='mouseenter', popover-placement='top', popover='{{::#{item}.notes()}}')&attributes(attributes) // right-hand side control buttons .task-meta-controls @@ -8,8 +10,8 @@ mixin reward(item) .task-controls.task-primary input.reward.visuallyhidden( type='checkbox', - ui-keypress='{13:"buy(#{item})"}') - a.money.btn-buy.item-btn(ng-class='::{highValue: #{item}.value >= 1000}', ng-click='::buy(#{item})') + ui-keypress='{13:"#{action}"}') + a.money.btn-buy.item-btn(ng-class='::{highValue: #{item}.value >= 1000}', ng-click='::#{action}') span.shop_gold span.reward-cost {{::#{item}.value}} // main content @@ -19,5 +21,5 @@ mixin reward(item) ul.items.rewards(ng-if='main && list.type=="reward"') +reward('item')(ng-repeat='item in itemStore') +reward('healthPotion') - +reward('armoire')(ng-if='user.flags.armoireEnabled', + +reward('armoire', 'buyArmoire()')(ng-if='user.flags.armoireEnabled', popover='{{armoire.notes(user, armoireCount(user.items.gear.owned))}}') diff --git a/website/views/social/layout.jade b/website/views/social/layout.jade index 7789a6150b..d5b638b318 100644 --- a/website/views/social/layout.jade +++ b/website/views/social/layout.jade @@ -22,6 +22,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png') meta(name='twitter:description' content=socialDescription) meta(name='apple-itunes-app' content='app-id=994882113') + meta(name='google-play-app' content='app-id=com.habitrpg.android.habitica') + link(rel='apple-touch-icon' href='/logo.png') + link(rel='android-touch-icon' href='/logo.png') link(rel='canonical', href='', type='text/html') link(rel='shortcut icon', href='/favicon.ico') link(rel='mask-icon', href='/favicon.ico') @@ -42,3 +45,14 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') include ../shared/mixins .container block content + // Smart App Banner + script(type='text/javascript'). + new SmartBanner({ + title: 'Habitica: Gamify Your Tasks', + author: 'HabitRPG, Inc.', + button: 'GET', + store: { + ios: 'On the App Store', + android: 'In Google Play' + } + }); diff --git a/website/views/static/api-v2.jade b/website/views/static/api-v2.jade new file mode 100644 index 0000000000..c6e5c034f0 --- /dev/null +++ b/website/views/static/api-v2.jade @@ -0,0 +1,103 @@ +doctype html +html + head + title Swagger UI + link(href='//fonts.googleapis.com/css?family=Droid+Sans:400,700', rel='stylesheet', type='text/css') + link(href='/bower_components/swagger-ui/dist/css/reset.css', media='screen', rel='stylesheet', type='text/css') + link(href='/bower_components/swagger-ui/dist/css/screen.css', media='screen', rel='stylesheet', type='text/css') + link(href='/bower_components/swagger-ui/dist/css/reset.css', media='print', rel='stylesheet', type='text/css') + link(href='/bower_components/swagger-ui/dist/css/screen.css', media='print', rel='stylesheet', type='text/css') + + script(src='/bower_components/swagger-ui/dist/lib/shred.bundle.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/jquery-1.8.0.min.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/jquery.slideto.min.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/jquery.wiggle.min.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/jquery.ba-bbq.min.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/handlebars-1.0.0.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/underscore-min.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/backbone-min.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/swagger.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/swagger-ui.js', type='text/javascript') + script(src='/bower_components/swagger-ui/dist/lib/highlight.7.3.pack.js', type='text/javascript') + script(type='text/javascript'). + $(function () { + window.swaggerUi = new SwaggerUi({ + url: "/api/v2/api-docs", + dom_id: "swagger-ui-container", + supportedSubmitMethods: ['get', 'post', 'put', 'delete'], + onComplete: function(swaggerApi, swaggerUi){ + if(console) { + console.log("Loaded SwaggerUI") + } + $('pre code').each(function(i, e) {hljs.highlightBlock(e)}); + }, + onFailure: function(data) { + if(console) { + console.log("Unable to Load SwaggerUI"); + console.log(data); + } + }, + docExpansion: "none" + }); + + debugger; + + $('#input_apiKey').change(function() { + var key = $('#input_apiKey')[0].value; + console.log("apiKey: " + key); + if(key && key.trim() != "") { + console.log("added key " + key); + window.authorizations.add("apiKey", new ApiKeyAuthorization("x-api-key", key, "header")); + } + }) + $('#input_uuid').change(function() { + var key = $('#input_uuid')[0].value; + console.log("uuid: " + key); + if(key && key.trim() != "") { + console.log("added key " + key); + window.authorizations.add("uuid", new ApiKeyAuthorization("x-api-user", key, "header")); + } + }) + window.swaggerUi.load(); + }); + body.swagger-section + #header + .swagger-ui-wrap + a#logo(href='http://swagger.wordnik.com') Habitica API Documentation + + .swagger-ui-wrap(style='padding:50px') + form#api_selector + .input + input#input_uuid(placeholder='UUID', name='uuid', type='text') + input#input_apiKey(placeholder='API Key', name='apiKey', type='password') + //.input + input#input_baseUrl(placeholder='http://example.com/api', name='baseUrl', type='text') + //.input + a#explore(href='#') Explore + br + h2 API v3 + p This page contains documentation for version 2 of Habitica's API. A new API version, the third, has been released and its documentation can be found here and an introductory blog post with the most important changes here. + p API v2 is still available to give time to developers to port their apps and integration to the new API but it's considered deprecated and should not be used for new projects. It'll be completely retired shortly. + br + h2 Two API Types + p Habitica's API is meant for two different audiences: (1) extensions and scripts, and (2) full-fledged applications. Extensions and scripts can utilize Habitica's up/down scoring for individual tasks. An example of this in action is the Chrome Extension, which up-scores you for visiting productive websites, and down-scores you for visiting procrastination websites. Other examples currently in use are Pomodoro, Anki, and Github scripts - which up-score you for good behavior and downscore you for bad behavior - see the list. The second API consumer is for full-fledge applications, which need read / write access to the entire user document. An example of this would be Mobile Apps or Desktop application. + h2 Extensions / Scripts + p Habitica has a simple API for up-scoring and down-scoring third party Habits:
POST /api/v2/user/tasks/{id}/{direction} (headers x-api-user and x-api-key required).
+ h4 Example
+ p curl -X POST -H "x-api-key: YOUR_API_TOKEN" -H "x-api-user: YOUR_USER_ID" https://habitica.com/api/v2/user/tasks/productivity/up
+ p Note: You may need to add --compressed -H "Content-Type:application/json" to your curl if you get errors.
+ ul
+ li POST to the URL /api/v2/user/tasks/{id}/{direction}
+ ul
+ li {direction} is 'up' or 'down'
+ li {id} is a unique identifier for a Habit, which you make up, consisting of lowercase letters. Try to make it something common, like 'productivity' or 'fitness' - because other services may piggy-back off your Habit. For example, the Chrome extension down-scores a productivity Habit when you visit vice websites (reddit, 9gag, etc). However, Pomodoro up-scores productivity when you complete a Pomodoro task. So the two services share a single Habit to score your overall productivity. If the Habit doesn't yet exist, it is created the first time you POST to this URL.
+ li apiToken (POST body) required
+ p A more advanced version that allows modification of other types of tasks is available in the /user/tasks/{id}/{direction} route in the full API below.
+ h2 Full API
+ p All API requests should be prefaced by https://habitica.com. Every authenticated request should include two headers. Your api key (x-api-key) and your user id (x-api-user). Do not include {} braces in your header (-H 'x-api-user: a94b6d9d-6b64-43ae-856c-2c3f211bd426')
+ h2 Requirements:
+ p The base-url for all routes is /api/v2. So /user actions will be at https://habitica.com/api/v2/*. You need to send x-api-user and x-api-key headers for each request.
+ p For create & edit paths (PUT & POST), you'll need to know the schema of the object you're trying to create or edit. See Schema definitions here
+ p If any of the documentation is lacking or you're having trouble with it, please post an issue to Github
+ #message-bar.swagger-ui-wrap
+ #swagger-ui-container.swagger-ui-wrap
diff --git a/website/views/static/api.jade b/website/views/static/api.jade
deleted file mode 100644
index 8c7ebcce8a..0000000000
--- a/website/views/static/api.jade
+++ /dev/null
@@ -1,99 +0,0 @@
-doctype html
-html
- head
- title Swagger UI
- link(href='//fonts.googleapis.com/css?family=Droid+Sans:400,700', rel='stylesheet', type='text/css')
- link(href='/bower_components/swagger-ui/dist/css/reset.css', media='screen', rel='stylesheet', type='text/css')
- link(href='/bower_components/swagger-ui/dist/css/screen.css', media='screen', rel='stylesheet', type='text/css')
- link(href='/bower_components/swagger-ui/dist/css/reset.css', media='print', rel='stylesheet', type='text/css')
- link(href='/bower_components/swagger-ui/dist/css/screen.css', media='print', rel='stylesheet', type='text/css')
-
- script(src='/bower_components/swagger-ui/dist/lib/shred.bundle.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/jquery-1.8.0.min.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/jquery.slideto.min.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/jquery.wiggle.min.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/jquery.ba-bbq.min.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/handlebars-1.0.0.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/underscore-min.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/backbone-min.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/swagger.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/swagger-ui.js', type='text/javascript')
- script(src='/bower_components/swagger-ui/dist/lib/highlight.7.3.pack.js', type='text/javascript')
- script(type='text/javascript').
- $(function () {
- window.swaggerUi = new SwaggerUi({
- url: "/api/v2/api-docs",
- dom_id: "swagger-ui-container",
- supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
- onComplete: function(swaggerApi, swaggerUi){
- if(console) {
- console.log("Loaded SwaggerUI")
- }
- $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
- },
- onFailure: function(data) {
- if(console) {
- console.log("Unable to Load SwaggerUI");
- console.log(data);
- }
- },
- docExpansion: "none"
- });
-
- debugger;
-
- $('#input_apiKey').change(function() {
- var key = $('#input_apiKey')[0].value;
- console.log("apiKey: " + key);
- if(key && key.trim() != "") {
- console.log("added key " + key);
- window.authorizations.add("apiKey", new ApiKeyAuthorization("x-api-key", key, "header"));
- }
- })
- $('#input_uuid').change(function() {
- var key = $('#input_uuid')[0].value;
- console.log("uuid: " + key);
- if(key && key.trim() != "") {
- console.log("added key " + key);
- window.authorizations.add("uuid", new ApiKeyAuthorization("x-api-user", key, "header"));
- }
- })
- window.swaggerUi.load();
- });
- body.swagger-section
- #header
- .swagger-ui-wrap
- a#logo(href='http://swagger.wordnik.com') Habitica API Documentation
-
- .swagger-ui-wrap(style='padding:50px')
- form#api_selector
- .input
- input#input_uuid(placeholder='UUID', name='uuid', type='text')
- input#input_apiKey(placeholder='API Key', name='apiKey', type='password')
- //.input
- input#input_baseUrl(placeholder='http://example.com/api', name='baseUrl', type='text')
- //.input
- a#explore(href='#') Explore
- br
- h2 Two API Types
- p Habitica's API is meant for two different audiences: (1) extensions and scripts, and (2) full-fledged applications. Extensions and scripts can utilize Habitica's up/down scoring for individual tasks. An example of this in action is the Chrome Extension, which up-scores you for visiting productive websites, and down-scores you for visiting procrastination websites. Other examples currently in use are Pomodoro, Anki, and Github scripts - which up-score you for good behavior and downscore you for bad behavior - see the list. The second API consumer is for full-fledge applications, which need read / write access to the entire user document. An example of this would be Mobile Apps or Desktop application.
- h2 Extensions / Scripts
- p Habitica has a simple API for up-scoring and down-scoring third party Habits: POST /api/v2/user/tasks/{id}/{direction} (headers x-api-user and x-api-key required).
- h4 Example
- p curl -X POST -H "x-api-key: YOUR_API_TOKEN" -H "x-api-user: YOUR_USER_ID" https://habitica.com/api/v2/user/tasks/productivity/up
- p Note: You may need to add --compressed -H "Content-Type:application/json" to your curl if you get errors.
- ul
- li POST to the URL /api/v2/user/tasks/{id}/{direction}
- ul
- li {direction} is 'up' or 'down'
- li {id} is a unique identifier for a Habit, which you make up, consisting of lowercase letters. Try to make it something common, like 'productivity' or 'fitness' - because other services may piggy-back off your Habit. For example, the Chrome extension down-scores a productivity Habit when you visit vice websites (reddit, 9gag, etc). However, Pomodoro up-scores productivity when you complete a Pomodoro task. So the two services share a single Habit to score your overall productivity. If the Habit doesn't yet exist, it is created the first time you POST to this URL.
- li apiToken (POST body) required
- p A more advanced version that allows modification of other types of tasks is available in the /user/tasks/{id}/{direction} route in the full API below.
- h2 Full API
- p All API requests should be prefaced by https://habitica.com. Every authenticated request should include two headers. Your api key (x-api-key) and your user id (x-api-user). Do not include {} braces in your header (-H 'x-api-user: a94b6d9d-6b64-43ae-856c-2c3f211bd426')
- h2 Requirements:
- p The base-url for all routes is /api/v2. So /user actions will be at https://habitica.com/api/v2/*. You need to send x-api-user and x-api-key headers for each request.
- p For create & edit paths (PUT & POST), you'll need to know the schema of the object you're trying to create or edit. See Schema definitions here
- p If any of the documentation is lacking or you're having trouble with it, please post an issue to Github
- #message-bar.swagger-ui-wrap
- #swagger-ui-container.swagger-ui-wrap
diff --git a/website/views/static/contact.jade b/website/views/static/contact.jade
index 77ab5ac170..8d45f78ccd 100644
--- a/website/views/static/contact.jade
+++ b/website/views/static/contact.jade
@@ -25,6 +25,10 @@ block content
| :
a(href='mailto:leslie@habitica.com') leslie@habitica.com
br
+ =env.t('subscriptionPaymentIssues')
+ | :
+ a(href='mailto:admin@habitica.com') admin@habitica.com
+ br
=env.t('generalQuestionsSite')
| :
a(target='_blank', href='http://habitica.wikia.com/wiki/The_Keep:The_Newbies_Guild') Newbies Guild
diff --git a/website/views/static/faq.jade b/website/views/static/faq.jade
index 9707de9902..c14efc2250 100644
--- a/website/views/static/faq.jade
+++ b/website/views/static/faq.jade
@@ -22,8 +22,8 @@ block content
- for heading, index in headings
a.h2.accordion.collapsed(ng-href='#' + heading, data-toggle='collapse')=env.t('faqQuestion' + index)
.clearfix.collapse(id=heading)
- !=marked(env.t('webFaqAnswer' + index))
+ !=md.render(env.t('webFaqAnswer' + index))
hr
- h3!=marked(env.t('webFaqStillNeedHelp'))
+ h3!=md.render(env.t('webFaqStillNeedHelp'))
diff --git a/website/views/static/front.jade b/website/views/static/front.jade
index c1a2a5683e..3a3a06f37f 100644
--- a/website/views/static/front.jade
+++ b/website/views/static/front.jade
@@ -22,6 +22,9 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
meta(name='twitter:description' content='Habitica is a free habit-building and productivity app that treats your real life like a game! Motivate yourself with in-game rewards and social encouragement.')
meta(name='twitter:image' content='https://s3.amazonaws.com/habitica-assets/assets/gryphon_logo.png')
meta(name='apple-itunes-app' content='app-id=994882113')
+ meta(name='google-play-app' content='app-id=com.habitrpg.android.habitica')
+ link(rel='apple-touch-icon' href='/logo.png')
+ link(rel='android-touch-icon' href='/logo.png')
link(rel='canonical', href='', type='text/html')
link(rel='shortcut icon', sizes="32x32", href='/favicon.ico')
link(rel='shortcut icon', sizes="192x192", href='/favicon_192x192.png')
@@ -31,6 +34,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
script(type='text/javascript').
window.env = !{JSON.stringify(env._.pick(env, env.clientVars))};
+
!= env.getManifestFiles("tmp_static_front")
script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js')
@@ -636,6 +640,17 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
$('[data-toggle="tooltip"]').tooltip()
$('[data-toggle="popover"]').popover()
})
+ // Smart App Banner
+ script(type='text/javascript').
+ new SmartBanner({
+ title: 'Habitica: Gamify Your Tasks',
+ author: 'HabitRPG, Inc.',
+ button: 'GET',
+ store: {
+ ios: 'On the App Store',
+ android: 'In Google Play'
+ }
+ });
// Hack fix for carousel (http://stackoverflow.com/a/22182184/362790)
script.
angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
diff --git a/website/views/static/maintenance-info.jade b/website/views/static/maintenance-info.jade
new file mode 100644
index 0000000000..241aafde3a
--- /dev/null
+++ b/website/views/static/maintenance-info.jade
@@ -0,0 +1,37 @@
+- var t = env ? env.t : translation;
+
+title Habitica |
+ =t('maintenance')
+
+head
+ link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css')
+
+body
+ .container
+ h1.text-center=t('maintenanceInfoTitle')
+ img.img-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/scene_maintenance.png')
+ h2=t('maintenanceInfoWhat')
+ p!=t('maintenanceInfoWhatText')
+ img.pull-left(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/scene_new.png')
+ h2=t('maintenanceInfoWhy')
+ p=t('maintenanceInfoWhyText')
+ p!=t('maintenanceInfoTechDetails')
+ h2=t('maintenanceInfoMore')
+ h3=t('maintenanceInfoAccountChanges')
+ p!=t('maintenanceInfoAccountChangesText')
+ h3=t('maintenanceInfoAddFeatures')
+ p=t('maintenanceInfoAddFeaturesText')
+ h3=t('maintenanceInfoHowLong')
+ img.pull-right(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/scene_chatter.png')
+ p!=t('maintenanceInfoHowLongText')
+ h3=t('maintenanceInfoStatsAffected')
+ p=t('maintenanceInfoStatsAffectedText1')
+ p=t('maintenanceInfoStatsAffectedText2')
+ h3=t('maintenanceInfoSeeTasks')
+ p=t('maintenanceInfoSeeTasksText')
+ h3=t('maintenanceInfoRarePet')
+ p=t('maintenanceInfoRarePetText')
+ img.pull-left(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/scene_coding.png')
+ h3=t('maintenanceInfoWho')
+ p=t('maintenanceInfoWhoText')
+ p=t('maintenanceInfoTesting')
diff --git a/website/views/static/maintenance.jade b/website/views/static/maintenance.jade
new file mode 100644
index 0000000000..0537913219
--- /dev/null
+++ b/website/views/static/maintenance.jade
@@ -0,0 +1,18 @@
+- var t = env ? env.t : translation;
+
+title Habitica |
+ =t('maintenance')
+
+head
+ link(rel='stylesheet', type='text/css', href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css')
+
+body.text-center
+ h1=t('habiticaBackSoon')
+ img.img-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/assets/scene_maintenance.png')
+ p!=t('importantMaintenance')
+ p!=t('twitterMaintenanceUpdates')
+ ul.lead(style='list-style-position:inside')
+ li=t('noDamageKeepStreaks')
+ li=t('veteranPetAward')
+ p!=t('maintenanceMoreInfo', {linkStart: '', linkEnd: '',})
+ p.lead=t('thanksForPatience')
diff --git a/website/views/static/overview.jade b/website/views/static/overview.jade
index c66fcce3b7..b22c377bf3 100644
--- a/website/views/static/overview.jade
+++ b/website/views/static/overview.jade
@@ -18,6 +18,6 @@ block content
- for step in stepsNum
h3=env.t('step'+step)
p
- !=marked(env.t('webStep'+step+'Text'))
+ !=md.render(env.t('webStep'+step+'Text'))
hr
- !=marked(env.t('overviewQuestions'))
+ !=md.render(env.t('overviewQuestions'))