LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-29 07:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1247 from knkski/iframely-url-setting

Browse source 
Add iframely_url setting
This commit is contained in:
Dessalines 2020-11-01 22:44:28 -05:00 committed by GitHub
commit cca0b4c0f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/defaults.hjson
View file

@ -39,6 +39,8 @@
docs_dir: "/app/documentation" docs_dir: "/app/documentation"
# address where pictrs is available # address where pictrs is available
pictrs_url: "http://pictrs:8080" pictrs_url: "http://pictrs:8080"
# address where iframely is available
iframely_url: "http://iframely"
# rate limits for various user actions, by user ip # rate limits for various user actions, by user ip
rate_limit: { rate_limit: {
# maximum number of messages created in interval # maximum number of messages created in interval

2
lemmy_utils/src/request.rs
View file

@ -58,7 +58,7 @@ pub(crate) async fn fetch_iframely(
client: &Client, client: &Client,
url: &str, url: &str,
) -> Result<IframelyResponse, LemmyError> { ) -> Result<IframelyResponse, LemmyError> {
let fetch_url = format!("http://iframely/oembed?url={}", url); let fetch_url = format!("{}/oembed?url={}", Settings::get().iframely_url, url);
let response = retry(|| client.get(&fetch_url).send()).await?; let response = retry(|| client.get(&fetch_url).send()).await?;

1
lemmy_utils/src/settings.rs
View file

@ -16,6 +16,7 @@ pub struct Settings {
pub docs_dir: PathBuf, pub docs_dir: PathBuf,
pub jwt_secret: String, pub jwt_secret: String,
pub pictrs_url: String, pub pictrs_url: String,
pub iframely_url: String,
pub rate_limit: RateLimitConfig, pub rate_limit: RateLimitConfig,
pub email: Option<EmailConfig>, pub email: Option<EmailConfig>,
pub federation: FederationConfig, pub federation: FederationConfig,