From 6e85ced88cf858194825316de1c050fcc85af131 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Tue, 4 Nov 2025 18:33:42 -0500
Subject: [PATCH] Improved greet trigger.

---
 triggers/greet/greet.sh              | 12 ++++++++++--
 triggers/greet/greetings.txt.example |  3 +--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/triggers/greet/greet.sh b/triggers/greet/greet.sh
index e9b00b3..f2da742 100755
--- a/triggers/greet/greet.sh
+++ b/triggers/greet/greet.sh
@@ -17,10 +17,18 @@ else
     greeting=("Greetings" "Welcome!")
 fi
 
-# Replace {channel} placeholder with actual channel name
+# Replace placeholders with actual values
 selectedGreeting="${greeting[$((RANDOM % ${#greeting[@]}))]}"
 selectedGreeting="${selectedGreeting//\{channel\}/$2}"
 
-msg "$2" "$1: $selectedGreeting"
+# Check if greeting contains {name} placeholder
+if [[ "$selectedGreeting" == *"{name}"* ]]; then
+    # Replace {name} with actual name, don't add prefix
+    selectedGreeting="${selectedGreeting//\{name\}/$1}"
+    msg "$2" "$selectedGreeting"
+else
+    # No {name} placeholder, use traditional "name: greeting" format
+    msg "$2" "$1: $selectedGreeting"
+fi
 ;;
 esac
diff --git a/triggers/greet/greetings.txt.example b/triggers/greet/greetings.txt.example
index dd96e81..7809b98 100644
--- a/triggers/greet/greetings.txt.example
+++ b/triggers/greet/greetings.txt.example
@@ -1,4 +1,3 @@
 Greetings
-Howdy, welcome to {channel}!
-Wazzup Moe Fugger!
+Howdy {name}, welcome to {channel}!
 Welcome to {channel}!