From 4f7695b0ce0575260ee606d723af22736e0f6896 Mon Sep 17 00:00:00 2001 From: Wolfsblvt Date: Thu, 13 Mar 2025 16:28:28 +0100 Subject: [PATCH] Update auto comments to make them more uniform --- .github/issues-auto-comments.yml | 41 +++++++++++++++------------ .github/pr-auto-comments.yml | 30 +++++++++++--------- .github/workflows/job-close-stale.yml | 25 ++++++++-------- .github/workflows/pr-auto-manager.yml | 10 +++---- 4 files changed, 58 insertions(+), 48 deletions(-) diff --git a/.github/issues-auto-comments.yml b/.github/issues-auto-comments.yml index f73c2d2a3..9c412ffd8 100644 --- a/.github/issues-auto-comments.yml +++ b/.github/issues-auto-comments.yml @@ -1,39 +1,45 @@ -comment: - footer: > - --- - > I am a bot, and this is an automated message πŸ€– labels: - name: βœ–οΈ Invalid labeled: issue: action: close body: > - Hello @{{ issue.user.login }}. Your ticket has been marked as invalid. - Please ensure you follow the issue template, provide all requested info, - and be sure to check the docs + previous issues prior to raising tickets. + Hey @{{ issue.user.login }}, this issue has been marked as invalid. + + Please double-check that you've followed the issue template, included all necessary details, and reviewed the docs & previous issues before submitting. + If provided, follow the instructions given by maintainers. - name: πŸ‘©β€πŸ’» Good First Issue labeled: issue: body: > - This issue has been marked as a good first issue for contributors to implement! + πŸ† This issue has been marked as a good first issue for contributors to implement! This is a great way to support the project. While also improving your skills, you'll also be credited as a contributor once your PR is merged. + If you're new to SillyTavern [here is the official documentation](https://docs.sillytavern.app/). The official contribution guide can be found [here](https://github.com/SillyTavern/SillyTavern/blob/release/CONTRIBUTING.md). - If you need any support at all, feel free to reach out via [Discord](https://discord.gg/sillytavern), or let us know in this issue or via [discussions](https://github.com/SillyTavern/SillyTavern/discussions). + If you need any support, feel free to reach out via [Discord](https://discord.gg/sillytavern), or let us know in this issue or via [discussions](https://github.com/SillyTavern/SillyTavern/discussions). - name: ❌ wontfix labeled: issue: action: close body: > - This ticket has been marked as 'wontfix', which usually means it is out-of-scope, or not feasible at this time. - IF you have any questions about this, feel free to reach out. + ❌ This issue has been marked as 'wontfix', which usually means it is out-of-scope, not feasible at this time or will not be implemented for various reasons. + If you have any questions about this, feel free to reach out. + + - name: πŸ›‘ Out of Scope + labeled: + issue: + action: close + body: > + πŸ›‘ This issue has been marked as 'out of scope', as this can't or won't be implemented. + If you have any questions about this, feel free to reach out. - name: βœ… Done (staging) labeled: issue: body: > - It looks like all or part of this issue has now been implemented as part of the `staging` branch. + βœ… It looks like all or part of this issue has now been implemented as part of the `staging` branch. If you currently are on the `release` branch, you can switch to `staging` to test this right away. Note that `staging` is considered less stable than the official releases. To switch, follow existing instructions, @@ -43,15 +49,14 @@ labels: labeled: issue: body: > - It looks like all or part of this issue has now been implemented as part of the `latest` release. + βœ… It looks like all or part of this issue has now been implemented as part of the latest release. - name: ‼️ High Priority labeled: issue: body: > - This issue has been marked as high priority, indicating that it is important to the maintainers and the community. - While we cannot guarantee an immediate fix or provide an exact timeline, please rest assured that it is on our radar and will be addressed whenever possible. - Thank you for your patience and understanding. + 🚨 This issue has been marked high priority, meaning it's important to the maintainers or community. + While we can't promise immediate changes, it is on our radar and will be addressed whenever possible. Thanks for your patience! - name: πŸ’€ Spam labeled: @@ -60,5 +65,5 @@ labels: locking: lock lock_reason: spam body: > - This issue has been identified as spam, and is now locked. - Please refrain from posting spam in the future, as it disrupts the community and wastes valuable time. + πŸ’€ This issue has been flagged as spam and is now locked. + Please avoid posting spam - it disrupts the community and wastes everyone's time. diff --git a/.github/pr-auto-comments.yml b/.github/pr-auto-comments.yml index be935b098..24dca6153 100644 --- a/.github/pr-auto-comments.yml +++ b/.github/pr-auto-comments.yml @@ -1,39 +1,43 @@ -comment: - footer: > - --- - > I am a bot, and this is an automated message πŸ€– labels: - name: βœ–οΈ Invalid labeled: pr: action: close body: > - Thank you @{{ pull_request.user.login }} for contributing to this repository. - Your Pull Request has been marked as invalid. + Hey @{{ pull_request.user.login }}, thanks for your contribution! + Unfortunately, this PR has been marked as invalid. - Please ensure you follow the pull request template, provide all relevant info, - and target the correct branch. `staging` is the default target branch, `release` should only be targeted for important hotfixes. + Please check that you've followed the PR template, included all relevant details, and are targeting the correct branch (`staging` for regular contributions, `release` only for hotfixes). - If you have any questions, feel free to reach out. + If you need help, feel free to ask! - name: β›” Don't Merge labeled: pr: body: > - This PR has been temporarily blocked from merging. + 🚨 This PR has been temporarily blocked from merging. - name: πŸ’₯πŸ’£ Breaking Changes labeled: pr: body: > - This PR is marked as containing one or more breaking changes. + ⚠️ Heads up! This PR introduces breaking changes. - Please make sure that those are documented accordingly and steps to inform users at release are prepared. + Make sure these changes are well-documented and that users will be properly informed when this is released. - name: β›” Waiting For External/Upstream labeled: pr: body: > - This PR is awaiting external or upstream changes or approval. + β›” This PR is awaiting external or upstream changes or approval. It can only be merged once those changes have been implemented and approved. + Please inform us of any progress on the upstream changes or approval. + + - name: πŸ”¬ Needs Testing + labeled: + pr: + body: > + πŸ”¬ This PR needs testing! + Any contributor can test and leave reviews, so feel free to help us out! + diff --git a/.github/workflows/job-close-stale.yml b/.github/workflows/job-close-stale.yml index e44bf87b0..649b95530 100644 --- a/.github/workflows/job-close-stale.yml +++ b/.github/workflows/job-close-stale.yml @@ -26,15 +26,15 @@ jobs: remove-stale-when-updated: true enable-statistics: true stale-issue-message: > - This issue has gone 6 months without an update. To keep the ticket open, please indicate that it is still relevant in a comment below. - Otherwise it will be closed in 7 days. + ⏳ This issue has been inactive for 6 months. If it's still relevant, drop a comment below to keep it open. + Otherwise, it will be auto-closed in 7 days. stale-pr-message: > - This PR is stale because it has been open 6 months with no activity. Either remove the stale label or comment below with a short update, - otherwise this PR will be closed in 7 days. + ⏳ This PR has been inactive for 6 months. If it's still relevant, update it or remove the stale label. + Otherwise, it will be auto-closed in 7 days. close-issue-message: > - This issue was automatically closed because it has been stalled for over 6 months with no activity. + πŸ”’ This issue was auto-closed due to inactivity for over 6 months. close-pr-message: > - This pull request was automatically closed because it has been stalled for over 6 months with no activity. + πŸ”’ This PR was auto-closed due to inactivity for over 6 months. stale-issue-label: '⚰️ Stale' close-issue-label: 'πŸ•ΈοΈ Inactive' stale-pr-label: '⚰️ Stale' @@ -60,10 +60,10 @@ jobs: operations-per-run: 30 remove-stale-when-updated: true stale-issue-message: > - Hi! Looks like additional info is required for this issue to be addressed. - Don't forget to provide this within the next few days to keep your ticket open. + ⚠️ Hey! We need some more info to move forward with this issue. + Please provide the requested details in the next few days to keep this ticket open. close-issue-message: > - Issue closed due to no response from user. + πŸ”’ This issue was auto-closed due to no response from user. only-labels: '🚏 Awaiting User Response' labels-to-remove-when-unstale: '🚏 Awaiting User Response' stale-issue-label: 'πŸ›‘ No Response' @@ -87,10 +87,11 @@ jobs: operations-per-run: 30 remove-stale-when-updated: true stale-issue-message: > - This issue was marked as having an alternative solution available. Did this help you out, and this issue can be closed? - Please confirm by commenting to keep it open, otherwise it will be closed in 7 days. + πŸ”„ An alternative solution has been provided for this issue. + Did this solve your problem? If so, we'll go ahead and close it. + If you still need help, drop a comment within the next 7 days to keep this open. close-issue-message: > - Issue closed automatically due to no confirmation regarding the alternative solution. + βœ… Closing this issue due to no confirmation on the alternative solution. only-labels: '🚧 Alternative Exists' stale-issue-label: '🚏 Awaiting User Response' close-issue-label: 'πŸ•ΈοΈ Inactive' diff --git a/.github/workflows/pr-auto-manager.yml b/.github/workflows/pr-auto-manager.yml index 1b733521f..030548c4c 100644 --- a/.github/workflows/pr-auto-manager.yml +++ b/.github/workflows/pr-auto-manager.yml @@ -17,7 +17,8 @@ jobs: with: dirtyLabel: '🚫 Merge Conflicts' repoToken: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} - commentOnDirty: "This pull request has conflicts. Please resolve them, otherwise it cannot be merged." + commentOnDirty: > + ⚠️ This PR has conflicts that need to be resolved before it can be merged. pr-size-labeler: name: Apply Label for PR Size @@ -41,9 +42,9 @@ jobs: xl_label: 'PR - XL' fail_if_xl: 'false' message_if_xl: > - This PR exceeds the recommended size of 1000 lines. - Please ensure you are not addressing multiple issues in one PR. - Note this PR might be rejected due to its size. + ⚠️ This PR is over 1000 lines, which is larger than recommended. + + Please make sure that it only addresses a single issue - PRs this large are hard to test and may be rejected. github_api_url: 'https://api.github.com' files_to_ignore: | "package-lock.json" @@ -168,5 +169,4 @@ jobs: for ISSUE in $(echo $final_issues | jq -r '.[]'); do echo "Updating issue #$ISSUE" gh issue edit $ISSUE -R ${{ github.repository }} --add-label "βœ… Done (staging)" - gh issue comment $ISSUE -R ${{ github.repository }} -b "This issue is now available in the \`staging\` branch for testing. Please verify and let us know any feedback!" done