From 6f1f0e37cec4bf0c0f511f973d42248b15e0cb47 Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Mon, 28 Aug 2023 17:01:18 +0200
Subject: [PATCH] Fix org fetching (#2343)

---
 server/forge/gitea/gitea.go | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go
index fcbe567fa..55e3e90b1 100644
--- a/server/forge/gitea/gitea.go
+++ b/server/forge/gitea/gitea.go
@@ -534,23 +534,25 @@ func (c *Gitea) Org(ctx context.Context, u *model.User, owner string) (*model.Or
 		return nil, err
 	}
 
-	user, _, err := client.GetUserInfo(owner)
-	if user != nil && err == nil {
-		return &model.Org{
-			Name:    user.UserName,
-			IsUser:  true,
-			Private: user.Visibility != gitea.VisibleTypePublic,
-		}, nil
-	}
-
 	org, _, err := client.GetOrg(owner)
 	if err != nil {
 		return nil, err
 	}
+	if org != nil {
+		return &model.Org{
+			Name:    org.UserName,
+			Private: gitea.VisibleType(org.Visibility) != gitea.VisibleTypePublic,
+		}, nil
+	}
 
+	user, _, err := client.GetUserInfo(owner)
+	if err != nil {
+		return nil, err
+	}
 	return &model.Org{
-		Name:    org.UserName,
-		Private: gitea.VisibleType(org.Visibility) != gitea.VisibleTypePublic,
+		Name:    user.UserName,
+		IsUser:  true,
+		Private: user.Visibility != gitea.VisibleTypePublic,
 	}, nil
 }