diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Recover.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Recover.cs index 56569c9..5427de3 100644 --- a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Recover.cs +++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Recover.cs @@ -73,11 +73,11 @@ public partial class MareWizardModule embed.WithTitle($"Recovery for {uid} complete"); embed.WithDescription("This is your new private secret key. Do not share this private secret key with anyone. **If you lose it, it is irrevocably lost.**" + Environment.NewLine + Environment.NewLine - + $"**{computedHash}**" + + "**__NOTE: Secret keys are considered legacy authentication. If you are using the suggested OAuth2 authentication, you do not need to use the Secret Key or recover ever again.__**" + + Environment.NewLine + Environment.NewLine + + $"||**`{computedHash}`**||" + Environment.NewLine + "__NOTE: The Secret Key only contains the letters ABCDEF and numbers 0 - 9.__" - + Environment.NewLine - +" __NOTE: If you are using the suggested OAuth2 authentication, you do not need to use the Secret Key__" + Environment.NewLine + Environment.NewLine + "Enter this key in the Mare Synchronos Service Settings and reconnect to the service."); diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Register.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Register.cs index 95483c9..72411c2 100644 --- a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Register.cs +++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Register.cs @@ -133,14 +133,14 @@ public partial class MareWizardModule eb.WithTitle($"Registration successful, your UID: {uid}"); eb.WithDescription("This is your private secret key. Do not share this private secret key with anyone. **If you lose it, it is irrevocably lost.**" + Environment.NewLine + Environment.NewLine - + $"**{key}**" + + "**__NOTE: Secret keys are considered legacy. Using the suggested OAuth2 authentication in Mare, you do not need to use this Secret Key.__**" + Environment.NewLine + Environment.NewLine - + "Enter this key in Mare Synchronos and hit save to connect to the service." + + $"||**`{key}`**||" + + Environment.NewLine + Environment.NewLine + + "If you want to continue using legacy authentication, enter this key in Mare Synchronos and hit save to connect to the service." + Environment.NewLine + "__NOTE: The Secret Key only contains the letters ABCDEF and numbers 0 - 9.__" + Environment.NewLine - + " __NOTE: Secret keys are considered legacy. Using the suggested OAuth2 authentication, you do not need to use this Secret Key.__" - + Environment.NewLine + "You should connect as soon as possible to not get caught by the automatic cleanup process." + Environment.NewLine + "Have fun."); @@ -159,9 +159,9 @@ public partial class MareWizardModule + Environment.NewLine + Environment.NewLine + "**Make sure your profile is set to public (All Users) for your character. The bot cannot read profiles with privacy settings set to \"logged in\" or \"private\".**" + Environment.NewLine + Environment.NewLine - + "## You __need__ to enter following the code this bot provided onto your lodestone in the character profile:" + + "## You __need__ to enter following the code this bot provided onto your Lodestone in the character profile:" + Environment.NewLine + Environment.NewLine - + "**" + verificationCode + "**"); + + "**`" + verificationCode + "`**"); cb.WithButton("Cancel", "wizard-register", emote: new Emoji("❌")); cb.WithButton("Retry", "wizard-register-verify:" + verificationCode, ButtonStyle.Primary, emote: new Emoji("🔁")); } @@ -209,7 +209,7 @@ public partial class MareWizardModule + Environment.NewLine + "__NOTE: If the link does not lead you to your character edit profile page, you need to log in and set up your privacy settings!__" + Environment.NewLine + Environment.NewLine - + $"**{lodestoneAuth}**" + + $"**`{lodestoneAuth}`**" + Environment.NewLine + Environment.NewLine + $"**! THIS IS NOT THE KEY YOU HAVE TO ENTER IN MARE !**" + Environment.NewLine + Environment.NewLine diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Relink.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Relink.cs index 24ab74a..52e9bcc 100644 --- a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Relink.cs +++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Relink.cs @@ -124,9 +124,11 @@ public partial class MareWizardModule eb.WithTitle($"Relink successful, your UID is again: {uid}"); eb.WithDescription("This is your private secret key. Do not share this private secret key with anyone. **If you lose it, it is irrevocably lost.**" + Environment.NewLine + Environment.NewLine - + $"**{key}**" + + $"||**`{key}`**||" + Environment.NewLine + Environment.NewLine + "Enter this key in Mare Synchronos and hit save to connect to the service." + + Environment.NewLine + Environment.NewLine + + "NOTE: If you are using OAuth2, you do not require to use this secret key." + Environment.NewLine + "Have fun."); AddHome(cb); @@ -140,8 +142,8 @@ public partial class MareWizardModule eb.WithDescription("The bot was not able to find the required verification code on your Lodestone profile." + Environment.NewLine + Environment.NewLine + "Please restart your relink process, make sure to save your profile _twice_ for it to be properly saved." + Environment.NewLine + Environment.NewLine + "**Make sure your profile is set to public (All Users) for your character. The bot cannot read profiles with privacy settings set to \"logged in\" or \"private\".**" + Environment.NewLine + Environment.NewLine - + "The code the bot is looking for is**" + Environment.NewLine + Environment.NewLine - + "**" + verificationCode + "**"); + + "The code the bot is looking for is" + Environment.NewLine + Environment.NewLine + + "**`" + verificationCode + "`**"); cb.WithButton("Cancel", "wizard-relink", emote: new Emoji("❌")); cb.WithButton("Retry", "wizard-relink-verify:" + verificationCode + "," + uid, ButtonStyle.Primary, emote: new Emoji("🔁")); } @@ -192,7 +194,7 @@ public partial class MareWizardModule embed.WithTitle("Authorize your character for relinking"); embed.WithDescription("Add following key to your character profile at https://na.finalfantasyxiv.com/lodestone/my/setting/profile/" + Environment.NewLine + Environment.NewLine - + $"**{lodestoneAuth}**" + + $"**`{lodestoneAuth}`**" + Environment.NewLine + Environment.NewLine + $"**! THIS IS NOT THE KEY YOU HAVE TO ENTER IN MARE !**" + Environment.NewLine