diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-06-23 21:11:38 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-06-23 21:11:38 -0400 |
| commit | dc94e58cbf7e7de10d97331a3056380a3416e0b0 (patch) | |
| tree | 85ed25783b0470ead3012a9718aea50b39c940dd /server/src/api/post.rs | |
| parent | fd6a040568239d2e6949394fdc0ce0f7ac70275c (diff) | |
| parent | 790b944031f9433be765936763d848ffa6e1b496 (diff) | |
Merge branch 'master' into federation_merge_from_master_2
Diffstat (limited to 'server/src/api/post.rs')
| -rw-r--r-- | server/src/api/post.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/server/src/api/post.rs b/server/src/api/post.rs index 9bbde791..420bef1f 100644 --- a/server/src/api/post.rs +++ b/server/src/api/post.rs @@ -17,7 +17,7 @@ use crate::{ Saveable, SortType, }, - fetch_iframely_and_pictshare_data, + fetch_iframely_and_pictrs_data, naive_now, slur_check, slurs_vec_to_str, @@ -152,9 +152,9 @@ impl Perform for Oper<CreatePost> { return Err(APIError::err("site_ban").into()); } - // Fetch Iframely and Pictshare cached image - let (iframely_title, iframely_description, iframely_html, pictshare_thumbnail) = - fetch_iframely_and_pictshare_data(data.url.to_owned()); + // Fetch Iframely and pictrs cached image + let (iframely_title, iframely_description, iframely_html, pictrs_thumbnail) = + fetch_iframely_and_pictrs_data(data.url.to_owned()); let post_form = PostForm { name: data.name.to_owned(), @@ -171,7 +171,7 @@ impl Perform for Oper<CreatePost> { embed_title: iframely_title, embed_description: iframely_description, embed_html: iframely_html, - thumbnail_url: pictshare_thumbnail, + thumbnail_url: pictrs_thumbnail, ap_id: "changeme".into(), local: true, published: None, @@ -507,9 +507,9 @@ impl Perform for Oper<EditPost> { return Err(APIError::err("site_ban").into()); } - // Fetch Iframely and Pictshare cached image - let (iframely_title, iframely_description, iframely_html, pictshare_thumbnail) = - fetch_iframely_and_pictshare_data(data.url.to_owned()); + // Fetch Iframely and Pictrs cached image + let (iframely_title, iframely_description, iframely_html, pictrs_thumbnail) = + fetch_iframely_and_pictrs_data(data.url.to_owned()); let read_post = Post::read(&conn, data.edit_id)?; @@ -528,7 +528,7 @@ impl Perform for Oper<EditPost> { embed_title: iframely_title, embed_description: iframely_description, embed_html: iframely_html, - thumbnail_url: pictshare_thumbnail, + thumbnail_url: pictrs_thumbnail, ap_id: read_post.ap_id, local: read_post.local, published: None, |