vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: fix issues

Browse source
This commit is contained in:
Tanmoy Sarkar 2024-01-04 18:36:54 +05:30
parent 6e490a3157
commit 896da0afb3
3 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/integrations/doctype/push_notification_settings/push_notification_settings.json
View file

@ -5,18 +5,12 @@
"doctype": "DocType",
"engine": "InnoDB",
"field_order": [
"metadata_section",
"enable_push_notification_relay",
"authentication_credential_section",
"enable_push_notification_relay",
"api_key",
"api_secret"
],
"fields": [
{
"fieldname": "metadata_section",
"fieldtype": "Section Break",
"label": "Metadata"
},
{
"default": "0",
"fieldname": "enable_push_notification_relay",
@ -26,7 +20,7 @@
{
"fieldname": "authentication_credential_section",
"fieldtype": "Section Break",
"label": "Authentication Credential"
"label": "Authentication"
},
{
"fieldname": "api_key",
@ -35,14 +29,14 @@
},
{
"fieldname": "api_secret",
"fieldtype": "Data",
"fieldtype": "Password",
"label": "API Secret"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2024-01-04 11:56:25.953147",
"modified": "2024-01-04 17:52:41.383109",
"modified_by": "Administrator",
"module": "Integrations",
"name": "Push Notification Settings",

2
frappe/integrations/doctype/push_notification_settings/push_notification_settings.py
View file

@ -15,7 +15,7 @@ class PushNotificationSettings(Document):
from frappe.types import DF
api_key: DF.Data | None
api_secret: DF.Data | None
api_secret: DF.Password | None
enable_push_notification_relay: DF.Check
# end: auto-generated types

43
frappe/push_notification.py
View file

@ -3,6 +3,7 @@ from urllib.parse import urlparse
import frappe
from frappe.utils.response import Response
from frappe import sbool
from .frappeclient import FrappeClient
@ -98,34 +99,34 @@ class PushNotification:
self,
user_id: str,
title: str,
content: str,
body: str,
link: str = None,
data=None,
truncate_content: bool = False,
truncate_body: bool = False,
) -> bool:
"""
Send notification to a user.
:param user_id: (str) The ID of the user. This should be user's unique identifier.
:param title: (str) The title of the notification.
:param content: (str) The body of the notification. At max 1000 characters.
:param body: (str) The body of the notification. At max 1000 characters.
:param link: (str) The link to be opened when the notification is clicked.
:param data: (dict) The data to be sent with the notification. This can be used to provide extra information while dealing with in-app notifications.
:param truncate_content: (bool) Whether to truncate the content or not. If True, the content will be truncated to 1000 characters.
:param truncate_body: (bool) Whether to truncate the body or not. If True, the body will be truncated to 1000 characters.
:return: bool True if the request queued successfully, False otherwise.
"""
if data is None:
data = {}
if link is not None and link != "":
data["click_action"] = link
if len(content) > 1000:
if truncate_content:
content = content[:1000]
if len(body) > 1000:
if truncate_body:
body = body[:1000]
else:
raise Exception("Content should be at max 1000 characters")
raise Exception("Body should be at max 1000 characters")
response_data = self._send_post_request(
"notification_relay.api.send_notification.user",
{"user_id": user_id, "title": title, "content": content, "data": json.dumps(data)},
{"user_id": user_id, "title": title, "body": body, "data": json.dumps(data)},
)
return response_data["success"]
@ -133,34 +134,34 @@ class PushNotification:
self,
topic_name: str,
title: str,
content: str,
body: str,
link: str = None,
data=None,
truncate_content: bool = False,
truncate_body: bool = False,
) -> bool:
"""
Send notification to a notification topic.
:param topic_name: (str) The name of the topic. This topic should be already created.
:param title: (str) The title of the notification.
:param content: (str) The body of the notification. At max 1000 characters.
:param body: (str) The body of the notification. At max 1000 characters.
:param link: (str) The link to be opened when the notification is clicked.
:param data: (dict) The data to be sent with the notification. This can be used to provide extra information while dealing with in-app notifications.
:param truncate_content: (bool) Whether to truncate the content or not. If True, the content will be truncated to 1000 characters.
:param truncate_body: (bool) Whether to truncate the body or not. If True, the body will be truncated to 1000 characters.
:return: bool True if the request queued successfully, False otherwise.
"""
if data is None:
data = {}
if link is not None and link != "":
data["click_action"] = link
if len(content) > 1000:
if truncate_content:
content = content[:1000]
if len(body) > 1000:
if truncate_body:
body = body[:1000]
else:
raise Exception("Content should be at max 1000 characters")
raise Exception("Body should be at max 1000 characters")
response_data = self._send_post_request(
"notification_relay.api.send_notification.topic",
{"topic_name": topic_name, "title": title, "content": content, "data": json.dumps(data)},
{"topic_name": topic_name, "title": title, "body": body, "data": json.dumps(data)},
)
return response_data["success"]
@ -170,8 +171,7 @@ class PushNotification:
:return: bool True if enabled, False otherwise.
"""
notification_settings = frappe.get_doc("Push Notification Settings")
return notification_settings.enable_push_notification_relay
return sbool(frappe.db.get_single_value("Push Notification Settings", "enable_push_notification_relay"))
def _get_credential(self) -> tuple[str, str]:
"""
@ -251,8 +251,7 @@ class PushNotification:
site_uri = urlparse(frappe.utils.get_url())
if site_uri.port is not None:
return str(site_uri.port)
else:
return ""
return ""
# Webhook which will be called by the central relay server for authentication