vbatts/ntfy
1
0
Fork 0
Code Pull requests Activity

Fix PowerShell rendering, changelog

Browse source
This commit is contained in:
Philipp Heckel 2022-06-27 12:21:11 -04:00
parent 50a830c360
commit f134bc6dcd
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
docs/publish.md
View file

@ -883,25 +883,25 @@ is the only required one:
=== "PowerShell" === "PowerShell"
``` powershell ``` powershell
$uri = "https://ntfy.sh" $uri = "https://ntfy.sh"
$body = @{ $body = @{
topic = "powershell" topic = "mytopic"
title = "Low disk space alert" title = "Low disk space alert"
message = "Disk space is low at 5.1 GB" message = "Disk space is low at 5.1 GB"
priority = 4 priority = 4
attach = "https://filesrv.lan/space.jpg" attach = "https://filesrv.lan/space.jpg"
filename = "diskspace.jpg" filename = "diskspace.jpg"
tags = @("warning", "cd") tags = @("warning", "cd")
click = "https://homecamera.lan/xasds1h2xsSsa/" click = "https://homecamera.lan/xasds1h2xsSsa/"
actions = @( actions = @(
@{ @{
action = "view" action = "view"
label = "Admin panel" label = "Admin panel"
url = "https://filesrv.lan/admin" url = "https://filesrv.lan/admin"
} }
) )
} | ConvertTo-Json } | ConvertTo-Json
Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing
``` ```
=== "Python" === "Python"
@ -1233,7 +1233,7 @@ Alternatively, the same actions can be defined as **JSON array**, if the notific
} }
) )
} | ConvertTo-Json } | ConvertTo-Json
Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing
``` ```
=== "Python" === "Python"
@ -1731,6 +1731,9 @@ And the same example using [JSON publishing](#publish-as-json):
=== "PowerShell" === "PowerShell"
``` powershell ``` powershell
# Powershell requires the 'Depth' argument to equal 3 here to expand 'Extras',
# otherwise it will read System.Collections.Hashtable in the returned JSON
$uri = "https://ntfy.sh" $uri = "https://ntfy.sh"
$body = @{ $body = @{
topic = "wifey" topic = "wifey"
@ -1745,9 +1748,6 @@ And the same example using [JSON publishing](#publish-as-json):
} }
} }
) )
# Powershell requires the 'Depth' argument to equal 3 here to expand 'Extras', otherwise it will read System.Collections.Hashtable in the returned json
} | ConvertTo-Json -Depth 3 } | ConvertTo-Json -Depth 3
Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing
``` ```
@ -2002,6 +2002,9 @@ And the same example using [JSON publishing](#publish-as-json):
=== "PowerShell" === "PowerShell"
``` powershell ``` powershell
# Powershell requires the 'Depth' argument to equal 3 here to expand 'headers',
# otherwise it will read System.Collections.Hashtable in the returned JSON
$uri = "https://ntfy.sh" $uri = "https://ntfy.sh"
$body = @{ $body = @{
topic = "myhome" topic = "myhome"
@ -2018,7 +2021,6 @@ And the same example using [JSON publishing](#publish-as-json):
body = '{"action": "close"}' body = '{"action": "close"}'
} }
) )
# Powershell requires the 'Depth' argument to equal 3 here to expand 'headers', otherwise it will read System.Collections.Hashtable in the returned json
} | ConvertTo-Json -Depth 3 } | ConvertTo-Json -Depth 3
Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing Invoke-RestMethod -Method 'Post' -Uri $uri -Body $body -ContentType "application/json" -UseBasicParsing
``` ```

4
docs/releases.md
View file

@ -32,6 +32,10 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting) * `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting)
**Documentation:**
* Fix some PowerShell publish docs ([#345](https://github.com/binwiederhier/ntfy/pull/345), thanks to [@noahpeltier](https://github.com/noahpeltier))
--> -->
## ntfy server v1.27.2 ## ntfy server v1.27.2