From 2f050fe99a96fe9e4397275585c0ed3d5da195e0 Mon Sep 17 00:00:00 2001
From: Yousef Mansy <yousefmansy1@gmail.com>
Date: Sun, 2 Apr 2023 18:58:50 -0700
Subject: [PATCH] Add fallback welcome message in config.

---
 gateway/command.go  |  5 ++++-
 gateway/handlers.go | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gateway/command.go b/gateway/command.go
index 61f29bec..03698726 100644
--- a/gateway/command.go
+++ b/gateway/command.go
@@ -162,7 +162,10 @@ func (r *Router) handleWelcomeCmd(msg *config.Message, welcomeMsg *config.Messag
 func (r *Router) handleEchoWelcomeCmd(msg *config.Message) {
 	msg.Event = config.EventWelcomeMsg
 
-	if r.getWelcomeMessage(msg.Channel) == nil {
+	srcBridge := r.getBridge(msg.Account)
+	str := srcBridge.Channels[msg.Channel+msg.Account].Options.WelcomeMessage
+
+	if r.getWelcomeMessage(msg.Channel) == nil && str == "" {
 		r.replyCmd(msg, "No welcome message configured, set with !setwelcome")
 		return
 	}
diff --git a/gateway/handlers.go b/gateway/handlers.go
index 6845a3d7..d595df88 100644
--- a/gateway/handlers.go
+++ b/gateway/handlers.go
@@ -53,11 +53,21 @@ func (r *Router) handleEventWelcome(msg *config.Message) bool {
 	if msg.Event != config.EventWelcomeMsg {
 		return false
 	}
-
 	welcomeMsg := r.getWelcomeMessage(msg.Channel)
+	srcBridge := r.getBridge(msg.Account)
+
+	str := srcBridge.Channels[msg.Channel+msg.Account].Options.WelcomeMessage
 
 	if welcomeMsg != nil {
 		r.sendDM(welcomeMsg, msg.UserID)
+	} else if str != "" {
+		rmsg := config.Message{
+			Account:  msg.Account,
+			Protocol: msg.Protocol,
+			Event:    msg.Event,
+			Text:     str,
+		}
+		r.sendDM(&rmsg, msg.UserID)
 	}
 
 	return true