From 61d54461138f06f6493911ebffa1ac65856d1912 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:38:17 +0900
Subject: [PATCH] Use plume_common::escape() instead of askama_escape::escape()
 directly

---
 Cargo.lock                 | 10 +---------
 Cargo.toml                 |  1 -
 plume-models/src/medias.rs |  3 +--
 src/template_utils.rs      |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1c3c33c7..5e6b0016 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -198,12 +198,6 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a"
 
-[[package]]
-name = "askama_escape"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
-
 [[package]]
 name = "askama_escape"
 version = "0.10.2"
@@ -2987,7 +2981,6 @@ name = "plume"
 version = "0.7.1-dev"
 dependencies = [
  "activitypub",
- "askama_escape 0.1.0",
  "atom_syndication",
  "chrono",
  "clap",
@@ -3048,7 +3041,7 @@ dependencies = [
  "activitystreams-derive",
  "activitystreams-traits",
  "array_tool",
- "askama_escape 0.10.2",
+ "askama_escape",
  "base64 0.10.1",
  "chrono",
  "heck",
@@ -3101,7 +3094,6 @@ version = "0.7.1-dev"
 dependencies = [
  "activitypub",
  "ammonia",
- "askama_escape 0.1.0",
  "bcrypt",
  "chrono",
  "diesel",
diff --git a/Cargo.toml b/Cargo.toml
index 33e46dca..c1a2d8a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
-askama_escape = "0.1"
 atom_syndication = "0.6"
 clap = "2.33"
 dotenv = "0.15.0"
diff --git a/plume-models/src/medias.rs b/plume-models/src/medias.rs
index 68cb52c4..f4761461 100644
--- a/plume-models/src/medias.rs
+++ b/plume-models/src/medias.rs
@@ -3,12 +3,11 @@ use crate::{
     users::User, Connection, Error, Result, CONFIG,
 };
 use activitypub::object::Image;
-use askama_escape::escape;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use guid_create::GUID;
 use plume_common::{
     activity_pub::{inbox::FromId, request, Id},
-    utils::MediaProcessor,
+    utils::{escape, MediaProcessor},
 };
 use std::{
     fs::{self, DirBuilder},
diff --git a/src/template_utils.rs b/src/template_utils.rs
index de1e18ac..945fdbd9 100644
--- a/src/template_utils.rs
+++ b/src/template_utils.rs
@@ -9,7 +9,7 @@ use rocket_i18n::Catalog;
 use std::collections::{btree_map::BTreeMap, hash_map::DefaultHasher};
 use std::hash::Hasher;
 
-pub use askama_escape::escape;
+pub use plume_common::utils::escape;
 
 pub static CACHE_NAME: &str = env!("CACHE_ID");