Merge

Valour/Client/Components/Menus/Modals/ChangeUsernameModal.razor

@@ -0,0 +1,106 @@
+@inject ValourClient Client
+@inherits Modal<ChangeUsernameModal.Params>
+
+<div class="col-md-12">
+    <section class="modal-bg">
+        <h3>Change your username</h3>
+        <h5>@_changeUsernameMessage</h5>
+
+        <div class="form-group mt-2">
+            <label class="m-2">New Username</label>
+            <input id="new-username-input" type="text" autocomplete="off" class="form-control" @bind-value="@_newUsername" />
+            <label class="m-2">Password</label>
+            <input id="password-input" type="password" autocomplete="current-password" class="form-control" @bind-value="@_password" />
+        </div>
+        <br />
+
+        <ResultLabel Result="@_result" />
+
+        <br />
+        <div @onclick="@OnCancel" class="btn v-btn d-inline-block">Cancel</div>
+        @if (_canChangeUsername)
+        {
+            <div @onclick="@OnConfirm" class="btn v-btn danger d-inline-block">Confirm</div>
+        }
+    </section>
+</div>
+
+@code {
+    public class Params {}
+    private string _changeUsernameMessage;
+    private bool _canChangeUsername = false;
+
+    private string _newUsername = "";
+    private string _password = "";
+
+    private ITaskResult _result;
+
+
+    private void OnCancel()
+    {
+        Close();
+    }
+
+    private async Task OnConfirm()
+    {
+        var toastData = new ProgressToastData<TaskResult>()
+        {
+            ProgressTask = Client.UpdateMyUsernameAsync(_newUsername, _password),
+            Title = "Changing Username",
+            Message = "Updating...",
+            SuccessMessage = "Username updated!",
+        };
+
+        var result = await ToastContainer.Instance.WaitToastWithTaskResult(toastData);
+        if (result.Success)
+        {
+            Close();
+        }
+        else
+        {
+            _result = result;
+            StateHasChanged();   
+        }
+    }
+
+    private void SetChangeUsernameMessage()
+    {
+        var user = Client.Me;
+        double daysSinceLastChange = 0;
+        if (user.NameChangeTime is not null)
+        {
+            daysSinceLastChange = (DateTime.UtcNow - user.NameChangeTime.Value).TotalDays;
+        }
+
+        if (user.Subscription is null)
+        {
+            if (daysSinceLastChange < 30)
+            {
+                var daysLeft = 30 - daysSinceLastChange;
+                _changeUsernameMessage = $"You can change your username again in {daysLeft.ToString("F0")} {(daysLeft > 1 ? "days" : "day")}.\nStargazers can change their username every 7 days!";
+            }
+            else
+            {
+                _canChangeUsername = true;
+            }
+        }
+        else
+        {
+            if (daysSinceLastChange < 7)
+            {
+                var daysLeft = 7 - daysSinceLastChange;
+                _changeUsernameMessage = $"You can change your username again in {daysLeft.ToString("F0")} {(daysLeft > 1 ? "days" : "day")}.";
+            }
+            else
+            {
+                _canChangeUsername = true;
+            }
+        }
+    }
+
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+        SetChangeUsernameMessage();
+    }
+}

Valour/Client/Components/Menus/Modals/ChangeUsernameModal.razor.css

@@ -0,0 +1,7 @@
+.modal-bg {
+    background-color: var(--main-2);
+    border-radius: 2em;
+    text-align: center;
+    padding: 30px;
+    max-width: 400px
+}

Valour/Client/Components/Menus/Modals/Users/Edit/EditUserInfoComponent.razor

@@ -63,6 +63,7 @@
 <div class="btn-row">
     <button class="btn v-btn danger" @onclick="@OnClickDeleteAccount">Delete my Account</button>
     <button class="btn v-btn secondary" @onclick="@OnClickChangePassword">Change Password</button>
+    <button class="btn v-btn secondary" onclick="@OnClickChangeUsername">Change Username</button>
 </div> 
 <br/>
 <br/>
@@ -71,12 +72,12 @@
 
     [CascadingParameter]
     public ModalRoot ModalRoot { get; set; }
-    
+
     [Parameter] 
     public User User { get; set; }
