mstar/linstrom
1
0
Fork 0
Code Issues 27 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move utils into shared folder

Browse source
This commit is contained in:
Melody Becker 2025-04-05 12:21:44 +02:00
parent 500bf48295
commit c25f27e82e
Signed by: mstar
SSH key fingerprint: SHA256:vkXfS9FG2pVNVfvDrzd1VW9n8VJzqqdKQGljxxX8uK8
22 changed files with 111 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

15
storage/roles.go
View file

@ -2,9 +2,10 @@ package storage
import (
"git.mstar.dev/mstar/goutils/sliceutils"
"git.mstar.dev/mstar/linstrom/util"
"github.com/rs/zerolog/log"
"gorm.io/gorm"
"git.mstar.dev/mstar/linstrom/shared"
)
// Could I collapse all these go:generate command into more condensed ones?
@ -14,7 +15,7 @@ import (
// This is explicit in what is being done. And easier to understand
//go:generate go build -o RolesGenerator ../cmd/RolesGenerator/main.go
//go:generate ./RolesGenerator -input=roles.go -output=rolesUtil_generated.go
//go:generate ./RolesGenerator -input=roles.go -output=rolesshared_generated.go
//go:generate rm RolesGenerator
//go:generate go build -o ApiGenerator ../cmd/RolesApiTypeGenerator/main.go
@ -186,7 +187,7 @@ Misskey "permissions" (no order):
*/
func (s *Storage) NewEmptyRole(name string) (*Role, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
// Check if a role with the given name already exists
_, err := s.FindRoleByName(name)
switch err {
@ -207,7 +208,7 @@ func (s *Storage) NewEmptyRole(name string) (*Role, error) {
}
func (s *Storage) FindRoleByName(name string) (*Role, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
role := Role{}
err := s.db.Where("name = ?", name).First(&role).Error
switch err {
@ -221,7 +222,7 @@ func (s *Storage) FindRoleByName(name string) (*Role, error) {
}
func (s *Storage) FindRolesByNames(names []string) ([]Role, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
roles := []Role{}
err := s.db.Where("name IN ?", names).Find(&roles).Error
switch err {
@ -235,7 +236,7 @@ func (s *Storage) FindRolesByNames(names []string) ([]Role, error) {
}
func (s *Storage) UpdateRole(role *Role) error {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
return s.db.Save(role).Error
}
@ -247,6 +248,6 @@ func (s *Storage) DeleteRoleByName(name string) error {
) {
return ErrNotAllowed
}
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
return s.db.Where(&Role{Name: name, IsBuiltIn: false}).Delete(&Role{}).Error
}