From 1bb7e3d0f98c4bee90478d6464b4021e1f27c938 Mon Sep 17 00:00:00 2001
From: arthomnix <arthomnix@arthomnix.dev>
Date: Sat, 28 Oct 2023 20:44:55 +0100
Subject: [PATCH] NOISSUE Add more XErr error descriptions

---
 .../auth/steps/XboxAuthorizationStep.cpp      | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
index 589768e3..1cefc017 100644
--- a/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
+++ b/launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
@@ -2,7 +2,6 @@
 
 #include <QNetworkRequest>
 #include <QJsonParseError>
-#include <QJsonDocument>
 
 #include "minecraft/auth/AuthRequest.h"
 #include "minecraft/auth/Parsers.h"
@@ -121,7 +120,22 @@ bool XboxAuthorizationStep::processSTSError(
             return true;
         }
         switch(errorCode) {
-            case 2148916233:{
+            case 2148916227: {
+                // NOTE: this is the error experienced by a number of people on Discord using dodgy alt accounts
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("Your XBox Live account has been banned by Microsoft for violating the XBox Community Standards.\nThis may happen if your account was shared or resold.")
+                );
+                return true;
+            }
+            case 2148916229: {
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("This Microsoft account is linked to a family and your parent or guardian has not given you permission to play online.")
+                );
+                return true;
+            }
+            case 2148916233: {
                 emit finished(
                     AccountTaskState::STATE_FAILED_SOFT,
                     tr("This Microsoft account does not have an XBox Live profile. Buy the game on %1 first.")
@@ -129,6 +143,13 @@ bool XboxAuthorizationStep::processSTSError(
                 );
                 return true;
             }
+            case 2148916234: {
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("This account has not accepted the XBox Terms of Service. Please log in online and accept them.")
+                );
+                return true;
+            }
             case 2148916235: {
                 // NOTE: this is the Grulovia error
                 emit finished(
@@ -137,6 +158,21 @@ bool XboxAuthorizationStep::processSTSError(
                 );
                 return true;
             }
+            case 2148916236: {
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("This Microsoft account requires proof of age to play. Please login to %1 to provide proof of age.")
+                        .arg("<a href=\"https://login.live.com/login.srf\">login.live.com</a>")
+                );
+                return true;
+            }
+            case 2148916237: {
+                emit finished(
+                    AccountTaskState::STATE_FAILED_SOFT,
+                    tr("This Microsoft account has reached its playtime limit and has been blocked from logging in.")
+                );
+                return true;
+            }
             case 2148916238: {
                 emit finished(
                     AccountTaskState::STATE_FAILED_SOFT,