fishpi 0.0.47 → 0.0.49

package/lib/article.js

@@ -12,11 +12,7 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -48,7 +44,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/breezemoon.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/chat.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -37,7 +33,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/chatroom.d.ts

@@ -85,7 +85,7 @@ declare class ChatRoom {
          * @param oId 红包消息 Id
          * @param gesture 猜拳类型
          */
-        open(oId: string, gesture?: GestureType): Promise<ApiResponse<RedPacketInfo>>;
+        open(oId: string, gesture?: GestureType | undefined): Promise<ApiResponse<RedPacketInfo>>;
         /**
          * 发送一个红包
          * @param redpacket 红包对象

package/lib/chatroom.js

@@ -12,11 +12,7 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -48,7 +44,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/comment.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/emoji.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/finger.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -48,6 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Finger = void 0;
+var typing_1 = require("./typing");
 var utils_1 = require("./utils");
 var Finger = /** @class */ (function () {
     function Finger(key) {
@@ -140,19 +141,22 @@ var Finger = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
+                        metal = new typing_1.MetalBase(metal);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, (0, utils_1.request)({
                                 url: "user/edit/give-metal",
                                 method: 'post',
                                 data: __assign(__assign({ goldFingerKey: this.goldFingerKey, userName: userName }, metal), { attr: metal.attr.toString() }),
                             })];
-                    case 1:
+                    case 2:
                         rsp = _a.sent();
                         return [2 /*return*/, rsp];
-                    case 2:
+                    case 3:
                         e_3 = _a.sent();
                         throw e_3;
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });

package/lib/index.js

@@ -12,11 +12,7 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -51,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/notice.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/typing.d.ts

@@ -559,6 +559,8 @@ export declare class MetalBase {
      * 徽章数据
      */
     data: string;
+    constructor(metal?: MetalBase);
+    toUrl(includeText?: boolean): string;
 }
 /**
  * 徽章信息
@@ -580,7 +582,7 @@ export interface Metal extends MetalBase {
 /**
  * 徽章列表
  */
-export type MetalList = Array<Metal>;
+export declare type MetalList = Array<Metal>;
 export declare enum ClientType {
     /**
      * 网页端
@@ -777,7 +779,7 @@ export interface Message extends MessageEvent {
      */
     data: OnlineMsg | discussMsg | RevokeMsg | ChatMsg | RedPacketStatusMsg | BarragerMsg | CustomMsg;
 }
-export type CustomMsg = string;
+export declare type CustomMsg = string;
 /**
  * 弹幕消息
  */
@@ -818,7 +820,7 @@ export interface BarragerMsg {
 /**
  * 在线用户消息
  */
-export type OnlineMsg = Array<{
+export declare type OnlineMsg = Array<{
     /**
      * 用户首页
      */
@@ -835,11 +837,11 @@ export type OnlineMsg = Array<{
 /**
  * 主题修改消息，主题内容
  */
-export type discussMsg = string;
+export declare type discussMsg = string;
 /**
  * 撤回消息，被撤回消息的 oId
  */
-export type RevokeMsg = string;
+export declare type RevokeMsg = string;
 /**
  * 聊天消息
  */
@@ -897,7 +899,7 @@ export interface ChatMsg {
 /**
  * @ 用户列表
  */
-export type AtUserList = Array<{
+export declare type AtUserList = Array<{
     /**
      * 用户名
      */
@@ -965,7 +967,7 @@ export declare enum NoticeType {
 /**
  * 通知列表
  */
-export type NoticeList = Array<NoticePoint | NoticeComment | NoticeAt | NoticeFollow | NoticeSystem>;
+export declare type NoticeList = Array<NoticePoint | NoticeComment | NoticeAt | NoticeFollow | NoticeSystem>;
 /**
  * 通知数
  */
@@ -1536,7 +1538,7 @@ export declare enum ArticleStatus {
 /**
  * 评论者信息
  */
-export type CommentAuthor = ArticleAuthor;
+export declare type CommentAuthor = ArticleAuthor;
 /**
  * 文章作者信息
  */

package/lib/typing.js

@@ -1,6 +1,7 @@
 "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;
+var utils_1 = require("./utils");
 /**
  * 数据类型
  */
@@ -216,7 +217,7 @@ var MetalAttr = /** @class */ (function () {
 }());
 exports.MetalAttr = MetalAttr;
 var MetalBase = /** @class */ (function () {
-    function MetalBase() {
+    function MetalBase(metal) {
         /**
          * 徽章属性
          */
@@ -233,7 +234,22 @@ var MetalBase = /** @class */ (function () {
          * 徽章数据
          */
         this.data = '';
+        if (!metal) {
+            return;
+        }
+        this.attr = Object.assign(new MetalAttr(), metal.attr);
+        this.name = metal.name;
+        this.description = metal.description;
+        this.data = metal.data;
     }
+    MetalBase.prototype.toUrl = function (includeText) {
+        if (includeText === void 0) { includeText = true; }
+        var url = "https://".concat(utils_1.domain, "/gen?txt=").concat(this.description, "&").concat(this.attr.toString());
+        if (!includeText) {
+            url = "https://".concat(utils_1.domain, "/gen?txt=&").concat(this.attr.toString());
+        }
+        return url;
+    };
     return MetalBase;
 }());
 exports.MetalBase = MetalBase;

package/lib/user.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/utils.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -37,7 +33,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/package.json

@@ -1,55 +1,55 @@
-{
-  "name": "fishpi",
-  "version": "0.0.47",
-  "description": "A Package to use API of fishpi.",
-  "main": "./lib/index.js",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "prebuild": "rimraf lib",
-    "build": "tsc",
-    "prepublish": "npm run build",
-    "test": "NODE_OPTIONS=\"-r ts-node/register --no-warnings\" node  ./test/index.ts",
-    "publish": "npm publish"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/imlinhanchao/fishpi-api-package.git"
-  },
-  "license": "MIT",
-  "author": {
-    "name": "Hancel.Lin",
-    "email": "imlinhanchao@foxmail.com",
-    "url": "https://github.com/imlinhanchao"
-  },
-  "engines": {
-    "node": ">=12.0"
-  },
-  "keywords": [],
-  "bugs": {
-    "url": "https://github.com/imlinhanchao/fishpi-api-package/issues"
-  },
-  "homepage": "https://github.com/imlinhanchao/fishpi-api-package#readme",
-  "dependencies": {
-    "@types/js-md5": "^0.7.0",
-    "form-data": "^4.0.0",
-    "js-md5": "^0.7.3",
-    "reconnecting-websocket": "^4.4.0",
-    "ws": "^8.4.2"
-  },
-  "devDependencies": {
-    "@types/node": "^12.20.11",
-    "@types/node-fetch": "^2.6.3",
-    "@types/ws": "^8.2.2",
-    "node-fetch": "2",
-    "rimraf": "^5.0.0",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.2.4"
-  },
-  "release": {
-    "branches": [
-      "master"
-    ]
-  }
-}
+{
+  "name": "fishpi",
+  "version": "0.0.49",
+  "description": "A Package to use API of fishpi.",
+  "main": "./lib/index.js",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "prebuild": "rimraf lib",
+    "build": "tsc",
+    "prepublish": "npm run build",
+    "test": "NODE_OPTIONS=\"-r ts-node/register --no-warnings\" node  ./test/index.ts",
+    "publish": "npm publish"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/imlinhanchao/fishpi-api-package.git"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "Hancel.Lin",
+    "email": "imlinhanchao@foxmail.com",
+    "url": "https://github.com/imlinhanchao"
+  },
+  "engines": {
+    "node": ">=12.0"
+  },
+  "keywords": [],
+  "bugs": {
+    "url": "https://github.com/imlinhanchao/fishpi-api-package/issues"
+  },
+  "homepage": "https://github.com/imlinhanchao/fishpi-api-package#readme",
+  "dependencies": {
+    "@types/js-md5": "^0.7.0",
+    "form-data": "^4.0.0",
+    "js-md5": "^0.7.3",
+    "reconnecting-websocket": "^4.4.0",
+    "ws": "^8.4.2"
+  },
+  "devDependencies": {
+    "@types/node": "^12.20.11",
+    "@types/node-fetch": "^2.6.3",
+    "@types/ws": "^8.2.2",
+    "node-fetch": "2",
+    "rimraf": "^5.0.0",
+    "ts-node": "^10.2.1",
+    "typescript": "^4.2.4"
+  },
+  "release": {
+    "branches": [
+      "master"
+    ]
+  }
+}