-    
+
     private UserInfoComponent _infoPreview;
-    
+
     private string _tag;
     private ITaskResult _tagChangeResult;
 
@@ -88,11 +89,12 @@
 
     private int _statusCode;
     private ITaskResult _statusCodeChangeResult;
-    
+
     private async Task OnStatusApply()
     {
         var oldStatus = User.Status;
         User.Status = _status;
+
         _statusChangeResult = await User.UpdateAsync();
 
         // Rollback change if it failed
@@ -104,7 +106,7 @@
         StateHasChanged();
         _infoPreview.UpdateAll();
     }
-    
+
     private async Task OnTagApply()
     {
         if (_tag.Length != 4)
@@ -123,17 +125,18 @@
                 return;
             }
         }
-        
+
         var oldTag = User.Tag;
         User.Tag = _tag;
+
         _tagChangeResult = await User.UpdateAsync();
-        
+
         // Rollback change if it failed
         if (!_tagChangeResult.Success)
         {
             User.Tag = oldTag;
         }
-        
+
         StateHasChanged();
         _infoPreview.UpdateAll();
     }
@@ -142,8 +145,9 @@
     {
         var oldStatusCode = User.UserStateCode;
         User.UserStateCode = _statusCode;
+
         _statusCodeChangeResult = await User.UpdateAsync();
-
+        
         // Rollback change if it failed
         if (!_statusCodeChangeResult.Success)
         {
@@ -171,29 +175,30 @@
     private async Task LoadFiles(InputFileChangeEventArgs e)
     {
         var file = e.File;
-        
+
         // 10mb limit
         if (file.Size > 10240000)
         {
             _pfpChangeResult = new TaskResult(false, "Max profile image size is 10mb.");
             StateHasChanged();
             return;
         }
-        
+
         var streamContent = new StreamContent(file.OpenReadStream(10240000));
         var content = new MultipartFormDataContent();
         streamContent.Headers.ContentType = new MediaTypeHeaderValue(file.ContentType);
         content.Add(streamContent, file.Name, file.Name);
-        
+
         var result = await Client.PrimaryNode.PostAsyncWithResponse<string>($"upload/profile", content);
+
         _pfpChangeResult = result;
-        
+
         if (_pfpChangeResult.Success)
         {
             // We slightly modify the url to force a refresh
             _pfpUrl = User.GetAvatar(AvatarFormat.WebpAnimated256) + $"?x={DateTime.Now.Ticks}";
         }
-        
+
         StateHasChanged();
         _infoPreview.UpdateAll();
     }
@@ -202,9 +207,14 @@
     {
         ModalRoot.OpenModal<DeleteAccountModal>();
     }
-    
+
     private void OnClickChangePassword()
     {
         ModalRoot.OpenModal<ChangePasswordModal>();
     }
+
+    private void OnClickChangeUsername()
+    {
+        ModalRoot.OpenModal<ChangeUsernameModal>();
+    }
 }

Valour/Client/Components/Users/ProfileCard.razor

@@ -21,6 +21,10 @@
                     <div class="names">
                         <p class="nickname">@_name</p>
                         <p class="name-and-tag" style="@CustomText">@_nameAndTag</p>
+                        @if (User.PriorName is not null)
+                        {
+                            <p class="name-and-tag">Formerly: @User.PriorName</p>
+                        }
                         <div class="status-bubble">
                             <div class="arrow"></div>
                             <p class="status-text">"@(_status)"</p>

Valour/Database/User.cs

@@ -115,7 +115,19 @@ public class User : ISharedUser
     /// </summary>
     [Column("subscription_type")]
     public string SubscriptionType { get; set; }
-
+
+    /// <summary>
+    /// The user's prior username, if they have changed it before.
+    /// </summary>
+    [Column("prior_name")]
+    public string PriorName { get; set; }
+
+    /// <summary>
+    /// The date and time the user last changed their username.
+    /// </summary>
+    [Column("name_change_time")]
+    public DateTime? NameChangeTime { get; set; }
+
     public string GetAvatarUrl(AvatarFormat format = AvatarFormat.Webp256) =>
         ISharedUser.GetAvatar(this, format);
 }

Valour/Sdk/Client/ValourClient.cs

