From 4b0577f1bd43a38fef4b08a42afc728736f6477d Mon Sep 17 00:00:00 2001
From: "Alexander \"Arav\" Andreev" <me@arav.top>
Date: Fri, 19 Aug 2022 02:24:00 +0400
Subject: [PATCH] GetAnswer() method changed into Answer().

---
 internal/captcha/dwelling_captcha.go | 2 +-
 pkg/captcha/captcha.go               | 4 ++--
 pkg/captcha/db.go                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/internal/captcha/dwelling_captcha.go b/internal/captcha/dwelling_captcha.go
index 3f39882..41892c2 100644
--- a/internal/captcha/dwelling_captcha.go
+++ b/internal/captcha/dwelling_captcha.go
@@ -42,7 +42,7 @@ func (c *DwellingCaptcha) Image(style string) *image.Image {
 		ctx.SetRGB255(0x0a, 0x0a, 0x0a)
 	}
 	ctx.Scale(4.0, 2.7)
-	ctx.DrawStringAnchored(string(c.GetAnswer()), 20, 5, .5, .5)
+	ctx.DrawStringAnchored(string(c.Answer()), 20, 5, .5, .5)
 
 	// draw lines and points
 	h := float64(ctx.Height())
diff --git a/pkg/captcha/captcha.go b/pkg/captcha/captcha.go
index d1fcd20..52ddbd2 100644
--- a/pkg/captcha/captcha.go
+++ b/pkg/captcha/captcha.go
@@ -23,7 +23,7 @@ type Captcha interface {
 	// Image generates and returns an image of captcha.
 	Image(style string) *image.Image
 	// GetAnswer returns a pregenerated answer.
-	GetAnswer() Answer
+	Answer() Answer
 	// Solve compares a stored answer with a passed one.
 	// Sets field Solved to true if they are equal.
 	Solve(answer Answer) bool
@@ -53,7 +53,7 @@ func (c *BaseCaptcha) Image(style string) *image.Image {
 	return nil
 }
 
-func (c *BaseCaptcha) GetAnswer() Answer {
+func (c *BaseCaptcha) Answer() Answer {
 	if c.answer == "" {
 		c.answer = NewIntAnswer()
 	}
diff --git a/pkg/captcha/db.go b/pkg/captcha/db.go
index a50e81c..8a4b264 100644
--- a/pkg/captcha/db.go
+++ b/pkg/captcha/db.go
@@ -65,7 +65,7 @@ func NewInMemoryCaptchaDB(expire time.Duration) *InMemoryCaptchaDB {
 // `data` string is an additional random data used to generate an ID,
 // e.g. IP-address.
 func (cdb *InMemoryCaptchaDB) New(data string, captcha Captcha) (Captcha, ID) {
-	id := NewID(data, captcha.GetAnswer())
+	id := NewID(data, captcha.Answer())
 
 	cdb.Lock()
 	cdb.db[id] = captcha