From 11d768e89ecea6d9b47926232ca61f1a0ffbaa02 Mon Sep 17 00:00:00 2001 From: SauceyRed <42098474+SauceyRed@users.noreply.github.com> Date: Fri, 3 Mar 2023 12:10:10 +0100 Subject: [PATCH 1/2] Added 12 quotes to english.json - 6771-6782 (#4039) Saucy Red * Added 12 quotes to english.json * Fixed IDs in english.json --- frontend/static/quotes/english.json | 72 +++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/frontend/static/quotes/english.json b/frontend/static/quotes/english.json index 046e7f260..f16c517ae 100644 --- a/frontend/static/quotes/english.json +++ b/frontend/static/quotes/english.json @@ -38663,6 +38663,78 @@ "source": "Strong Towns - A Bottom-Up Revolution to Rebuild American Prosperity", "id": 6770, "length": 531 + }, + { + "text": "The single quality that is common across every living creature on this planet, is fear. It’s funny, then, that as common as fear is, we so easily underestimate its power. Fear of growing close to someone, the subsequent fear of loss, fear of failure. And as more people depend on you, those fears can take on greater power. But fear itself isn’t worthy of concern, it is who we become while in its clutches. Will you be proud of that person? Will you forgive them? Will you understand why they felt the need to do the things they did? Will you even recognize them? Or will the person staring back at you be the very thing you should have feared from the start? I suppose we all find out sooner or later.", + "source": "RWBY", + "id": 6771, + "length": 703 + }, + { + "text": "I once told you I made more mistakes than any man, woman, or child on this planet. I wasn't exaggerating. I'm... cursed. For thousands of years I have walked the surface of Remnant; living, dying, and reincarnating in the body of a like-minded soul. The Professor Ozpin you all met was not my first form, and it clearly wasn't my last. It's... an extraordinarily strenuous process, on everyone involved.", + "source": "RWBY", + "id": 6772, + "length": 403 + }, + { + "text": "Being a team leader isn't just a title you carry into battle, but a badge you wear constantly. If you are not always performing at your absolute best, then what reason do you give others to follow you?", + "source": "RWBY", + "id": 6773, + "length": 201 + }, + { + "text": "I'll...keep this brief. You have traveled here today in search of knowledge--to hone your craft and acquire new skills. And when you have finished, you plan to dedicate your life to the protection of the people. But I look amongst you, and all I see is wasted energy, in need of purpose -- direction. You assume knowledge will free you of this, but your time at this school will prove that knowledge can only carry you so far. It is up to you to take the first step.", + "source": "RWBY", + "id": 6774, + "length": 466 + }, + { + "text": "It's important not to lose sight of what drives us: love, justice, reverence... but the moment you put your desires before my own... they will be lost to you. This isn't a threat, this is simply the truth. The path to your desires is only found... through me.", + "source": "RWBY", + "id": 6775, + "length": 259 + }, + { + "text": "You told me once that bad things just happen. You were angry when you said it, and I didn't want to listen. But you were right. Bad things do happen, all the time, every day. Which is why I'm out here, to do whatever I can, wherever I can, and hopefully do some good.", + "source": "RWBY", + "id": 6776, + "length": 267 + }, + { + "text": "We've all lost something, and I've seen what loss can do to people. But if we gave up every time we lost, then we'd never be able to move forward.", + "source": "RWBY", + "id": 6777, + "length": 146 + }, + { + "text": "You're wrong. We've done things that most people would call impossible, and I know the only reason we were able to do it is because we didn't do it alone! We had people to teach us, people to help us, we had each other. Work with us. At least I know we'll have a better chance if we try together. Please.", + "source": "RWBY", + "id": 6778, + "length": 304 + }, + { + "text": "Just because you don't have an idea, doesn't mean we're out of options! Oz hasn't been here to tell us what to do, but we still managed to get this far anyway. We've been in bad situations before, and we don't need an adult to come save us or tell us what to do. We just did it our way! And I say we do it our way. And if you think you can keep up with us \"kids\"... we'd be happy to have you.", + "source": "RWBY", + "id": 6779, + "length": 392 + }, + { + "text": "The Threads of Fate are not puppet strings. They connect life to destiny. You are fate-touched, able to see and bend the threads around you. Understand the wholeness of what you serve, champion. All the living share one experience: death. Your mother, your sister, even you. We must safeguard that beautiful moment when the soul transitions to a new purpose.", + "source": "The Legend of Vox Machina", + "id": 6780, + "length": 358 + }, + { + "text": "Protecting the sanctity between life and death. That is our cause. Your cause. Do you accept this charge?", + "source": "The Legend of Vox Machina", + "id": 6781, + "length": 105 + }, + { + "text": "I've been watching you longer than you know. Recklessly drawn to your destiny, like a flame. My beautiful champion. There is much to fear, but not death. For it gives meaning to life.", + "source": "The Legend of Vox Machina", + "id": 6782, + "length": 183 } ] } From 5c93fa7edf47689788c694a5e7fffda5758c2412 Mon Sep 17 00:00:00 2001 From: Miodec Date: Fri, 3 Mar 2023 12:06:09 +0100 Subject: [PATCH 2/2] added better error to try to identify an issue --- backend/src/api/controllers/user.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/src/api/controllers/user.ts b/backend/src/api/controllers/user.ts index a7f6f5505..7de823537 100644 --- a/backend/src/api/controllers/user.ts +++ b/backend/src/api/controllers/user.ts @@ -84,7 +84,15 @@ export async function sendVerificationEmail( e.message.includes("TOO_MANY_ATTEMPTS_TRY_LATER") ) { // for some reason this error is not handled with a custom auth/ code, so we have to do it manually - throw new MonkeyError(429, "Too many requests. Please try again later."); + throw new MonkeyError(429, "Too many requests. Please try again later"); + } + if (e.code === "auth/user-not-found") { + throw new MonkeyError( + 500, + "Auth user not found when the user was found in the database", + JSON.stringify({ email: email, userInfoEmail: email, stack: e.stack }), + userInfo.uid + ); } throw e; }