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

Merge branch 'master' of https://github.com/42wim/matterbridge

Browse Source
This commit is contained in:
humorhenker
2021-02-18 09:30:59 +01:00
parent 5bfa59059b 4e11e29f70
commit 5330d808d0
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/development.yml vendored
View File

@@ -16,7 +16,7 @@ jobs:
test-build-upload: test-build-upload:
strategy: strategy:
matrix: matrix:
go-version: [1.14.x, 1.15.x, 1.16.x] go-version: [1.15.x, 1.16.x]
platform: [ubuntu-latest] platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
steps: steps:
@@ -35,23 +35,23 @@ jobs:
run: | run: |
mkdir -p output/{win,lin,arm,mac} mkdir -p output/{win,lin,arm,mac}
VERSION=$(git describe --tags) VERSION=$(git describe --tags)
GOOS=linux GOARCH=amd64 go build -mod=vendor -ldflags "-s -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o output/lin/matterbridge-$VERSION-linux-amd64 GOOS=linux GOARCH=amd64 go build -ldflags "-s -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o output/lin/matterbridge-$VERSION-linux-amd64
GOOS=windows GOARCH=amd64 go build -mod=vendor -ldflags "-s -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o output/win/matterbridge-$VERSION-windows-amd64.exe GOOS=windows GOARCH=amd64 go build -ldflags "-s -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o output/win/matterbridge-$VERSION-windows-amd64.exe
GOOS=darwin GOARCH=amd64 go build -mod=vendor -ldflags "-s -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o output/mac/matterbridge-$VERSION-darwin-amd64 GOOS=darwin GOARCH=amd64 go build -ldflags "-s -X main.githash=$(git log --pretty=format:'%h' -n 1)" -o output/mac/matterbridge-$VERSION-darwin-amd64
- name: Upload linux 64-bit - name: Upload linux 64-bit
if: startsWith(matrix.go-version,'1.15') if: startsWith(matrix.go-version,'1.16')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: matterbridge-linux-64bit name: matterbridge-linux-64bit
path: output/lin path: output/lin
- name: Upload windows 64-bit - name: Upload windows 64-bit
if: startsWith(matrix.go-version,'1.15') if: startsWith(matrix.go-version,'1.16')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: matterbridge-windows-64bit name: matterbridge-windows-64bit
path: output/win path: output/win
- name: Upload darwin 64-bit - name: Upload darwin 64-bit
if: startsWith(matrix.go-version,'1.15') if: startsWith(matrix.go-version,'1.16')
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: matterbridge-darwin-64bit name: matterbridge-darwin-64bit

3
bridge/xmpp/xmpp.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
"net/url"
"strings" "strings"
"sync" "sync"
"time" "time"
@@ -157,7 +158,7 @@ func (b *Bxmpp) postSlackCompatibleWebhook(msg config.Message) error {
return err return err
} }
resp, err := http.Post(b.GetString("WebhookURL")+"/"+msg.Channel, "application/json", bytes.NewReader(webhookBody)) resp, err := http.Post(b.GetString("WebhookURL")+"/"+url.QueryEscape(msg.Channel), "application/json", bytes.NewReader(webhookBody))
if err != nil { if err != nil {
b.Log.Errorf("Failed to POST webhook: %s", err) b.Log.Errorf("Failed to POST webhook: %s", err)
return err return err