0.4.3 - Updated

Author: takecchi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuculus/cuculus-api",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [

src/apis/PostsApi.ts

@@ -48,10 +48,6 @@ export interface DeletePostRequest {
     id: string;
 }
 
-export interface DeleteRepostRequest {
-    id: string;
-}
-
 export interface GetFavoritedByRequest {
     id: string;
 }
@@ -261,44 +257,6 @@ export class PostsApi extends runtime.BaseAPI {
         await this.deletePostRaw(requestParameters, initOverrides);
     }
 
-    /**
-     * リポスト解除
-     */
-    async deleteRepostRaw(requestParameters: DeleteRepostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<UserPost>> {
-        if (requestParameters.id === null || requestParameters.id === undefined) {
-            throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling deleteRepost.');
-        }
-
-        const queryParameters: any = {};
-
-        const headerParameters: runtime.HTTPHeaders = {};
-
-        if (this.configuration && this.configuration.accessToken) {
-            const token = this.configuration.accessToken;
-            const tokenString = await token("bearer", []);
-
-            if (tokenString) {
-                headerParameters["Authorization"] = `Bearer ${tokenString}`;
-            }
-        }
-        const response = await this.request({
-            path: `/v0/posts/{id}/repost`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters.id))),
-            method: 'DELETE',
-            headers: headerParameters,
-            query: queryParameters,
-        }, initOverrides);
-
-        return new runtime.JSONApiResponse(response, (jsonValue) => UserPostFromJSON(jsonValue));
-    }
-
-    /**
-     * リポスト解除
-     */
-    async deleteRepost(requestParameters: DeleteRepostRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<UserPost> {
-        const response = await this.deleteRepostRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-
     /**
      * ポストIDからお気に入りしたアカウント一覧を返す
      */

src/apis/UsersApi.ts

@@ -15,11 +15,14 @@
 
 import * as runtime from '../runtime';
 import type {
+  Relationship,
   User,
   UserPost,
   UserWithFollows,
 } from '../models/index';
 import {
+    RelationshipFromJSON,
+    RelationshipToJSON,
     UserFromJSON,
     UserToJSON,
     UserPostFromJSON,
@@ -36,6 +39,10 @@ export interface DeleteFollowRequest {
     id: number;
 }
 
+export interface GetRelationShipRequest {
+    id: number;
+}
+
 export interface GetUserByIdRequest {
     id: number;
 }
@@ -66,9 +73,9 @@ export interface GetUserPostsRequest {
 export class UsersApi extends runtime.BaseAPI {
 
     /**
-     * ユーザーIDをフォローする
+     * ユーザーIDをフォローする。またはフォローリクエストを送る
      */
-    async createFollowRaw(requestParameters: CreateFollowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+    async createFollowRaw(requestParameters: CreateFollowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Relationship>> {
         if (requestParameters.id === null || requestParameters.id === undefined) {
             throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling createFollow.');
         }
@@ -92,14 +99,15 @@ export class UsersApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.VoidApiResponse(response);
+        return new runtime.JSONApiResponse(response, (jsonValue) => RelationshipFromJSON(jsonValue));
     }
 
     /**
-     * ユーザーIDをフォローする
+     * ユーザーIDをフォローする。またはフォローリクエストを送る
      */
-    async createFollow(requestParameters: CreateFollowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
-        await this.createFollowRaw(requestParameters, initOverrides);
+    async createFollow(requestParameters: CreateFollowRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Relationship> {
+        const response = await this.createFollowRaw(requestParameters, initOverrides);
+        return await response.value();
     }
 
     /**
@@ -173,6 +181,44 @@ export class UsersApi extends runtime.BaseAPI {
         return await response.value();
     }
 
+    /**
+     * ユーザーIDとの関係を取得する
+     */
+    async getRelationShipRaw(requestParameters: GetRelationShipRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Relationship>> {
+        if (requestParameters.id === null || requestParameters.id === undefined) {
+            throw new runtime.RequiredError('id','Required parameter requestParameters.id was null or undefined when calling getRelationShip.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            const token = this.configuration.accessToken;
+            const tokenString = await token("bearer", []);
+
+            if (tokenString) {
+                headerParameters["Authorization"] = `Bearer ${tokenString}`;
+            }
+        }
+        const response = await this.request({
+            path: `/v0/users/{id}/relationship`.replace(`{${"id"}}`, encodeURIComponent(String(requestParameters.id))),
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => RelationshipFromJSON(jsonValue));
+    }
+
+    /**
+     * ユーザーIDとの関係を取得する
+     */
+    async getRelationShip(requestParameters: GetRelationShipRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Relationship> {
+        const response = await this.getRelationShipRaw(requestParameters, initOverrides);
+        return await response.value();
+    }
+
     /**
      * ユーザーIDからユーザーを取得する
      */

src/models/HealthControllerCheck200ResponseInfoValue.ts

@@ -19,20 +19,21 @@ import { exists, mapValues } from '../runtime';
  * @interface HealthControllerCheck200ResponseInfoValue
  */
 export interface HealthControllerCheck200ResponseInfoValue {
-    [key: string]: string | any;
+    [key: string]: any | any;
     /**
      * 
      * @type {string}
      * @memberof HealthControllerCheck200ResponseInfoValue
      */
-    status?: string;
+    status: string;
 }
 
 /**
  * Check if a given object implements the HealthControllerCheck200ResponseInfoValue interface.
  */
 export function instanceOfHealthControllerCheck200ResponseInfoValue(value: object): boolean {
     let isInstance = true;
+    isInstance = isInstance && "status" in value;
 
     return isInstance;
 }
@@ -48,7 +49,7 @@ export function HealthControllerCheck200ResponseInfoValueFromJSONTyped(json: any
     return {
 
             ...json,
-        'status': !exists(json, 'status') ? undefined : json['status'],
+        'status': json['status'],
     };
 }
 

src/models/Post.ts

@@ -51,7 +51,7 @@ export interface Post {
      */
     author: User;
     /**
-     * 本文|空orNullの場合はRTです。
+     * 本文|リポストの場合はUndefinedになります。
      * @type {string}
      * @memberof Post
      */
@@ -62,6 +62,18 @@ export interface Post {
      * @memberof Post
      */
     postedAt: Date;
+    /**
+     * リポスト数
+     * @type {number}
+     * @memberof Post
+     */
+    repostCount: number;
+    /**
+     * お気に入り数
+     * @type {number}
+     * @memberof Post
+     */
+    favoriteCount: number;
 }
 
 /**
@@ -72,6 +84,8 @@ export function instanceOfPost(value: object): boolean {
     isInstance = isInstance && "id" in value;
     isInstance = isInstance && "author" in value;
     isInstance = isInstance && "postedAt" in value;
+    isInstance = isInstance && "repostCount" in value;
+    isInstance = isInstance && "favoriteCount" in value;
 
     return isInstance;
 }
@@ -92,6 +106,8 @@ export function PostFromJSONTyped(json: any, ignoreDiscriminator: boolean): Post
         'author': UserFromJSON(json['author']),
         'text': !exists(json, 'text') ? undefined : json['text'],
         'postedAt': (new Date(json['posted_at'])),
+        'repostCount': json['repost_count'],
+        'favoriteCount': json['favorite_count'],
     };
 }
 
@@ -110,6 +126,8 @@ export function PostToJSON(value?: Post | null): any {
         'author': UserToJSON(value.author),
         'text': value.text,
         'posted_at': (value.postedAt.toISOString()),
+        'repost_count': value.repostCount,
+        'favorite_count': value.favoriteCount,
     };
 }
 

src/models/Relationship.ts

@@ -0,0 +1,84 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cuculus API
+ * The Cuculus API description
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface Relationship
+ */
+export interface Relationship {
+    /**
+     * 
+     * @type {number}
+     * @memberof Relationship
+     */
+    id: number;
+    /**
+     * フォロー中
+     * @type {boolean}
+     * @memberof Relationship
+     */
+    following: boolean;
+    /**
+     * フォローリクエスト中
+     * @type {boolean}
+     * @memberof Relationship
+     */
+    followRequested: boolean;
+}
+
+/**
+ * Check if a given object implements the Relationship interface.
+ */
+export function instanceOfRelationship(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "id" in value;
+    isInstance = isInstance && "following" in value;
+    isInstance = isInstance && "followRequested" in value;
+
+    return isInstance;
+}
+
+export function RelationshipFromJSON(json: any): Relationship {
+    return RelationshipFromJSONTyped(json, false);
+}
+
+export function RelationshipFromJSONTyped(json: any, ignoreDiscriminator: boolean): Relationship {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'id': json['id'],
+        'following': json['following'],
+        'followRequested': json['follow_requested'],
+    };
+}
+
+export function RelationshipToJSON(value?: Relationship | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'id': value.id,
+        'following': value.following,
+        'follow_requested': value.followRequested,
+    };
+}
+

src/models/User.ts

@@ -56,11 +56,11 @@ export interface User {
      */
     profileImageUrl: string;
     /**
-     * 
+     * 非公開アカウントかどうか
      * @type {boolean}
      * @memberof User
      */
-    _protected: boolean;
+    isPrivate: boolean;
     /**
      * 
      * @type {string}
@@ -86,7 +86,7 @@ export function instanceOfUser(value: object): boolean {
     isInstance = isInstance && "createdAt" in value;
     isInstance = isInstance && "bio" in value;
     isInstance = isInstance && "profileImageUrl" in value;
-    isInstance = isInstance && "_protected" in value;
+    isInstance = isInstance && "isPrivate" in value;
     isInstance = isInstance && "url" in value;
     isInstance = isInstance && "verified" in value;
 
@@ -109,7 +109,7 @@ export function UserFromJSONTyped(json: any, ignoreDiscriminator: boolean): User
         'createdAt': (new Date(json['created_at'])),
         'bio': json['bio'],
         'profileImageUrl': json['profile_image_url'],
-        '_protected': json['protected'],
+        'isPrivate': json['is_private'],
         'url': json['url'],
         'verified': json['verified'],
     };
@@ -130,7 +130,7 @@ export function UserToJSON(value?: User | null): any {
         'created_at': (value.createdAt.toISOString()),
         'bio': value.bio,
         'profile_image_url': value.profileImageUrl,
-        'protected': value._protected,
+        'is_private': value.isPrivate,
         'url': value.url,
         'verified': value.verified,
     };