aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use plume_common::escape() instead of askama_escape::escape() directly

Browse Source
This commit is contained in:
Kitaiti Makoto 2022-01-07 05:38:17 +09:00
parent c786569171
commit 61d5446113
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.lock generated
View File

@ -198,12 +198,6 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a"
[[package]]
name = "askama_escape"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
[[package]] [[package]]
name = "askama_escape" name = "askama_escape"
version = "0.10.2" version = "0.10.2"
@ -2987,7 +2981,6 @@ name = "plume"
version = "0.7.1-dev" version = "0.7.1-dev"
dependencies = [ dependencies = [
"activitypub", "activitypub",
"askama_escape 0.1.0",
"atom_syndication", "atom_syndication",
"chrono", "chrono",
"clap", "clap",
@ -3048,7 +3041,7 @@ dependencies = [
"activitystreams-derive", "activitystreams-derive",
"activitystreams-traits", "activitystreams-traits",
"array_tool", "array_tool",
"askama_escape 0.10.2", "askama_escape",
"base64 0.10.1", "base64 0.10.1",
"chrono", "chrono",
"heck", "heck",
@ -3101,7 +3094,6 @@ version = "0.7.1-dev"
dependencies = [ dependencies = [
"activitypub", "activitypub",
"ammonia", "ammonia",
"askama_escape 0.1.0",
"bcrypt", "bcrypt",
"chrono", "chrono",
"diesel", "diesel",

1
Cargo.toml
View File

@ -7,7 +7,6 @@ edition = "2018"
[dependencies] [dependencies]
activitypub = "0.1.3" activitypub = "0.1.3"
askama_escape = "0.1"
atom_syndication = "0.6" atom_syndication = "0.6"
clap = "2.33" clap = "2.33"
dotenv = "0.15.0" dotenv = "0.15.0"

3
plume-models/src/medias.rs
View File

@ -3,12 +3,11 @@ use crate::{
users::User, Connection, Error, Result, CONFIG, users::User, Connection, Error, Result, CONFIG,
}; };
use activitypub::object::Image; use activitypub::object::Image;
use askama_escape::escape;
use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl}; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
use guid_create::GUID; use guid_create::GUID;
use plume_common::{ use plume_common::{
activity_pub::{inbox::FromId, request, Id}, activity_pub::{inbox::FromId, request, Id},
utils::MediaProcessor, utils::{escape, MediaProcessor},
}; };
use std::{ use std::{
fs::{self, DirBuilder}, fs::{self, DirBuilder},

2
src/template_utils.rs
View File

@ -9,7 +9,7 @@ use rocket_i18n::Catalog;
use std::collections::{btree_map::BTreeMap, hash_map::DefaultHasher}; use std::collections::{btree_map::BTreeMap, hash_map::DefaultHasher};
use std::hash::Hasher; use std::hash::Hasher;
pub use askama_escape::escape; pub use plume_common::utils::escape;
pub static CACHE_NAME: &str = env!("CACHE_ID"); pub static CACHE_NAME: &str = env!("CACHE_ID");