binwiederhier/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2024-11-26 12:15:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

JSON templating

Browse Source
This commit is contained in:
binwiederhier 2024-03-24 14:21:28 -04:00
parent 547b09a7e5
commit 5511812e30
5 changed files with 155 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
docs/publish.md
View File

File diff suppressed because one or more lines are too long

2
docs/releases.md
View File

@ -1342,7 +1342,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
**Features:** **Features:**
* You can now include a message and/or title template that will be filled with values from a JSON body, great for services that let you specify a webhook URL but do not let you change the webhook body (such as Grafana). ([#724](https://github.com/binwiederhier/ntfy/issues/724), thanks to [@wunter8](https://github.com/wunter8) for implementing) * [Message templating](publish.md#message-templating): You can now include a message and/or title template that will be filled with values from a JSON body (e.g. `curl -gd '{"alert":"Disk space low"}' "ntfy.sh/mytopic?tpl=1&m={{.alert}}"`), which is great for services that let you specify a webhook URL but do not let you change the webhook body (such as GitHub, or Grafana). ([#724](https://github.com/binwiederhier/ntfy/issues/724), thanks to [@wunter8](https://github.com/wunter8) for implementing)
### ntfy Android app v1.16.1 (UNRELEASED) ### ntfy Android app v1.16.1 (UNRELEASED)

60
docs/static/js/extra.js vendored
View File

@ -1,51 +1,53 @@
// Link tabs, as per https://facelessuser.github.io/pymdown-extensions/extensions/tabbed/#linked-tabs // Link tabs, as per https://facelessuser.github.io/pymdown-extensions/extensions/tabbed/#linked-tabs
const savedCodeTab = localStorage.getItem('savedTab') const savedCodeTab = localStorage.getItem("savedTab");
const codeTabs = document.querySelectorAll(".tabbed-set > input") const codeTabs = document.querySelectorAll(".tabbed-set > input");
for (const tab of codeTabs) { for (const tab of codeTabs) {
tab.addEventListener("click", () => { tab.addEventListener("click", () => {
const current = document.querySelector(`label[for=${tab.id}]`) const current = document.querySelector(`label[for=${tab.id}]`);
const pos = current.getBoundingClientRect().top const pos = current.getBoundingClientRect().top;
const labelContent = current.innerHTML const labelContent = current.innerHTML;
const labels = document.querySelectorAll('.tabbed-set > label, .tabbed-alternate > .tabbed-labels > label') const labels = document.querySelectorAll(".tabbed-set > label, .tabbed-alternate > .tabbed-labels > label");
for (const label of labels) { for (const label of labels) {
if (label.innerHTML === labelContent) { if (label.innerHTML === labelContent) {
document.querySelector(`input[id=${label.getAttribute('for')}]`).checked = true document.querySelector(`input[id=${label.getAttribute("for")}]`).checked = true;
} }
} }
// Preserve scroll position // Preserve scroll position
const delta = (current.getBoundingClientRect().top) - pos const delta = (current.getBoundingClientRect().top) - pos;
window.scrollBy(0, delta) window.scrollBy(0, delta);
// Save // Save
localStorage.setItem('savedTab', labelContent) localStorage.setItem("savedTab", labelContent);
}) });
// Select saved tab // Select saved tab
const current = document.querySelector(`label[for=${tab.id}]`) const current = document.querySelector(`label[for=${tab.id}]`);
const labelContent = current.innerHTML const labelContent = current.innerHTML;
if (savedCodeTab === labelContent) { if (savedCodeTab === labelContent) {
tab.checked = true tab.checked = true;
} }
} }
// Lightbox for screenshot // Lightbox for screenshot
const lightbox = document.createElement('div'); const lightbox = document.createElement("div");
lightbox.classList.add('lightbox'); lightbox.classList.add("lightbox");
document.body.appendChild(lightbox); document.body.appendChild(lightbox);
const showScreenshotOverlay = (e, el, group, index) => { const showScreenshotOverlay = (e, el, group, index) => {
lightbox.classList.add('show'); lightbox.classList.add("show");
document.addEventListener('keydown', nextScreenshotKeyboardListener); document.addEventListener("keydown", nextScreenshotKeyboardListener);
return showScreenshot(e, group, index); return showScreenshot(e, group, index);
}; };
const showScreenshot = (e, group, index) => { const showScreenshot = (e, group, index) => {
const actualIndex = resolveScreenshotIndex(group, index); const actualIndex = resolveScreenshotIndex(group, index);
lightbox.innerHTML = '<div class="close-lightbox"></div>' + screenshots[group][actualIndex].innerHTML; lightbox.innerHTML = "<div class=\"close-lightbox\"></div>" + screenshots[group][actualIndex].innerHTML;
lightbox.querySelector('img').onclick = (e) => { return showScreenshot(e, group, actualIndex+1); }; lightbox.querySelector("img").onclick = (e) => {
return showScreenshot(e, group, actualIndex + 1);
};
currentScreenshotGroup = group; currentScreenshotGroup = group;
currentScreenshotIndex = actualIndex; currentScreenshotIndex = actualIndex;
e.stopPropagation(); e.stopPropagation();
@ -53,11 +55,11 @@ const showScreenshot = (e, group, index) => {
}; };
const nextScreenshot = (e) => { const nextScreenshot = (e) => {
return showScreenshot(e, currentScreenshotGroup, currentScreenshotIndex+1); return showScreenshot(e, currentScreenshotGroup, currentScreenshotIndex + 1);
}; };
const previousScreenshot = (e) => { const previousScreenshot = (e) => {
return showScreenshot(e, currentScreenshotGroup, currentScreenshotIndex-1); return showScreenshot(e, currentScreenshotGroup, currentScreenshotIndex - 1);
}; };
const resolveScreenshotIndex = (group, index) => { const resolveScreenshotIndex = (group, index) => {
@ -70,8 +72,8 @@ const resolveScreenshotIndex = (group, index) => {
}; };
const hideScreenshotOverlay = (e) => { const hideScreenshotOverlay = (e) => {
lightbox.classList.remove('show'); lightbox.classList.remove("show");
document.removeEventListener('keydown', nextScreenshotKeyboardListener); document.removeEventListener("keydown", nextScreenshotKeyboardListener);
}; };
const nextScreenshotKeyboardListener = (e) => { const nextScreenshotKeyboardListener = (e) => {
@ -85,14 +87,16 @@ const nextScreenshotKeyboardListener = (e) => {
} }
}; };
let currentScreenshotGroup = ''; let currentScreenshotGroup = "";
let currentScreenshotIndex = 0; let currentScreenshotIndex = 0;
let screenshots = {}; let screenshots = {};
Array.from(document.getElementsByClassName('screenshots')).forEach((sg) => { Array.from(document.getElementsByClassName("screenshots")).forEach((sg) => {
const group = sg.id; const group = sg.id;
screenshots[group] = [...sg.querySelectorAll('a')]; screenshots[group] = [...sg.querySelectorAll("a")];
screenshots[group].forEach((el, index) => { screenshots[group].forEach((el, index) => {
el.onclick = (e) => { return showScreenshotOverlay(e, el, group, index); }; el.onclick = (e) => {
return showScreenshotOverlay(e, el, group, index);
};
}); });
}); });

3
go.mod
View File

@ -35,7 +35,6 @@ require (
github.com/microcosm-cc/bluemonday v1.0.26 github.com/microcosm-cc/bluemonday v1.0.26
github.com/prometheus/client_golang v1.19.0 github.com/prometheus/client_golang v1.19.0
github.com/stripe/stripe-go/v74 v74.30.0 github.com/stripe/stripe-go/v74 v74.30.0
github.com/tidwall/gjson v1.17.1
) )
require ( require (
@ -70,8 +69,6 @@ require (
github.com/prometheus/procfs v0.13.0 // indirect github.com/prometheus/procfs v0.13.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect github.com/stretchr/objx v0.5.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
go.opencensus.io v0.24.0 // indirect go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect

7
go.sum
View File

@ -143,13 +143,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stripe/stripe-go/v74 v74.30.0 h1:0Kf0KkeFnY7iRhOwvTerX0Ia1BRw+eV1CVJ51mGYAUY= github.com/stripe/stripe-go/v74 v74.30.0 h1:0Kf0KkeFnY7iRhOwvTerX0Ia1BRw+eV1CVJ51mGYAUY=
github.com/stripe/stripe-go/v74 v74.30.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw= github.com/stripe/stripe-go/v74 v74.30.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho= github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=