diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 095ee31..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 9e23ac2..55a4f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/dist
-/uploads
\ No newline at end of file
+/uploads
+
+.DS_Store
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ca153ed..1df2743 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,8 @@
-
-
-
-
-
-
-
-
+
+
@@ -94,6 +88,7 @@
+
@@ -157,7 +152,6 @@
-
@@ -182,7 +176,8 @@
-
+
+
true
diff --git a/go.mod b/go.mod
index 0c802cb..3492e42 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.22.1
require (
firebase.google.com/go v3.13.0+incompatible
- git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154745-ab0b491f45ff
+ git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951
git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745
github.com/go-playground/validator/v10 v10.17.0
github.com/gofiber/fiber/v2 v2.52.4
diff --git a/go.sum b/go.sum
index 45cdac2..776d28f 100644
--- a/go.sum
+++ b/go.sum
@@ -29,6 +29,8 @@ git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154526-59bda7a4117a h1:ozV2DWlcS
git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154526-59bda7a4117a/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154745-ab0b491f45ff h1:Bzcu+n1YFD09SGoGxuFnqT56u3kK66sQ/vF8PEhbPJQ=
git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154745-ab0b491f45ff/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
+git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951 h1:RgZJK4PXhrjhUX75BclBCg2xfetMkswcMwMqfTBtryQ=
+git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745 h1:40BUsQMNXjqHyytkyF9py1HjTAWlRgO6R57YXUrHNy4=
git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745/go.mod h1:FsQGSLTl0gvo+9Jmbot02S72suyF9tFTrzDj70Xhifo=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
diff --git a/pkg/.DS_Store b/pkg/.DS_Store
deleted file mode 100644
index eac0472..0000000
Binary files a/pkg/.DS_Store and /dev/null differ
diff --git a/pkg/internal/.DS_Store b/pkg/internal/.DS_Store
deleted file mode 100644
index bb2309c..0000000
Binary files a/pkg/internal/.DS_Store and /dev/null differ
diff --git a/pkg/internal/grpc/realms.go b/pkg/internal/grpc/realms.go
index aad261c..a9d6e59 100644
--- a/pkg/internal/grpc/realms.go
+++ b/pkg/internal/grpc/realms.go
@@ -121,8 +121,8 @@ func (v *Server) ListRealmMember(ctx context.Context, request *proto.RealmMember
}
return &proto.ListRealmMemberResponse{
- Data: lo.Map(members, func(item models.RealmMember, index int) *proto.MemberInfo {
- return &proto.MemberInfo{
+ Data: lo.Map(members, func(item models.RealmMember, index int) *proto.RealmMemberInfo {
+ return &proto.RealmMemberInfo{
RealmId: uint64(item.RealmID),
UserId: uint64(item.AccountID),
PowerLevel: int32(item.PowerLevel),
@@ -131,7 +131,7 @@ func (v *Server) ListRealmMember(ctx context.Context, request *proto.RealmMember
}, nil
}
-func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.MemberInfo, error) {
+func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.RealmMemberInfo, error) {
var member models.RealmMember
tx := database.C.Where("realm_id = ?", request.GetRealmId())
if request.UserId != nil {
@@ -142,7 +142,7 @@ func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberL
return nil, err
}
- return &proto.MemberInfo{
+ return &proto.RealmMemberInfo{
RealmId: uint64(member.RealmID),
UserId: uint64(member.AccountID),
PowerLevel: int32(member.PowerLevel),
diff --git a/pkg/internal/server/.DS_Store b/pkg/internal/server/.DS_Store
deleted file mode 100644
index 1df5315..0000000
Binary files a/pkg/internal/server/.DS_Store and /dev/null differ