jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2025-02-22 13:19:01 -08:00
Code Issues 4 Actions Packages Projects Releases Wiki Activity

Add simple functionality to disable URLs in part/quit msgs

Browse Source
This commit is contained in:
Kufat 2022-08-08 10:39:35 -04:00
parent 37d3721c28
commit e275bbfb2e
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bridge/irc/handlers.go
View File

@ -84,6 +84,10 @@ func isKill(quitmsg string) bool {
return strings.HasPrefix(quitmsg, "Killed") || strings.HasPrefix(quitmsg, "Local kill") || strings.HasPrefix(quitmsg[1:], "-lined") return strings.HasPrefix(quitmsg, "Killed") || strings.HasPrefix(quitmsg, "Local kill") || strings.HasPrefix(quitmsg[1:], "-lined")
} }
func suppressUrls(msg *string) {
*msg = strings.ReplaceAll(*msg, "://", ": //")
}
func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) { func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) {
if len(event.Params) == 0 { if len(event.Params) == 0 {
b.Log.Debugf("handleJoinPart: empty Params? %#v", event) b.Log.Debugf("handleJoinPart: empty Params? %#v", event)
@ -114,6 +118,9 @@ func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) {
if event.Command == "PART" && len(event.Params) >= 2 { if event.Command == "PART" && len(event.Params) >= 2 {
partmsg = " with message: " + event.Last() partmsg = " with message: " + event.Last()
} }
if len(partmsg) > 0 && b.SuppressPartQuitURLs {
suppressUrls(&partmsg)
}
msg := config.Message{Username: "system", Text: event.Source.Name + " " + strings.ToLower(event.Command) + "s" + partmsg, Channel: channel, Account: b.Account, Event: config.EventJoinLeave} msg := config.Message{Username: "system", Text: event.Source.Name + " " + strings.ToLower(event.Command) + "s" + partmsg, Channel: channel, Account: b.Account, Event: config.EventJoinLeave}
if b.GetBool("verbosejoinpart") { if b.GetBool("verbosejoinpart") {
b.Log.Debugf("<= Sending verbose JOIN_LEAVE event from %s to gateway", b.Account) b.Log.Debugf("<= Sending verbose JOIN_LEAVE event from %s to gateway", b.Account)
@ -289,6 +296,9 @@ func (b *Birc) handleQuit(client *girc.Client, event girc.Event) {
if len(event.Params) >= 1 { if len(event.Params) >= 1 {
quitmsg = " with message: " + event.Last() quitmsg = " with message: " + event.Last()
} }
if len(quitmsg) > 0 && b.SuppressPartQuitURLs {
suppressUrls(&quitmsg)
}
if b.GetBool("verbosejoinpart") { if b.GetBool("verbosejoinpart") {
verbosequit = " (" + event.Source.Ident + "@" + event.Source.Host + ")" verbosequit = " (" + event.Source.Ident + "@" + event.Source.Host + ")"
} }

2
bridge/irc/irc.go
View File

@ -34,6 +34,7 @@ type Birc struct {
connected chan error connected chan error
Local chan config.Message // local queue for flood control Local chan config.Message // local queue for flood control
FirstConnection, authDone bool FirstConnection, authDone bool
SuppressPartQuitURLs bool
MessageDelay, MessageQueue, MessageLength int MessageDelay, MessageQueue, MessageLength int
ActivityTimeout int64 ActivityTimeout int64
channels map[string]bool channels map[string]bool
@ -75,6 +76,7 @@ func New(cfg *bridge.Config) bridge.Bridger {
} else { } else {
b.ActivityTimeout = 0 // Disable b.ActivityTimeout = 0 // Disable
} }
b.SuppressPartQuitURLs = b.GetBool("SuppressPartQuitURLs")
b.FirstConnection = true b.FirstConnection = true
return b return b
} }