go.mod

@@ -3,7 +3,7 @@ module git.solsynth.dev/hydrogen/interactive
 go 1.21.6
 
 require (
-	git.solsynth.dev/hydrogen/identity v0.0.0-20240405190322-7f5183f83bbf
+	git.solsynth.dev/hydrogen/identity v0.0.0-20240331080359-e8aac7bb6627
 	github.com/go-playground/validator/v10 v10.17.0
 	github.com/gofiber/fiber/v2 v2.52.4
 	github.com/gofiber/template/html/v2 v2.1.1

go.sum

@@ -1,7 +1,5 @@
 git.solsynth.dev/hydrogen/identity v0.0.0-20240331080359-e8aac7bb6627 h1:BUhDqy/Whw1yVbDpmGk7clzRAC1jo+AOsCwuwhCVwkg=
 git.solsynth.dev/hydrogen/identity v0.0.0-20240331080359-e8aac7bb6627/go.mod h1:GxcduEpQWQ2mO37A9uRtseS680uMLi957GDywRBAJHg=
-git.solsynth.dev/hydrogen/identity v0.0.0-20240405190322-7f5183f83bbf h1:dj9XcgDsI7LGkHmDxFBGwYGveBYYklda1hS2z/h8Z9w=
-git.solsynth.dev/hydrogen/identity v0.0.0-20240405190322-7f5183f83bbf/go.mod h1:GxcduEpQWQ2mO37A9uRtseS680uMLi957GDywRBAJHg=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=

pkg/grpc/client.go

@@ -8,7 +8,6 @@ import (
 	"google.golang.org/grpc"
 )
 
-var Friendships idpb.FriendshipsClient
 var Notify idpb.NotifyClient
 var Auth idpb.AuthClient
 
@@ -17,7 +16,6 @@ func ConnectPassport() error {
 	if conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials())); err != nil {
 		return err
 	} else {
-		Friendships = idpb.NewFriendshipsClient(conn)
 		Notify = idpb.NewNotifyClient(conn)
 		Auth = idpb.NewAuthClient(conn)
 	}

pkg/server/realm_members_api.go

@@ -84,30 +84,3 @@ func kickRealm(c *fiber.Ctx) error {
 		return c.SendStatus(fiber.StatusOK)
 	}
 }
-
-func leaveRealm(c *fiber.Ctx) error {
-	user := c.Locals("principal").(models.Account)
-	realmId, _ := c.ParamsInt("realmId", 0)
-
-	var realm models.Realm
-	if err := database.C.Where(&models.Realm{
-		BaseModel: models.BaseModel{ID: uint(realmId)},
-	}).First(&realm).Error; err != nil {
-		return fiber.NewError(fiber.StatusNotFound, err.Error())
-	} else if user.ID == realm.AccountID {
-		return fiber.NewError(fiber.StatusBadRequest, "you cannot leave your own realm")
-	}
-
-	var account models.Account
-	if err := database.C.Where(&models.Account{
-		BaseModel: models.BaseModel{ID: user.ID},
-	}).First(&account).Error; err != nil {
-		return fiber.NewError(fiber.StatusNotFound, err.Error())
-	}
-
-	if err := services.KickRealmMember(account, realm); err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, err.Error())
-	} else {
-		return c.SendStatus(fiber.StatusOK)
-	}
-}

pkg/server/startup.go

@@ -121,7 +121,6 @@ func NewServer() {
 			realms.Post("/", authMiddleware, createRealm)
 			realms.Post("/:realmId/invite", authMiddleware, inviteRealm)
 			realms.Post("/:realmId/kick", authMiddleware, kickRealm)
-			realms.Post("/:realmId/leave", authMiddleware, kickRealm)
 			realms.Put("/:realmId", authMiddleware, editRealm)
 			realms.Delete("/:realmId", authMiddleware, deleteRealm)
 		}

pkg/services/accounts.go

@@ -34,17 +34,6 @@ func GetAccountFollowed(user models.Account, target models.Account) (models.Acco
 	return relationship, err == nil
 }
 
-func GetAccountFriend(userId, relatedId uint, status int) (*proto.FriendshipResponse, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-	defer cancel()
-
-	return grpc.Friendships.GetFriendship(ctx, &proto.FriendshipTwoSideLookupRequest{
-		AccountId: uint64(userId),
-		RelatedId: uint64(relatedId),
-		Status:    uint32(status),
-	})
-}
-
 func NotifyAccount(user models.Account, subject, content string, realtime bool, links ...*proto.NotifyLink) error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()

pkg/services/realms.go

@@ -1,7 +1,6 @@
 package services
 
 import (
-	"fmt"
 	"git.solsynth.dev/hydrogen/interactive/pkg/database"
 	"git.solsynth.dev/hydrogen/interactive/pkg/models"
 	"github.com/samber/lo"
@@ -77,16 +76,13 @@ func ListRealmMember(realmId uint) ([]models.RealmMember, error) {
 }
 
 func InviteRealmMember(user models.Account, target models.Realm) error {
-	if _, err := GetAccountFriend(user.ID, target.AccountID, 1); err != nil {
-		return fmt.Errorf("you only can invite your friends to your realm")
-	}
-
 	member := models.RealmMember{
 		RealmID:   target.ID,
 		AccountID: user.ID,
 	}
 
 	err := database.C.Save(&member).Error
+
 	return err
 }