Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-27 07:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Small fixup and fix unit test conflicts

Browse source
This commit is contained in:
FeTetra 2025-02-17 22:06:23 -05:00
commit 3fb1441ac1
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
View file

@ -57,7 +57,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
UserEntity? user = await this.database.UserFromGameToken(token);
StringBuilder announceText = new(ServerConfiguration.Instance.AnnounceText + "\n\n");
StringBuilder announceText = new(ServerConfiguration.Instance.AnnounceText);
announceText.Replace("%user", user.Username);
announceText.Replace("%id", token.UserId.ToString());
@ -69,7 +69,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
if (EmailEnforcementConfiguration.Instance.EnableEmailEnforcement)
{
announceText.Append(BaseLayoutStrings.EmailEnforcementWarnMain.Translate(LocalizationManager.DefaultLang) + "\n\n");
announceText.Append("\n\n" + BaseLayoutStrings.EmailEnforcementWarnMain.Translate(LocalizationManager.DefaultLang) + "\n\n");
if (user.EmailAddress == null)
{
@ -148,7 +148,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
if (!SMTPHelper.IsValidEmail(this.database, email)) return this.BadRequest();
UserEntity? user = await this.database.UserFromGameToken(token);
if (user == null || user.EmailAddressVerified) return this.Ok();
if (user == null || user.EmailAddressVerified) return this.BadRequest();
user.EmailAddress = email;
await SMTPHelper.SendVerificationEmail(this.database, mailService, user);