From 2565304ae1a0dd4b0678fcf99b4b828f70ce053b Mon Sep 17 00:00:00 2001
From: Andrei Mihu <andrei@heroiclabs.com>
Date: Wed, 14 Jul 2021 18:16:10 +0100
Subject: [PATCH] Improve error response when attempting to create a group with
 an unavailable name.

---
 server/core_group.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/core_group.go b/server/core_group.go
index a8a6237d3..523a0ae22 100644
--- a/server/core_group.go
+++ b/server/core_group.go
@@ -121,6 +121,11 @@ RETURNING id, creator_id, name, description, avatar_url, state, edge_count, lang
 	if err = ExecuteInTx(ctx, tx, func() error {
 		rows, err := tx.QueryContext(ctx, query, params...)
 		if err != nil {
+			var pgErr *pgconn.PgError
+			if errors.As(err, &pgErr) && pgErr.Code == dbErrorUniqueViolation {
+				logger.Info("Could not create group as it already exists.", zap.String("name", name))
+				return ErrGroupNameInUse
+			}
 			logger.Debug("Could not create group.", zap.Error(err))
 			return err
 		}
-- 
GitLab