From 997b156e2fdd44e05c04cf95eff903b06a976e56 Mon Sep 17 00:00:00 2001 From: diamondburned Date: Mon, 26 Oct 2020 22:25:55 -0700 Subject: [PATCH] Changed Namer to a Name method in Authenticator This commit removes the Namer interface and use a normal Name() method instead. This is because we don't want to add icons into Authenticators. --- cchat.go | 7 +++---- repository/main.go | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/cchat.go b/cchat.go index a9b0170..f5ad229 100644 --- a/cchat.go +++ b/cchat.go @@ -202,10 +202,6 @@ type Attachments interface { // break // success // } type Authenticator interface { - // Namer returns a short and concise name of this Authenticator method. The name - // should not include the name of the Service. - Namer - // Authenticate will be called with a list of values with indices correspond to // the returned slice of AuthenticateEntry. Authenticate([]string) (Session, error) // Blocking @@ -214,6 +210,9 @@ type Authenticator interface { AuthenticateForm() []AuthenticateEntry // Description returns the description of this authenticator method. Description() text.Rich + // Name returns a short and concise name of this Authenticator method. The name + // should not include the name of the Service. + Name() text.Rich } // Author is the interface for an identifiable author. The interface defines diff --git a/repository/main.go b/repository/main.go index ae35c45..2ca4fda 100644 --- a/repository/main.go +++ b/repository/main.go @@ -706,14 +706,20 @@ var Main = Packages{ } `}, Name: "Authenticator", - Embeds: []EmbeddedInterface{{ - Comment: Comment{` - Namer returns a short and concise name of this Authenticator - method. The name should not include the name of the Service. - `}, - InterfaceName: "Namer", - }}, Methods: []Method{ + GetterMethod{ + method: method{ + Comment: Comment{` + Name returns a short and concise name of this + Authenticator method. The name should not include + the name of the Service. + `}, + Name: "Name", + }, + Returns: []NamedType{{ + Type: MakeQual("text", "Rich"), + }}, + }, GetterMethod{ method: method{ Comment: Comment{`