cargo fmt
Release Tagging / release (pull_request) Successful in 27s
swoosh Build / Check (pull_request) Successful in 39s
swoosh Build / Test Suite (pull_request) Successful in 25s
swoosh Build / Rustfmt (pull_request) Successful in 30s
swoosh Build / Clippy (pull_request) Successful in 27s
swoosh Build / build (pull_request) Successful in 24s
Release Tagging / release (pull_request) Successful in 27s
swoosh Build / Check (pull_request) Successful in 39s
swoosh Build / Test Suite (pull_request) Successful in 25s
swoosh Build / Rustfmt (pull_request) Successful in 30s
swoosh Build / Clippy (pull_request) Successful in 27s
swoosh Build / build (pull_request) Successful in 24s
This commit is contained in:
+23
-14
@@ -2,17 +2,25 @@
|
|||||||
|
|
||||||
pub mod types;
|
pub mod types;
|
||||||
|
|
||||||
pub fn send_mssage(msg: &textsender_models::message::Message, contact: &textsender_models::contact::Contact, param: crate::twilio::types::Parameters, config: &textsender_models::config::auxiliary::TwilioConfig) -> Result<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
|
pub fn send_mssage(
|
||||||
|
msg: &textsender_models::message::Message,
|
||||||
|
contact: &textsender_models::contact::Contact,
|
||||||
|
param: crate::twilio::types::Parameters,
|
||||||
|
config: &textsender_models::config::auxiliary::TwilioConfig,
|
||||||
|
) -> Result<crate::twilio::api::types::TwilioAPIMessage, std::io::Error> {
|
||||||
if config.account_sid.is_nil() {
|
if config.account_sid.is_nil() {
|
||||||
Err(std::io::Error::other("Account SID is empty"))
|
Err(std::io::Error::other("Account SID is empty"))
|
||||||
} else if config.auth_token.is_empty() {
|
} else if config.auth_token.is_empty() {
|
||||||
Err(std::io::Error::other(" Auth token is empty"))
|
Err(std::io::Error::other(" Auth token is empty"))
|
||||||
} else {
|
} else {
|
||||||
let now = time::OffsetDateTime::now_utc();
|
let now = time::OffsetDateTime::now_utc();
|
||||||
match reqwest::Client::builder() .build() {
|
match reqwest::Client::builder().build() {
|
||||||
Ok(client) => {
|
Ok(client) => {
|
||||||
let mut headers = reqwest::header::HeaderMap::new();
|
let mut headers = reqwest::header::HeaderMap::new();
|
||||||
headers.insert("Content-Type", "application/x-www-form-urlencoded".parse().unwrap());
|
headers.insert(
|
||||||
|
"Content-Type",
|
||||||
|
"application/x-www-form-urlencoded".parse().unwrap(),
|
||||||
|
);
|
||||||
headers.insert("Accept", "application/json".parse().unwrap());
|
headers.insert("Accept", "application/json".parse().unwrap());
|
||||||
// headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
|
// headers.insert("Authorization", "Basic QUNlZmExZWY1MTYzMTRjOWQxYTY4Y2JkNjU3ZGU0OTI3NzpmNGExZjJiMGI3OWVhMzczNTA3OGMyZDhlZTk2ODRlMQ==".parse()?);
|
||||||
|
|
||||||
@@ -38,7 +46,9 @@ pub fn send_mssage(msg: &textsender_models::message::Message, contact: &textsend
|
|||||||
params.insert("MessagingServiceSid", config.service_sid.as_str());
|
params.insert("MessagingServiceSid", config.service_sid.as_str());
|
||||||
params.insert("Body", msg.content.as_str());
|
params.insert("Body", msg.content.as_str());
|
||||||
|
|
||||||
let url = format!("https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json");
|
let url = format!(
|
||||||
|
"https://api.twilio.com/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages.json"
|
||||||
|
);
|
||||||
|
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
/*
|
/*
|
||||||
@@ -52,22 +62,19 @@ pub fn send_mssage(msg: &textsender_models::message::Message, contact: &textsend
|
|||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
let body = response.text();
|
let body = response.text();
|
||||||
|
|
||||||
let mut obj = crate::twilio::api::types::TwilioAPIMessage{..Default::default()};
|
let mut obj = crate::twilio::api::types::TwilioAPIMessage {
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
Ok(obj)
|
Ok(obj)
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
Err(std::io::Error::other(err.to_string()))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
Err(err) => Err(std::io::Error::other(err.to_string())),
|
||||||
Err(err) => {
|
|
||||||
Err(std::io::Error::other(err.to_string()))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
@@ -114,7 +121,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
|
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
|
||||||
if m.Config == nil {
|
if m.Config == nil {
|
||||||
@@ -163,6 +169,9 @@ func isSchedulable(now *time.Time, scheduled *time.Time) bool {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
fn is_scheduleable(now: &Option<time::OffsetDateTime>, scheduled: &Option<time::OffsetDateTime>) -> bool {
|
fn is_scheduleable(
|
||||||
|
now: &Option<time::OffsetDateTime>,
|
||||||
|
scheduled: &Option<time::OffsetDateTime>,
|
||||||
|
) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
|
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
|
||||||
pub struct TwilioAPIMessage {
|
pub struct TwilioAPIMessage {
|
||||||
pub account_sid: String,
|
pub account_sid: String,
|
||||||
@@ -22,7 +21,7 @@ pub struct TwilioAPIMessage {
|
|||||||
pub status: String,
|
pub status: String,
|
||||||
pub subresource_uris: SubresourceURI,
|
pub subresource_uris: SubresourceURI,
|
||||||
pub to: String,
|
pub to: String,
|
||||||
pub uri: String
|
pub uri: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
|
#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
|
||||||
@@ -30,8 +29,6 @@ pub struct SubresourceURI {
|
|||||||
pub media: String,
|
pub media: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
{
|
{
|
||||||
"account_sid": "ACefa1ef516314c9d1a68cbd657de49277",
|
"account_sid": "ACefa1ef516314c9d1a68cbd657de49277",
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
// Things needed to send a message
|
// Things needed to send a message
|
||||||
// Contact - Receipient to send to (textsender-models)
|
// Contact - Receipient to send to (textsender-models)
|
||||||
// Message - The content to sent (textsender-models)
|
// Message - The content to sent (textsender-models)
|
||||||
|
|||||||
Reference in New Issue
Block a user