Browse Source

Merge branch 'main' into fix/youtube-beforeyoucontinue

fix/youtube-beforeyoucontinue
DashEightMate 5 months ago
parent
commit
596ecb99b2
  1. 888
      server/Cargo.lock
  2. 2
      server/Cargo.toml
  3. 2
      server/lemmy_utils/Cargo.toml
  4. 3
      server/src/apub/activities.rs
  5. 1
      server/src/apub/community.rs
  6. 2
      server/src/apub/post.rs
  7. 1
      server/src/apub/user.rs

888
server/Cargo.lock
File diff suppressed because it is too large
View File

2
server/Cargo.toml

@ -39,7 +39,7 @@ bcrypt = "0.8.0"
captcha = "0.0.7"
chrono = { version = "0.4.7", features = ["serde"] }
comrak = "0.7"
config = {version = "0.10.1", default-features = false, features = ["hjson"] }
config = {version = "0.11.0", default-features = false, features = ["hjson"] }
diesel = { version = "1.4.6", features = ["postgres","chrono","r2d2","64-column-tables","serde_json","uuid"] }
diesel_migrations = "1.4.0"
dotenv = "0.15.0"

2
server/lemmy_utils/Cargo.toml

@ -11,7 +11,7 @@ path = "src/lib.rs"
[dependencies]
regex = "1.3.5"
config = { version = "0.10.1", default-features = false, features = ["hjson"] }
config = { version = "0.11.0", default-features = false, features = ["hjson"] }
chrono = { version = "0.4.7", features = ["serde"] }
lettre = "0.9.3"
lettre_email = "0.9.4"

3
server/src/apub/activities.rs

@ -8,9 +8,10 @@ use activitystreams::{
};
use lemmy_db::{community::Community, user::User_};
use lemmy_utils::{get_apub_protocol_string, settings::Settings, LemmyError};
use serde::{export::fmt::Debug, Serialize};
use serde::{Serialize};
use url::{ParseError, Url};
use uuid::Uuid;
use std::fmt::Debug;
pub async fn send_activity_to_community<T, Kind>(
creator: &User_,

1
server/src/apub/community.rs

@ -344,6 +344,7 @@ impl FromApub for CommunityForm {
let description = group
.inner
.content()
.as_ref()
.map(|s| s.as_single_xsd_string())
.flatten()
.map(|s| s.to_string());

2
server/src/apub/post.rs

@ -152,11 +152,13 @@ fn extract_embed_from_apub(
.map(|s| s.to_string());
let description = preview_page
.summary()
.as_ref()
.map(|s| s.as_single_xsd_string())
.flatten()
.map(|s| s.to_string());
let html = preview_page
.content()
.as_ref()
.map(|c| c.as_single_xsd_string())
.flatten()
.map(|s| s.to_string());

1
server/src/apub/user.rs

@ -233,6 +233,7 @@ impl FromApub for UserForm {
let bio = person
.inner
.summary()
.as_ref()
.map(|s| s.as_single_xsd_string())
.flatten()
.map(|s| s.to_string());

Loading…
Cancel
Save