From 58483ea70c2c99a352592c5e50686fb03985650e Mon Sep 17 00:00:00 2001 From: Wim Date: Fri, 17 Feb 2017 23:21:43 +0100 Subject: Update changelog --- changelog.md | 3 +++ matterbridge.toml.sample | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 36d3cf1a..b45a35d8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,9 @@ # v0.9.3-dev ## Bugfix * slack: fix receiving messages from private channels #118 +* slack: fix echo when using webhooks #119 +* mattermost: reconnecting should work better now +* irc: keeps reconnecting (every 60 seconds) now after ping timeout/disconnects. # v0.9.2 ## New features diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 4cc7f94f..e251d0e0 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -298,11 +298,15 @@ ShowJoinPart=false #### Settings for webhook matterbridge. #### These settings will not be used when useAPI is enabled +#NOT RECOMMENDED TO USE INCOMING/OUTGOING WEBHOOK. USE SLACK API +#AND DEDICATED BOT USER WHEN POSSIBLE! #Url is your incoming webhook url as specified in slack #See account settings - integrations - incoming webhooks on slack #REQUIRED (unless useAPI=true) URL="https://hooks.slack.com/services/yourhook" +#NOT RECOMMENDED TO USE INCOMING/OUTGOING WEBHOOK. USE SLACK API +#AND DEDICATED BOT USER WHEN POSSIBLE! #Address to listen on for outgoing webhook requests from slack #See account settings - integrations - outgoing webhooks on slack #This setting will not be used when useAPI is eanbled @@ -310,7 +314,7 @@ URL="https://hooks.slack.com/services/yourhook" #REQUIRED (unless useAPI=true) BindAddress="0.0.0.0:9999" -#### Settings for using slack API +#### Settings for using slack API (RECOMMENDED) #OPTIONAL useAPI=false -- cgit v1.2.3