zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix(web): give up on parsing inline mentions

Browse source 
just add trailing tags just for hashtags, whatever...
This commit is contained in:
əlemi 2024-07-06 03:45:02 +02:00
parent 29e9901583
commit f4f6bfc8d2
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
utils/mdhtml/lib.rs
View file

@ -51,13 +51,12 @@ impl TokenSink for Sink {
} }
}, },
"a" => { "a" => {
let mut any_attr = !tag.attrs.is_empty(); let any_attr = !tag.attrs.is_empty();
for attr in tag.attrs { for attr in tag.attrs {
match attr.name.local.as_ref() { match attr.name.local.as_ref() {
"href" => self.buffer.push_str(&format!(" href=\"{}\"", attr.value.as_ref())), "href" => self.buffer.push_str(&format!(" href=\"{}\"", attr.value.as_ref())),
"title" => self.buffer.push_str(&format!(" title=\"{}\"", attr.value.as_ref())), "title" => self.buffer.push_str(&format!(" title=\"{}\"", attr.value.as_ref())),
"class" => if attr.value.as_ref() == "u-url mention" { "class" => if attr.value.as_ref() == "u-url mention" {
any_attr = false;
self.buffer.push_str(" class=\"u-url mention\"") self.buffer.push_str(" class=\"u-url mention\"")
}, },
_ => {}, _ => {},

76
web/src/objects/item.rs
View file

@ -6,10 +6,6 @@ use crate::prelude::*;
use apb::{field::OptionalString, target::Addressed, ActivityMut, Base, Collection, CollectionMut, Object, ObjectMut}; use apb::{field::OptionalString, target::Addressed, ActivityMut, Base, Collection, CollectionMut, Object, ObjectMut};
lazy_static::lazy_static! {
static ref REGEX: Regex = regex::Regex::new("<a href=\"([-a-zA-Z0-9()@:%_\\+.~#?&\\/=]+)\" class=\"u-url mention\">@(\\w+)(@\\w+|)</a>").expect("failed compiling @ regex");
}
#[component] #[component]
pub fn Object( pub fn Object(
object: crate::Object, object: crate::Object,
@ -39,23 +35,7 @@ pub fn Object(
Some(view! { <div class="pb-1"></div> }) Some(view! { <div class="pb-1"></div> })
}; };
let mut content = mdhtml::safe_html(object.content().unwrap_or_default()); let content = mdhtml::safe_html(object.content().unwrap_or_default());
let mut results = vec![];
for (matched, [id, username, _domain]) in REGEX.captures_iter(&content).map(|c| c.extract()) {
// TODO what the fuck mastodon........... why are you putting the fancy url in the A HREF????????
let id = id.replace('@', "users/");
// TODO ughh ugly on-the-fly html editing, can this be avoided?
let to_replace = format!(
"<a class=\"clean dim\" href=\"{}\" title=\"{}\"><span class=\"border-button mr-s\"><code class=\"color mr-s\">@</code>{}</span></a>",
Uri::web(U::Actor, &id), id, username
);
results.push((matched.to_string(), to_replace));
}
for (from, to) in results {
content = content.replace(&from, &to);
}
let audience_badge = object.audience().id().str() let audience_badge = object.audience().id().str()
.map(|x| view! { .map(|x| view! {
@ -70,21 +50,45 @@ pub fn Object(
}); });
let hashtag_badges = object.tag().filter_map(|x| { let hashtag_badges = object.tag().filter_map(|x| {
if let Ok(apb::LinkType::Hashtag) = apb::Link::link_type(&x) { match apb::Link::link_type(&x) {
let name = apb::Link::name(&x).unwrap_or_default().replace('#', ""); Ok(apb::LinkType::Hashtag) => {
let href = Uri::web(U::Hashtag, &name); let name = apb::Link::name(&x).unwrap_or_default().replace('#', "");
Some(view! { let href = Uri::web(U::Hashtag, &name);
<a class="clean dim" href={href}> Some(view! {
<span class="border-button ml-s"> <a class="clean dim" href={href}>
<code class="color mr-s">#</code> <span class="border-button ml-s" >
<small class="mr-s"> <code class="color mr-s">#</code>
{name} <small class="mr-s">
</small> {name}
</span> </small>
</a>" " </span>
}) </a>" "
} else { })
None },
Ok(apb::LinkType::Mention) => {
let uid = apb::Link::href(&x);
let mention = apb::Link::name(&x).unwrap_or_default().replacen('@', "", 1);
let (username, domain) = if let Some((username, server)) = mention.split_once('@') {
(username.to_string(), server.to_string())
} else {
(
mention.to_string(),
uid.replace("https://", "").replace("http://", "").split('/').next().unwrap_or_default().to_string(),
)
};
let href = Uri::web(U::Actor, uid);
Some(view! {
<a class="clean dim" href={href}>
<span class="border-button ml-s" title={format!("@{username}@{domain}")} >
<code class="color mr-s">@</code>
<small class="mr-s">
{username}
</small>
</span>
</a>" "
})
},
_ => None,
} }
}).collect_view(); }).collect_view();