Skip to content

Commit 57668a5

Browse files
Streamline content alteration
1 parent cd12d35 commit 57668a5

File tree

1 file changed

+28
-19
lines changed

1 file changed

+28
-19
lines changed

src/contentservers/combiner.rs

+28-19
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,22 @@ pub(crate) fn combine_content(
1717
for plugin in plugins.clone() {
1818
match &plugin.runners.modify_body_html {
1919
Some(p) => {
20-
let handlebars = Handlebars::new();
21-
let mut data = std::collections::BTreeMap::new();
22-
data.insert("input".to_string(), "kamkdxcvjgCVJGVvdbvcgcvgdvd");
23-
let cmdjson: String = handlebars
24-
.render_template(&p.execute, &data)
25-
.unwrap_or(format!("[ \"returndirect\", \"f{}\" ]", contents));
26-
let cmds: Vec<String> = serde_json::from_str(cmdjson.as_str()).unwrap();
20+
let cont_1 = serde_json::to_string(&contents).unwrap();
21+
let mut cont_2 = cont_1.as_str().chars();
22+
cont_2.next();
23+
cont_2.next_back();
24+
let con_s = cont_2.as_str();
25+
let cmdjson: String = p.execute.replace(r#"{{{input}}}"#, con_s);
26+
let cmds: Vec<String> = match serde_json::from_str(cmdjson.as_str()) {
27+
Ok(cmds) => cmds,
28+
Err(e) => {
29+
logger::jsr_error(format!(
30+
"Could not parse JSON for plugin {}: {}",
31+
plugin.name, e
32+
));
33+
[].to_vec()
34+
}
35+
};
2736
// .unwrap_or(["returndirect", contents.as_str()].to_vec());
2837
let mut cmd: Vec<&str> = vec![];
2938
for com in &cmds {
@@ -123,12 +132,12 @@ pub(crate) fn combine_content(
123132
for plugin in plugins.clone() {
124133
match &plugin.runners.modify_head_html {
125134
Some(p) => {
126-
let handlebars = Handlebars::new();
127-
let mut data = std::collections::BTreeMap::new();
128-
data.insert("input".to_string(), crate::escape_json(&head));
129-
let cmdjson: String = handlebars
130-
.render_template(&p.execute, &data)
131-
.unwrap_or(format!("[ \"returndirect\", \"f{}\" ]", head));
135+
let cont_1 = serde_json::to_string(&contents).unwrap();
136+
let mut cont_2 = cont_1.as_str().chars();
137+
cont_2.next();
138+
cont_2.next_back();
139+
let con_s = cont_2.as_str();
140+
let cmdjson: String = p.execute.replace(r#"{{{input}}}"#, con_s);
132141
let cmds: Vec<String> = serde_json::from_str(cmdjson.as_str()).unwrap_or(
133142
[
134143
"returndirect".to_string(),
@@ -186,12 +195,12 @@ pub(crate) fn combine_content(
186195
for plugin in plugins.clone() {
187196
match &plugin.runners.modify_output_html {
188197
Some(p) => {
189-
let handlebars = Handlebars::new();
190-
let mut data = std::collections::BTreeMap::new();
191-
data.insert("input".to_string(), "kamdlnjnjnsjkanj");
192-
let cmdjson: String = handlebars
193-
.render_template(&p.execute, &data)
194-
.unwrap_or(format!("[ \"returndirect\", \"f{}\" ]", k));
198+
let cont_1 = serde_json::to_string(&k).unwrap();
199+
let mut cont_2 = cont_1.as_str().chars();
200+
cont_2.next();
201+
cont_2.next_back();
202+
let con_s = cont_2.as_str();
203+
let cmdjson: String = p.execute.replace(r#"{{{input}}}"#, con_s);
195204
let cmds: Vec<String> = serde_json::from_str(cmdjson.as_str()).unwrap();
196205
// .unwrap_or(["returndirect".to_string(), escape_json(&k).to_string()].to_vec());
197206
let mut cmd: Vec<&str> = vec![];

0 commit comments

Comments
 (0)