Skip to content

Commit b09b0d0

Browse files
committed
Merge branch 'main' into feature/multiple-tokens
# Conflicts: # build/main.js # build/main.js.map # io-package.json # src/main.ts
2 parents 6ad772f + 58a99af commit b09b0d0

File tree

9 files changed

+9016
-14799
lines changed

9 files changed

+9016
-14799
lines changed

CHANGELOG_OLD.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Older changes
2+
## 0.1.0
3+
4+
- (Thomas Pohl) Update to adapter-core 2.5.1
5+
6+
## 0.0.2-RC1.0 (2022-02-09)
7+
8+
- (Thomas Pohl) Update dependencies
9+
10+
## 0.0.1
11+
12+
- (Thomas Pohl) initial release

README.md

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,56 +17,54 @@ Send push notifications from [ioBroker](https://iobroker.net/) to [Gotify](https
1717

1818
## Changelog
1919

20+
<!--
21+
Placeholder for the next version (at the beginning of the line):
22+
### **WORK IN PROGRESS**
23+
-->
24+
25+
### 0.5.0 (2025-12-28)
26+
27+
- (Thomas Pohl) Allow to overwrite token when sending messages (javascript only not for blockly)
28+
- (Thomas Pohl) Update dependencies
29+
2030
### 0.4.0
2131

22-
- (Thomas Pohl) Support for notification-manager was added
23-
- (Thomas Pohl) Blockly can now send messages with priority 10
32+
- (Thomas Pohl) Support for notification-manager was added
33+
- (Thomas Pohl) Blockly can now send messages with priority 10
2434

2535
### 0.3.0
2636

27-
- (Thomas Pohl) The token is stored now encrypted
28-
- (Thomas Pohl) node.js 22 is supported
37+
- (Thomas Pohl) The token is stored now encrypted
38+
- (Thomas Pohl) node.js 22 is supported
2939

3040
### 0.2.1
3141

32-
- (Thomas Pohl) Optimized startup behavior when adapter is not configured
42+
- (Thomas Pohl) Optimized startup behavior when adapter is not configured
3343

3444
### 0.2.0
3545

36-
- (Thomas Pohl) Add timeout for http calls
37-
- (Thomas Pohl) Update dependency versions
38-
39-
### 0.1.0
40-
41-
- (Thomas Pohl) Update to adapter-core 2.5.1
42-
43-
### 0.0.2-RC1.0 (2022-02-09)
44-
45-
- (Thomas Pohl) Update dependencies
46-
47-
### 0.0.1
48-
49-
- (Thomas Pohl) initial release
46+
- (Thomas Pohl) Add timeout for http calls
47+
- (Thomas Pohl) Update dependency versions
5048

5149
## Installation
5250

5351
### Preparation
5452

55-
- Login with you user in gotify
56-
- Create an application for ioBroker
57-
- Note the token of your new application
58-
![new application](img/newApplication.png)
53+
- Login with you user in gotify
54+
- Create an application for ioBroker
55+
- Note the token of your new application
56+
![new application](img/newApplication.png)
5957

6058
### In ioBroker
6159

62-
- Goto Adapter
63-
- Click on github-cat-icon
64-
- Go to Custom tab
65-
- Enter https://github.com/ThomasPohl/ioBroker.gotify
66-
- Install
67-
- Create a new instance for the gotify-adapter
68-
- Enter the Url auf you installation
69-
- Add the previously created token
60+
- Goto Adapter
61+
- Click on github-cat-icon
62+
- Go to Custom tab
63+
- Enter https://github.com/ThomasPohl/ioBroker.gotify
64+
- Install
65+
- Create a new instance for the gotify-adapter
66+
- Enter the Url auf you installation
67+
- Add the previously created token
7068

7169
## Usage
7270

@@ -79,10 +77,24 @@ If yoou choose Markdown as format you can use [Markdown](https://guides.github.c
7977

8078
### Javascript
8179

80+
Send a simple message using the default token:
81+
82+
```javascript
83+
sendTo('gotify.0', 'send', {
84+
title: 'DG lüften',
85+
message: 'Luftfeuchtigkeit im DG zu hoch!',
86+
});
87+
```
88+
89+
Send a message with a custom token (overrides the configured default token):
90+
8291
```javascript
83-
sendTo("gotify.0", "send", {
84-
title: "DG lüften",
85-
message: "Luftfeuchtigkeit im DG zu hoch!",
92+
sendTo('gotify.0', 'send', {
93+
title: 'Custom notification',
94+
message: 'This message uses a different token',
95+
priority: 8,
96+
contentType: 'text/markdown',
97+
token: 'AaBbCcDdEeFfGg123456',
8698
});
8799
```
88100

build/main.js

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/main.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

io-package.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
{
22
"common": {
33
"name": "gotify",
4-
"version": "0.4.0",
4+
"version": "0.5.0",
55
"news": {
6+
"0.5.0": {
7+
"en": "Allow to overwrite token when sending messages (javascript only not for blockly)\nUpdate dependencies",
8+
"de": "Lassen Sie Token beim Senden von Nachrichten überschreiben (javascript nur nicht für blockweise)\nAbhängigkeiten aktualisieren",
9+
"ru": "Разрешить перезаписывать токен при отправке сообщений (javascript только не для блокировки)\nОбновление зависимостей",
10+
"pt": "Permitir sobrescrever o token ao enviar mensagens (javascript apenas não para blockly)\nAtualizar dependências",
11+
"nl": "Token overschrijven bij het versturen van berichten (javascript alleen niet voor blokjes)\nAfhankelijkheden bijwerken",
12+
"fr": "Permettre d'écraser le jeton lors de l'envoi de messages (javascript seulement pas pour bloquer)\nMise à jour des dépendances",
13+
"it": "Consentire di sovrascrivere token quando si inviano messaggi (javascript solo non per blocco)\nDipendenze di aggiornamento",
14+
"es": "Permitir overwrite token al enviar mensajes (javascript solamente no por bloqueo)\nActualizar las dependencias",
15+
"pl": "Pozwól nadpisać token podczas wysyłania wiadomości (javascript tylko nie dla blockly)\nAktualizuj zależności",
16+
"uk": "Дозволяє перезаписувати токени при надсиланні повідомлень (javascript only not for blockly)\nОновлення залежності",
17+
"zh-cn": "允许在发送信件时覆盖符号( javascript 仅用于块状)\n更新依赖关系"
18+
},
619
"0.4.0": {
720
"en": "Support for notification-manager was added. Blockly can now send notifications with priority 10.",
821
"de": "Unterstützung für Notification-Manager wurde hinzugefügt. Blockly kann jetzt Benachrichtigungen mit der Priorität 10 versenden.",
@@ -140,13 +153,14 @@
140153
},
141154
"protectedNative": ["token", "tokens.token"],
142155
"encryptedNative": ["token", "tokens.token"],
156+
"objects": [],
143157
"instanceObjects": [
144158
{
145159
"_id": "info.connection",
146160
"type": "state",
147161
"common": {
148162
"name": {
149-
"en": "Connected to Gotify server",
163+
"en": "Connection to Gotify server",
150164
"de": "Verbindung mit Gotify Server",
151165
"ru": "Подключен к серверу Gotify",
152166
"pt": "Conectado ao servidor Gotify",

0 commit comments

Comments
 (0)