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.

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

Fix RocketChat webhook #9908

Merged
merged 5 commits into from
Jan 21, 2020
Merged

Fix RocketChat webhook #9908

merged 5 commits into from
Jan 21, 2020

Conversation

jolheiser
Copy link
Member

@jolheiser jolheiser commented Jan 21, 2020

Resolves #9899

I'm fairly certain this should fix rocket chat webhooks for push actions.
I do not have a rocket chat instance to confirm on, however, so this PR should probably not be accepted until someone can confirm.

Turns out rocket chat has a free cloud trial, so I can confirm it works.
I also just removed attachments altogether for repo create/delete event, as it was always blank. 🤷‍♂️

(Repo event) With blank attachment
Screenshot from 2020-01-20 23-43-13

(Repo event) Without
Screenshot from 2020-01-20 23-43-19

(Push event) Rocket Chat
Screenshot from 2020-01-20 23-44-38

(Repo events and push event) Slack
Screenshot from 2020-01-20 23-40-48

Signed-off-by: jolheiser <john.olheiser@gmail.com>
modules/webhook/slack.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 21, 2020
@lunny
Copy link
Member

lunny commented Jan 21, 2020

@bkraul could you confirm that this fixed #9899 ?

@lunny lunny added this to the 1.12.0 milestone Jan 21, 2020
Signed-off-by: jolheiser <john.olheiser@gmail.com>
@guillep2k
Copy link
Member

If this bug was caused by #9378, perhaps we should consider backporting this fix into 1.10.4, as that PR was backported to 1.10.2.

Signed-off-by: jolheiser <john.olheiser@gmail.com>
@codecov-io
Copy link

codecov-io commented Jan 21, 2020

Codecov Report

Merging #9908 into master will increase coverage by <.01%.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9908      +/-   ##
==========================================
+ Coverage    42.3%   42.31%   +<.01%     
==========================================
  Files         607      607              
  Lines       79352    79352              
==========================================
+ Hits        33571    33574       +3     
+ Misses      41639    41636       -3     
  Partials     4142     4142
Impacted Files Coverage Δ
models/login_source.go 25.63% <50%> (ø) ⬆️
models/gpg_key.go 55.03% <0%> (-0.56%) ⬇️
models/error.go 31.31% <0%> (+0.54%) ⬆️
services/pull/check.go 58.74% <0%> (+2.09%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5260a2c...60b7321. Read the comment docs.

Copy link
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One query, but otherwise lgtm.

modules/webhook/slack.go Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 21, 2020
@bkraul
Copy link

bkraul commented Jan 21, 2020

@bkraul could you confirm that this fixed #9899 ?

Will do once this is merged and built on to docker image. Thanks for the quick response, guys!

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 21, 2020
@sapk sapk merged commit 38a6b11 into go-gitea:master Jan 21, 2020
@sapk
Copy link
Member

sapk commented Jan 21, 2020

@jolheiser Please, can you send backport if possible ?

@jolheiser jolheiser deleted the rocketchat branch January 21, 2020 20:32
jolheiser added a commit to jolheiser/gitea that referenced this pull request Jan 21, 2020
* Fix RocketChat??

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Don't send attachment for repo create/delete

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Make fmt

Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: Lauris BH <lauris@nix.lv>
@bkraul
Copy link

bkraul commented Jan 21, 2020

This works like a charm on latest docker build! Thank you!

techknowlogick pushed a commit that referenced this pull request Jan 21, 2020
* Fix RocketChat??

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Don't send attachment for repo create/delete

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Make fmt

Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
@techknowlogick techknowlogick changed the title Fix RocketChat Fix RocketChat webhook Jan 21, 2020
@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Jan 21, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Web hooks not successful: Invalid href value provided.