Skip to content
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

Jump to bottom

Add support for critical alerts #71

Merged
merged 7 commits into from
Aug 1, 2023
Merged

Add support for critical alerts #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e4f0b44
feat: support critical alerts
Mstrodl Apr 3, 2023
70925db
Use Serialize
Mstrodl Apr 4, 2023
efe7c16
Notification sounds should encode the same
Mstrodl Apr 4, 2023
1d41329
Tests
Mstrodl Apr 5, 2023
7215a54
payload: no need to implement serialize ourselves
Mstrodl May 24, 2023
b743cf3
critical: use bool rathern than u8 on rust side
Mstrodl Jun 5, 2023
1630180
payload: require Debug on PayloadLike
Mstrodl Jun 12, 2023
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
19 changes: 10 additions & 9 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::error::Error::ResponseError;
use crate::signer::Signer;
use hyper_alpn::AlpnConnector;

use crate::request::payload::Payload;
use crate::request::payload::PayloadLike;
use crate::response::Response;
use http::header::{AUTHORIZATION, CONTENT_LENGTH, CONTENT_TYPE};
use hyper::{self, Body, Client as HttpClient, StatusCode};
Expand Down Expand Up @@ -101,7 +101,7 @@ impl Client {
///
/// See [ErrorReason](enum.ErrorReason.html) for possible errors.
#[cfg_attr(feature = "tracing", ::tracing::instrument)]
pub async fn send(&self, payload: Payload<'_>) -> Result<Response, Error> {
pub async fn send<T: PayloadLike>(&self, payload: T) -> Result<Response, Error> {
let request = self.build_request(payload);
let requesting = self.http_client.request(request);

Expand Down Expand Up @@ -131,27 +131,28 @@ impl Client {
}
}

fn build_request(&self, payload: Payload<'_>) -> hyper::Request<Body> {
let path = format!("https://{}/3/device/{}", self.endpoint, payload.device_token);
fn build_request<T: PayloadLike>(&self, payload: T) -> hyper::Request<Body> {
let path = format!("https://{}/3/device/{}", self.endpoint, payload.get_device_token());

let mut builder = hyper::Request::builder()
.uri(&path)
.method("POST")
.header(CONTENT_TYPE, "application/json");

if let Some(ref apns_priority) = payload.options.apns_priority {
let options = payload.get_options();
if let Some(ref apns_priority) = options.apns_priority {
builder = builder.header("apns-priority", apns_priority.to_string().as_bytes());
}
if let Some(apns_id) = payload.options.apns_id {
if let Some(apns_id) = options.apns_id {
builder = builder.header("apns-id", apns_id.as_bytes());
}
if let Some(ref apns_expiration) = payload.options.apns_expiration {
if let Some(ref apns_expiration) = options.apns_expiration {
builder = builder.header("apns-expiration", apns_expiration.to_string().as_bytes());
}
if let Some(ref apns_collapse_id) = payload.options.apns_collapse_id {
if let Some(ref apns_collapse_id) = options.apns_collapse_id {
builder = builder.header("apns-collapse-id", apns_collapse_id.value.as_bytes());
}
if let Some(apns_topic) = payload.options.apns_topic {
if let Some(apns_topic) = options.apns_topic {
builder = builder.header("apns-topic", apns_topic.as_bytes());
}
if let Some(ref signer) = self.signer {
Expand Down
2 changes: 1 addition & 1 deletion src/request/notification.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mod default;
mod options;
mod web;

pub use self::default::{DefaultAlert, DefaultNotificationBuilder};
pub use self::default::{DefaultAlert, DefaultNotificationBuilder, DefaultSound};
pub use self::options::{CollapseId, NotificationOptions, Priority};
pub use self::web::{WebNotificationBuilder, WebPushAlert};

Expand Down
Loading