be more user-friendly when profile change is throttled

dimkr · Oct 18, 2024 · b7899cf · b7899cf
1 parent 60b0acb
commit b7899cf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 15 deletions.
diff --git a/front/alias.go b/front/alias.go
@@ -32,9 +32,13 @@ func (h *Handler) alias(w text.Writer, r *Request, args ...string) {
 
 	now := time.Now()
 
-	if (r.User.Updated != nil && now.Sub(r.User.Updated.Time) < h.Config.MinActorEditInterval) || (r.User.Updated == nil && now.Sub(r.User.Published.Time) < h.Config.MinActorEditInterval) {
-		r.Log.Warn("Throttled request to set alias")
-		w.Status(40, "Please try again later")
+	can := r.User.Published.Time.Add(h.Config.MinActorEditInterval)
+	if r.User.Updated != nil {
+		can = r.User.Updated.Time.Add(h.Config.MinActorEditInterval)
+	}
+	if now.Before(can) {
+		r.Log.Warn("Throttled request to set alias", "can", can)
+		w.Statusf(40, "Please wait for %s", time.Until(can).Truncate(time.Second).String())
 		return
 	}
 

diff --git a/front/avatar.go b/front/avatar.go
@@ -78,9 +78,13 @@ func (h *Handler) uploadAvatar(w text.Writer, r *Request, args ...string) {
 
 	now := time.Now()
 
-	if (r.User.Updated != nil && now.Sub(r.User.Updated.Time) < h.Config.MinActorEditInterval) || (r.User.Updated == nil && now.Sub(r.User.Published.Time) < h.Config.MinActorEditInterval) {
-		r.Log.Warn("Throttled request to set avatar")
-		w.Status(40, "Please try again later")
+	can := r.User.Published.Time.Add(h.Config.MinActorEditInterval)
+	if r.User.Updated != nil {
+		can = r.User.Updated.Time.Add(h.Config.MinActorEditInterval)
+	}
+	if now.Before(can) {
+		r.Log.Warn("Throttled request to set avatar", "can", can)
+		w.Statusf(40, "Please wait for %s", time.Until(can).Truncate(time.Second).String())
 		return
 	}
 

diff --git a/front/bio.go b/front/bio.go
@@ -33,9 +33,13 @@ func (h *Handler) doBio(w text.Writer, r *Request, readInput func(text.Writer, *
 
 	now := time.Now()
 
-	if (r.User.Updated != nil && now.Sub(r.User.Updated.Time) < h.Config.MinActorEditInterval) || (r.User.Updated == nil && now.Sub(r.User.Published.Time) < h.Config.MinActorEditInterval) {
-		r.Log.Warn("Throttled request to set summary")
-		w.Status(40, "Please try again later")
+	can := r.User.Published.Time.Add(h.Config.MinActorEditInterval)
+	if r.User.Updated != nil {
+		can = r.User.Updated.Time.Add(h.Config.MinActorEditInterval)
+	}
+	if now.Before(can) {
+		r.Log.Warn("Throttled request to set summary", "can", can)
+		w.Statusf(40, "Please wait for %s", time.Until(can).Truncate(time.Second).String())
 		return
 	}
 

diff --git a/front/move.go b/front/move.go
@@ -38,9 +38,13 @@ func (h *Handler) move(w text.Writer, r *Request, args ...string) {
 
 	now := time.Now()
 
-	if (r.User.Updated != nil && now.Sub(r.User.Updated.Time) < h.Config.MinActorEditInterval) || (r.User.Updated == nil && now.Sub(r.User.Published.Time) < h.Config.MinActorEditInterval) {
-		r.Log.Warn("Throttled request to move account")
-		w.Status(40, "Please try again later")
+	can := r.User.Published.Time.Add(h.Config.MinActorEditInterval)
+	if r.User.Updated != nil {
+		can = r.User.Updated.Time.Add(h.Config.MinActorEditInterval)
+	}
+	if now.Before(can) {
+		r.Log.Warn("Throttled request to move account", "can", can)
+		w.Statusf(40, "Please wait for %s", time.Until(can).Truncate(time.Second).String())
 		return
 	}
 

diff --git a/front/name.go b/front/name.go
@@ -34,9 +34,13 @@ func (h *Handler) name(w text.Writer, r *Request, args ...string) {
 
 	now := time.Now()
 
-	if (r.User.Updated != nil && now.Sub(r.User.Updated.Time) < h.Config.MinActorEditInterval) || (r.User.Updated == nil && now.Sub(r.User.Published.Time) < h.Config.MinActorEditInterval) {
-		r.Log.Warn("Throttled request to set name")
-		w.Status(40, "Please try again later")
+	can := r.User.Published.Time.Add(h.Config.MinActorEditInterval)
+	if r.User.Updated != nil {
+		can = r.User.Updated.Time.Add(h.Config.MinActorEditInterval)
+	}
+	if now.Before(can) {
+		r.Log.Warn("Throttled request to set name", "can", can)
+		w.Statusf(40, "Please wait for %s", time.Until(can).Truncate(time.Second).String())
 		return
 	}