Adding instance software and version. Fixes #2222 #2733
Conversation
| @@ -71,7 +71,7 @@ tracing-error = "0.2.0" | |||
| tracing-log = "0.1.3" | |||
| tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } | |||
| url = { version = "2.3.1", features = ["serde"] } | |||
| reqwest = { version = "0.11.12", features = ["json"] } | |||
| reqwest = { version = "0.11.12", features = ["json", "blocking"] } | |||
There was a problem hiding this comment.
This is unfortunately necessary, because our scheduler cannot work with async functions.
| pub blocked: Option<Vec<String>>, | ||
| pub linked: Vec<Instance>, | ||
| pub allowed: Option<Vec<Instance>>, | ||
| pub blocked: Option<Vec<Instance>>, |
There was a problem hiding this comment.
Might as well return all the type information, and let front-ends decide what they want to use.
| -- Add Software and Version columns from nodeinfo to the instance table | ||
|
|
||
| alter table instance add column software varchar(255); | ||
| alter table instance add column version varchar(255); |
There was a problem hiding this comment.
The front ends can just display Unknown or something if the field is missing.
src/lib.rs
Outdated
| @@ -111,6 +106,11 @@ pub async fn start_lemmy_server() -> Result<(), LemmyError> { | |||
| .timeout(REQWEST_TIMEOUT) | |||
| .build()?; | |||
|
|
|||
| let scheduler_client = reqwest::blocking::Client::builder() | |||
There was a problem hiding this comment.
A blocking version of reqwest
src/scheduled_tasks.rs
Outdated
| @@ -33,6 +41,11 @@ pub fn setup(db_url: String) -> Result<(), LemmyError> { | |||
| clear_old_activities(&mut conn); | |||
| }); | |||
|
|
|||
| update_instance_software(&mut conn_2, &client); | |||
| scheduler.every(1.days()).run(move || { | |||
| update_instance_software(&mut conn_2, &client); | |||
There was a problem hiding this comment.
Runs on startup, and every day. Seems like a daily run is best. The software is never gonna change, but the software version might.
| async fn test_nodeinfo() { | ||
| let client = Client::builder().build().unwrap(); | ||
| let lemmy_ml_nodeinfo = client | ||
| .get("https://lemmy.ml/nodeinfo/2.0.json") |
There was a problem hiding this comment.
This was useful to test a few, but I'm not sure if this should be included.
scripts/fix-clippy.sh
Outdated
| @@ -1,6 +1,8 @@ | |||
| #!/bin/bash | |||
| set -e | |||
|
|
|||
| cd ../ | |||
There was a problem hiding this comment.
I usually call ./scripts/fix-clippy.sh so that would break. You can use this then it should work from any path.
crates/apub/src/lib.rs
Outdated
| .iter() | ||
| .map(|i| i.domain.clone()) | ||
| .collect::<Vec<String>>() | ||
| .contains(&domain) |
There was a problem hiding this comment.
clippy changed this to .any
crates/apub/src/lib.rs
Outdated
| .iter() | ||
| .map(|i| i.domain.clone()) | ||
| .collect::<Vec<String>>() | ||
| .contains(&domain) |
There was a problem hiding this comment.
clippy changed this to .any
src/scheduled_tasks.rs
Outdated
| @@ -120,3 +133,80 @@ fn drop_ccnew_indexes(conn: &mut PgConnection) { | |||
| .execute(conn) | |||
| .expect("drop ccnew indexes"); | |||
| } | |||
|
|
|||
| // You can't use the structs from node_info.rs, | |||
| // because many fields are missing from other platforms. | |||
There was a problem hiding this comment.
I dont like this, better to mark fields as optional and use #[serde(default)] attribute in the original structs. Then you can also store user numbers etc if they are present.
src/scheduled_tasks.rs
Outdated
| .user_agent(user_agent) | ||
| .timeout(REQWEST_TIMEOUT) | ||
| .build() | ||
| .expect("couldnt build reqwest client"); |
|
Looks good. But this is a breaking change so we shouldnt release it before 0.18.0 |
That's no problem, I got some other breaking changes coming in too. If we want to do any other |
Nutomic
force-pushed
the
instance_software_and_version
branch
from
dab5bb8
to
b0dfa9f
Compare
@Nutomic Is there any other info you think might be useful to store in the instance table?