fishpi 0.0.52 → 0.0.54

package/lib/article.d.ts

@@ -1,4 +1,4 @@
-import { ApiResponse, ArticlePost, ArticleListType, ArticleDetail, VoteStatus, ArticleList, ArticleType } from './typing';
+import { ApiResponse, ArticlePost, ArticleListType, ArticleDetail, ArticleList, ArticleType, VoteType } from './typing';
 import ReconnectingWebSocket from 'reconnecting-websocket';
 declare class Article {
     private _apiKey;
@@ -35,11 +35,23 @@ declare class Article {
      * @param tag 指定查询标签，可选
      * @returns 文章列表
      */
-    list({ type, page, tag }: {
+    list({ type, page, size, tag }: {
         type: ArticleListType;
         page?: number;
+        size?: number;
         tag?: string;
     }): Promise<ApiResponse<ArticleList>>;
+    /**
+     * 查询文章列表
+     * @param type 查询类型
+     * @param tag 指定查询标签，可选
+     * @returns 文章列表
+     */
+    listByUser({ user, page, size }: {
+        user: string;
+        page?: number;
+        size?: number;
+    }): Promise<ApiResponse<ArticleList>>;
     /**
      * 查询用户文章列表
      * @param userName 用户名
@@ -66,7 +78,7 @@ declare class Article {
     vote(id: string, type: 'up' | 'down'): Promise<{
         code: number;
         msg?: string;
-        type?: VoteStatus;
+        type?: VoteType;
     }>;
     /**
      * 感谢文章

package/lib/article.js

@@ -155,27 +155,55 @@ var Article = /** @class */ (function () {
      * @returns 文章列表
      */
     Article.prototype.list = function (_a) {
-        var type = _a.type, _b = _a.page, page = _b === void 0 ? 1 : _b, tag = _a.tag;
+        var type = _a.type, _b = _a.page, page = _b === void 0 ? 1 : _b, _c = _a.size, size = _c === void 0 ? 20 : _c, tag = _a.tag;
         return __awaiter(this, void 0, void 0, function () {
             var rsp, e_3;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _c.trys.push([0, 2, , 3]);
+                        _d.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, (0, utils_1.request)({
-                                url: "api/articles/".concat(tag !== undefined ? "tag/".concat(tag) : 'recent').concat(type, "?p=").concat(page, "&").concat(this._apiKey ? "apiKey=".concat(this._apiKey) : ''),
+                                url: "api/articles/".concat(tag !== undefined ? "tag/".concat(tag) : 'recent').concat(type, "?p=").concat(page, "&size=").concat(size, "&").concat(this._apiKey ? "apiKey=".concat(this._apiKey) : ''),
                             })];
                     case 1:
-                        rsp = _c.sent();
+                        rsp = _d.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_3 = _c.sent();
+                        e_3 = _d.sent();
                         throw e_3;
                     case 3: return [2 /*return*/];
                 }
             });
         });
     };
+    /**
+     * 查询文章列表
+     * @param type 查询类型
+     * @param tag 指定查询标签，可选
+     * @returns 文章列表
+     */
+    Article.prototype.listByUser = function (_a) {
+        var user = _a.user, _b = _a.page, page = _b === void 0 ? 1 : _b, _c = _a.size, size = _c === void 0 ? 20 : _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_4;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _d.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "api/user/".concat(user, "articles?p=").concat(page, "&size=").concat(size, "&").concat(this._apiKey ? "apiKey=".concat(this._apiKey) : ''),
+                            })];
+                    case 1:
+                        rsp = _d.sent();
+                        return [2 /*return*/, rsp];
+                    case 2:
+                        e_4 = _d.sent();
+                        throw e_4;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * 查询用户文章列表
      * @param userName 用户名
