README.md

@@ -1,11 +0,0 @@
-# emt
-CLI Emojis
-
-Binaries:  
-https://bullercodeworks.com/downloads/emt/
-
-Included is a completion script for bash:  
-* `emt-completion.bash`
-
-Just put `emt` in your path, then source the completion script when you
-fire up your shell (put a line in your bashrc or something)

emt-completion.bash

@@ -1,3 +0,0 @@
-#/usr/bin/env bash
-WORDLIST=`emt -completion-list`
-complete -W "$WORDLIST" emt

go.mod

@@ -1,5 +0,0 @@
-module git.bullercodeworks.com/brian/emt
-
-go 1.16
-
-require github.com/kyokomi/emoji v2.2.4+incompatible

go.sum

@@ -1,2 +0,0 @@
-github.com/kyokomi/emoji v2.2.4+incompatible h1:np0woGKwx9LiHAQmwZx79Oc0rHpNw3o+3evou4BEPv4=
-github.com/kyokomi/emoji v2.2.4+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA=

main.go

@@ -8,48 +8,80 @@ import (
 	"github.com/kyokomi/emoji"
 )
 
+var emoticons map[string]string
+
 func main() {
-	if len(os.Args) < 2 || strings.HasSuffix(os.Args[1], "-help") {
-		showUsage()
-	}
-
-	var getApprox bool
+	initEmoticons()
+	// We default to "shrug"
+	var done bool
 	var which string
-	var matchWhich string
-	allEmoji := emoji.CodeMap()
-	for _, v := range os.Args {
-		if v == "-a" {
-			getApprox = true
-		} else if v == "-completion-list" {
-			for k := range allEmoji {
-				fmt.Print(strings.Trim(k, ":"), " ")
-			}
-		} else {
-			which = v
-		}
-	}
-
-	if !strings.HasPrefix(which, ":") && !strings.HasSuffix(which, ":") {
-		matchWhich = ":" + which + ":"
-	}
-	if v, ok := allEmoji[matchWhich]; ok {
-		fmt.Println(v)
-		os.Exit(0)
-	} else if getApprox {
-		for k, v := range allEmoji {
-			if strings.Contains(k, which) {
-				fmt.Println(v)
-			}
-		}
-	}
-	os.Exit(1)
-}
-
-func showUsage() {
+	if len(os.Args) == 2 {
+		which = os.Args[1]
+		if which == "help" {
+			showHelp()
+		} else if which == "help-emoji" {
 			allEmoji := emoji.CodeMap()
 			fmt.Println("== Supported Emoji ==")
 			for k, v := range allEmoji {
 				fmt.Println(k + " " + v)
 			}
 			os.Exit(0)
+		}
+		// it might be a one-word emoji request
+		allEmoji := emoji.CodeMap()
+		if _, done = allEmoji[which]; done {
+			tst1 := ":" + which + ":"
+			tst2 := emoji.Sprint(tst1)
+			if tst1 != tst2 {
+				fmt.Println(tst2)
+				done = true
+			}
+		} else {
+			// Search for any emoji that contain this string
+			var cnt int
+			for k, v := range allEmoji {
+				if strings.Contains(k, which) {
+					fmt.Println(k + " " + v)
+					cnt++
+				}
+			}
+			if cnt > 0 {
+				done = true
+			} else {
+				fmt.Println("No emoji for " + which + " found.")
+			}
+		}
+	}
+	if !done {
+		var i string
+		if i, done = emoticons[which]; done {
+			fmt.Println(i)
+		}
+	}
+	if !done {
+		showHelp()
+	}
+}
+
+func showHelp() {
+	fmt.Println("There are a *ton* of emoji supported, to list them, do \"help-emoji\"")
+	for k, v := range emoticons {
+		fmt.Println(k, v)
+	}
+	os.Exit(0)
+}
+
+func initEmoticons() {
+	emoticons = make(map[string]string)
+	emoticons["ascii-bat"] = "～°·_·°～"
+	emoticons["ascii-bomb"] = "●～*"
+	emoticons["ascii-fish"] = ">°)))彡"
+	emoticons["ascii-flip"] = "(╯°□°）╯︵ ┻━┻"
+	emoticons["ascii-lenny"] = "( ͡° ͜ʖ ͡°)"
+	emoticons["ascii-octopus"] = "<コ:彡"
+	emoticons["ascii-shrug"] = "¯\\_(ツ)_/¯"
+	emoticons["ascii-smirk"] = "( ͡° ͜ʖ ͡°)"
+	emoticons["ascii-snake"] = "~>°)～～～"
+	emoticons["ascii-star"] = "☆彡"
+	emoticons["ascii-tadpole"] = "(°°)～"
 }