Skip to content

Adding device option to pushover #124

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding device option to pushover #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion octoprint_Octoslack/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def get_settings_defaults(self):
"slack_rtm_authorized_users": "",
"channel": "",
"pushbullet_config": {"access_token": "", "channel": ""},
"pushover_config": {"app_token": "", "user_key": ""},
"pushover_config": {"app_token": "", "user_key": "", "device": ""},
"rocketchat_config": {
"server_url": "",
"username": "",
Expand Down Expand Up @@ -3762,6 +3762,10 @@ def send_slack_message(
)
return

pushoverDevice = self._settings.get(
["pushover_config"], merged=True
).get("device")

po_title = None
po_body = None
pb_image_url = None
Expand Down Expand Up @@ -3829,6 +3833,7 @@ def send_slack_message(
user=pushoverUserKey,
title=po_title,
message=po_body,
device=pushoverDevice,
url=pb_image_url,
url_title=pb_image_title,
image=pb_image_local_path,
Expand Down
19 changes: 12 additions & 7 deletions octoprint_Octoslack/templates/Octoslack_settings.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,20 +358,25 @@
<br/>
<div class="octoprint_config_row">
<span class="octoslack_label">App Token</span>
<input type="text" class="octoslack_width_auto" id="octoslack_pushover_app_token" size="60" placeholder="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" data-bind="value: settings.plugins.Octoslack.pushover_config.app_token">
</br>
<small class="muted">
<input type="text" class="octoslack_width_auto" id="octoslack_pushover_app_token" size="60" placeholder="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" data-bind="value: settings.plugins.Octoslack.pushover_config.app_token"></br>
<small class="muted">
Register your Pushover application <a href="https://pushover.net/apps/build" target="_blank">here</a>. Your App Token will be available on the next screen
</small>
</div>
<div class="octoprint_config_row">
<span class="octoslack_label">User/Group Key</span>
<input type="text" class="octoslack_width_auto" id="octoslack_pushover_user_key" size="60" placeholder="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" data-bind="value: settings.plugins.Octoslack.pushover_config.user_key">
</br>
<small class="muted">
<input type="text" class="octoslack_width_auto" id="octoslack_pushover_user_key" size="60" placeholder="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" data-bind="value: settings.plugins.Octoslack.pushover_config.user_key"></br>
<small class="muted">
The message recipient's user or group key. Your user key is available on your <a href="https://pushover.net/" target="_blank">Pushover dashboard</a> page
</small>
</div>
<div class="octoprint_config_row">
<span class="octoslack_label">Device</span>
<input type="text" class="octoslack_width_auto" id="octoslack_pushover_device" size="60" placeholder="" data-bind="value: settings.plugins.Octoslack.pushover_config.device"></br>
<small class="muted">
The device where the message will be sent to. Leave empty to send to all your devices.
</small>
</div>
</div>
</div> <!-- End Pushover config section -->
<div id="octoslack_rocketchat_config_section" class="octoslack_hidden"> <!-- Start Rockat.Chat config section -->
Expand Down Expand Up @@ -545,7 +550,7 @@
<span class="octoslack_valign octoslack_action_label"
onclick="$('#octoslackSnapshotUploadMethod_pushover').trigger('click')">Pushover</span>
<br/>
<small class="muted">Snapshot images will hosted by <a href="https://pushover.net/" target="_blank">Pushover</a>. Only Pushover hosted snapshots will render in the message. All other hosting options will simply be included as a URL in the message body</small>
<small class="muted">Snapshot images will be hosted by <a href="https://pushover.net/" target="_blank">Pushover</a>. Only Pushover hosted snapshots will render in the message. All other hosting options will simply be included as a URL in the message body</small>
</div>
<div id="octoslackRocketChatUploadMethod">
<input type="radio" name="octoslackSnapshotUploadMethod"
Expand Down