message: relocate from container

This package is quite useful. This change allows it to be imported without importing container.

Signed-off-by: Ophestra <cat@gensokyo.uk>

3 files changed, 10 insertions, 10 deletions

diff --git a/system/dbus/dbus_test.go b/system/dbus/dbus_test.go
index 978b55e1..299a4637 100644
--- a/system/dbus/dbus_test.go
+++ b/system/dbus/dbus_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"hakurei.app/container"
 	"hakurei.app/helper"
+	"hakurei.app/message"
 	"hakurei.app/system/dbus"
 )
 
@@ -93,9 +93,9 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) {
 
 	t.Run("invalid start", func(t *testing.T) {
 		if !useSandbox {
-			p = dbus.NewDirect(t.Context(), container.NewMsg(nil), nil, nil)
+			p = dbus.NewDirect(t.Context(), message.NewMsg(nil), nil, nil)
 		} else {
-			p = dbus.New(t.Context(), container.NewMsg(nil), nil, nil)
+			p = dbus.New(t.Context(), message.NewMsg(nil), nil, nil)
 		}
 
 		if err := p.Start(); !errors.Is(err, syscall.ENOTRECOVERABLE) {
@@ -128,9 +128,9 @@ func testProxyFinaliseStartWaitCloseString(t *testing.T, useSandbox bool) {
 				defer cancel()
 				output := new(strings.Builder)
 				if !useSandbox {
-					p = dbus.NewDirect(ctx, container.NewMsg(nil), final, output)
+					p = dbus.NewDirect(ctx, message.NewMsg(nil), final, output)
 				} else {
-					p = dbus.New(ctx, container.NewMsg(nil), final, output)
+					p = dbus.New(ctx, message.NewMsg(nil), final, output)
 				}
 
 				t.Run("invalid wait", func(t *testing.T) {
diff --git a/system/dbus/export_test.go b/system/dbus/export_test.go
index b1dc365f..bc24f3f3 100644
--- a/system/dbus/export_test.go
+++ b/system/dbus/export_test.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"io"
 
-	"hakurei.app/container"
+	"hakurei.app/message"
 )
 
 // NewDirect returns a new instance of [Proxy] with its sandbox disabled.
-func NewDirect(ctx context.Context, msg container.Msg, final *Final, output io.Writer) *Proxy {
+func NewDirect(ctx context.Context, msg message.Msg, final *Final, output io.Writer) *Proxy {
 	p := New(ctx, msg, final, output)
 	p.useSandbox = false
 	return p
diff --git a/system/dbus/proxy.go b/system/dbus/proxy.go
index 535f233d..385a8c7c 100644
--- a/system/dbus/proxy.go
+++ b/system/dbus/proxy.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 	"syscall"
 
-	"hakurei.app/container"
 	"hakurei.app/helper"
 	"hakurei.app/hst"
+	"hakurei.app/message"
 )
 
 // ProxyName is the file name or path to the proxy program.
@@ -19,7 +19,7 @@ var ProxyName = "xdg-dbus-proxy"
 type Proxy struct {
 	helper helper.Helper
 	ctx    context.Context
-	msg    container.Msg
+	msg    message.Msg
 
 	cancel context.CancelCauseFunc
 	cause  func() error
@@ -100,6 +100,6 @@ func Finalise(sessionBus, systemBus ProxyPair, session, system *hst.BusConfig) (
 }
 
 // New returns a new instance of [Proxy].
-func New(ctx context.Context, msg container.Msg, final *Final, output io.Writer) *Proxy {
+func New(ctx context.Context, msg message.Msg, final *Final, output io.Writer) *Proxy {
 	return &Proxy{name: ProxyName, ctx: ctx, msg: msg, final: final, output: output, useSandbox: true}
 }