From 1e6b5996491d7d27147a0dea2b52c36577820d63 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 10 May 2018 20:07:24 +0300 Subject: Don't parse room ID --- matrix/matrix.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'matrix') diff --git a/matrix/matrix.go b/matrix/matrix.go index 4609876..de65b60 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -438,16 +438,11 @@ func (c *Container) SendTyping(roomID string, typing bool) { } // JoinRoom makes the current user try to join the given room. -func (c *Container) JoinRoom(roomID string) (*rooms.Room, error) { +func (c *Container) JoinRoom(roomID, server string) (*rooms.Room, error) { if len(roomID) == 0 { return nil, fmt.Errorf("invalid room ID") } - server := "" - if roomID[0] == '!' { - server = roomID[strings.Index(roomID, ":")+1:] - } - resp, err := c.client.JoinRoom(roomID, server, nil) if err != nil { return nil, err -- cgit v1.2.3