From 11bd11081d68f00c29a4a55e9ecff06a5762eb28 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Fri, 25 Dec 2020 19:39:44 +0100
Subject: [PATCH] Simplify function names

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 msgformatter.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/msgformatter.go b/msgformatter.go
index 9d10cb4..4264ed7 100644
--- a/msgformatter.go
+++ b/msgformatter.go
@@ -15,9 +15,8 @@ import (
 func formatMessage(tplString string, m *irc.Message, r *rule, fields map[string]interface{}) (string, error) {
 	// Create anonymous functions in current context in order to access function variables
 	messageFunctions := korvike.GetFunctionMap()
-	messageFunctions["fixUsername"] = func(username string) string { return strings.TrimLeft(username, "@") }
 
-	messageFunctions["getArg"] = func(arg int) (string, error) {
+	messageFunctions["arg"] = func(arg int) (string, error) {
 		msgParts := strings.Split(m.Trailing(), " ")
 		if len(msgParts) <= arg {
 			return "", errors.New("argument not found")
@@ -26,14 +25,11 @@ func formatMessage(tplString string, m *irc.Message, r *rule, fields map[string]
 		return msgParts[arg], nil
 	}
 
-	messageFunctions["getCounterValue"] = func(name string, _ ...string) int64 {
+	messageFunctions["counterValue"] = func(name string, _ ...string) int64 {
 		return store.GetCounterValue(name)
 	}
 
-	messageFunctions["getTag"] = func(tag string) string {
-		s, _ := m.GetTag(tag)
-		return s
-	}
+	messageFunctions["fixUsername"] = func(username string) string { return strings.TrimLeft(username, "@") }
 
 	messageFunctions["group"] = func(idx int) (string, error) {
 		fields := r.matchMessage.FindStringSubmatch(m.Trailing())
@@ -53,6 +49,11 @@ func formatMessage(tplString string, m *irc.Message, r *rule, fields map[string]
 		return game, err
 	}
 
+	messageFunctions["tag"] = func(tag string) string {
+		s, _ := m.GetTag(tag)
+		return s
+	}
+
 	// Parse and execute template
 	tpl, err := template.
 		New(tplString).