From 3b319d5f9feda24554cf8a7068bd7a84a5577057 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sat, 30 Sep 2017 17:08:12 +0300
Subject: [PATCH] Allow disabling IRC compatibility
---
config.go | 4 ++++
example-config.json | 3 +++
gitlab-webhook.go | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/config.go b/config.go
index 9a27d9e..4e29330 100644
--- a/config.go
+++ b/config.go
@@ -39,6 +39,10 @@ type Config struct {
GitLab struct {
Domain string `json:"domain"`
} `json:"gitlab"`
+
+ Options struct {
+ IRCCompatibility bool `json:"irc-compatibility"`
+ } `json:"options"`
}
var config Config
diff --git a/example-config.json b/example-config.json
index f23cc18..c68a229 100644
--- a/example-config.json
+++ b/example-config.json
@@ -11,5 +11,8 @@
"homeserver": "https://matrix.org",
"username": "",
"password": ""
+ },
+ "options": {
+ "irc-compatibility": false
}
}
diff --git a/gitlab-webhook.go b/gitlab-webhook.go
index f8393ca..bc23b03 100644
--- a/gitlab-webhook.go
+++ b/gitlab-webhook.go
@@ -96,7 +96,7 @@ func handlePushEvent(payload interface{}, header webhooks.Header) {
pluralizer)
// IRC compatibility: Allow up to 4 commits to be displayed through the IRC bridge without
// having the bridge turn the message into a link.
- if data.TotalCommitsCount > 4 {
+ if data.TotalCommitsCount > 4 || !config.Options.IRCCompatibility {
var msg bytes.Buffer
fmt.Fprintln(&msg, "<ul>")
for i := len(data.Commits) - 1; i >= 0; i-- {
--
GitLab