@@ -189,6 +189,12 @@ public async Task<TaskResult> UpdateMyPasswordAsync(string oldPassword, string n
         var model = new ChangePasswordRequest() { OldPassword = oldPassword, NewPassword = newPassword };
         return await PrimaryNode.PostAsync("api/users/me/password", model);
     }
+
+    public async Task<TaskResult> UpdateMyUsernameAsync(string newUsername, string password)
+    {
+        var model = new ChangeUsernameRequest() { NewUsername = newUsername, Password = password };
+        return await PrimaryNode.PostAsync("api/users/me/username", model);
+    }
 
     // Sad zone
     public async Task<TaskResult> DeleteMyAccountAsync(string password)

Valour/Sdk/Models/User.cs

@@ -106,6 +106,16 @@ public class User : ClientModel<User, long>, ISharedUser, IMessageAuthor
     /// </summary>
     public string SubscriptionType { get; set; }
 
+    /// <summary>
+    /// The user's prior username, if they have changed it before.
+    /// </summary>
+    public string PriorName { get; set; }
+
+    /// <summary>
+    /// The date and time the user last changed their username.
+    /// </summary>
+    public DateTime? NameChangeTime { get; set; }
+
     /// <summary>
     /// The subscription the user currently has
     /// </summary>

Valour/Server/Api/Dynamic/UserApi.cs

@@ -447,6 +447,32 @@ public static async Task<IResult> ChangePasswordRouteAsync(
 
         return Results.NoContent();
     }
+
+    [ValourRoute(HttpVerbs.Post, "api/users/me/username")]
+    [UserRequired(UserPermissionsEnum.FullControl)]
+    public static async Task<IResult> ChangeUsernameRouteAsync(
+        [FromBody] ChangeUsernameRequest request,
+        UserService userService)
+    {
+        if (request is null)
+        {
+            return ValourResult.BadRequest("Include request in body.");
+        }
+
+        var credential = await userService.GetCredentialAsync(await userService.GetCurrentUserIdAsync());
+
+        // Verify password
+        var validResult = await userService.ValidateCredentialAsync(CredentialType.PASSWORD, credential.Identifier, request.Password);
+        if (!validResult.Success)
+            return ValourResult.Forbid(validResult.Message);
+
+        var userId = await userService.GetCurrentUserIdAsync();
+        var result = await userService.ChangeUsernameAsync(userId, request.NewUsername);
+        if (!result.Success)
+            return ValourResult.Problem(result.Message);
+
+        return Results.NoContent();
+    }
 
     [ValourRoute(HttpVerbs.Post, "api/users/me/hardDelete")]
     [UserRequired(UserPermissionsEnum.FullControl)]

Valour/Server/Mapping/UserMapper.cs

@@ -23,7 +23,9 @@ public static User ToModel(this Valour.Database.User user)
             TimeLastActive = user.TimeLastActive,
             IsMobile = user.IsMobile,
             Compliance = user.Compliance,
-            SubscriptionType = user.SubscriptionType
+            SubscriptionType = user.SubscriptionType,
+            PriorName = user.PriorName,
+            NameChangeTime = user.NameChangeTime
         };
     }
 
@@ -48,7 +50,9 @@ public static Valour.Database.User ToDatabase(this User user)
             TimeLastActive = user.TimeLastActive,
             IsMobile = user.IsMobile,
             Compliance = user.Compliance,
-            SubscriptionType = user.SubscriptionType
+            SubscriptionType = user.SubscriptionType,
+            PriorName = user.PriorName,
+            NameChangeTime = user.NameChangeTime
         };
     }
 }

Valour/Server/Models/User.cs

@@ -78,7 +78,17 @@ public class User : ServerModel<long>, ISharedUser
     /// is subscribed to
     /// </summary>
     public string SubscriptionType { get; set; }
-
+
+    /// <summary>
+    /// The user's prior username, if they have changed it before.
+    /// </summary>
+    public string PriorName { get; set; }
+
+    /// <summary>
+    /// The date and time the user last changed their username.
+    /// </summary>
+    public DateTime? NameChangeTime { get; set; }
+
     /// <summary>
     /// The subscription the user currently has
     /// </summary>