idk how to plan this out

packages/httpRequest/connectionsAndDms.go

@@ -241,7 +241,7 @@ func HandleUserNewConnection(response http.ResponseWriter, request *http.Request
 	}
 	requestor.Mu.RUnlock()
 
-	connection := types.NewConnection()
+	connection := types.CreateConn()
 	connection.CreatedAt = time.Now()
 	connection.RequestorId = requestor.Id
 	connection.RecipientId = recipient.Id

packages/httpRequest/get.go

@@ -58,7 +58,7 @@ func getHubByIdStr(ctx context.Context, hubId string) (*types.Hub, error) {
 
 	hub, ok := cache.GetHubById(hubUuid)
 	if !ok {
-		hub = types.NewHub()
+		hub = types.CreateHub()
 		hub.Id = hubUuid
 		if err := postgresql.GetWholeHub(ctx, hub); err != nil {
 			return nil, err

packages/httpRequest/hubs.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"time"
 
+	"go-socket/packages/Enums/permission"
 	"go-socket/packages/cache"
 	"go-socket/packages/postgresql"
 	"go-socket/packages/types"
@@ -11,9 +12,18 @@ import (
 	"github.com/google/uuid"
 )
 
-func hasHubUserPermission(user *types.HubUser, hub *types.Hub, permission types.RolePermission) bool {
-	for _, roleId := range user.Roles {
-		if role, ok := hub.Roles[roleId]; ok && role.HasPermission(permission) {
+func hasHubUserGlobalPermission(user *types.HubUser, hub *types.Hub, perm permission.Global) bool {
+	for _, roleId := range user.GlobalRoles {
+		if role, ok := hub.GlobalRoles[roleId]; ok && role.HasPermission(perm) {
+			return true
+		}
+	}
+	return false
+}
+
+func hasHubUserChannelGroupPermission(user *types.HubUser, hub *types.Hub, perm permission.ChannelGroup) bool {
+	for _, roleId := range user.ChannelGroupRoles {
+		if role, ok := hub.ChannelGroupRoles[roleId]; ok && role.HasPermission(perm) {
 			return true
 		}
 	}
@@ -38,7 +48,7 @@ func HandleHubCreate(response http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	hub := types.NewHub()
+	hub := types.CreateHub()
 	hub.Name = hubName
 	hub.Creator = user.Id
 	hub.Color = types.Rgba{}.GetRandom()
@@ -52,19 +62,19 @@ func HandleHubCreate(response http.ResponseWriter, request *http.Request) {
 	}
 	hub.ChannelGroups[rootGrp.Id] = rootGrp
 
-	rootRole := &types.HubRole{
+	rootRole := &types.HubGlobalRole{
 		Id:             0,
 		Name:           "root",
 		Color:          types.Rgba{255, 0, 0, 255},
-		RolePermission: ^types.RolePermission(0),
+		RolePermission: ^permission.Global(0),
 	}
-	hub.Roles[rootRole.Id] = rootRole
+	hub.GlobalRoles[rootRole.Id] = rootRole
 
 	rootUser := &types.HubUser{
-		Id:        user.Id,
-		Username:  user.Name,
-		Roles:     []uint8{rootRole.Id},
-		CreatedAt: hub.CreatedAt,
+		Id:          user.Id,
+		Username:    user.Name,
+		GlobalRoles: []uint8{rootRole.Id},
+		CreatedAt:   hub.CreatedAt,
 	}
 	hub.Users[rootUser.Id] = rootUser
 
@@ -73,7 +83,7 @@ func HandleHubCreate(response http.ResponseWriter, request *http.Request) {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
 	}
-	if err = postgresql.HubRoleSave(ctx, hub.Id, rootRole); err != nil {
+	if err = postgresql.HubGlobalRoleSave(ctx, hub.Id, rootRole); err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
 	}
@@ -85,7 +95,7 @@ func HandleHubCreate(response http.ResponseWriter, request *http.Request) {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
 	}
-	if err = postgresql.HubUserRoleAdd(ctx, hub.Id, user.Id, rootRole.Id); err != nil {
+	if err = postgresql.HubUserGlobalRoleAdd(ctx, hub.Id, user.Id, rootRole.Id); err != nil {
 		http.Error(response, "internal server error", http.StatusInternalServerError)
 		return
 	}
@@ -106,7 +116,7 @@ func HandleHubDelete(response http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	if !hasHubUserPermission(hubUser, hub, types.PermissionRemoveHub) {
+	if !hasHubUserGlobalPermission(hubUser, hub, permission.GlobalRemoveHub) {
 		http.Error(response, "forbidden", http.StatusForbidden)
 		return
 	}
@@ -129,5 +139,5 @@ func HandleHubGet(response http.ResponseWriter, request *http.Request) {
 	if err != nil {
 		return
 	}
-	
+
 }