Fix issue with fetching users in seed script (#16393)
Release Notes: - N/A
This commit is contained in:
parent
18f0626e08
commit
ebecd7e65f
1 changed files with 3 additions and 5 deletions
|
@ -1,7 +1,6 @@
|
||||||
use crate::db::{self, ChannelRole, NewUserParams};
|
use crate::db::{self, ChannelRole, NewUserParams};
|
||||||
|
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
use chrono::{DateTime, Utc};
|
|
||||||
use db::Database;
|
use db::Database;
|
||||||
use serde::{de::DeserializeOwned, Deserialize};
|
use serde::{de::DeserializeOwned, Deserialize};
|
||||||
use std::{fmt::Write, fs, path::Path};
|
use std::{fmt::Write, fs, path::Path};
|
||||||
|
@ -13,7 +12,6 @@ struct GitHubUser {
|
||||||
id: i32,
|
id: i32,
|
||||||
login: String,
|
login: String,
|
||||||
email: Option<String>,
|
email: Option<String>,
|
||||||
created_at: DateTime<Utc>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
|
@ -131,7 +129,7 @@ pub async fn seed(config: &Config, db: &Database, force: bool) -> anyhow::Result
|
||||||
&github_user.login,
|
&github_user.login,
|
||||||
Some(github_user.id),
|
Some(github_user.id),
|
||||||
github_user.email.as_deref(),
|
github_user.email.as_deref(),
|
||||||
Some(github_user.created_at),
|
None,
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
@ -161,9 +159,9 @@ async fn fetch_github<T: DeserializeOwned>(client: &reqwest::Client, url: &str)
|
||||||
.header("user-agent", "zed")
|
.header("user-agent", "zed")
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
.unwrap_or_else(|_| panic!("failed to fetch '{url}'"));
|
.unwrap_or_else(|error| panic!("failed to fetch '{url}': {error}"));
|
||||||
response
|
response
|
||||||
.json()
|
.json()
|
||||||
.await
|
.await
|
||||||
.unwrap_or_else(|_| panic!("failed to deserialize github user from '{url}'"))
|
.unwrap_or_else(|error| panic!("failed to deserialize github user from '{url}': {error}"))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue