Merge pull request 'Percent encode to create ActivityPub URI' (#1127) from blog-slug into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1127
This commit is contained in:
KitaitiMakoto 2023-01-04 09:55:34 +00:00
commit ed9970b102

View File

@ -9,7 +9,7 @@ use crate::{
use chrono::NaiveDateTime; use chrono::NaiveDateTime;
use diesel::{self, result::Error::NotFound, ExpressionMethods, QueryDsl, RunQueryDsl}; use diesel::{self, result::Error::NotFound, ExpressionMethods, QueryDsl, RunQueryDsl};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use plume_common::utils::md_to_html; use plume_common::utils::{md_to_html, iri_percent_encode_seg};
use std::sync::RwLock; use std::sync::RwLock;
#[derive(Clone, Identifiable, Queryable)] #[derive(Clone, Identifiable, Queryable)]
@ -173,8 +173,8 @@ impl Instance {
"{instance}/{prefix}/{name}/{box_name}", "{instance}/{prefix}/{name}/{box_name}",
instance = self.public_domain, instance = self.public_domain,
prefix = prefix, prefix = prefix,
name = name, name = iri_percent_encode_seg(name),
box_name = box_name box_name = iri_percent_encode_seg(box_name)
)) ))
} }