From 7d029c8a54ae64fc5f9997511eacfb24880da2a8 Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Mon, 6 Nov 2023 17:08:51 +0800 Subject: [PATCH] Fix: user permission --- internal/db/relation.go | 3 --- internal/op/user.go | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/db/relation.go b/internal/db/relation.go index cc89be1..6fdc43f 100644 --- a/internal/db/relation.go +++ b/internal/db/relation.go @@ -15,9 +15,6 @@ func GetRoomUserRelation(roomID, userID string) (*model.RoomUserRelation, error) Role: model.RoomRoleUser, Permissions: model.DefaultPermissions, }).FirstOrInit(roomUserRelation).Error - if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { - return roomUserRelation, errors.New("room or user not found") - } return roomUserRelation, err } diff --git a/internal/op/user.go b/internal/op/user.go index 2a2a496..582a270 100644 --- a/internal/op/user.go +++ b/internal/op/user.go @@ -56,7 +56,7 @@ func (u *User) IsPending() bool { } func (u *User) HasPermission(roomID string, permission model.Permission) bool { - if u.Role >= model.RoleAdmin { + if u.IsAdmin() { return true } ur, err := db.GetRoomUserRelation(roomID, u.ID)