mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-05 16:39:55 +00:00
Merge pull request #1033 from LemmyNet/post_thumbnail_url_fixes
Fix post thumbnail_url to use full urls. Fixes #632
This commit is contained in:
commit
be2d9f0427
4 changed files with 58 additions and 16 deletions
|
@ -133,10 +133,7 @@ impl Community {
|
|||
.get_result::<Self>(conn)
|
||||
}
|
||||
|
||||
fn community_mods_and_admins(
|
||||
conn: &PgConnection,
|
||||
community_id: i32,
|
||||
) -> Result<Vec<i32>, Error> {
|
||||
fn community_mods_and_admins(conn: &PgConnection, community_id: i32) -> Result<Vec<i32>, Error> {
|
||||
use crate::{community_view::CommunityModeratorView, user_view::UserView};
|
||||
let mut mods_and_admins: Vec<i32> = Vec::new();
|
||||
mods_and_admins.append(
|
||||
|
|
|
@ -33,7 +33,7 @@ use lemmy_db::{
|
|||
user::User_,
|
||||
Crud,
|
||||
};
|
||||
use lemmy_utils::{convert_datetime, get_apub_protocol_string, settings::Settings};
|
||||
use lemmy_utils::convert_datetime;
|
||||
use serde::Deserialize;
|
||||
use url::Url;
|
||||
|
||||
|
@ -114,15 +114,8 @@ impl ToApub for Post {
|
|||
}
|
||||
|
||||
if let Some(thumbnail_url) = &self.thumbnail_url {
|
||||
let full_url = format!(
|
||||
"{}://{}/pictshare/{}",
|
||||
get_apub_protocol_string(),
|
||||
Settings::get().hostname,
|
||||
thumbnail_url
|
||||
);
|
||||
|
||||
let mut image = Image::new();
|
||||
image.set_url(full_url);
|
||||
image.set_url(thumbnail_url.to_string());
|
||||
page.set_image(image.into_any_base()?);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
// This is for db migrations that require code
|
||||
use crate::LemmyError;
|
||||
use diesel::*;
|
||||
use diesel::{
|
||||
sql_types::{Nullable, Text},
|
||||
*,
|
||||
};
|
||||
use lemmy_db::{
|
||||
comment::Comment,
|
||||
community::{Community, CommunityForm},
|
||||
|
@ -10,7 +13,13 @@ use lemmy_db::{
|
|||
user::{UserForm, User_},
|
||||
Crud,
|
||||
};
|
||||
use lemmy_utils::{generate_actor_keypair, make_apub_endpoint, EndpointType};
|
||||
use lemmy_utils::{
|
||||
generate_actor_keypair,
|
||||
get_apub_protocol_string,
|
||||
make_apub_endpoint,
|
||||
settings::Settings,
|
||||
EndpointType,
|
||||
};
|
||||
use log::info;
|
||||
|
||||
pub fn run_advanced_migrations(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||
|
@ -19,6 +28,7 @@ pub fn run_advanced_migrations(conn: &PgConnection) -> Result<(), LemmyError> {
|
|||
post_updates_2020_04_03(&conn)?;
|
||||
comment_updates_2020_04_03(&conn)?;
|
||||
private_message_updates_2020_05_05(&conn)?;
|
||||
post_thumbnail_url_updates_2020_07_27(&conn)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
@ -188,3 +198,32 @@ fn private_message_updates_2020_05_05(conn: &PgConnection) -> Result<(), LemmyEr
|
|||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn post_thumbnail_url_updates_2020_07_27(conn: &PgConnection) -> Result<(), LemmyError> {
|
||||
use lemmy_db::schema::post::dsl::*;
|
||||
|
||||
info!("Running post_thumbnail_url_updates_2020_07_27");
|
||||
|
||||
let domain_prefix = format!(
|
||||
"{}://{}/pictrs/image/",
|
||||
get_apub_protocol_string(),
|
||||
Settings::get().hostname
|
||||
);
|
||||
|
||||
let incorrect_thumbnails = post.filter(thumbnail_url.not_like("http%"));
|
||||
|
||||
// Prepend the rows with the update
|
||||
let res = diesel::update(incorrect_thumbnails)
|
||||
.set(
|
||||
thumbnail_url.eq(
|
||||
domain_prefix
|
||||
.into_sql::<Nullable<Text>>()
|
||||
.concat(thumbnail_url),
|
||||
),
|
||||
)
|
||||
.get_results::<Post>(conn)?;
|
||||
|
||||
info!("{} Post thumbnail_url rows updated.", res.len());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -31,6 +31,7 @@ pub mod websocket;
|
|||
|
||||
use crate::request::{retry, RecvError};
|
||||
use actix_web::{client::Client, dev::ConnectionInfo};
|
||||
use lemmy_utils::{get_apub_protocol_string, settings::Settings};
|
||||
use log::error;
|
||||
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
|
||||
use serde::Deserialize;
|
||||
|
@ -140,7 +141,7 @@ async fn fetch_iframely_and_pictrs_data(
|
|||
};
|
||||
|
||||
// Fetch pictrs thumbnail
|
||||
let pictrs_thumbnail = match iframely_thumbnail_url {
|
||||
let pictrs_hash = match iframely_thumbnail_url {
|
||||
Some(iframely_thumbnail_url) => match fetch_pictrs(client, &iframely_thumbnail_url).await {
|
||||
Ok(res) => Some(res.files[0].file.to_owned()),
|
||||
Err(e) => {
|
||||
|
@ -158,6 +159,18 @@ async fn fetch_iframely_and_pictrs_data(
|
|||
},
|
||||
};
|
||||
|
||||
// The full urls are necessary for federation
|
||||
let pictrs_thumbnail = if let Some(pictrs_hash) = pictrs_hash {
|
||||
Some(format!(
|
||||
"{}://{}/pictrs/image/{}",
|
||||
get_apub_protocol_string(),
|
||||
Settings::get().hostname,
|
||||
pictrs_hash
|
||||
))
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
(
|
||||
iframely_title,
|
||||
iframely_description,
|
||||
|
|
Loading…
Reference in a new issue