stuff

client/config_ignorer.go

@@ -1,4 +1,4 @@
-package modules
+package client
 
 import (
 	"errors"

client/login.go

@@ -1,4 +1,4 @@
-package modules
+package client
 
 import (
 	"crypto/rand"
@@ -11,7 +11,6 @@ import (
 	"strconv"
 
 	"github.com/admin-else/strom/api"
-	"github.com/admin-else/strom/client"
 	"github.com/admin-else/strom/crypto"
 	"github.com/admin-else/strom/event"
 	"github.com/admin-else/strom/proto"
@@ -157,7 +156,7 @@ func Login(c *proto.Conn, account *api.Account) (err error) {
 }
 
 func ConnectAndLogin(connectTo string, account *api.Account) (c *proto.Conn, err error) {
-	c, err = client.Connect(connectTo)
+	c, err = Connect(connectTo)
 	if err != nil {
 		return
 	}

client/status.go

@@ -1,4 +1,4 @@
-package modules
+package client
 
 import (
 	"fmt"

client/timer.go

@@ -1,6 +1,9 @@
-package modules
+package client
 
-import "time"
+import (
+	"slices"
+	"time"
+)
 
 type IntervalTask struct {
 	F           func() error
@@ -33,18 +36,15 @@ func (t *Timer) Tick() (err error) {
 		}
 		t.Interval[i] = task
 	}
-	var triggerLater []OnceTask
-	for _, task := range t.Once {
+	for i, task := range t.Once {
 		if task.Trigger.After(time.Now()) {
 			err = task.F()
 			if err != nil {
 				return
 			}
-		} else {
-			triggerLater = append(triggerLater, task)
+			slices.Delete(t.Once, i, i)
 		}
 	}
-	t.Once = triggerLater
 	return
 }