Switch to better solution for disabling URL embeds.

This commit is contained in:
Kufat
2022-08-08 13:00:06 -04:00
parent e275bbfb2e
commit b82b7b67a8
5 changed files with 27 additions and 12 deletions

View File

@@ -84,10 +84,6 @@ func isKill(quitmsg string) bool {
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) {
if len(event.Params) == 0 {
b.Log.Debugf("handleJoinPart: empty Params? %#v", event)
@@ -118,9 +114,6 @@ func (b *Birc) handleJoinPart(client *girc.Client, event girc.Event) {
if event.Command == "PART" && len(event.Params) >= 2 {
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}
if b.GetBool("verbosejoinpart") {
b.Log.Debugf("<= Sending verbose JOIN_LEAVE event from %s to gateway", b.Account)
@@ -296,9 +289,6 @@ func (b *Birc) handleQuit(client *girc.Client, event girc.Event) {
if len(event.Params) >= 1 {
quitmsg = " with message: " + event.Last()
}
if len(quitmsg) > 0 && b.SuppressPartQuitURLs {
suppressUrls(&quitmsg)
}
if b.GetBool("verbosejoinpart") {
verbosequit = " (" + event.Source.Ident + "@" + event.Source.Host + ")"
}

View File

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