server: only render text/calendar summary table on calendar invites
This commit is contained in:
parent
d143b2715d
commit
cc994df4e5
@ -328,12 +328,6 @@ pub fn extract_alternative(
|
|||||||
return extract_related(sp, part_addr);
|
return extract_related(sp, part_addr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for sp in &m.subparts {
|
|
||||||
if sp.ctype.mimetype.as_str() == TEXT_HTML {
|
|
||||||
let body = sp.get_body()?;
|
|
||||||
return Ok(Body::html(body));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for sp in &m.subparts {
|
for sp in &m.subparts {
|
||||||
if sp.ctype.mimetype.as_str() == TEXT_CALENDAR {
|
if sp.ctype.mimetype.as_str() == TEXT_CALENDAR {
|
||||||
let body = sp.get_body()?;
|
let body = sp.get_body()?;
|
||||||
@ -341,6 +335,12 @@ pub fn extract_alternative(
|
|||||||
return Ok(Body::html(summary));
|
return Ok(Body::html(summary));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for sp in &m.subparts {
|
||||||
|
if sp.ctype.mimetype.as_str() == TEXT_HTML {
|
||||||
|
let body = sp.get_body()?;
|
||||||
|
return Ok(Body::html(body));
|
||||||
|
}
|
||||||
|
}
|
||||||
for sp in &m.subparts {
|
for sp in &m.subparts {
|
||||||
if sp.ctype.mimetype.as_str() == TEXT_PLAIN {
|
if sp.ctype.mimetype.as_str() == TEXT_PLAIN {
|
||||||
let body = sp.get_body()?;
|
let body = sp.get_body()?;
|
||||||
@ -1299,7 +1299,7 @@ pub fn render_ical_summary(ical_data: &str) -> Result<String, ServerError> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1324,10 +1324,10 @@ pub fn render_ical_summary(ical_data: &str) -> Result<String, ServerError> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn parse_ical_datetime(dt: &str) -> Option<String> {
|
fn parse_ical_datetime(dt: &str) -> Option<String> {
|
||||||
use chrono::{NaiveDateTime, DateTime, Utc};
|
use chrono::{DateTime, NaiveDateTime, Utc};
|
||||||
let dt = dt.split(':').last().unwrap_or(dt);
|
let dt = dt.split(':').last().unwrap_or(dt);
|
||||||
if let Ok(ndt) = NaiveDateTime::parse_from_str(dt, "%Y%m%dT%H%M%SZ") {
|
if let Ok(ndt) = NaiveDateTime::parse_from_str(dt, "%Y%m%dT%H%M%SZ") {
|
||||||
let dt_utc: DateTime<Utc> = DateTime::from_utc(ndt, Utc);
|
let dt_utc: DateTime<Utc> = TimeZone::from_utc_datetime(&Utc, &ndt);
|
||||||
return Some(dt_utc.format("%Y-%m-%dT%H:%M:%SZ").to_string());
|
return Some(dt_utc.format("%Y-%m-%dT%H:%M:%SZ").to_string());
|
||||||
}
|
}
|
||||||
if let Ok(ndt) = NaiveDateTime::parse_from_str(dt, "%Y%m%dT%H%M%S") {
|
if let Ok(ndt) = NaiveDateTime::parse_from_str(dt, "%Y%m%dT%H%M%S") {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user