lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Add fallback welcome message in config.

Browse Source
This commit is contained in:
Yousef Mansy
2023-04-02 18:58:50 -07:00
parent 5bc8231b2d
commit 2f050fe99a
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gateway/command.go
View File

@@ -162,7 +162,10 @@ func (r *Router) handleWelcomeCmd(msg *config.Message, welcomeMsg *config.Messag
func (r *Router) handleEchoWelcomeCmd(msg *config.Message) { func (r *Router) handleEchoWelcomeCmd(msg *config.Message) {
msg.Event = config.EventWelcomeMsg 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") r.replyCmd(msg, "No welcome message configured, set with !setwelcome")
return return
} }

12
gateway/handlers.go
View File

@@ -53,11 +53,21 @@ func (r *Router) handleEventWelcome(msg *config.Message) bool {
if msg.Event != config.EventWelcomeMsg { if msg.Event != config.EventWelcomeMsg {
return false return false
} }
welcomeMsg := r.getWelcomeMessage(msg.Channel) welcomeMsg := r.getWelcomeMessage(msg.Channel)
srcBridge := r.getBridge(msg.Account)
str := srcBridge.Channels[msg.Channel+msg.Account].Options.WelcomeMessage
if welcomeMsg != nil { if welcomeMsg != nil {
r.sendDM(welcomeMsg, msg.UserID) 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 return true