Support v13.13.2

.github/workflows/ci.yml

@@ -15,9 +15,9 @@ jobs:
       - id: setup_env
         run: ./ci/testenv/setup.sh
         env:
-          MISSKEY_IMAGE: 'misskey/misskey:12.75.1'
+          MISSKEY_IMAGE: 'misskey/misskey:13.13.2'
           MISSKEY_ID: aid
-      - run: cargo test --features 12-75-0
+      - run: cargo test --features 13-13-2
         timeout-minutes: 15
         env:
           TEST_API_URL: http://localhost:3000/api/

.github/workflows/flaky.yml

@@ -12,6 +12,98 @@ jobs:
     strategy:
       matrix:
         include:
+          - image: 'misskey/misskey:13.13.2'
+            flags: --features 13-13-2
+          - image: 'misskey/misskey:13.13.1'
+            flags: --features 13-13-0
+          - image: 'misskey/misskey:13.12.2'
+            flags: --features 13-12-2
+          - image: 'misskey/misskey:13.12.0'
+            flags: --features 13-12-0
+          - image: 'misskey/misskey:13.11.3'
+            flags: --features 13-11-3
+          - image: 'misskey/misskey:13.11.2'
+            flags: --features 13-11-2
+          - image: 'misskey/misskey:13.11.0'
+            flags: --features 13-11-0
+          - image: 'misskey/misskey:13.10.3'
+            flags: --features 13-10-3
+          - image: 'misskey/misskey:13.10.0'
+            flags: --features 13-10-0
+          - image: 'misskey/misskey:13.9.0'
+            flags: --features 13-9-0
+          - image: 'misskey/misskey:13.8.0'
+            flags: --features 13-8-0
+          - image: 'misskey/misskey:13.7.0'
+            flags: --features 13-7-0
+          - image: 'misskey/misskey:13.4.0'
+            flags: --features 13-4-0
+          - image: 'misskey/misskey:13.3.2'
+            flags: --features 13-3-2
+          - image: 'misskey/misskey:13.3.0'
+            flags: --features 13-3-0
+          - image: 'misskey/misskey:13.2.5'
+            flags: --features 13-2-4
+          - image: 'misskey/misskey:13.2.3'
+            flags: --features 13-2-3
+          - image: 'misskey/misskey:13.1.1'
+            flags: --features 13-1-1
+          - image: 'misskey/misskey:13.1.0'
+            flags: --features 13-1-0
+          - image: 'misskey/misskey:13.0.0'
+            flags: --features 13-0-0
+          - image: 'misskey/misskey:12.112.3'
+            flags: --features 12-112-3
+          - image: 'misskey/misskey:12.112.2'
+            flags: --features 12-112-0
+          - image: 'misskey/misskey:12.111.0'
+            flags: --features 12-111-0
+          - image: 'misskey/misskey:12.109.2'
+            flags: --features 12-109-0
+          - image: 'misskey/misskey:12.108.1'
+            flags: --features 12-108-0
+          - image: 'misskey/misskey:12.107.0'
+            flags: --features 12-107-0
+          - image: 'misskey/misskey:12.106.0'
+            flags: --features 12-106-0
+          - image: 'misskey/misskey:12.105.0'
+            flags: --features 12-105-0
+          - image: 'misskey/misskey:12.102.0'
+            flags: --features 12-102-0
+          - image: 'misskey/misskey:12.99.1'
+            flags: --features 12-99-0
+          - image: 'misskey/misskey:12.98.0'
+            flags: --features 12-98-0
+          - image: 'misskey/misskey:12.97.0'
+            flags: --features 12-96-0
+          - image: 'misskey/misskey:12.95.0'
+            flags: --features 12-95-0
+          - image: 'misskey/misskey:12.93.0'
+            flags: --features 12-93-0
+          - image: 'misskey/misskey:12.92.0'
+            flags: --features 12-92-0
+          - image: 'misskey/misskey:12.91.0'
+            flags: --features 12-91-0
+          - 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'
+            flags: --features 12-88-0
+          - image: 'misskey/misskey:12.82.0'
+            flags: --features 12-82-0
+          - image: 'misskey/misskey:12.81.0'
+            flags: --features 12-81-0
+          - image: 'misskey/misskey:12.80.0'
+            flags: --features 12-80-0
+          - image: 'misskey/misskey:12.79.2'
+            flags: --features 12-79-2
+          - image: 'misskey/misskey:12.79.0'
+            flags: --features 12-79-0
+          - image: 'misskey/misskey:12.77.1'
+            flags: --features 12-77-1
+          - image: 'misskey/misskey:12.77.0'
+            flags: --features 12-77-0
           - image: 'misskey/misskey:12.75.0'
             flags: --features 12-75-0
           - image: 'misskey/misskey:12.71.0'

