code: refine the webhook job code
code: refine the webhook job code

Try to make each branch more clear. It just so happened that I broke a
test too, so fixed that.

1egoman/backstroke,1egoman/backstroke,1egoman/backstroke