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

Use template_card instead of text messages for the WeCom notification provider #5286

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

darkclip
Copy link

⚠️⚠️⚠️ 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

Use template_card instead of text messages for the WeCom notification provider
Just got time to revisit this one. Since my old fork is too far behind master branch, ff seems to be an easier option.

Type of change

  • New feature (non-breaking change which adds functionality)

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)

Event before after
UP before_up up
DOWN before_down down
Cert-expiry before_expire exp
Testing before_testing after_testing

@darkclip
Copy link
Author

@CommanderStorm gentle ping ^^

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.

Sorry to request another change, before we can shedule this for merging into the v2.1 merge window.

(v2.0 has closed a few days ago, bit bad timing.. sorry)

Comment on lines 61 to 70
url: monitorJSON["url"]
? monitorJSON["url"]
: "https://github.com/louislam/uptime-kuma", // both card_action and card_action.url are mandatory
},
};
if (monitorJSON["url"]) {
templateCard["jump_list"] = [
{
type: 1,
url: monitorJSON["url"],
Copy link
Collaborator

Choose a reason for hiding this comment

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

In the meantime, while the other PR was dormant, we noticed that there are ways in which the url should be handled.

Instead of using monitorJSON["url"], could you extract the adress like this

const address = this.extractAddress(monitorJSON)

and then only check adress?

Example in another notification provider:

const address = this.extractAddress(monitorJSON);

@CommanderStorm CommanderStorm added the pr:please address review comments this PR needs a bit more work to be mergable label Nov 1, 2024
@darkclip
Copy link
Author

darkclip commented Nov 1, 2024

no worries, just glad to contribute

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:please address review comments this PR needs a bit more work to be mergable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants