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

Truncate commit message during Discord webhook push events #31970

Merged

Conversation

kemzeb
Copy link
Contributor

@kemzeb kemzeb commented Sep 3, 2024

Resolves #31668.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 3, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 3, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Sep 3, 2024
return pushTestPayloadWithCommitMessage("This is a commit summary that is longer than 50 characters\n\nThis is the message body.")
}

func pushTestPayloadWithCommitMessage(message string) *api.PushPayload {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Wanted to avoid test code duplication here by adding these 2 functions. I'm open for alternative ways to writing my test case.

@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Sep 6, 2024
@yp05327 yp05327 added this to the 1.23.0 milestone Sep 17, 2024
services/webhook/discord.go Outdated Show resolved Hide resolved
@kemzeb kemzeb force-pushed the feat-make-discord-msg-more-readable branch from 146603a to 0983b27 Compare September 17, 2024 23:12
@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 Sep 18, 2024
@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 Sep 24, 2024
@techknowlogick techknowlogick enabled auto-merge (squash) September 24, 2024 02:47
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 24, 2024
@techknowlogick techknowlogick merged commit aadbe04 into go-gitea:main Sep 24, 2024
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 24, 2024
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Sep 24, 2024
@kemzeb kemzeb deleted the feat-make-discord-msg-more-readable branch September 24, 2024 04:04
lunny pushed a commit that referenced this pull request Sep 24, 2024
…32121)

Backport #31970 by @kemzeb

Resolves #31668.

Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 25, 2024
* giteaofficial/main:
  Notify the user when the file path contains leading or trailing spaces and fix the error message for invalid file names. (go-gitea#31507)
  Fix wrong status of `Set up Job` when first step is skipped (go-gitea#32120)
  Fix bug when deleting a migrated branch (go-gitea#32075)
  Include collaboration repositories on dashboard source/forks/mirrors list (go-gitea#31946)
  Display head branch more comfortable on pull request view (go-gitea#32000)
  Truncate commit message during Discord webhook push events (go-gitea#31970)
  Fix template bug of pull request view (go-gitea#32072)
lunny pushed a commit that referenced this pull request Nov 7, 2024
Resolves #32371.

#31970 should have just showed the commit summary, but
`strings.SplitN()` was misused such that we did not perform any
splitting at all and just used the message. This was not caught in the
unit test made in that PR since the test commit summary was > 50 (which
truncated away the commit description).

This snapshot resolves this and adds another unit test to ensure that we
only show the commit summary.
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Nov 7, 2024
…itea#32432)

Resolves go-gitea#32371.

go-gitea#31970 should have just showed the commit summary, but
`strings.SplitN()` was misused such that we did not perform any
splitting at all and just used the message. This was not caught in the
unit test made in that PR since the test commit summary was > 50 (which
truncated away the commit description).

This snapshot resolves this and adds another unit test to ensure that we
only show the commit summary.
lunny pushed a commit that referenced this pull request Nov 8, 2024
…) (#32447)

Backport #32432 by @kemzeb

Resolves #32371.

#31970 should have just showed the commit summary, but
`strings.SplitN()` was misused such that we did not perform any
splitting at all and just used the message. This was not caught in the
unit test made in that PR since the test commit summary was > 50 (which
truncated away the commit description).

This snapshot resolves this and adds another unit test to ensure that we
only show the commit summary.

Co-authored-by: Kemal Zebari <60799661+kemzeb@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Discord Webhooks hard to read for multiline commit messages
5 participants