From f86032e68213087b8f087245851b915b5f6acfa6 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 8 Dec 2024 21:34:30 +0800 Subject: Server & Client should only have pointer receivers --- clients.go | 6 +++--- main.go | 2 +- servers.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clients.go b/clients.go index 16dea78..1c3f8e0 100644 --- a/clients.go +++ b/clients.go @@ -17,7 +17,7 @@ type Client struct { Host string Caps map[string]struct{} Extra map[string]any - Server Server + Server *Server State ClientState } @@ -40,12 +40,12 @@ func (client *Client) SendRaw(s string) error { return nil } -func (client Client) ClientSource() string { +func (client *Client) ClientSource() string { // TODO: Edge cases where these aren't available return client.Nick + "!" + client.Ident + "@" + client.Host } -func (client Client) ServerSource() string { +func (client *Client) ServerSource() string { return client.CID } diff --git a/main.go b/main.go index 3f6025a..b17c713 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,7 @@ func main() { setupCapls() - self = Server{ + self = &Server{ conn: nil, SID: "001", Name: "irc.runxiyu.org", diff --git a/servers.go b/servers.go index 4cc8b31..f9dd319 100644 --- a/servers.go +++ b/servers.go @@ -16,7 +16,7 @@ func (server *Server) Send(msg SMsg) error { } func (server *Server) SendRaw(s string) error { - if server == &self { + if server == self { return ErrSendToSelf } if server.conn == nil { @@ -34,12 +34,12 @@ func (server *Server) SendRaw(s string) error { return nil } -func (server Server) ClientSource() string { +func (server *Server) ClientSource() string { return server.Name } -func (server Server) ServerSource() string { +func (server *Server) ServerSource() string { return server.SID } -var self Server +var self *Server -- cgit v1.2.3