@@ -184,7 +212,7 @@ var Article = /** @class */ (function () {
     Article.prototype.userArticles = function (_a) {
         var userName = _a.userName, _b = _a.page, page = _b === void 0 ? 1 : _b;
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_4;
+            var rsp, e_5;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -196,8 +224,8 @@ var Article = /** @class */ (function () {
                         rsp = _c.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_4 = _c.sent();
-                        throw e_4;
+                        e_5 = _c.sent();
+                        throw e_5;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -211,7 +239,7 @@ var Article = /** @class */ (function () {
     Article.prototype.detail = function (id, p) {
         if (p === void 0) { p = 1; }
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, i, i, e_5;
+            var rsp, i, i, e_6;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -230,8 +258,8 @@ var Article = /** @class */ (function () {
                         }
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_5 = _a.sent();
-                        throw e_5;
+                        e_6 = _a.sent();
+                        throw e_6;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -245,7 +273,7 @@ var Article = /** @class */ (function () {
      */
     Article.prototype.vote = function (id, type) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_6;
+            var rsp, e_7;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -262,8 +290,8 @@ var Article = /** @class */ (function () {
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_6 = _a.sent();
-                        throw e_6;
+                        e_7 = _a.sent();
+                        throw e_7;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -275,7 +303,7 @@ var Article = /** @class */ (function () {
      */
     Article.prototype.thank = function (id) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_7;
+            var rsp, e_8;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -291,8 +319,8 @@ var Article = /** @class */ (function () {
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_7 = _a.sent();
-                        throw e_7;
+                        e_8 = _a.sent();
+                        throw e_8;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -304,7 +332,7 @@ var Article = /** @class */ (function () {
      */
     Article.prototype.follow = function (followingId) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_8;
+            var rsp, e_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -321,8 +349,8 @@ var Article = /** @class */ (function () {
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_8 = _a.sent();
-                        throw e_8;
+                        e_9 = _a.sent();
+                        throw e_9;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -334,7 +362,7 @@ var Article = /** @class */ (function () {
      */
     Article.prototype.watch = function (followingId) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_9;
+            var rsp, e_10;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -351,8 +379,8 @@ var Article = /** @class */ (function () {
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_9 = _a.sent();
-                        throw e_9;
+                        e_10 = _a.sent();
+                        throw e_10;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -364,7 +392,7 @@ var Article = /** @class */ (function () {
      */
     Article.prototype.reward = function (id) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_10;
+            var rsp, e_11;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -380,8 +408,8 @@ var Article = /** @class */ (function () {
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_10 = _a.sent();
-                        throw e_10;
+                        e_11 = _a.sent();
+                        throw e_11;
                     case 3: return [2 /*return*/];
                 }
             });
@@ -393,7 +421,7 @@ var Article = /** @class */ (function () {
      */
     Article.prototype.heat = function (id) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_11;
+            var rsp, e_12;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -408,8 +436,8 @@ var Article = /** @class */ (function () {
                             throw new Error(rsp.msg);
                         return [2 /*return*/, rsp.articleHeat];
                     case 2:
-                        e_11 = _a.sent();
-                        throw e_11;
+                        e_12 = _a.sent();
+                        throw e_12;
                     case 3: return [2 /*return*/];
                 }
             });

package/lib/breezemoon.d.ts

@@ -1,4 +1,4 @@
-import { ApiResponse, BreezemoonContent } from './typing';
+import { ApiResponse, BreezemoonContent, BreezemoonList } from './typing';
 declare class Breezemoon {
     private _apiKey;
     constructor(token?: string);
@@ -16,6 +16,12 @@ declare class Breezemoon {
         code: number;
         breezemoons: Array<BreezemoonContent>;
     }>;
+    /**
+     * 获取清风明月列表
+     * @param page 消息页码
+     * @param size 每页个数
+     */
+    listByUser(user: string, page?: number, size?: number): Promise<ApiResponse<BreezemoonList>>;
     /**
      * 发送清风明月
      * @param content 内容

package/lib/breezemoon.js

@@ -81,13 +81,41 @@ var Breezemoon = /** @class */ (function () {
             });
         });
     };
+    /**
+     * 获取清风明月列表
+     * @param page 消息页码
+     * @param size 每页个数
+     */
+    Breezemoon.prototype.listByUser = function (user, page, size) {
+        if (page === void 0) { page = 1; }
+        if (size === void 0) { size = 20; }
+        return __awaiter(this, void 0, void 0, function () {
+            var rsp, e_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, (0, utils_1.request)({
+                                url: "api/user/".concat(user, "breezemoons?p=").concat(page, "&size=").concat(size, "&apiKey=").concat(this._apiKey)
+                            })];
+                    case 1:
+                        rsp = _a.sent();
+                        return [2 /*return*/, rsp];
+                    case 2:
+                        e_2 = _a.sent();
+                        throw e_2;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * 发送清风明月
      * @param content 内容
      */
     Breezemoon.prototype.send = function (content) {
         return __awaiter(this, void 0, void 0, function () {
-            var rsp, e_2;
+            var rsp, e_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -104,8 +132,8 @@ var Breezemoon = /** @class */ (function () {
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
                     case 2:
-                        e_2 = _a.sent();
-                        throw e_2;
+                        e_3 = _a.sent();
+                        throw e_3;
                     case 3: return [2 /*return*/];
                 }
             });

package/lib/chatroom.js

@@ -327,7 +327,7 @@ var ChatRoom = /** @class */ (function () {
                             })];
                     case 1:
                         rsp = _a.sent();
-                        mat = rsp.match(/>发送弹幕每次将花费\s*<b>([-0-9]+)<\/b>\s*([^<]*?)<\/div>/);
+                        mat = rsp.match(/barragerCost">([-0-9]+)<\/span><\/b>\s*<span id="barragerUnit">([^<]*?)<\//);
                         if (mat) {
                             return [2 /*return*/, {
                                     cost: parseInt(mat[1]),
@@ -532,10 +532,8 @@ var ChatRoom = /** @class */ (function () {
                                                     userOId = msg.userOId, oId = msg.oId, time = msg.time, userName = msg.userName, userNickname = msg.userNickname, userAvatarURL = msg.userAvatarURL, content = msg.content, md = msg.md, client = msg.client;
                                                     try {
                                                         data_1 = JSON.parse(content);
-                                                        if (data_1.msgType === 'redPacket') {
-                                                            content = data_1;
-                                                            msg.type = 'redPacket';
-                                                        }
+                                                        content = data_1;
+                                                        msg.type = data_1.msgType;
                                                     }
                                                     catch (e) { }
                                                     data = { userOId: userOId, oId: oId, time: time, userName: userName, userNickname: userNickname, userAvatarURL: userAvatarURL, content: content, md: md, client: client, via: (0, utils_1.clientToVia)(client) };

package/lib/comment.d.ts

@@ -1,4 +1,4 @@
-import { ApiResponse, CommentPost, VoteStatus } from './typing';
+import { ApiResponse, CommentPost, VoteType } from './typing';
 declare class Comment {
     private _apiKey;
     constructor(token?: string);
@@ -33,7 +33,7 @@ declare class Comment {
     vote(id: string, type: 'up' | 'down'): Promise<{
         code: number;
         msg?: string;
-        type?: VoteStatus;
+        type?: VoteType;
     }>;
     /**
      * 评论感谢

package/lib/index.js

@@ -443,6 +443,7 @@ var FishPi = /** @class */ (function () {
                             data = new FormData();
                             files.forEach(function (f) { return data.append('file[]', require('fs').readFileSync(f.toString()), require('path').basename(f.toString())); });
                         }
+                        data.append('apiKey', this.apiKey);
                         _b.label = 3;
                     case 3:
                         _b.trys.push([3, 5, , 6]);

package/lib/typing.d.ts

@@ -657,6 +657,10 @@ export interface ChatRoomMessage {
      * 消息 Id
      */
     oId: string;
+    /**
+     * 发送用户 Id
+     */
+    userOId: string;
     /**
      * 发送者用户名
      */
@@ -1226,6 +1230,22 @@ export interface NoticeSystem {
      */
     createTime: string;
 }
+/**
+ * 用户清风明月列表
+ */
+export interface BreezemoonList {
+    /**
+     * 分页信息
+     */
+    pagination: {
+        paginationPageCount: number;
+        paginationPageNums: Array<number>;
+    };
+    /**
+     * 清风明月列表
+     */
+    breezemoons: Array<BreezemoonContent>;
+}
 export interface BreezemoonContent {
     /**
      * 发布者用户名
@@ -1829,7 +1849,7 @@ export interface ArticleDetail {
      */
     articleQnAOfferPoint: number;
     /**
-     * 作者头像缩略图
+     * 文章缩略图
      */
     articleThumbnailURL: string;
     /**
@@ -2267,7 +2287,7 @@ export declare enum ArticleListType {
 /**
  * 点赞类型
  */
-export declare enum VoteStatus {
+export declare enum VoteType {
     /**
      * 点赞
      */

package/lib/typing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArticleListType = exports.ArticleStatus = exports.YesNoStatus = exports.VoteStatus = exports.PublicStatus = exports.ArticleType = exports.ReportType = exports.ReportDataType = exports.NoticeType = exports.ChatRoomMessageType = exports.ChatMessageType = exports.ChatContentType = exports.ClientType = exports.MetalBase = exports.MetalAttr = exports.RedPacketType = exports.GestureType = exports.UserAppRole = exports.DataType = void 0;
+exports.VoteType = exports.ArticleListType = exports.ArticleStatus = exports.YesNoStatus = exports.VoteStatus = exports.PublicStatus = exports.ArticleType = exports.ReportType = exports.ReportDataType = exports.NoticeType = exports.ChatRoomMessageType = exports.ChatMessageType = exports.ChatContentType = exports.ClientType = exports.MetalBase = exports.MetalAttr = exports.RedPacketType = exports.GestureType = exports.UserAppRole = exports.DataType = void 0;
 var utils_1 = require("./utils");
 /**
  * 数据类型
@@ -581,13 +581,14 @@ var ArticleListType;
 /**
  * 点赞类型
  */
-(function (VoteStatus) {
+var VoteType;
+(function (VoteType) {
     /**
      * 点赞
      */
-    VoteStatus[VoteStatus["Voted"] = 0] = "Voted";
+    VoteType[VoteType["Voted"] = 0] = "Voted";
     /**
      * 取消点赞
      */
-    VoteStatus[VoteStatus["Unvote"] = -1] = "Unvote";
-})(VoteStatus = exports.VoteStatus || (exports.VoteStatus = {}));
+    VoteType[VoteType["Unvote"] = -1] = "Unvote";
+})(VoteType = exports.VoteType || (exports.VoteType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fishpi",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "A Package to use API of fishpi.",
   "main": "./lib/index.js",
   "files": [