From 4ad4c8c2146df47a12ce0f1bfdb60f6d75109bbe Mon Sep 17 00:00:00 2001
From: saces <saces@c-base.org>
Date: Tue, 20 Jan 2026 06:48:27 +0100
Subject: [PATCH] go: refactor cli utils into package

---
 libmxclient/mxclientlib.go                 | 14 +++++++-------
 libmxclient/{mxclient => mxutils}/utils.go |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename libmxclient/{mxclient => mxutils}/utils.go (99%)

diff --git a/libmxclient/mxclientlib.go b/libmxclient/mxclientlib.go
index c5ff6b2..28428e5 100644
--- a/libmxclient/mxclientlib.go
+++ b/libmxclient/mxclientlib.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-	"mxclientlib/mxclient"
+	"mxclientlib/mxutils"
 	"unsafe"
 )
 
@@ -23,7 +23,7 @@ cli tools
 //export cli_discoverhs
 func cli_discoverhs(id *C.char) *C.char {
 	mxid := C.GoString(id)
-	result := mxclient.DiscoverHS(mxid)
+	result := mxutils.DiscoverHS(mxid)
 	return C.CString(result)
 }
 
@@ -31,7 +31,7 @@ func cli_discoverhs(id *C.char) *C.char {
 func cli_mkmxtoken(id *C.char, pw *C.char) *C.char {
 	mxid := C.GoString(id)
 	mxpw := C.GoString(pw)
-	result := mxclient.MkToken(mxid, mxpw)
+	result := mxutils.MkToken(mxid, mxpw)
 	return C.CString(result)
 }
 
@@ -39,7 +39,7 @@ func cli_mkmxtoken(id *C.char, pw *C.char) *C.char {
 func cli_whoami(hs *C.char, tk *C.char) *C.char {
 	_hs := C.GoString(hs)
 	_tk := C.GoString(tk)
-	result := mxclient.Whoami(_hs, _tk)
+	result := mxutils.Whoami(_hs, _tk)
 	return C.CString(result)
 }
 
@@ -47,7 +47,7 @@ func cli_whoami(hs *C.char, tk *C.char) *C.char {
 func cli_accountinfo(hs *C.char, tk *C.char) *C.char {
 	_hs := C.GoString(hs)
 	_tk := C.GoString(tk)
-	result := mxclient.AccountInfo(_hs, _tk)
+	result := mxutils.AccountInfo(_hs, _tk)
 	return C.CString(result)
 }
 
@@ -55,14 +55,14 @@ func cli_accountinfo(hs *C.char, tk *C.char) *C.char {
 func cli_clearaccount(hs *C.char, tk *C.char) *C.char {
 	_hs := C.GoString(hs)
 	_tk := C.GoString(tk)
-	result := mxclient.ClearAccount(_hs, _tk)
+	result := mxutils.ClearAccount(_hs, _tk)
 	return C.CString(result)
 }
 
 //export cli_serverinfo
 func cli_serverinfo(url *C.char) *C.char {
 	_url := C.GoString(url)
-	result := mxclient.ServerInfo(_url)
+	result := mxutils.ServerInfo(_url)
 	return C.CString(result)
 }
 
diff --git a/libmxclient/mxclient/utils.go b/libmxclient/mxutils/utils.go
similarity index 99%
rename from libmxclient/mxclient/utils.go
rename to libmxclient/mxutils/utils.go
index 0e34ad4..7c01d5c 100644
--- a/libmxclient/mxclient/utils.go
+++ b/libmxclient/mxutils/utils.go
@@ -1,6 +1,6 @@
 // Copyright (C) 2026 saces@c-base.org
 // SPDX-License-Identifier: AGPL-3.0-only
-package mxclient
+package mxutils
 
 import (
 	"context"