summaryrefslogtreecommitdiff
path: root/internal/server
diff options
context:
space:
mode:
Diffstat (limited to 'internal/server')
-rw-r--r--internal/server/api/api.go74
-rw-r--r--internal/server/api/helpers.go25
-rw-r--r--internal/server/server.go4
3 files changed, 51 insertions, 52 deletions
diff --git a/internal/server/api/api.go b/internal/server/api/api.go
index 0445114..aedc86b 100644
--- a/internal/server/api/api.go
+++ b/internal/server/api/api.go
@@ -138,7 +138,7 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C
return &ErrInternalError
}
- networkUser, err := qtx.SetNetworkUser(ctx, data.SetNetworkUserParams{
+ networkUser, err := qtx.SetMember(ctx, data.SetMemberParams{
UserID: network.OwnerID,
NetworkID: network.ID,
IsMember: true,
@@ -176,9 +176,9 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C
Position: int(*networkUser.Position),
}
return &packet.NetworksInfo{
- Networks: []packet.FullNetwork{fullNetwork},
- Set: false,
- RemoveNetworks: nil,
+ Networks: []packet.FullNetwork{fullNetwork},
+ Set: false,
+ RemovedNetworks: nil,
}
}
@@ -226,9 +226,9 @@ func GetNetworksInfo(ctx context.Context, sess *session.Session) (packet.Payload
}
return &packet.NetworksInfo{
- Networks: fullNetworks,
- RemoveNetworks: nil,
- Set: true,
+ Networks: fullNetworks,
+ RemovedNetworks: nil,
+ Set: true,
}, nil
}
@@ -293,10 +293,9 @@ func CreateFrequency(ctx context.Context, sess *session.Session, request *packet
}
return &packet.FrequenciesInfo{
- RemoveFrequencies: nil,
- Frequencies: []data.Frequency{frequency},
- Network: request.Network,
- Set: false,
+ RemovedFrequencies: nil,
+ Frequencies: []data.Frequency{frequency},
+ Network: request.Network,
}
}
@@ -375,10 +374,9 @@ func DeleteFrequency(ctx context.Context, sess *session.Session, request *packet
}
return &packet.FrequenciesInfo{
- RemoveFrequencies: []snowflake.ID{frequency.ID},
- Frequencies: nil,
- Network: frequency.NetworkID,
- Set: false,
+ RemovedFrequencies: []snowflake.ID{frequency.ID},
+ Frequencies: nil,
+ Network: frequency.NetworkID,
}
}
@@ -406,13 +404,13 @@ func DeleteNetwork(ctx context.Context, sess *session.Session, request *packet.D
}
return &packet.NetworksInfo{
- Networks: nil,
- RemoveNetworks: []snowflake.ID{request.Network},
- Set: false,
+ Networks: nil,
+ RemovedNetworks: []snowflake.ID{request.Network},
+ Set: false,
}
}
-func SetNetworkUser(ctx context.Context, sess *session.Session, request *packet.SetNetworkUser) packet.Payload {
+func SetMember(ctx context.Context, sess *session.Session, request *packet.SetMember) packet.Payload {
queries := data.New(db)
network, err := queries.GetNetworkById(ctx, request.Network)
@@ -428,7 +426,7 @@ func SetNetworkUser(ctx context.Context, sess *session.Session, request *packet.
wantsToJoin := request.Member != nil && *request.Member && request.User == sess.ID()
if err == sql.ErrNoRows && network.IsPublic && wantsToJoin {
- _, err = queries.SetNetworkUser(ctx, data.SetNetworkUserParams{
+ newMember, err := queries.SetMember(ctx, data.SetMemberParams{
UserID: request.User,
NetworkID: request.Network,
IsMember: true,
@@ -442,13 +440,22 @@ func SetNetworkUser(ctx context.Context, sess *session.Session, request *packet.
return &ErrInternalError
}
- payload, err := GetSingleNetworkInfo(ctx, queries, network)
+ user, err := queries.GetUserById(ctx, newMember.UserID)
if err != nil {
log.Println("database error 3:", err)
return &ErrInternalError
}
- return payload
+ return &packet.MembersInfo{
+ RemovedMembers: nil,
+ Members: []data.GetNetworkMembersRow{{
+ User: user,
+ JoinedAt: newMember.JoinedAt,
+ IsAdmin: newMember.IsAdmin,
+ IsMuted: newMember.IsMuted,
+ }},
+ Network: request.Network,
+ }
}
if err != nil {
@@ -499,7 +506,7 @@ func SetNetworkUser(ctx context.Context, sess *session.Session, request *packet.
}
}
- _, err = queries.SetNetworkUser(ctx, data.SetNetworkUserParams{
+ newMember, err := queries.SetMember(ctx, data.SetMemberParams{
UserID: request.User,
NetworkID: request.Network,
IsMember: isMember,
@@ -513,11 +520,28 @@ func SetNetworkUser(ctx context.Context, sess *session.Session, request *packet.
return &ErrInternalError
}
- payload, err := GetSingleNetworkInfo(ctx, queries, network)
+ if !newMember.IsMember {
+ return &packet.MembersInfo{
+ RemovedMembers: []snowflake.ID{newMember.UserID},
+ Members: nil,
+ Network: request.Network,
+ }
+ }
+
+ user, err := queries.GetUserById(ctx, newMember.UserID)
if err != nil {
log.Println("database error 7:", err)
return &ErrInternalError
}
- return payload
+ return &packet.MembersInfo{
+ RemovedMembers: nil,
+ Members: []data.GetNetworkMembersRow{{
+ User: user,
+ JoinedAt: newMember.JoinedAt,
+ IsAdmin: newMember.IsAdmin,
+ IsMuted: newMember.IsMuted,
+ }},
+ Network: request.Network,
+ }
}
diff --git a/internal/server/api/helpers.go b/internal/server/api/helpers.go
index d5b2d8c..f82bf6e 100644
--- a/internal/server/api/helpers.go
+++ b/internal/server/api/helpers.go
@@ -5,7 +5,6 @@ import (
"strings"
"github.com/kyren223/eko/internal/data"
- "github.com/kyren223/eko/internal/packet"
"github.com/kyren223/eko/pkg/snowflake"
)
@@ -42,27 +41,3 @@ func IsNetworkAdmin(ctx context.Context, queries *data.Queries, userId, networkI
return isAdmin, nil
}
-func GetSingleNetworkInfo(ctx context.Context, queries *data.Queries, network data.Network) (packet.Payload, error) {
- frequencies, err := queries.GetNetworkFrequencies(ctx, network.ID)
- if err != nil {
- return nil, err
- }
-
- members, err := queries.GetNetworkMembers(ctx, network.ID)
- if err != nil {
- return nil, err
- }
-
- fullNetwork := packet.FullNetwork{
- Network: network,
- Frequencies: frequencies,
- Members: members,
- Position: -1,
- }
-
- return &packet.NetworksInfo{
- Networks: []packet.FullNetwork{fullNetwork},
- RemoveNetworks: nil,
- Set: false,
- }, nil
-}
diff --git a/internal/server/server.go b/internal/server/server.go
index 1efdea2..2b1003f 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -319,8 +319,8 @@ func processRequest(ctx context.Context, sess *session.Session, request packet.P
response = timeout(500*time.Millisecond, api.DeleteNetwork, ctx, sess, request)
case *packet.SwapUserNetworks:
response = timeout(5*time.Millisecond, api.SwapUserNetworks, ctx, sess, request)
- case *packet.SetNetworkUser:
- response = timeout(50*time.Millisecond, api.SetNetworkUser, ctx, sess, request)
+ case *packet.SetMember:
+ response = timeout(50*time.Millisecond, api.SetMember, ctx, sess, request)
case *packet.CreateFrequency:
response = timeout(5*time.Millisecond, api.CreateFrequency, ctx, sess, request)
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-10 14:30:25 +0000