From 92bf1f779bd86756f78f94283e6085e6fe2f5de0 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 13 Mar 2024 14:45:50 +0100
Subject: [chore] Expose move endpoint again, small settings panel fixes
 (#2752)

---
 internal/processing/account/move.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'internal/processing/account')

diff --git a/internal/processing/account/move.go b/internal/processing/account/move.go
index ca8dd4dea..a68c8f750 100644
--- a/internal/processing/account/move.go
+++ b/internal/processing/account/move.go
@@ -154,6 +154,17 @@ func (p *Processor) MoveSelf(
 		}
 	}
 
+	// If originAcct has already moved, ensure
+	// this move reattempt is to the same account.
+	if originAcct.IsMoving() &&
+		originAcct.MovedToURI != targetAcct.URI {
+		err := fmt.Errorf(
+			"your account is already Moving or has Moved to %s; you cannot also Move to %s",
+			originAcct.MovedToURI, targetAcct.URI,
+		)
+		return gtserror.NewErrorUnprocessableEntity(err, err.Error())
+	}
+
 	// Target account MUST be aliased to this
 	// account for this to be a valid Move.
 	if !slices.Contains(targetAcct.AlsoKnownAsURIs, originAcct.URI) {
-- 
cgit v1.2.3