Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Matrix webhook #10831

Merged
merged 14 commits into from
Mar 28, 2020
Merged

Add Matrix webhook #10831

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9308796
Add Matrix webhook
S7evinK Mar 26, 2020
f40aabb
Add template and related translations for Matrix hook
S7evinK Mar 26, 2020
30fecbd
Add actual webhook routes and form
S7evinK Mar 26, 2020
36dab56
Add missing file
S7evinK Mar 26, 2020
9176059
Update modules/webhook/matrix_test.go
lafriks Mar 26, 2020
bd3496c
Use stricter regex to replace URLs
S7evinK Mar 27, 2020
dbb761a
Escape url and text
S7evinK Mar 27, 2020
bedad37
Remove unnecessary whitespace
S7evinK Mar 27, 2020
c5ec5a9
Merge branch 'add-matrix-webhook' of github.com:S7evinK/gitea into ad…
S7evinK Mar 27, 2020
73da418
Fix copy and paste mistake
S7evinK Mar 28, 2020
0eecf43
Fix indention inconsistency
S7evinK Mar 28, 2020
553ff80
Use Authorization header instead of url parameter
S7evinK Mar 28, 2020
e00b4e5
Add raw commit information to webhook
S7evinK Mar 28, 2020
b0c473e
Merge branch 'master' into add-matrix-webhook
lafriks Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use stricter regex to replace URLs 
Signed-off-by: Till Faelligen <[email protected]>
  • Loading branch information
@S7evinK
S7evinK committed Mar 27, 2020
commit bd3496ce5da7ced8bdf286d36dd3899fea9fc6cf
2 changes: 1 addition & 1 deletion modules/webhook/matrix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func GetMatrixPayload(p api.Payloader, event models.HookEventType, meta string)
return s, nil
}

var urlRegex = regexp.MustCompile(`<a.*?href="(.*?)">(.*?)</a>`)
var urlRegex = regexp.MustCompile(`<a [^>]*?href="([^">]*?)">(.*?)</a>`)

func getMessageBody(htmlText string) string {
htmlText = urlRegex.ReplaceAllString(htmlText, "[$2]($1)")
Expand Down