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 the ability to notify @everyone in DingTalk notifications #4718

Merged
merged 3 commits into from Apr 27, 2024
Merged

Add the ability to notify @everyone in DingTalk notifications #4718

merged 3 commits into from Apr 27, 2024

Conversation

ghost
Copy link

@ghost ghost commented Apr 27, 2024 •
edited by ghost
Loading

⚠️⚠️⚠️ Since we do not accept all types of pull requests and do not want to waste your time. Please be sure that you have read pull request rules:
https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma

Tick the checkbox if you understand [x]:

  • I have read and understand the pull request rules.

Description

Add a configuration item for whether to notify everyone in DingTalk notification method

Regarding the language translation part, I only added relevant translations in en.json. For other languages, please ask the official for help with translation. Thank you~

Type of change

Please delete any options that are not relevant.

  • User interface (UI)
  • Other

Checklist

  • My code follows the style guidelines of this project
  • I ran ESLint and other linters for modified files
  • I have performed a self-review of my own code and tested it
  • I have commented my code, particularly in hard-to-understand areas (including JSDoc for methods)
  • My changes generates no new warnings
  • My code needed automated testing. I have added them (this is optional task)

Screenshots (if any)

Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.
OpenisAtAll
OpenisAtAll
OffisAtAll
OffisAtAll
Notification settings page
Notification settings page

@louislam @CommanderStorm

@ghost
Copy link
Author

ghost commented Apr 27, 2024

Hello, I have tested this submission and modified it as required. Please review and merge it. Thank you.

CommanderStorm
CommanderStorm requested changes Apr 27, 2024
View reviewed changes
Copy link
Collaborator

@CommanderStorm CommanderStorm left a comment

Choose a reason for hiding this comment

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

This part of #4712 (review) remains:

I think there was some misunderstanding what I meant in #4712 (comment)

src/components/notifications/DingDing.vue Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Apr 27, 2024

@CommanderStorm Hello, I'm sorry for causing trouble. Re-optimized, please take a look again

@CommanderStorm
Copy link
Collaborator

CommanderStorm commented Apr 27, 2024 •
edited
Loading

I'm sorry for causing trouble

No worries, back and forths in PRs are very common/expected.

It does not really make sense to notify everybody and specific people. You either notify nobody, somebody or everybody.

=> a selection between these would make sense to me.

I have adjusted the PR accordinly.
What do you think about the changes?

@ghost
Copy link
Author

ghost commented Apr 27, 2024 •
edited by ghost
Loading

I'm sorry for causing trouble

No worries, back and forths in PRs are very common/expected.

It does not really make sense to notify everybody and specific people. You either notify nobody, somebody or everybody.
=> a selection between these would make sense to me.

I have adjusted the PR accordinly. What do you think about the changes?

@CommanderStorm I tested it and it works. Do you think it can be merged here?

In addition, should this branch also be updated so that it can also be used in the next 1.23.X instead of being limited to 2.0.0?
https://github.com/louislam/uptime-kuma/tree/1.23.X

@CommanderStorm
Copy link
Collaborator

should this branch also be updated so that it can also be used in the next 1.23.X instead of being limited to 2.0.0?

I would argue that this is a new feature and not a bugfix
as by https://github.com/louislam/uptime-kuma/releases/tag/1.23.0 I would therefore keep this in v2.0:

🐻 It should be the last minor version of Uptime Kuma v1. I will focus on the development of v2. Stay tuned!

CommanderStorm
CommanderStorm approved these changes Apr 27, 2024
View reviewed changes
Copy link
Collaborator

@CommanderStorm CommanderStorm left a comment

Choose a reason for hiding this comment

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

Thanks for adjustment to the notification provider ✨

All changes in this PR are small and uncontroversial
⇒ merging with junior maintainer approval

@CommanderStorm CommanderStorm changed the title Add a configuration item for whether to notify everyone in DingTalk notification method Add the ability to notify @everyone in DingTalk notifications Apr 27, 2024
@CommanderStorm CommanderStorm added area:notifications Everything related to notifications type:enhance-existing feature wants to enhance existing monitor labels Apr 27, 2024
@CommanderStorm CommanderStorm added this to the 2.0.0 milestone Apr 27, 2024
@CommanderStorm CommanderStorm merged commit 126d6cd into louislam:master Apr 27, 2024
17 checks passed
@ghost
Copy link
Author

ghost commented Apr 27, 2024

Thanks for adjustment to the notification provider ✨

All changes in this PR are small and uncontroversial ⇒ merging with junior maintainer approval

@CommanderStorm Hello, thank you for your support~ I would also like to inquire, in addition to the en.json language, can you help with translations in other languages, such as Chinese?

@CommanderStorm
Copy link
Collaborator

CommanderStorm commented Apr 27, 2024 •
edited
Loading

Given that I can't speak/write Chinese (only de/en)
=> no, I can't help with translation.

People who speak a different language can translate strings at https://weblade.kuma.pet

@ghost
Copy link
Author

ghost commented Apr 27, 2024

Given that I can't speak/write Chinese (only de/en) => no, I can't help with translation.

People who speak a different language can translate strings at https://weblade.kuma.pet

@CommanderStorm I have performed translation on the site. Is it effective? Can you help me take a look?

@CommanderStorm
Copy link
Collaborator

CommanderStorm commented Apr 28, 2024 •
edited
Loading

Weblate pushes the translations into this PR: #4394
=> Your translation is 8dc9111

@CommanderStorm CommanderStorm mentioned this pull request May 28, 2024
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area:notifications Everything related to notifications type:enhance-existing feature wants to enhance existing monitor
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.
1 participant
@CommanderStorm