Merge branch 'master' into master

This commit is contained in:
Paul
2021-01-15 01:05:58 +01:00
committed by GitHub
2 changed files with 2 additions and 2 deletions

View File

@@ -1,7 +1,7 @@
FROM alpine AS builder
COPY . /go/src/github.com/42wim/matterbridge
RUN apk update && apk add go git gcc musl-dev \
RUN apk --no-cache add go git gcc musl-dev \
&& cd /go/src/github.com/42wim/matterbridge \
&& export GOPATH=/go \
&& go get \

View File

@@ -405,7 +405,7 @@ func (b *Btelegram) handleUploadFile(msg *config.Message, chatid int64) string {
captiontext = msg.Username + html.EscapeString(fi.Comment)
parsemode = tgbotapi.ModeHTML
}
re := regexp.MustCompile(".(jpg|png)$")
re := regexp.MustCompile(".(jpg|jpe|png)$")
if re.MatchString(fi.Name) {
pc := tgbotapi.NewPhotoUpload(chatid, file)
pc.Caption = captiontext