Compare commits

..

2 Commits

Author SHA1 Message Date
Marta 1f89393c73 version bump 4 weeks ago
Marta 6d22c44eb6 added support for akkoma 4 weeks ago
  1. 2
      Cargo.lock
  2. 2
      Cargo.toml
  3. 25
      src/fetcher.rs
  4. 3
      src/misc.rs

2
Cargo.lock generated

@ -322,7 +322,7 @@ dependencies = [ @@ -322,7 +322,7 @@ dependencies = [
[[package]]
name = "fedi_emoji_downloader"
version = "0.1.2"
version = "0.1.3"
dependencies = [
"chrono",
"clap",

2
Cargo.toml

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[package]
name = "fedi_emoji_downloader"
version = "0.1.2"
version = "0.1.3"
edition = "2021"
[dependencies]

25
src/fetcher.rs

@ -114,6 +114,7 @@ impl EmojiFetcher { @@ -114,6 +114,7 @@ impl EmojiFetcher {
self.needs_interactive("logging into gotosocial", self.try_fetch_gts())
.await
}
FediSoftware::Akkoma => self.try_fetch_akkoma().await,
FediSoftware::Other(other) => {
error!("unsupported fedi software: `{other}`");
Ok(())
@ -166,11 +167,35 @@ impl EmojiFetcher { @@ -166,11 +167,35 @@ impl EmojiFetcher {
Ok(())
}
async fn try_fetch_akkoma(&self) -> Result<()> {
info!("trying to fetch emojis from akkoma");
info!("trying without authentication");
let unauth_res = self.do_fetch(|rb| rb).await;
if unauth_res.is_ok() {
info!("successfully fetched from akkoma without authentication");
return Ok(());
}
info!("seems like authentication is needed; asking necessary info");
let access_token = self
.needs_interactive(
"logging into akkoma",
mastodon::auth_interactive(&self.client),
)
.await?;
mastodon::verify_login(&self.client, &access_token).await?;
self.do_fetch(|rb| rb.bearer_auth(&access_token)).await?;
mastodon::invalidate_token(&self.client, &access_token).await
}
async fn ask_target_and_try_fetch(&self) -> Result<()> {
info!("Could not auto-detect which software the instance uses.");
let options = vec![
FediSoftware::Mastodon,
FediSoftware::Gotosocial,
FediSoftware::Akkoma,
FediSoftware::Other("".into()),
];
let answer = inquire::Select::new("Please select the instance software:", options)

3
src/misc.rs

@ -7,6 +7,7 @@ use serde::Deserialize; @@ -7,6 +7,7 @@ use serde::Deserialize;
pub enum FediSoftware {
Mastodon,
Gotosocial,
Akkoma,
Other(String),
#[default]
Unknown,
@ -20,6 +21,7 @@ where @@ -20,6 +21,7 @@ where
match value.as_ref() {
"mastodon" => FediSoftware::Mastodon,
"gotosocial" => FediSoftware::Gotosocial,
"akkoma" => FediSoftware::Akkoma,
"" => FediSoftware::Unknown,
other => FediSoftware::Other(other.to_owned()),
}
@ -31,6 +33,7 @@ impl Display for FediSoftware { @@ -31,6 +33,7 @@ impl Display for FediSoftware {
match self {
FediSoftware::Mastodon => write!(f, "Mastodon"),
FediSoftware::Gotosocial => write!(f, "Gotosocial"),
FediSoftware::Akkoma => write!(f, "Akkoma"),
FediSoftware::Other(_) => write!(f, "Other Software"),
FediSoftware::Unknown => write!(f, "Unknown Software"),
}

Loading…
Cancel
Save