From 815190be147e575f12211c468f8121e5c60e6337 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 16 Apr 2020 19:27:35 +0300 Subject: Update stuff and move pushrules to mautrix-go --- ui/view-login.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ui/view-login.go') diff --git a/ui/view-login.go b/ui/view-login.go index 9eb8226..d1cd4ee 100644 --- a/ui/view-login.go +++ b/ui/view-login.go @@ -19,6 +19,7 @@ package ui import ( "math" + "maunium.net/go/mautrix/id" "maunium.net/go/tcell" "maunium.net/go/mautrix" @@ -75,7 +76,7 @@ func (ui *GomuksUI) NewLoginView() mauview.Component { hs := ui.gmx.Config().HS view.homeserver.SetPlaceholder("https://example.com").SetText(hs) - view.username.SetPlaceholder("@user:example.com").SetText(ui.gmx.Config().UserID) + view.username.SetPlaceholder("@user:example.com").SetText(string(ui.gmx.Config().UserID)) view.password.SetPlaceholder("correct horse battery staple").SetMaskCharacter('*') view.quitButton.SetOnClick(func() { ui.gmx.Stop(true) }).SetBackgroundColor(tcell.ColorDarkCyan) @@ -103,7 +104,7 @@ func (ui *GomuksUI) NewLoginView() mauview.Component { } func (view *LoginView) resolveWellKnown() { - _, homeserver, err := mautrix.ParseUserID(view.username.GetText()) + _, homeserver, err := id.UserID(view.username.GetText()).Parse() if err != nil { return } -- cgit v1.2.3