From 7ba1a1858f5ee2a44f18501b486ec11dd1990018 Mon Sep 17 00:00:00 2001
From: Kaleb Elwert <kaleb.elwert@datadoghq.com>
Date: Fri, 22 Jan 2021 09:55:07 -0800
Subject: [PATCH] Remove TagValue and Tags.GetTag

Fixes #83
Fixes #84
---
 .gitmodules    |  2 +-
 parser.go      | 27 +++++++++------------------
 parser_test.go |  8 ++++----
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 8ed3899..7781b69 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "testcases"]
 	path = testcases
-	url = https://github.com/go-irc/irc-parser-tests/
+	url = https://github.com/go-irc/irc-parser-tests.git
diff --git a/parser.go b/parser.go
index 701568b..be522ff 100644
--- a/parser.go
+++ b/parser.go
@@ -40,13 +40,10 @@ var (
 	ErrMissingCommand = errors.New("irc: Missing message command")
 )
 
-// TagValue represents the value of a tag.
-type TagValue string
-
-// ParseTagValue parses a TagValue from the connection. If you need to
-// set a TagValue, you probably want to just set the string itself, so
-// it will be encoded properly.
-func ParseTagValue(v string) TagValue {
+// ParseTagValue parses an encoded tag value as a string. If you need to set a
+// tag, you probably want to just set the string itself, so it will be encoded
+// properly.
+func ParseTagValue(v string) string {
 	ret := &bytes.Buffer{}
 
 	input := bytes.NewBufferString(v)
@@ -76,11 +73,11 @@ func ParseTagValue(v string) TagValue {
 		}
 	}
 
-	return TagValue(ret.String())
+	return ret.String()
 }
 
-// Encode converts a TagValue to the format in the connection.
-func (v TagValue) Encode() string {
+// EncodeTagValue converts a raw string to the format in the connection.
+func EncodeTagValue(v string) string {
 	ret := &bytes.Buffer{}
 
 	for _, c := range v {
@@ -95,7 +92,7 @@ func (v TagValue) Encode() string {
 }
 
 // Tags represents the IRCv3 message tags.
-type Tags map[string]TagValue
+type Tags map[string]string
 
 // ParseTags takes a tag string and parses it into a tag map. It will
 // always return a tag map, even if there are no valid tags.
@@ -116,12 +113,6 @@ func ParseTags(line string) Tags {
 	return ret
 }
 
-// GetTag is a convenience method to look up a tag in the map.
-func (t Tags) GetTag(key string) (string, bool) {
-	ret, ok := t[key]
-	return string(ret), ok
-}
-
 // Copy will create a new copy of all IRC tags attached to this
 // message.
 func (t Tags) Copy() Tags {
@@ -143,7 +134,7 @@ func (t Tags) String() string {
 		buf.WriteString(k)
 		if v != "" {
 			buf.WriteByte('=')
-			buf.WriteString(v.Encode())
+			buf.WriteString(EncodeTagValue(v))
 		}
 	}
 
diff --git a/parser_test.go b/parser_test.go
index 710f6a7..6f6a264 100644
--- a/parser_test.go
+++ b/parser_test.go
@@ -177,7 +177,7 @@ func TestMsgSplit(t *testing.T) {
 		)
 
 		for k, v := range test.Atoms.Tags {
-			tag, ok := msg.GetTag(k)
+			tag, ok := msg.Tags[k]
 			assert.True(t, ok, "Missing tag")
 			if v == nil {
 				assert.EqualValues(t, "", tag, "%s: Tag %q differs: %s != \"\"", test.Desc, k, tag)
@@ -216,14 +216,14 @@ func TestMsgJoin(t *testing.T) {
 			Prefix:  ParsePrefix(test.Atoms.Source),
 			Command: test.Atoms.Verb,
 			Params:  test.Atoms.Params,
-			Tags:    make(map[string]TagValue),
+			Tags:    make(map[string]string),
 		}
 
 		for k, v := range test.Atoms.Tags {
 			if v == nil {
-				msg.Tags[k] = TagValue("")
+				msg.Tags[k] = ""
 			} else {
-				msg.Tags[k] = TagValue(v.(string))
+				msg.Tags[k] = v.(string)
 			}
 		}