Skip to content

Commit

Permalink
Add: Support v12.89.1
Browse files Browse the repository at this point in the history
  • Loading branch information
poppingmoon committed Jun 9, 2023
1 parent a1652df commit 9b011c2
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
- id: setup_env
run: ./ci/testenv/setup.sh
env:
MISSKEY_IMAGE: 'misskey/misskey:12.89.0'
MISSKEY_IMAGE: 'misskey/misskey:12.89.1'
MISSKEY_ID: aid
- run: cargo test --features 12-89-0
- run: cargo test --features 12-89-1
timeout-minutes: 15
env:
TEST_API_URL: http://localhost:3000/api/
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/flaky.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
strategy:
matrix:
include:
- image: 'misskey/misskey:12.89.1'
flags: --features 12-89-1
- image: 'misskey/misskey:12.89.0'
flags: --features 12-89-0
- image: 'misskey/misskey:12.88.0'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unstable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
- id: setup_env
run: ./ci/testenv/setup.sh
env:
MISSKEY_IMAGE: 'misskey/misskey:12.89.0'
MISSKEY_IMAGE: 'misskey/misskey:12.89.1'
MISSKEY_ID: aid
- run: cargo test --features 12-89-0
- run: cargo test --features 12-89-1
timeout-minutes: 15
env:
TEST_API_URL: http://localhost:3000/api/
Expand Down
1 change: 1 addition & 0 deletions misskey-api/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support for Misskey v12.82.0 ~ v12.87.0
- Partial support for Misskey v12.88.0
- Support for Misskey v12.89.0
- Support for Misskey v12.89.1 ~ v12.90.1

### Changed
### Deprecated
Expand Down
1 change: 1 addition & 0 deletions misskey-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ categories = ["api-bindings"]
[features]
default = ["aid"]

12-89-1 = ["12-89-0"]
12-89-0 = ["12-88-0"]
12-88-0 = ["12-82-0"]
12-82-0 = ["12-81-0"]
Expand Down
7 changes: 7 additions & 0 deletions misskey-api/src/endpoint/admin/update_meta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ pub struct Request {
#[serde(skip_serializing_if = "Option::is_none")]
#[builder(default, setter(strip_option))]
pub deepl_auth_key: Option<Option<String>>,
#[cfg(feature = "12-89-1")]
#[cfg_attr(docsrs, doc(cfg(feature = "12-89-1")))]
#[serde(skip_serializing_if = "Option::is_none")]
#[builder(default, setter(strip_option))]
pub deepl_is_pro: Option<bool>,
#[serde(skip_serializing_if = "Option::is_none")]
#[builder(default, setter(strip_option))]
pub enable_twitter_integration: Option<bool>,
Expand Down Expand Up @@ -310,6 +315,8 @@ mod tests {
summaly_proxy: Some(None),
#[cfg(feature = "12-88-0")]
deepl_auth_key: Some(None),
#[cfg(feature = "12-89-1")]
deepl_is_pro: Some(false),
enable_twitter_integration: Some(false),
twitter_consumer_key: Some(None),
twitter_consumer_secret: Some(None),
Expand Down
6 changes: 6 additions & 0 deletions misskey-api/src/model/meta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,12 @@ pub struct AdminMeta {
#[cfg(feature = "12-69-0")]
#[cfg_attr(docsrs, doc(cfg(feature = "12-69-0")))]
pub object_storage_s3_force_path_style: bool,
#[cfg(feature = "12-89-1")]
#[cfg_attr(docsrs, doc(cfg(feature = "12-89-1")))]
pub deepl_auth_key: Option<String>,
#[cfg(feature = "12-89-1")]
#[cfg_attr(docsrs, doc(cfg(feature = "12-89-1")))]
pub deepl_is_pro: bool,
}

#[derive(Deserialize, Serialize, Debug, Clone)]
Expand Down
1 change: 1 addition & 0 deletions misskey-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ keywords = ["async", "client", "misskey"]
[features]
default = ["aid"]

12-89-1 = ["misskey-api/12-89-1", "12-89-0"]
12-89-0 = ["misskey-api/12-89-0", "12-88-0"]
12-88-0 = ["misskey-api/12-88-0", "12-82-0"]
12-82-0 = ["misskey-api/12-82-0", "12-81-0"]
Expand Down
5 changes: 5 additions & 0 deletions misskey-util/src/builder/admin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,11 @@ impl<C> MetaUpdateBuilder<C> {
}

update_builder_bool_field! {
/// Sets whether or not DeepL is pro.
#[cfg(feature = "12-89-1")]
#[cfg_attr(docsrs, doc(cfg(feature = "12-89-1")))]
pub deepl_is_pro;

/// Sets whether or not to enable the Twitter integration.
pub enable_twitter_integration;
}
Expand Down
1 change: 1 addition & 0 deletions misskey/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ categories = ["api-bindings", "web-programming::http-client", "web-programming::
[features]
default = ["http-client", "websocket-client", "tokio-runtime", "aid"]

12-89-1 = ["misskey-api/12-89-1", "misskey-util/12-89-1"]
12-89-0 = ["misskey-api/12-89-0", "misskey-util/12-89-0"]
12-88-0 = ["misskey-api/12-88-0", "misskey-util/12-88-0"]
12-82-0 = ["misskey-api/12-82-0", "misskey-util/12-82-0"]
Expand Down
1 change: 1 addition & 0 deletions misskey/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
//!
//! | Feature | Supported Misskey versions (inclusive) | Tested Misskey version |
//! | -------------------------- | -------------------------------------- | ---------------------- |
//! | `12-89-1` | v12.89.1 ~ v12.90.1 | v12.89.1 |
//! | `12-89-0` | v12.89.0 | v12.89.0 |
//! | `12-88-0` | v12.88.0 | v12.88.0 |
//! | `12-82-0` | v12.82.0 ~ v12.87.0 | v12.82.0 |
Expand Down

0 comments on commit 9b011c2

Please sign in to comment.