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

13
storage/remoteServerInfo.go
View file

@ -2,8 +2,9 @@ package storage
import (
"github.com/rs/zerolog/log"
"git.mstar.dev/mstar/linstrom/util"
"gorm.io/gorm"
"git.mstar.dev/mstar/linstrom/shared"
)
type RemoteServer struct {
@ -16,7 +17,7 @@ type RemoteServer struct {
}
func (s *Storage) FindRemoteServerByDomain(url string) (*RemoteServer, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
server := RemoteServer{}
err := s.db.Where("domain = ?").First(&server).Error
switch err {
@ -31,7 +32,7 @@ func (s *Storage) FindRemoteServerByDomain(url string) (*RemoteServer, error) {
// Find a remote server with a given display name
func (s *Storage) FindRemoteServerByDisplayName(displayName string) (*RemoteServer, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
server := RemoteServer{}
err := s.db.Where("name = ?", displayName).First(&server).Error
switch err {
@ -45,7 +46,7 @@ func (s *Storage) FindRemoteServerByDisplayName(displayName string) (*RemoteServ
}
func (s *Storage) FindRemoteServerById(id uint) (*RemoteServer, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
server := RemoteServer{}
err := s.db.First(&server, id).Error
switch err {
@ -63,7 +64,7 @@ func (s *Storage) NewRemoteServer(
url, displayName, icon string,
serverType RemoteServerType,
) (*RemoteServer, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
_, err := s.FindRemoteServerByDomain(url)
switch err {
case nil:
@ -90,7 +91,7 @@ func (s *Storage) NewRemoteServer(
// If icon is set, update that
// Returns the updated version
func (s *Storage) UpdateRemoteServer(url string, displayName, icon *string) (*RemoteServer, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
if displayName == nil && icon == nil {
return nil, ErrNothingToChange
}