@taole/newgiftbar 0.0.6 → 0.0.8

package/README.md

@@ -47,3 +47,6 @@ giftBar.init({
     resolveUsers: () => users,
 });
 ```
+
+# 厅白名单更新地址
+https://y.tuwan.com/events/qhmupload

package/npm/newgiftbar.es.js

@@ -628,8 +628,8 @@ const options = {
    */
   clickGiftItem: null,
   /**
-   * 底部确认后的厅内独占执行。可能扣包裹 / 送给当前厅。
-   * type 30/37 onlySendGift（teacherid=0）。特赦卡 type=29 在栏内 giveGift，不进这里。
+   * 底部确认后的厅内独占执行。type 30/37 已在栏内 giveGift，不再走这里。
+   * 特赦卡 type=29 也在栏内。目前新栏底部不再调用。
    * @type {(payload: { gift: object, tabId: number|string, count?: number, selectUser?: object }) => void|Promise<void>}
    */
   useGiftAsync: null,
@@ -888,6 +888,13 @@ const IM_DEFAULT_MAGIC_TIP_LINK = "https://y.tuwan.com/activity/36C33a2de?v=1656
 function isPackageTab(tabId) {
   return PACKAGE_TAB_IDS.indexOf(Number(tabId)) > -1;
 }
+function isHallGiveGift(gift) {
+  const type = Number(gift && gift.type);
+  return type === 30 || type === 37;
+}
+function isRoomHallGiveGift(gift) {
+  return !isImSource() && isHallGiveGift(gift);
+}
 function getVipLevelUrl() {
   return "https://y" + (options.isChatTest ? "-test" : "") + ".tuwan.com/vip_level";
 }
@@ -1246,9 +1253,6 @@ function resolveFooterAction(action, gift, tabId, selectedUser) {
     if (Number(gift.question_gift) === 1) {
       return { kind: "question" };
     }
-    if (type === 30 || type === 37) {
-      return { kind: "hostUse" };
-    }
     if (id === 1293 && uid === 0) {
       return { kind: "alert", message: "该礼物不能赠送全麦" };
     }
@@ -4581,6 +4585,22 @@ function buildPayUrl({ gift, tabId, count, action, ctx, extra }) {
   const paySure = extra && extra.pay_sure !== void 0 ? extra.pay_sure : 0;
   const question = extra && extra.question || "";
   const open = extra && extra.open || 0;
+  if (isRoomHallGiveGift(gift)) {
+    return giveGiftUrl(
+      platformPrefixQuery([
+        ["giftid", giftId],
+        ["teacherid", 0],
+        ["is_whole_wheat", 0],
+        ["num", count],
+        ["cid", ctx.cid],
+        ["worth", worth],
+        ["question_gift", 0],
+        ["question", ""],
+        ["open", 0],
+        ...extraParts(ctx, extra)
+      ])
+    );
+  }
   if (isPackageTab(navid)) {
     if (type === 7) {
       if (isImSource()) {
@@ -5861,6 +5881,15 @@ function pickError(response, meta) {
   if (!response) {
     return -99;
   }
+  if (isRoomHallGiveGift(meta && meta.gift)) {
+    if (Object.prototype.hasOwnProperty.call(response, "error")) {
+      return response.error;
+    }
+    if (Object.prototype.hasOwnProperty.call(response, "code")) {
+      return response.code;
+    }
+    return -99;
+  }
   if (isPackageOrdinaryGift(meta) && Object.prototype.hasOwnProperty.call(response, "code")) {
     return response.code;
   }
@@ -5897,9 +5926,18 @@ async function requestPay(url, meta) {
   const response = await options.request(url);
   const error = pickError(response, meta);
   if (error === 0) {
+    if (isRoomHallGiveGift(meta && meta.gift) && String(response.code) === "9" && response.error_msg) {
+      alertMsg(response.error_msg);
+    }
     notifyPaySuccess(meta, response, url);
     return response;
   }
+  if (error === 9 && isRoomHallGiveGift(meta && meta.gift)) {
+    if (response.error_msg) {
+      alertMsg(response.error_msg);
+    }
+    return response;
+  }
   if (error === 199) {
     return response;
   }
@@ -5932,6 +5970,13 @@ async function requestPay(url, meta) {
       checkboxText: row && row.remark || "今日不再提示"
     });
     if (choice.ok) {
+      if (isRoomHallGiveGift(meta && meta.gift)) {
+        const remind = choice.checked ? 2 : 1;
+        return requestPay(appendQuery(url, { remind }), {
+          ...meta,
+          extra: { ...meta.extra || {}, remind }
+        });
+      }
       return requestPay(appendQuery(url, { pay_sure: choice.checked ? 2 : 1 }), {
         ...meta,
         extra: { ...meta.extra || {}, pay_sure: choice.checked ? 2 : 1 }
@@ -5954,7 +5999,7 @@ async function requestPay(url, meta) {
     return response;
   }
   if (error === -2) {
-    if (isPackageOrdinaryGift(meta)) {
+    if (isPackageOrdinaryGift(meta) || isRoomHallGiveGift(meta && meta.gift)) {
       alertMsg(response.error_msg || "赠送失败");
       return response;
     }
@@ -6005,7 +6050,7 @@ async function payGiftAction({ gift, tabId, count, selectedUser, action, extra }
     options.onQuestionGift({ gift, tabId, count, selectedUser, ctx });
     return null;
   }
-  if (source !== "im" && action === "send" && selectedUser) {
+  if (source !== "im" && action === "send" && selectedUser && !isRoomHallGiveGift(gift)) {
     if (Number(selectedUser.uid) === Number(ctx.selfUid) && !canSendToSelf(gift, tabId)) {
       alertMsg("自己不能送给自己礼物");
       return null;
@@ -6040,15 +6085,20 @@ async function payGiftAction({ gift, tabId, count, selectedUser, action, extra }
       }
     }
   }
+  const payExtra = {
+    ...extra || {},
+    // 对标 onlySendGift：成功不发 giftall，公屏靠服务端
+    ...isRoomHallGiveGift(gift) ? { skipPaySuccess: true } : {}
+  };
   const url = buildPayUrl({
     gift,
     tabId,
     count,
     action,
     ctx,
-    extra: extra || {}
+    extra: payExtra
   });
-  return requestPay(url, { gift, tabId, count, selectedUser, action, ctx, extra: extra || {} });
+  return requestPay(url, { gift, tabId, count, selectedUser, action, ctx, extra: payExtra });
 }
 class SvgaPlayer {
   constructor() {
@@ -19832,8 +19882,11 @@ function instance($$self, $$props, $$invalidate) {
         selectedUser: currentUser,
         action: cmd.payAction || "send"
       });
-      const ok = response && (response.error === 0 || response.code === 0);
-      if (ok && Number(selectGiftItem.type) === 24 && isPackageTab(activeTabId)) {
+      const hallGive = isRoomHallGiveGift(selectGiftItem);
+      const ok = response && (response.error === 0 || response.code === 0 || hallGive && (response.error === 9 || String(response.code) === "9"));
+      if (ok && hallGive) {
+        await updateView();
+      } else if (ok && Number(selectGiftItem.type) === 24 && isPackageTab(activeTabId)) {
         setTimeout(() => getBaoguo(true), 1500);
       } else if (isPackageTab(activeTabId)) {
         getBaoguo(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/newgiftbar",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "聊天室 / IM 礼物栏业务组件",
   "author": "",
   "module": "./npm/newgiftbar.es.js",