.github/workflows/unstable.yml

@@ -28,9 +28,9 @@ jobs:
       - id: setup_env
         run: ./ci/testenv/setup.sh
         env:
-          MISSKEY_IMAGE: 'misskey/misskey:12.75.1'
+          MISSKEY_IMAGE: 'misskey/misskey:13.13.2'
           MISSKEY_ID: aid
-      - run: cargo test --features 12-75-0
+      - run: cargo test --features 13-13-2
         timeout-minutes: 15
         env:
           TEST_API_URL: http://localhost:3000/api/

ci/testenv/docker-compose.yml

@@ -20,11 +20,11 @@ services:
 
   redis:
     restart: always
-    image: redis:4.0-alpine
+    image: redis:7-alpine
 
   db:
     restart: always
-    image: postgres:11.2-alpine
+    image: postgres:15-alpine
     environment:
       - POSTGRES_PASSWORD=misskey-test
       - POSTGRES_USER=misskey-test

ci/testenv/get-token/get-token.sh

@@ -4,12 +4,15 @@ until nc -z web 3000; do
   sleep 1
 done
 
-ADMIN_TOKEN=$(
+ADMIN_DATA=$(
   curl -fsS -XPOST -H 'Content-Type: application/json' \
     --data '{"username":"admin","password":"admin"}'   \
-    http://web:3000/api/admin/accounts/create | jq -r .token
+    http://web:3000/api/admin/accounts/create
 )
 
+ADMIN_TOKEN=$(echo "$ADMIN_DATA" | jq -r .token)
+ADMIN_ID=$(echo "$ADMIN_DATA" | jq -r .id)
+
 USER_DATA=$(
   curl -fsS -XPOST -H 'Content-Type: application/json'     \
     --data '{"username":"testuser","password":"testuser"}' \
@@ -19,9 +22,66 @@ USER_DATA=$(
 USER_TOKEN=$(echo "$USER_DATA" | jq -r .token)
 USER_ID=$(echo "$USER_DATA" | jq -r .id)
 
+# endpoint `admin/moderators/add` is removed in Misskey v13.0.0
 curl -fsS -XPOST -H 'Content-Type: application/json'            \
   --data '{"i":"'"${ADMIN_TOKEN}"'","userId":"'"${USER_ID}"'"}' \
-  http://web:3000/api/admin/moderators/add || exit 1
+  http://web:3000/api/admin/moderators/add ||
+(
+  # create and assign moderator role
+  ROLE_ID=$(
+    curl -fsS -XPOST -H 'Content-Type: application/json' \
+      --data '{
+        "i": "'"${ADMIN_TOKEN}"'",
+        "name": "Moderator",
+        "description": "",
+        "color": "",
+        "iconUrl": null,
+        "target": "manual",
+        "condFormula": {},
+        "isPublic": false,
+        "isModerator": true,
+        "isAdministrator": false,
+        "asBadge": false,
+        "canEditMembersByModerator": false,
+        "displayOrder": 0,
+        "policies": {
+          "canSearchNotes": {
+            "value": true,
+            "priority": 0,
+            "useDefault": false
+          },
+          "pinLimit": {
+            "value": 1000,
+            "priority": 0,
+            "useDefault": false
+          },
+          "clipLimit": {
+            "value": 1000,
+            "priority": 0,
+            "useDefault": false
+          },
+          "antennaLimit": {
+            "value": 1000,
+            "priority": 0,
+            "useDefault": false
+          },
+          "userListLimit": {
+            "value": 1000,
+            "priority": 0,
+            "useDefault": false
+          }
+        }
+      }' \
+    http://web:3000/api/admin/roles/create | jq -r .id \
+  ) &&
+  curl -fsS -XPOST -H 'Content-Type: application/json' \
+    --data '{"i":"'"${ADMIN_TOKEN}"'", "roleId": "'"${ROLE_ID}"'", "userId":"'"${ADMIN_ID}"'"}' \
+    http://web:3000/api/admin/roles/assign &&
+  curl -fsS -XPOST -H 'Content-Type: application/json' \
+    --data '{"i":"'"${ADMIN_TOKEN}"'", "roleId": "'"${ROLE_ID}"'", "userId":"'"${USER_ID}"'"}' \
+    http://web:3000/api/admin/roles/assign
+) ||
+exit 1
 
 echo "::set-output name=admin_token::$ADMIN_TOKEN"
 echo "::set-output name=user_token::$USER_TOKEN"

ci/testenv/setup.sh

@@ -10,7 +10,7 @@ readonly MAX_RETRY=5
 count=0
 while :; do
   docker-compose build
-  docker-compose run --rm web yarn run init
+  docker-compose run --rm web yarn run init || docker-compose run --rm web pnpm run init
   docker-compose up -d web
   if docker-compose run --rm get-token; then
     break

ci/testenv/web/Dockerfile

@@ -2,4 +2,7 @@ ARG MISSKEY_IMAGE
 FROM ${MISSKEY_IMAGE}
 ARG MISSKEY_ID
 COPY default.yml /misskey/.config/default.yml
+USER root
 RUN echo "id: '${MISSKEY_ID}'" >> /misskey/.config/default.yml
+# Disable rate limit
+ENV NODE_ENV=development

ci/testenv/web/default.yml

@@ -1,5 +1,8 @@
 url: http://localhost:3000/
 port: 3000
+allowedPrivateNetworks: [
+  127.0.0.1/32
+]
 
 db:
   host: db

example/follow-back/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-misskey = { path = "../../misskey", version = "0.2.0", features = ["websocket-client"] }
+misskey = { path = "../../misskey", version = "0.2.0", features = ["http-client", "websocket-client"] }
 tokio = { version = "1.0", features = ["full"] }
 structopt = "0.3.16"
 url = "2.1.1"

example/follow-back/src/main.rs

@@ -2,7 +2,7 @@ use anyhow::Result;
 use futures::stream::TryStreamExt;
 use misskey::prelude::*;
 use misskey::streaming::channel::main::MainStreamEvent;
-use misskey::WebSocketClient;
+use misskey::{HttpClient, WebSocketClient};
 use structopt::StructOpt;
 use url::Url;
 
@@ -18,15 +18,18 @@ struct Opt {
 async fn main() -> Result<()> {
     let opt = Opt::from_args();
 
-    // Build a client and connect to Misskey.
-    let client = WebSocketClient::builder(opt.url)
+    // Create `HttpClient`.
+    let http_client = HttpClient::with_token(opt.url.clone(), opt.i.clone())?;
+
+    // Build `WebSocketClient` and connect to Misskey.
+    let ws_client = WebSocketClient::builder(opt.url)
         .token(opt.i)
         .connect()
         .await?;
 
     // Connect to the main stream.
     // the main stream is a channel that streams events about the connected account, such as notifications.
-    let mut stream = client.main_stream().await?;
+    let mut stream = ws_client.main_stream().await?;
 
     // Wait for the next event using `try_next` method from `TryStreamExt`.
     while let Some(event) = stream.try_next().await? {
@@ -36,8 +39,8 @@ async fn main() -> Result<()> {
                 println!("followed from @{}", user.username);
 
                 // Follow back `user` if you haven't already.
-                if !client.is_following(&user).await? {
-                    client.follow(&user).await?;
+                if !http_client.is_following(&user).await? {
+                    http_client.follow(&user).await?;
                 }
             }
             // other events are just ignored

example/ping-pong/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-misskey = { path = "../../misskey", version = "0.2.0", features = ["websocket-client"] }
+misskey = { path = "../../misskey", version = "0.2.0", features = ["http-client", "websocket-client"] }
 tokio = { version = "1.0", features = ["full"] }
 structopt = "0.3.16"
 url = "2.1.1"

example/ping-pong/src/main.rs

@@ -3,7 +3,7 @@ use futures::stream::TryStreamExt;
 use misskey::model::note::Note;
 use misskey::prelude::*;
 use misskey::streaming::channel::main::MainStreamEvent;
-use misskey::WebSocketClient;
+use misskey::{HttpClient, WebSocketClient};
 use structopt::StructOpt;
 use url::Url;
 
@@ -19,15 +19,18 @@ struct Opt {
 async fn main() -> Result<()> {
     let opt = Opt::from_args();
 
-    // Build a client and connect to Misskey.
-    let client = WebSocketClient::builder(opt.url)
+    // Create `HttpClient`.
+    let http_client = HttpClient::with_token(opt.url.clone(), opt.i.clone())?;
+
+    // Build `WebSocketClient` and connect to Misskey.
+    let ws_client = WebSocketClient::builder(opt.url)
         .token(opt.i)
         .connect()
         .await?;
 
     // Connect to the main stream.
     // the main stream is a channel that streams events about the connected account, such as notifications.
-    let mut stream = client.main_stream().await?;
+    let mut stream = ws_client.main_stream().await?;
 
     // Wait for the next event using `try_next` method from `TryStreamExt`.
     while let Some(event) = stream.try_next().await? {
@@ -42,7 +45,7 @@ async fn main() -> Result<()> {
                 println!("got ping from @{}", user.username);
 
                 // Create a pong note as a reply to the mention
-                client.reply(note_id, "pong").await?;
+                http_client.reply(note_id, "pong").await?;
             }
             // other events are just ignored
             _ => {}

example/streaming/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-misskey = { path = "../../misskey", version = "0.2.0", features = ["websocket-client"] }
+misskey = { path = "../../misskey", version = "0.2.0", features = ["http-client", "websocket-client"] }
 tokio = { version = "1.0", features = ["full"] }
 structopt = "0.3.16"
 url = "2.1.1"

example/streaming/src/main.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use futures::stream::TryStreamExt;
 use misskey::prelude::*;
-use misskey::WebSocketClient;
+use misskey::{HttpClient, WebSocketClient};
 use structopt::StructOpt;
 use url::Url;
 
@@ -17,20 +17,23 @@ struct Opt {
 async fn main() -> Result<()> {
     let opt = Opt::from_args();
 
+    // Create `HttpClient`.
+    let http_client = HttpClient::with_token(opt.url.clone(), opt.i.clone())?;
+
     // Configure and build a client using `WebSocketClientBuilder`.
-    let client = WebSocketClient::builder(opt.url)
+    let ws_client = WebSocketClient::builder(opt.url)
         .token(opt.i)
         .connect()
         .await?;
 
     // Run two asynchronous tasks simultaneously.
-    futures::try_join!(post(&client), timeline(&client))?;
+    futures::try_join!(post(&http_client), timeline(&ws_client))?;
 
     Ok(())
 }
 
 // Post what you entered
-async fn post(client: &WebSocketClient) -> Result<()> {
+async fn post(client: &HttpClient) -> Result<()> {
     // We use async I/O from `tokio` for now
     use tokio::io::{self, AsyncBufReadExt, BufReader};